diff --git a/.gitignore b/.gitignore
index 2aaad73c13f..20b9a13e93f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,33 +13,6 @@ generated-sources/*
 generated-code/*
 *.swp
 *.swo
-*.csproj.user
-
-/target
-/generated-files
-/nbactions.xml
-*.pyc
-__pycache__
-samples/server-generator/scalatra/output
-samples/server-generator/node/output/node_modules
-samples/server-generator/scalatra/target
-samples/server-generator/scalatra/output/.history
-samples/client/petstore/qt5cpp/PetStore/moc_*
-samples/client/petstore/qt5cpp/PetStore/*.o
-samples/client/petstore/objc/PetstoreClient.xcworkspace/xcuserdata
-samples/client/petstore/qt5cpp/build-*
-samples/client/petstore/qt5cpp/PetStore/PetStore
-samples/client/petstore/qt5cpp/PetStore/Makefile
-samples/client/petstore/java/hello.txt
-samples/client/petstore/android/default/hello.txt
-samples/client/petstore/objc/SwaggerClientTests/Build
-samples/client/petstore/objc/SwaggerClientTests/Pods
-samples/client/petstore/objc/SwaggerClientTests/SwaggerClient.xcworkspace
-samples/client/petstore/objc/SwaggerClientTests/Podfile.lock
-samples/server/petstore/nodejs/node_modules
-samples/client/petstore/csharp/SwaggerClientTest/.vs
-samples/client/petstore/csharp/SwaggerClientTest/obj
-samples/client/petstore/csharp/SwaggerClientTest/bin
 target
 .idea
 .lib
@@ -48,15 +21,7 @@ atlassian-ide-plugin.xml
 packages/
 .pub
 .packages
-
-samples/client/petstore/php/SwaggerClient-php/composer.lock
-samples/client/petstore/php/SwaggerClient-php/vendor/
-
-samples/client/petstore/silex/SwaggerServer/composer.lock
-samples/client/petstore/silex/SwaggerServer/venodr/
-
-samples/client/petstore/python/.projectile
-samples/client/petstore/python/.venv/
+.vagrant/
 
 .settings
 
@@ -65,3 +30,69 @@ samples/client/petstore/python/.venv/
 *.pm~
 *.xml~
 *.t~
+
+/target
+/generated-files
+/nbactions.xml
+
+# scalatra
+samples/server-generator/scalatra/output
+samples/server-generator/scalatra/target
+samples/server-generator/scalatra/output/.history
+
+# nodejs
+samples/server-generator/node/output/node_modules
+samples/server/petstore/nodejs/node_modules
+
+# qt5 cpp
+samples/client/petstore/qt5cpp/PetStore/moc_*
+samples/client/petstore/qt5cpp/PetStore/*.o
+samples/client/petstore/qt5cpp/build-*
+samples/client/petstore/qt5cpp/PetStore/PetStore
+samples/client/petstore/qt5cpp/PetStore/Makefile
+
+#Java/Android
+**/.gradle/
+samples/client/petstore/java/hello.txt
+samples/client/petstore/android/default/hello.txt
+
+#PHP
+samples/client/petstore/php/SwaggerClient-php/composer.lock
+samples/client/petstore/php/SwaggerClient-php/vendor/
+samples/client/petstore/silex/SwaggerServer/composer.lock
+samples/client/petstore/silex/SwaggerServer/venodr/
+
+# Perl
+samples/client/petstore/perl/deep_module_test/
+
+# Objc
+samples/client/petstore/objc/PetstoreClient.xcworkspace/xcuserdata
+samples/client/petstore/objc/SwaggerClientTests/SwaggerClient.xcodeproj/xcuserdata
+samples/client/petstore/objc/SwaggerClientTests/Build
+samples/client/petstore/objc/SwaggerClientTests/Pods
+samples/client/petstore/objc/SwaggerClientTests/SwaggerClient.xcworkspace
+samples/client/petstore/objc/SwaggerClientTests/Podfile.lock
+
+# Swift
+samples/client/petstore/swift/SwaggerClientTests/SwaggerClient.xcodeproj/xcuserdata
+samples/client/petstore/swift/SwaggerClientTests/SwaggerClient.xcworkspace/xcuserdata
+samples/client/petstore/swift/SwaggerClientTests/Pods/Pods.xcodeproj/xcuserdata
+samples/client/petstore/swift/SwaggerClientTests/Pods/Pods.xcodeproj/xcshareddata/xcschemes
+
+# C#
+*.csproj.user
+samples/client/petstore/csharp/SwaggerClientTest/.vs
+samples/client/petstore/csharp/SwaggerClientTest/obj
+samples/client/petstore/csharp/SwaggerClientTest/bin
+samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/vendor/
+samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/
+samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/
+
+# Python
+*.pyc
+__pycache__
+samples/client/petstore/python/dev-requirements.txt.log
+samples/client/petstore/python/swagger_client.egg-info/SOURCES.txt
+samples/client/petstore/python/.coverage
+samples/client/petstore/python/.projectile
+samples/client/petstore/python/.venv/
diff --git a/.travis.yml b/.travis.yml
index 46286b5e5ca..46bb326da69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ sudo: required
 language: java
 jdk:
   - oraclejdk7
+  - oraclejdk8
 
 services:
   - docker
@@ -11,12 +12,10 @@ before_install:
   - gem install bundler
 
 install:
-  - docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD
 
 script:
   - mvn verify -Psamples
-  - docker build -t $DOCKER_IMAGE_NAME ./modules/swagger-generator
-  - if [ ! -z "$TRAVIS_TAG" ]; then docker tag $DOCKER_IMAGE_NAME:latest $DOCKER_IMAGE_NAME:$TRAVIS_TAG; fi && docker push $DOCKER_IMAGE_NAME
+  - if [ $DOCKER_HUB_USERNAME ]; then docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD && docker build -t $DOCKER_IMAGE_NAME ./modules/swagger-generator && if [ ! -z "$TRAVIS_TAG" ]; then docker tag $DOCKER_IMAGE_NAME:latest $DOCKER_IMAGE_NAME:$TRAVIS_TAG; fi && docker push $DOCKER_IMAGE_NAME; fi
 
 env:
   - DOCKER_IMAGE_NAME=swaggerapi/swagger-generator
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f80eeb3cd01..35294347b00 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 
 ## Before submitting an issue
 
- - Before submitting an issue, search the [open issue](https://github.com/swagger-api/swagger-codegen/issues) and [closed issue](https://github.com/swagger-api/swagger-codegen/issues?q=is%3Aissue+is%3Aclosed) to ensure no one else has reported something similar before.
+ - Search the [open issue](https://github.com/swagger-api/swagger-codegen/issues) and [closed issue](https://github.com/swagger-api/swagger-codegen/issues?q=is%3Aissue+is%3Aclosed) to ensure no one else has reported something similar before.
  - The issue should contain details on how to repeat the issue, e.g. 
    - the OpenAPI Spec for reproducing the issue (:bulb: use [Gist](https://gist.github.com) to share). If the OpenAPI Spec cannot be shared publicly, it will be hard for the community to help
    - version of Swagger Codegen
@@ -31,10 +31,12 @@ For a list of variables available in the template, please refer to this [page](h
 Code change should conform to the programming style guide of the respective langauages:
 - C#: https://msdn.microsoft.com/en-us/library/vstudio/ff926074.aspx
 - Java: https://google.github.io/styleguide/javaguide.html
+- JavaScript - https://github.com/airbnb/javascript/tree/master/es5
 - ObjC: https://github.com/NYTimes/objective-c-style-guide
 - PHP: https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md
 - Python: https://www.python.org/dev/peps/pep-0008/
 - Ruby: https://github.com/bbatsov/ruby-style-guide
+- Swift: https://developer.apple.com/library/prerelease/ios/documentation/Swift/Conceptual/Swift_Programming_Language/TheBasics.html
 - TypeScript: https://github.com/Microsoft/TypeScript/wiki/Coding-guidelines
 
 
diff --git a/LICENSE b/LICENSE
index 542991f9550..ebfd64c4931 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2015 SmartBear Software
+Copyright 2016 SmartBear Software
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
index 243ae836dbd..c55a8d0adf2 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,13 @@
 # Swagger Code Generator
 
-[![Build Status](https://travis-ci.org/swagger-api/swagger-codegen.png)](https://travis-ci.org/swagger-api/swagger-codegen)
+[![Build Status](https://travis-ci.org/swagger-api/swagger-codegen.svg)](https://travis-ci.org/swagger-api/swagger-codegen)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.swagger/swagger-codegen-project/badge.svg?style=plastic)](https://maven-badges.herokuapp.com/maven-central/io.swagger/swagger-codegen-project)
+[![PR Stats](http://issuestats.com/github/swagger-api/swagger-codegen/badge/pr)](http://issuestats.com/github/swagger-api/swagger-codegen) [![Issue Stats](http://issuestats.com/github/swagger-api/swagger-codegen/badge/issue)](http://issuestats.com/github/swagger-api/swagger-codegen)
 
 :star::star::star: If you would like to contribute, please refer to [guidelines](https://github.com/swagger-api/swagger-codegen/blob/master/CONTRIBUTING.md) and a list of [open tasks](https://github.com/swagger-api/swagger-codegen/issues?q=is%3Aopen+is%3Aissue+label%3A%22Need+community+contribution%22).:star::star::star:
 
 ## Overview
-This is the swagger codegen project, which allows generation of client libraries automatically from a Swagger-compliant server.  
+This is the swagger codegen project, which allows generation of client libraries automatically from a Swagger-compliant server.
 
 Check out [Swagger-Spec](https://github.com/OAI/OpenAPI-Specification) for additional information about the Swagger project, including additional libraries with support for other languages and more.
 
@@ -22,7 +23,8 @@ Check out [Swagger-Spec](https://github.com/OAI/OpenAPI-Specification) for addit
     - [Building](#building)
     - [Docker](#docker)
       - [Build and run](#build-and-run-using-docker)
-      - [Build a Node.js server stub](#build-a-nodejs-server-stub)
+      - [Run docker in Vagrant](#run-docker-in-vagrant)
+      - [Public Docker image](#public-docker-image)
     - [Homebrew](#homebrew)
   - Generators
     - [To generate a sample client library](#to-generate-a-sample-client-library)
@@ -32,21 +34,28 @@ Check out [Swagger-Spec](https://github.com/OAI/OpenAPI-Specification) for addit
     - [Where is Javascript???](#where-is-javascript)
     - [Generating a client from local files](#generating-a-client-from-local-files)
     - [Customizing the generator](#customizing-the-generator)
-    - [Validating your OpenAPI Spec](#validating-your-swagger-spec)
+    - [Validating your OpenAPI Spec](#validating-your-openapi-spec)
     - [Generating dynamic html api documentation](#generating-dynamic-html-api-documentation)
     - [Generating static html api documentation](#generating-static-html-api-documentation)
     - [To build a server stub](#to-build-a-server-stub)
       - [Node.js](#nodejs)
+      - [PHP Slim](#php-slim)
       - [PHP Silex](#php-silex)
       - [Python Flask (Connexion)](#python-flask-connexion)
       - [Ruby Sinatra](#ruby-sinatra)
       - [Scala Scalatra](#scala-scalatra)
-      - [Java JAX-RS](#java-jax-rs)
+      - [Java JAX-RS (Java JAX-RS (Jersey v1.18)](#java-jax-rs-jersey-v118)
+      - [Java JAX-RS (Apache CXF 2 / 3)](#java-jax-rs-apache-cxf-2--3)
+      - [Java JAX-RS (Resteasy)](#java-jax-rs-resteasy)      
       - [Java Spring MVC](#java-spring-mvc)
+      - [Haskell Servant](#haskell-servant)
+      - [ASP.NET 5 Web API](#aspnet-5-web-api)
     - [To build the codegen library](#to-build-the-codegen-library)
   - [Workflow Integration](#workflow-integration)
+  - [Github Integration](#github-integration)
   - [Online Generators](#online-generators)
   - [Guidelines for Contribution](https://github.com/swagger-api/swagger-codegen/wiki/Guidelines-for-Contribution)
+  - [Companies/Projects using Swagger Codegen](#companiesprojects-using-swagger-codegen)
   - [License](#license)
 
 
@@ -56,16 +65,16 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20
 Swagger Codegen Version    | Release Date | OpenAPI Spec compatibility | Notes
 -------------------------- | ------------ | -------------------------- | -----
 2.1.6-SNAPSHOT             |              | 1.0, 1.1, 1.2, 2.0   | [master](https://github.com/swagger-api/swagger-codegen)
-2.1.5 (**current stable**) | 2015-01-06   | 1.0, 1.1, 1.2, 2.0   | [tag v2.1.5](https://github.com/swagger-api/swagger-codegen/tree/v2.1.4)
+2.1.5 (**current stable**) | 2015-01-06   | 1.0, 1.1, 1.2, 2.0   | [tag v2.1.5](https://github.com/swagger-api/swagger-codegen/tree/v2.1.5)
 2.0.17                     | 2014-08-22   | 1.1, 1.2             | [tag v2.0.17](https://github.com/swagger-api/swagger-codegen/tree/v2.0.17)
 1.0.4                      | 2012-04-12   | 1.0, 1.1             | [tag v1.0.4](https://github.com/swagger-api/swagger-codegen/tree/swagger-codegen_2.9.1-1.1)
 
 
 ### Prerequisites
-If you're looking for the latest stable version, you can grab it directly from maven central (you'll need the java 7 runtime):
+If you're looking for the latest stable version, you can grab it directly from maven central (you'll need java 7 runtime at a minimum):
 
 ```
-wget http://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.1.4/swagger-codegen-cli-2.1.4.jar swagger-codegen-cli.jar
+wget http://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.1.5/swagger-codegen-cli-2.1.5.jar -O swagger-codegen-cli.jar
 
 java -jar swagger-codegen-cli.jar help
 ```
@@ -77,16 +86,16 @@ brew install swagger-codegen
 
 To build from source, you need the following installed and available in your $PATH:
 
-* [Java 7](http://java.oracle.com)
+* [Java 7 or 8](http://java.oracle.com)
 
-* [Apache maven 3.0.3 or greater](http://maven.apache.org/)
+* [Apache maven 3.3.3 or greater](http://maven.apache.org/)
 
 #### OS X Users
-Don't forget to install Java 7. You probably have 1.6 or 1.8.
+Don't forget to install Java 7 or 8. You probably have 1.6.
 
 Export JAVA_HOME in order to use the supported Java version:
 ```
-export JAVA_HOME=`/usr/libexec/java_home -v 1.7`
+export JAVA_HOME=`/usr/libexec/java_home -v 1.8`
 export PATH=${JAVA_HOME}/bin:$PATH
 ```
 
@@ -102,21 +111,27 @@ mvn package
 
 ```
 git clone https://github.com/swagger-api/swagger-codegen
-
 cd swagger-codegen
-
 ./run-in-docker.sh mvn package
  ```
 
-#### Build a Node.js server stub
 
+
+#### Run Docker in Vagrant
+Prerequisite: install [Vagrant](https://www.vagrantup.com/downloads.html) and [VirtualBox](https://www.virtualbox.org/wiki/Downloads).
  ```
-./run-in-docker.sh generate \
-  -i http://petstore.swagger.io/v2/swagger.json \
-  -l nodejs \
-  -o samples/server/petstore/nodejs
+git clone http://github.com/swagger-api/swagger-codegen.git
+cd swagger-codegen
+vagrant up
+vagrant ssh
+cd /vagrant
+./run-in-docker.sh mvn package
  ```
 
+#### Public Docker image
+
+https://hub.docker.com/r/swaggerapi/swagger-generator/
+
 ### Homebrew
 To install, run `brew install swagger-codegen`
 
@@ -148,18 +163,27 @@ with a number of options.  You can get the options with the `help generate` comm
 
 ```
 NAME
-        swagger generate - Generate code with chosen lang
+        swagger-codegen-cli generate - Generate code with chosen lang
 
 SYNOPSIS
-        swagger generate [(-a <authorization> | --auth <authorization>)]
+        swagger-codegen-cli generate
+                [(-a <authorization> | --auth <authorization>)]
+                [--additional-properties <additional properties>]
+                [--api-package <api package>] [--artifact-id <artifact id>]
+                [--artifact-version <artifact version>]
                 [(-c <configuration file> | --config <configuration file>)]
-                [-D <system properties>]
+                [-D <system properties>] [--group-id <group id>]
                 (-i <spec file> | --input-spec <spec file>)
+                [--import-mappings <import mappings>]
+                [--instantiation-types <instantiation types>]
+                [--invoker-package <invoker package>]
                 (-l <language> | --lang <language>)
+                [--language-specific-primitives <language specific primitives>]
+                [--library <library>] [--model-package <model package>]
                 [(-o <output directory> | --output <output directory>)]
-                [(-t <template directory> | --template-dir <template directory>)]
-                [(-v | --verbose)]
                 [(-s | --skip-overwrite)]
+                [(-t <template directory> | --template-dir <template directory>)]
+                [--type-mappings <type mappings>] [(-v | --verbose)]
 
 OPTIONS
         -a <authorization>, --auth <authorization>
@@ -167,6 +191,19 @@ OPTIONS
             remotely. Pass in a URL-encoded string of name:header with a comma
             separating multiple values
 
+        --additional-properties <additional properties>
+            sets additional properties that can be referenced by the mustache
+            templates in the format of name=value,name=value
+
+        --api-package <api package>
+            package for generated api classes
+
+        --artifact-id <artifact id>
+            artifactId in generated pom.xml
+
+        --artifact-version <artifact version>
+            artifact version in generated pom.xml
+
         -c <configuration file>, --config <configuration file>
             Path to json configuration file. File content should be in a json
             format {"optionKey":"optionValue", "optionKey1":"optionValue1"...}
@@ -177,25 +214,59 @@ OPTIONS
             sets specified system properties in the format of
             name=value,name=value
 
+        --group-id <group id>
+            groupId in generated pom.xml
+
         -i <spec file>, --input-spec <spec file>
-            location of the OpenAPI Spec, as URL or file (required)
+            location of the swagger spec, as URL or file (required)
+
+
+        --import-mappings <import mappings>
+            specifies mappings between a given class and the import that should
+            be used for that class in the format of type=import,type=import
+
+        --instantiation-types <instantiation types>
+            sets instantiation type mappings in the format of
+            type=instantiatedType,type=instantiatedType.For example (in Java):
+            array=ArrayList,map=HashMap. In other words array types will get
+            instantiated as ArrayList in generated code.
+
+        --invoker-package <invoker package>
+            root package for generated code
 
         -l <language>, --lang <language>
             client language to generate (maybe class name in classpath,
             required)
 
+        --language-specific-primitives <language specific primitives>
+            specifies additional language specific primitive types in the format
+            of type1,type2,type3,type3. For example:
+            String,boolean,Boolean,Double
+
+        --library <library>
+            library template (sub-template)
+
+        --model-package <model package>
+            package for generated models
+
         -o <output directory>, --output <output directory>
             where to write the generated files (current dir by default)
 
+        -s, --skip-overwrite
+            specifies if the existing files should be overwritten during the
+            generation.
+
         -t <template directory>, --template-dir <template directory>
             folder containing the template files
 
+        --type-mappings <type mappings>
+            sets mappings between swagger spec types and generated code types in
+            the format of swaggerType=generatedType,swaggerType=generatedType.
+            For example: array=List,map=Map,string=String
+
         -v, --verbose
             verbose mode
 
-        -s , --skip-overwrite
-            specifies if the existing files should be overwritten during
-            the generation
 ```
 
 You can then compile and run the client, as well as unit tests against it:
@@ -232,16 +303,15 @@ This will write, in the folder `output/myLibrary`, all the files you need to get
 
 You would then compile your library in the `output/myLibrary` folder with `mvn package` and execute the codegen like such:
 
-
 ```
-java -cp output/myLibrary/target/myClientCodegen-swagger-codegen-1.0.0.jar:modules/swagger-codegen-cli/target/swagger-codegen-cli.jar io.swagger.codegen.Codegen
+java -cp output/myLibrary/target/myClientCodegen-swagger-codegen-1.0.0.jar:modules/swagger-codegen-cli/target/swagger-codegen-cli.jar io.swagger.codegen.SwaggerCodegen
 ```
 
 Note the `myClientCodegen` is an option now, and you can use the usual arguments for generating your library:
 
 ```
 java -cp output/myLibrary/target/myClientCodegen-swagger-codegen-1.0.0.jar:modules/swagger-codegen-cli/target/swagger-codegen-cli.jar \
-  io.swagger.codegen.Codegen generate -l myClientCodegen\
+  io.swagger.codegen.SwaggerCodegen generate -l myClientCodegen\
   -i http://petstore.swagger.io/v2/swagger.json \
   -o myClient
 ```
@@ -299,10 +369,11 @@ There are different aspects of customizing the code generator beyond just creati
 
 ```
 $ ls -1 modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/
+AbstractJavaJAXRSServerCodegen.java
 AbstractTypeScriptClientCodegen.java
 AkkaScalaClientCodegen.java
 AndroidClientCodegen.java
-AndroidVolleyClientCodegen.java
+AspNet5ServerCodegen.java
 AsyncScalaClientCodegen.java
 CSharpClientCodegen.java
 ClojureClientCodegen.java
@@ -310,11 +381,15 @@ CsharpDotNet2ClientCodegen.java
 DartClientCodegen.java
 FlashClientCodegen.java
 FlaskConnexionCodegen.java
+GoClientCodegen.java
+HaskellServantCodegen.java
+JMeterCodegen.java
+JavaCXFServerCodegen.java
 JavaClientCodegen.java
 JavaInflectorServerCodegen.java
+JavaJerseyServerCodegen.java
+JavaResteasyServerCodegen.java
 JavascriptClientCodegen.java
-JaxRSServerCodegen.java
-JMeterCodegen.java
 NodeJSServerCodegen.java
 ObjcClientCodegen.java
 PerlClientCodegen.java
@@ -347,7 +422,7 @@ java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
   -o samples/client/petstore/java \
   -c path/to/config.json
 ```
-Supported config options can be different per language. Running `config-help -l {lang}` will show available options.  **These options are applied 
+Supported config options can be different per language. Running `config-help -l {lang}` will show available options.  **These options are applied
 by passing them with `-D{optionName}={optionValue}**.
 
 ```
@@ -398,12 +473,12 @@ CONFIG OPTIONS
         retrofit2 - HTTP client: OkHttp 2.5.0. JSON processing: Gson 2.4 (Retrofit 2.0.0-beta2)
 ```
 
-Your config file for java can look like
+Your config file for Java can look like
 
-```
+```json
 {
   "groupId":"com.my.company",
-  "artifactId":"MyClent",
+  "artifactId":"MyClient",
   "artifactVersion":"1.2.0",
   "library":"feign"
 }
@@ -414,15 +489,15 @@ For all the unspecified options default values will be used.
 Another way to override default options is to extend the config class for the specific language.
 To change, for example, the prefix for the Objective-C generated files, simply subclass the ObjcClientCodegen.java:
 
-```
+```java
 package com.mycompany.swagger.codegen;
 
 import io.swagger.codegen.languages.*;
 
 public class MyObjcCodegen extends ObjcClientCodegen {
-  static {
-    PREFIX = "HELO";
-  }
+    static {
+        PREFIX = "HELO";
+    }
 }
 ```
 
@@ -494,6 +569,15 @@ java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
   -o samples/server/petstore/nodejs
 ```
 
+### PHP Slim
+
+```
+java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
+  -i http://petstore.swagger.io/v2/swagger.json \
+  -l slim \
+  -o samples/server/petstore/slim
+```
+
 ### PHP Silex
 
 ```
@@ -508,7 +592,7 @@ java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
 ```
 java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
   -i http://petstore.swagger.io/v2/swagger.json \
-  -l flaskConnexion \
+  -l python-flask \
   -o samples/server/petstore/flaskConnexion
 ```
 
@@ -529,13 +613,47 @@ java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
   -o samples/server/petstore/scalatra
 ```
 
-### Java JAX-RS
+### Java JAX-RS (Jersey v1.18)
 
 ```
 java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
   -i http://petstore.swagger.io/v2/swagger.json \
   -l jaxrs \
-  -o samples/server/petstore/jaxrs
+  -o samples/server/petstore/jaxrs-jersey
+```
+
+### Java JAX-RS (Apache CXF 2 / 3)
+
+```
+java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
+  -i http://petstore.swagger.io/v2/swagger.json \
+  -l jaxrs-cxf \
+  -o samples/server/petstore/jaxrs-cxf
+```
+
+This Codegen only generate a minimalist server stub. You must add the CXF dependency to your classpath (eg: with Maven)
+If you are using CXF v2.x, you must provided a custom ```ResourceComparator``` class. This class will help CXF to choose the good resource interface for mapping an incomming request. The default behavior of CXF v2.x is not correct when many resources interface have the same global path.
+See: See http://cxf.apache.org/docs/jax-rs-basics.html#JAX-RSBasics-Customselectionbetweenmultipleresources
+
+You can found this class here: https://github.com/hiveship/CXF2-resource-comparator/blob/master/src/main/java/CXFInterfaceComparator.java
+TODO: This class could be directly generated by the Codegen.
+
+You must register this class into your JAX-RS configuration file:
+```xml
+         <jaxrs:resourceComparator>
+   			<bean class="your.package.CXFInterfaceComparator"/>
+		</jaxrs:resourceComparator> 
+```
+
+This is no longer necessary if you are using CXF >=v3.x
+
+### Java JAX-RS (Resteasy)
+
+```
+java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
+  -i http://petstore.swagger.io/v2/swagger.json \
+  -l jaxrs-resteasy \
+  -o samples/server/petstore/jaxrs-resteasy
 ```
 
 ### Java Spring MVC
@@ -547,9 +665,27 @@ java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
   -o samples/server/petstore/spring-mvc
 ```
 
+### Haskell Servant
+
+```
+java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
+  -i http://petstore.swagger.io/v2/swagger.json \
+  -l haskell-servant \
+  -o samples/server/petstore/haskell-servant
+```
+
+### ASP.NET 5 Web API
+
+```
+java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
+  -i http://petstore.swagger.io/v2/swagger.json \
+  -l aspnet5 \
+  -o samples/server/petstore/aspnet5
+```
+
 ### To build the codegen library
 
-This will create the swagger-codegen library from source.  
+This will create the swagger-codegen library from source.
 
 ```
 mvn package
@@ -561,6 +697,26 @@ Note!  The templates are included in the library generated.  If you want to modi
 
 You can use the [swagger-codegen-maven-plugin](modules/swagger-codegen-maven-plugin/README.md) for integrating with your workflow, and generating any codegen target.
 
+## GitHub Integration
+
+To push the auto-generated SDK to GitHub, we provide `git_push.sh` to streamline the process. For example:
+
+ 1) Create a new repository in GitHub (Ref: https://help.github.com/articles/creating-a-new-repository/)
+ 
+ 2) Generate the SDK
+```
+ java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
+ -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l perl \
+ --git-user-id "wing328" \
+ --git-repo-id "petstore-perl" \
+ --release-note "Github integration demo" \
+ -o /var/tmp/perl/petstore
+```
+ 3) Push the SDK to GitHub
+```
+cd /var/tmp/perl/petstore
+/bin/sh ./git_push.sh
+```
 
 ## Online generators
 
@@ -577,10 +733,43 @@ Guidelines for Contribution
 
 Please refer to this [page](https://github.com/swagger-api/swagger-codegen/blob/master/CONTRIBUTING.md)
 
+Companies/Projects using Swagger Codegen
+----------------------------------------
+Here are some companies/projects using Swagger Codegen in production. To add your company/project to the list, please visit [README.md](https://github.com/swagger-api/swagger-codegen/blob/master/README.md) and click on the icon to edit the page.
+- [Activehours](https://www.activehours.com/)
+- [Acunetix](https://www.acunetix.com/)
+- [Atlassian](https://www.atlassian.com/)
+- [beemo](http://www.beemo.eu)
+- [CloudBoost](https://www.CloudBoost.io/)
+- [Cupix](http://www.cupix.com)
+- [DocuSign](https://www.docusign.com)
+- [Ergon](http://www.ergon.ch/)
+- [eureka](http://eure.jp/)
+- [everystory.us](http://everystory.us)
+- [Expected Behavior](http://www.expectedbehavior.com/)
+- [FH Münster - University of Applied Sciences](http://www.fh-muenster.de)
+- [LANDR Audio](https://www.landr.com/)
+- [LiveAgent](https://www.ladesk.com/)
+- [Kuary](https://kuary.com/)
+- [nViso](http://www.nviso.ch/)
+- [Okiok](https://www.okiok.com)
+- [OSDN](https://osdn.jp)
+- [Pixoneye](http://www.pixoneye.com/)
+- [PostAffiliatePro](https://www.postaffiliatepro.com/)
+- [Reload! A/S](https://reload.dk/) 
+- [Royal Bank of Canada (RBC)](http://www.rbc.com/canada.html)
+- [SmartRecruiters](https://www.smartrecruiters.com/)
+- [StyleRecipe](http://stylerecipe.co.jp)
+- [Svenska Spel AB](https://www.svenskaspel.se/)
+- [ThoughtWorks](https://www.thoughtworks.com)
+- [uShip](https://www.uship.com/)
+- [Zalando](https://tech.zalando.com)
+- [ZEEF.com](https://zeef.com/)
+
 License
 -------
 
-Copyright 2015 SmartBear Software
+Copyright 2016 SmartBear Software
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -591,3 +780,6 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
+
+---
+<img src="http://swagger.io/wp-content/uploads/2016/02/logo.jpg"/>
diff --git a/Vagrantfile b/Vagrantfile
new file mode 100644
index 00000000000..3abbb54ea08
--- /dev/null
+++ b/Vagrantfile
@@ -0,0 +1,36 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+
+  config.vm.box = "ubuntu/trusty64"
+
+  config.vm.provider "virtualbox" do |v|
+    v.name = "swagger-codegen"
+    v.memory = 2048
+    v.cpus = 2
+  end
+
+  config.vm.box_check_update = true
+
+  #SSH
+  config.ssh.forward_agent = true
+
+  config.ssh.shell = "bash -c 'BASH_ENV=/etc/profile exec bash'"
+
+  #Provision
+  config.vm.provision "shell", inline: <<-SHELL
+    sudo touch /var/lib/cloud/instance/locale-check.skip
+    sudo apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
+    sudo sh -c 'echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" > /etc/apt/sources.list.d/docker.list'
+    sudo apt-cache policy docker-engine
+    sudo apt-get update
+    sudo apt-get upgrade -y
+    sudo apt-get install -y docker-engine
+    sudo usermod -aG docker vagrant
+  SHELL
+
+end
diff --git a/bin/all-petstore.sh b/bin/all-petstore.sh
index 5c171bb4039..f1e8ae4b116 100755
--- a/bin/all-petstore.sh
+++ b/bin/all-petstore.sh
@@ -23,6 +23,7 @@ cd $APP_DIR
 ./bin/clojure-petstore.sh
 ./bin/csharp-petstore.sh
 ./bin/dynamic-html.sh
+./bin/haskell-petstore.sh
 ./bin/html-petstore.sh
 ./bin/java-petstore.sh
 ./bin/java-petstore-jersey2.sh
diff --git a/bin/aspnet5-petstore-server.sh b/bin/aspnet5-petstore-server.sh
new file mode 100755
index 00000000000..276d2a6e4b0
--- /dev/null
+++ b/bin/aspnet5-petstore-server.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -l aspnet5 -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -o samples/server/petstore/aspnet5"
+
+java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/go-petstore.sh b/bin/go-petstore.sh
new file mode 100755
index 00000000000..239f31f0d71
--- /dev/null
+++ b/bin/go-petstore.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/go -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l go -o samples/client/petstore/go"
+
+java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/haskell-servant-petstore.sh b/bin/haskell-servant-petstore.sh
new file mode 100755
index 00000000000..a35f38251cc
--- /dev/null
+++ b/bin/haskell-servant-petstore.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/haskell-servant -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l haskell-servant -o samples/server/petstore/haskell-servant"
+
+java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/java-petstore-retrofit2rx.json b/bin/java-petstore-retrofit2rx.json
new file mode 100644
index 00000000000..c9e4301f2da
--- /dev/null
+++ b/bin/java-petstore-retrofit2rx.json
@@ -0,0 +1,4 @@
+{
+  "library": "retrofit2",
+  "artifactId": "swagger-petstore-retrofit2-rx"
+}
diff --git a/bin/java-petstore-retrofit2rx.sh b/bin/java-petstore-retrofit2rx.sh
new file mode 100755
index 00000000000..b0320644142
--- /dev/null
+++ b/bin/java-petstore-retrofit2rx.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l java -c bin/java-petstore-retrofit2rx.json -o samples/client/petstore/java/retrofit2rx -DuseRxJava=true"
+
+java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/java-petstore.sh b/bin/java-petstore.sh
index f842d9ca3b0..17a1b0d6b98 100755
--- a/bin/java-petstore.sh
+++ b/bin/java-petstore.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l java -o samples/client/petstore/java/default"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l java -o samples/client/petstore/java/default -DhideGenerationTimestamp=true"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/javascript-closure-angular.sh b/bin/javascript-closure-angular.sh
new file mode 100755
index 00000000000..efd830034dc
--- /dev/null
+++ b/bin/javascript-closure-angular.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l javascript-closure-angular -o samples/client/petstore/javascript-closure-angular"
+
+java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/javascript-petstore.sh b/bin/javascript-petstore.sh
index 9bf3ae70898..11fadd17d49 100755
--- a/bin/javascript-petstore.sh
+++ b/bin/javascript-petstore.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/javascript -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l javascript -o samples/client/petstore/javascript"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/Javascript -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l javascript -o samples/client/petstore/javascript"
 
 java -DappName=PetstoreClient $JAVA_OPTS -jar $executable $ags
diff --git a/bin/javascript-promise-petstore.sh b/bin/javascript-promise-petstore.sh
new file mode 100755
index 00000000000..f6e7ef13913
--- /dev/null
+++ b/bin/javascript-promise-petstore.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/Javascript \
+-i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l javascript \
+-o samples/client/petstore/javascript-promise \
+--additional-properties usePromises=true"
+
+java -DappName=PetstoreClient $JAVA_OPTS -jar $executable $ags
diff --git a/bin/jaxrs-cxf-petstore-server.sh b/bin/jaxrs-cxf-petstore-server.sh
new file mode 100755
index 00000000000..bac9cb1d4eb
--- /dev/null
+++ b/bin/jaxrs-cxf-petstore-server.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l jaxrs-cxf -o samples/server/petstore/jaxrs-cxf -DhideGenerationTimestamp=true"
+
+java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/jaxrs-petstore-server.sh b/bin/jaxrs-petstore-server.sh
index 2dd4fc03b38..6436c797e87 100755
--- a/bin/jaxrs-petstore-server.sh
+++ b/bin/jaxrs-petstore-server.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l jaxrs -o samples/server/petstore/jaxrs"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l jaxrs -o samples/server/petstore/jaxrs -DhideGenerationTimestamp=true"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/jaxrs-resteasy-petstore-server.sh b/bin/jaxrs-resteasy-petstore-server.sh
new file mode 100755
index 00000000000..a715ded67f9
--- /dev/null
+++ b/bin/jaxrs-resteasy-petstore-server.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l jaxrs-resteasy -o samples/server/petstore/jaxrs-resteasy -DhideGenerationTimestamp=true"
+
+java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/jersey2-petstore-server.sh b/bin/jersey2-petstore-server.sh
new file mode 100755
index 00000000000..d27379fd345
--- /dev/null
+++ b/bin/jersey2-petstore-server.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l jaxrs -o samples/server/petstore/jersey2 --library=jersey2 -DhideGenerationTimestamp=true"
+
+java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/nodejs-petstore-server.sh b/bin/nodejs-petstore-server.sh
index 5d797903791..3fff1bdc0c0 100755
--- a/bin/nodejs-petstore-server.sh
+++ b/bin/nodejs-petstore-server.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l nodejs -o samples/server/petstore/nodejs"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l nodejs-server -o samples/server/petstore/nodejs"
 
 java $JAVA_OPTS -Dservice -jar $executable $ags
diff --git a/bin/perl-petstore.sh b/bin/perl-petstore.sh
index 64d684e9ec8..b2eb1753d67 100755
--- a/bin/perl-petstore.sh
+++ b/bin/perl-petstore.sh
@@ -26,6 +26,9 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+# complex module name used for testing
 ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l perl -o samples/client/petstore/perl"
 
 java $JAVA_OPTS -jar $executable $ags
+
+java $JAVA_OPTS -jar $executable $ags --additional-properties moduleName=Something::Deep -o samples/client/petstore/perl/deep_module_test
diff --git a/bin/silex-petstore-server.sh b/bin/silex-petstore-server.sh
index ffa030b88c3..85b658a3723 100755
--- a/bin/silex-petstore-server.sh
+++ b/bin/silex-petstore-server.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/silex -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l silex -o samples/server/petstore/silex"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/silex -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l silex-PHP -o samples/server/petstore/silex"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/sinatra-petstore-server.sh b/bin/sinatra-petstore-server.sh
index 4f7e19cee39..7c99e9a068a 100755
--- a/bin/sinatra-petstore-server.sh
+++ b/bin/sinatra-petstore-server.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/sinatra -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l sinatra -o samples/server/petstore/sinatra"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/sinatra -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l sinatra -o samples/server/petstore/sinatra"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/slim-petstore-server.sh b/bin/slim-petstore-server.sh
old mode 100644
new mode 100755
diff --git a/bin/windows/aspnet5-petstore-server.bat b/bin/windows/aspnet5-petstore-server.bat
new file mode 100755
index 00000000000..955ad6677b8
--- /dev/null
+++ b/bin/windows/aspnet5-petstore-server.bat
@@ -0,0 +1,10 @@
+set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar
+
+If Not Exist %executable% (
+  mvn clean package
+)
+
+set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
+set ags=generate -t modules\swagger-codegen\src\main\resources\aspnet5 -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l aspnet5 -o samples\server\petstore\aspnet5\
+
+java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/go-petstore.bat b/bin/windows/go-petstore.bat
new file mode 100755
index 00000000000..050bfd23cc8
--- /dev/null
+++ b/bin/windows/go-petstore.bat
@@ -0,0 +1,10 @@
+set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar
+
+If Not Exist %executable% (
+  mvn clean package
+)
+
+set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
+set ags=generate -t modules\swagger-codegen\src\main\resources\go -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l go -o samples\client\petstore\go
+
+java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/modules/swagger-codegen-cli/pom.xml b/modules/swagger-codegen-cli/pom.xml
index 1f52f4ff663..c118a6325ef 100644
--- a/modules/swagger-codegen-cli/pom.xml
+++ b/modules/swagger-codegen-cli/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-codegen-project</artifactId>
-        <version>2.1.5</version>
+        <version>2.1.6-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -89,13 +89,13 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>${testng-version}</version>
+<!--             <version>${testng-version}</version> -->
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jmockit</groupId>
             <artifactId>jmockit</artifactId>
-            <version>${jmockit-version}</version>
+<!--             <version>${jmockit-version}</version> -->
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/SwaggerCodegen.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/SwaggerCodegen.java
index 502e4d046ba..98c0b8c05b5 100644
--- a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/SwaggerCodegen.java
+++ b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/SwaggerCodegen.java
@@ -21,6 +21,7 @@ public class SwaggerCodegen {
 
 
     public static void main(String[] args) {
+        @SuppressWarnings("unchecked")
         Cli.CliBuilder<Runnable> builder = Cli.<Runnable>builder("swagger-codegen-cli")
                 .withDescription("Swagger code generator CLI. More info on swagger.io")
                 .withDefaultCommand(Langs.class)
diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java
index d72295f4ca9..8c7beab502b 100644
--- a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java
+++ b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java
@@ -5,18 +5,11 @@ import io.airlift.airline.Option;
 import io.swagger.codegen.ClientOptInput;
 import io.swagger.codegen.CodegenConstants;
 import io.swagger.codegen.DefaultGenerator;
-import io.swagger.codegen.cmd.utils.OptionUtils;
 import io.swagger.codegen.config.CodegenConfigurator;
-import org.apache.commons.lang3.tuple.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
+import static io.swagger.codegen.config.CodegenConfiguratorUtils.*;
 import static org.apache.commons.lang3.StringUtils.isNotEmpty;
 
 /**
@@ -73,6 +66,12 @@ public class Generate implements Runnable {
     @Option(name = {"--model-package"}, title = "model package", description = CodegenConstants.MODEL_PACKAGE_DESC)
     private String modelPackage;
 
+    @Option(name = {"--model-name-prefix"}, title = "model name prefix", description = CodegenConstants.MODEL_NAME_PREFIX_DESC)
+    private String modelNamePrefix;
+
+    @Option(name = {"--model-name-suffix"}, title = "model name suffix", description = CodegenConstants.MODEL_NAME_SUFFIX_DESC)
+    private String modelNameSuffix;
+
     @Option(name = {"--instantiation-types"}, title = "instantiation types", description = "sets instantiation type mappings in the format of type=instantiatedType,type=instantiatedType." +
             "For example (in Java): array=ArrayList,map=HashMap. In other words array types will get instantiated as ArrayList in generated code.")
     private String instantiationTypes;
@@ -106,6 +105,18 @@ public class Generate implements Runnable {
 
     @Option(name = {"--library"}, title = "library", description = CodegenConstants.LIBRARY_DESC)
     private String library;
+    
+    @Option(name = {"--git-user-id"}, title = "git user id", description = CodegenConstants.GIT_USER_ID_DESC)
+    private String gitUserId;
+
+    @Option(name = {"--git-repo-id"}, title = "git repo id", description = CodegenConstants.GIT_REPO_ID_DESC)
+    private String gitRepoId;
+
+    @Option(name = {"--release-note"}, title = "release note", description = CodegenConstants.RELEASE_NOTE_DESC)
+    private String releaseNote;
+
+    @Option(name = {"--http-user-agent"}, title = "http user agent", description = CodegenConstants.HTTP_USER_AGENT_DESC)
+    private String httpUserAgent;
 
     @Override
     public void run() {
@@ -156,6 +167,14 @@ public class Generate implements Runnable {
             configurator.setModelPackage(modelPackage);
         }
 
+        if(isNotEmpty(modelNamePrefix)){
+            configurator.setModelNamePrefix(modelNamePrefix);
+        }
+
+        if(isNotEmpty(modelNameSuffix)){
+            configurator.setModelNameSuffix(modelNameSuffix);
+        }
+
         if(isNotEmpty(invokerPackage)) {
             configurator.setInvokerPackage(invokerPackage);
         }
@@ -176,74 +195,31 @@ public class Generate implements Runnable {
             configurator.setLibrary(library);
         }
 
-        setSystemProperties(configurator);
-        setInstantiationTypes(configurator);
-        setImportMappings(configurator);
-        setTypeMappings(configurator);
-        setAdditionalProperties(configurator);
-        setLanguageSpecificPrimitives(configurator);
+        if (isNotEmpty(gitUserId)) {
+            configurator.setGitUserId(gitUserId);
+        }
+
+        if (isNotEmpty(gitRepoId)) {
+            configurator.setGitRepoId(gitRepoId);
+        }
+
+        if (isNotEmpty(releaseNote)) {
+            configurator.setReleaseNote(releaseNote);
+        }
+
+        if (isNotEmpty(httpUserAgent)) {
+            configurator.setHttpUserAgent(httpUserAgent);
+        }
+
+        applySystemPropertiesKvp(systemProperties, configurator);
+        applyInstantiationTypesKvp(instantiationTypes, configurator);
+        applyImportMappingsKvp(importMappings, configurator);
+        applyTypeMappingsKvp(typeMappings, configurator);
+        applyAdditionalPropertiesKvp(additionalProperties, configurator);
+        applyLanguageSpecificPrimitivesCsv(languageSpecificPrimitives, configurator);
 
         final ClientOptInput clientOptInput = configurator.toClientOptInput();
 
         new DefaultGenerator().opts(clientOptInput).generate();
     }
-
-    private void setSystemProperties(CodegenConfigurator configurator) {
-        final Map<String, String> map = createMapFromKeyValuePairs(systemProperties);
-        for (Map.Entry<String, String> entry : map.entrySet()) {
-            configurator.addSystemProperty(entry.getKey(), entry.getValue());
-        }
-    }
-
-    private void setInstantiationTypes(CodegenConfigurator configurator) {
-        final Map<String, String> map = createMapFromKeyValuePairs(instantiationTypes);
-        for (Map.Entry<String, String> entry : map.entrySet()) {
-            configurator.addInstantiationType(entry.getKey(), entry.getValue());
-        }
-    }
-
-    private void setImportMappings(CodegenConfigurator configurator) {
-        final Map<String, String> map = createMapFromKeyValuePairs(importMappings);
-        for (Map.Entry<String, String> entry : map.entrySet()) {
-            configurator.addImportMapping(entry.getKey(), entry.getValue());
-        }
-    }
-
-    private void setTypeMappings(CodegenConfigurator configurator) {
-        final Map<String, String> map = createMapFromKeyValuePairs(typeMappings);
-        for (Map.Entry<String, String> entry : map.entrySet()) {
-            configurator.addTypeMapping(entry.getKey(), entry.getValue());
-        }
-    }
-
-    private void setAdditionalProperties(CodegenConfigurator configurator) {
-        final Map<String, String> map = createMapFromKeyValuePairs(additionalProperties);
-        for (Map.Entry<String, String> entry : map.entrySet()) {
-            configurator.addAdditionalProperty(entry.getKey(), entry.getValue());
-        }
-    }
-
-    private void setLanguageSpecificPrimitives(CodegenConfigurator configurator) {
-        final Set<String> set = createSetFromCsvList(languageSpecificPrimitives);
-        for (String item : set) {
-            configurator.addLanguageSpecificPrimitive(item);
-        }
-    }
-
-    private Set<String> createSetFromCsvList(String csvProperty) {
-        final List<String> values = OptionUtils.splitCommaSeparatedList(csvProperty);
-        return new HashSet<String>(values);
-    }
-
-    private Map createMapFromKeyValuePairs(String commaSeparatedKVPairs) {
-        final List<Pair<String, String>> pairs = OptionUtils.parseCommaSeparatedTuples(commaSeparatedKVPairs);
-
-        Map result = new HashMap();
-
-        for (Pair<String, String> pair : pairs) {
-            result.put(pair.getLeft(), pair.getRight());
-        }
-
-        return result;
-    }
 }
diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Meta.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Meta.java
index 9843024b104..c2dffbe6200 100644
--- a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Meta.java
+++ b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Meta.java
@@ -33,7 +33,7 @@ import static com.google.common.base.Joiner.on;
         "specify, and includes default templates to include.")
 public class Meta implements Runnable {
 
-    private static final Logger LOG = LoggerFactory.getLogger(Meta.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(Meta.class);
 
     private static final String TEMPLATE_DIR_CLASSPATH = "codegen";
     private static final String MUSTACHE_EXTENSION = ".mustache";
@@ -53,7 +53,7 @@ public class Meta implements Runnable {
     @Override
     public void run() {
         final File targetDir = new File(outputFolder);
-        LOG.info("writing to folder [{}]", targetDir.getAbsolutePath());
+        LOGGER.info("writing to folder [{}]", targetDir.getAbsolutePath());
 
         String mainClass = CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_CAMEL, name) + "Generator";
 
@@ -93,7 +93,7 @@ public class Meta implements Runnable {
      * @param data      - map with additional params needed to process templates
      * @return converter object to pass to lambdaj
      */
-    private Converter<SupportingFile, File> processFiles(final File targetDir, final Map<String, Object> data) {
+    private static Converter<SupportingFile, File> processFiles(final File targetDir, final Map<String, Object> data) {
         return new Converter<SupportingFile, File>() {
             private DefaultGenerator generator = new DefaultGenerator();
 
@@ -108,13 +108,13 @@ public class Meta implements Runnable {
                     String formatted = template;
 
                     if (support.templateFile.endsWith(MUSTACHE_EXTENSION)) {
-                        LOG.info("writing file to {}", outputFile.getAbsolutePath());
+                        LOGGER.info("writing file to {}", outputFile.getAbsolutePath());
                         formatted = Mustache.compiler().withLoader(loader(generator))
                                 .defaultValue("")
                                 .compile(template)
                                 .execute(data);
                     } else {
-                        LOG.info("copying file to {}", outputFile.getAbsolutePath());
+                        LOGGER.info("copying file to {}", outputFile.getAbsolutePath());
                     }
 
                     FileUtils.writeStringToFile(outputFile, formatted);
@@ -133,7 +133,7 @@ public class Meta implements Runnable {
      * @param generator - class with reader getter
      * @return loader for template
      */
-    private Mustache.TemplateLoader loader(final DefaultGenerator generator) {
+    private static Mustache.TemplateLoader loader(final DefaultGenerator generator) {
         return new Mustache.TemplateLoader() {
             @Override
             public Reader getTemplate(String name) {
@@ -149,7 +149,7 @@ public class Meta implements Runnable {
      * @param packageName - package name to convert
      * @return relative path
      */
-    private String asPath(String packageName) {
+    private static String asPath(String packageName) {
         return packageName.replace(".", File.separator);
     }
 }
diff --git a/modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/cmd/GenerateTest.java b/modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/cmd/GenerateTest.java
index e07d0be4610..36a560b776d 100644
--- a/modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/cmd/GenerateTest.java
+++ b/modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/cmd/GenerateTest.java
@@ -12,6 +12,7 @@ import mockit.Verifications;
 import org.apache.commons.lang3.ArrayUtils;
 import org.testng.annotations.Test;
 
+@SuppressWarnings("unused")
 public class GenerateTest {
 
     @Mocked
diff --git a/modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/cmd/utils/OptionUtilsTest.java b/modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/cmd/utils/OptionUtilsTest.java
index a7dc4d7f1cd..db88cdcdb9d 100644
--- a/modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/cmd/utils/OptionUtilsTest.java
+++ b/modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/cmd/utils/OptionUtilsTest.java
@@ -1,5 +1,6 @@
 package io.swagger.codegen.cmd.utils;
 
+import io.swagger.codegen.utils.OptionUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.Test;
 
@@ -10,6 +11,7 @@ import java.util.List;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 
+@SuppressWarnings("static-method")
 public class OptionUtilsTest {
 
     @Test
@@ -30,7 +32,7 @@ public class OptionUtilsTest {
         doTupleListTest(null, new ArrayList<Pair<String, String>>());
     }
 
-    private void doTupleListTest(String input, List<Pair<String, String>> expectedResults) {
+    private static void doTupleListTest(String input, List<Pair<String, String>> expectedResults) {
         final List<Pair<String, String>> result = OptionUtils.parseCommaSeparatedTuples(input);
         assertNotNull(result);
         assertEquals(result.size(), expectedResults.size());
@@ -41,7 +43,7 @@ public class OptionUtilsTest {
         }
     }
 
-    private void doCommaSeparatedListTest(String csvStr, List<String> expectedResults) {
+    private static void doCommaSeparatedListTest(String csvStr, List<String> expectedResults) {
         final List<String> result = OptionUtils.splitCommaSeparatedList(csvStr);
         assertNotNull(result);
         assertEquals(result.size(), expectedResults.size());
diff --git a/modules/swagger-codegen-maven-plugin/pom.xml b/modules/swagger-codegen-maven-plugin/pom.xml
index 94508f71527..52cf252d309 100644
--- a/modules/swagger-codegen-maven-plugin/pom.xml
+++ b/modules/swagger-codegen-maven-plugin/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-codegen-project</artifactId>
-        <version>2.1.5</version>
+        <version>2.1.6-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <artifactId>swagger-codegen-maven-plugin</artifactId>
@@ -51,7 +51,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+<!--             <version>4.12</version> -->
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/AdditionalParams.java b/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/AdditionalParams.java
deleted file mode 100644
index 7db012f439c..00000000000
--- a/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/AdditionalParams.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.swagger.codegen.plugin;
-
-/**
- * User: lanwen
- * Date: 24.03.15
- * Time: 14:47
- */
-public final class AdditionalParams {
-    public static final String TEMPLATE_DIR_PARAM = "templateDir";
-    public static final String MODEL_PACKAGE_PARAM = "modelPackage";
-    public static final String API_PACKAGE_PARAM = "apiPackage";
-    public static final String INVOKER_PACKAGE_PARAM = "invokerPackage";
-    public static final String LIBRARY_PARAM = "library";
-
-    private AdditionalParams() {}
-}
\ No newline at end of file
diff --git a/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java b/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java
index c56b86588e5..79a100bba21 100644
--- a/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java
+++ b/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java
@@ -16,9 +16,11 @@ package io.swagger.codegen.plugin;
  * limitations under the License.
  */
 
-import config.Config;
-import config.ConfigParser;
-import io.swagger.codegen.*;
+import io.swagger.codegen.CliOption;
+import io.swagger.codegen.ClientOptInput;
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.DefaultGenerator;
+import io.swagger.codegen.config.CodegenConfigurator;
 import io.swagger.models.Swagger;
 import io.swagger.parser.SwaggerParser;
 import org.apache.maven.plugin.AbstractMojo;
@@ -30,15 +32,28 @@ import org.apache.maven.project.MavenProject;
 
 import java.io.File;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
-import static io.swagger.codegen.plugin.AdditionalParams.*;
+import static io.swagger.codegen.config.CodegenConfiguratorUtils.*;
+import static org.apache.commons.lang3.StringUtils.isNotEmpty;
 
 /**
  * Goal which generates client/server code from a swagger json/yaml definition.
  */
 @Mojo(name = "generate", defaultPhase = LifecyclePhase.GENERATE_SOURCES)
 public class CodeGenMojo extends AbstractMojo {
+
+    @Parameter(name="verbose", required = false, defaultValue = "false")
+    private boolean verbose;
+
+    /**
+     * Client language to generate.
+     */
+    @Parameter(name = "language", required = true)
+    private String language;
+
     /**
      * Location of the output directory.
      */
@@ -60,10 +75,23 @@ public class CodeGenMojo extends AbstractMojo {
     private File templateDirectory;
 
     /**
-     * The package to use for generated model objects/classes
+     * Adds authorization headers when fetching the swagger definitions remotely.
+     " Pass in a URL-encoded string of name:header with a comma separating multiple values
      */
-    @Parameter(name = "modelPackage")
-    private String modelPackage;
+    @Parameter(name="auth")
+    private String auth;
+
+    /**
+     * Path to separate json configuration file.
+     */
+    @Parameter(name = "configurationFile", required = false)
+    private String configurationFile;
+
+    /**
+     * Specifies if the existing files should be overwritten during the generation.
+     */
+    @Parameter(name="skipOverwrite", required=false)
+    private Boolean skipOverwrite;
 
     /**
      * The package to use for generated api objects/classes
@@ -71,6 +99,12 @@ public class CodeGenMojo extends AbstractMojo {
     @Parameter(name = "apiPackage")
     private String apiPackage;
 
+    /**
+     * The package to use for generated model objects/classes
+     */
+    @Parameter(name = "modelPackage")
+    private String modelPackage;
+
     /**
      * The package to use for the generated invoker objects
      */
@@ -78,16 +112,22 @@ public class CodeGenMojo extends AbstractMojo {
     private String invokerPackage;
 
     /**
-     * Client language to generate.
+     * groupId in generated pom.xml
      */
-    @Parameter(name = "language", required = true)
-    private String language;
+    @Parameter(name = "groupId")
+    private String groupId;
 
     /**
-     * Path to separate json configuration file.
+     * artifactId in generated pom.xml
      */
-    @Parameter(name = "configurationFile", required = false)
-    private String configurationFile;
+    @Parameter(name = "artifactId")
+    private String artifactId;
+
+    /**
+     * artifact version in generated pom.xml
+     */
+    @Parameter(name = "artifactVersion")
+    private String artifactVersion;
 
     /**
      * Sets the library
@@ -99,7 +139,7 @@ public class CodeGenMojo extends AbstractMojo {
      * A map of language-specific parameters as passed with the -c option to the command line
      */
     @Parameter(name = "configOptions")
-    private Map configOptions;
+    private Map<?, ?> configOptions;
 
     /**
      * Add the output directory to the project as a source root, so that the
@@ -122,12 +162,92 @@ public class CodeGenMojo extends AbstractMojo {
 
     @Override
     public void execute() throws MojoExecutionException {
+
         Swagger swagger = new SwaggerParser().read(inputSpec);
 
-        CodegenConfig config = CodegenConfigLoader.forName(language);
-        config.setOutputDir(output.getAbsolutePath());
+        //attempt to read from config file
+        CodegenConfigurator configurator = CodegenConfigurator.fromFile(configurationFile);
+
+        //if a config file wasn't specified or we were unable to read it
+        if(configurator == null) {
+            configurator = new CodegenConfigurator();
+        }
+
+        configurator.setVerbose(verbose);
+
+        if(skipOverwrite != null) {
+            configurator.setSkipOverwrite(skipOverwrite);
+        }
+
+        if(isNotEmpty(inputSpec)) {
+            configurator.setInputSpec(inputSpec);
+        }
+
+        configurator.setLang(language);
+
+        configurator.setOutputDir(output.getAbsolutePath());
+
+        if(isNotEmpty(auth)) {
+            configurator.setAuth(auth);
+        }
+
+        if(isNotEmpty(apiPackage)) {
+            configurator.setApiPackage(apiPackage);
+        }
+
+        if(isNotEmpty(modelPackage)) {
+            configurator.setModelPackage(modelPackage);
+        }
+
+        if(isNotEmpty(invokerPackage)) {
+            configurator.setInvokerPackage(invokerPackage);
+        }
+
+        if(isNotEmpty(groupId)) {
+            configurator.setGroupId(groupId);
+        }
+
+        if(isNotEmpty(artifactId)) {
+            configurator.setArtifactId(artifactId);
+        }
+
+        if(isNotEmpty(artifactVersion)) {
+            configurator.setArtifactVersion(artifactVersion);
+        }
+
+        if(isNotEmpty(library)) {
+            configurator.setLibrary(library);
+        }
+
+        if (null != templateDirectory) {
+            configurator.setTemplateDir(templateDirectory.getAbsolutePath());
+        }
+
+        if (configOptions != null) {
+
+            if(configOptions.containsKey("instantiation-types")) {
+                applyInstantiationTypesKvp(configOptions.get("instantiation-types").toString(), configurator);
+            }
+
+            if(configOptions.containsKey("import-mappings")) {
+                applyImportMappingsKvp(configOptions.get("import-mappings").toString(), configurator);
+            }
+
+            if(configOptions.containsKey("type-mappings")) {
+                applyTypeMappingsKvp(configOptions.get("type-mappings").toString(), configurator);
+            }
+
+            if(configOptions.containsKey("language-specific-primitives")) {
+                applyLanguageSpecificPrimitivesCsv(configOptions.get("language-specific-primitives").toString(), configurator);
+            }
+
+            if(configOptions.containsKey("additional-properties")) {
+                applyAdditionalPropertiesKvp(configOptions.get("additional-properties").toString(), configurator);
+            }
+        }
 
         if (environmentVariables != null) {
+
             for(String key : environmentVariables.keySet()) {
                 String value = environmentVariables.get(key);
                 if(value == null) {
@@ -135,49 +255,22 @@ public class CodeGenMojo extends AbstractMojo {
                     value = "";
                 }
                 System.setProperty(key, value);
+                configurator.addSystemProperty(key, value);
             }
         }
-        if (null != library) {
-            config.setLibrary(library);
-        }
-        if (null != templateDirectory) {
-            config.additionalProperties().put(TEMPLATE_DIR_PARAM, templateDirectory.getAbsolutePath());
-        }
-        if (null != modelPackage) {
-            config.additionalProperties().put(MODEL_PACKAGE_PARAM, modelPackage);
-        }
-        if (null != apiPackage) {
-            config.additionalProperties().put(API_PACKAGE_PARAM, apiPackage);
-        }
-        if (null != invokerPackage) {
-            config.additionalProperties().put(INVOKER_PACKAGE_PARAM, invokerPackage);
-        }
+        
+        final ClientOptInput input = configurator.toClientOptInput();
+        final CodegenConfig config = input.getConfig();
 
-        if (configOptions != null) {
+        if(configOptions != null) {
             for (CliOption langCliOption : config.cliOptions()) {
                 if (configOptions.containsKey(langCliOption.getOpt())) {
-                    config.additionalProperties().put(langCliOption.getOpt(),
+                    input.getConfig().additionalProperties().put(langCliOption.getOpt(),
                             configOptions.get(langCliOption.getOpt()));
                 }
             }
         }
 
-        if (null != configurationFile) {
-            Config genConfig = ConfigParser.read(configurationFile);
-            if (null != genConfig) {
-                for (CliOption langCliOption : config.cliOptions()) {
-                    if (genConfig.hasOption(langCliOption.getOpt())) {
-                        config.additionalProperties().put(langCliOption.getOpt(), genConfig.getOption(langCliOption.getOpt()));
-                    }
-                }
-            } else {
-            	throw new RuntimeException("Unable to read configuration file");
-            }
-        }
-        
-        ClientOptInput input = new ClientOptInput().opts(new ClientOpts()).swagger(swagger);
-        input.setConfig(config);
-
         if(configHelp) {
             for (CliOption langCliOption : config.cliOptions()) {
                 System.out.println("\t" + langCliOption.getOpt());
@@ -190,8 +283,8 @@ public class CodeGenMojo extends AbstractMojo {
             new DefaultGenerator().opts(input).generate();
         } catch (Exception e) {
             // Maven logs exceptions thrown by plugins only if invoked with -e
-        	// I find it annoying to jump through hoops to get basic diagnostic information,
-        	// so let's log it in any case:
+            // I find it annoying to jump through hoops to get basic diagnostic information,
+            // so let's log it in any case:
             getLog().error(e); 
             throw new MojoExecutionException("Code generation failed. See above for the full exception.");
         }
diff --git a/modules/swagger-codegen/pom.xml b/modules/swagger-codegen/pom.xml
index 901f18b9a1b..a5c4eedd740 100644
--- a/modules/swagger-codegen/pom.xml
+++ b/modules/swagger-codegen/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-codegen-project</artifactId>
-        <version>2.1.5</version>
+        <version>2.1.6-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -101,7 +101,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>2.1</version>
+<!--                 <version>2.1</version> -->
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -256,7 +256,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>${testng-version}</version>
+<!--             <version>${testng-version}</version> -->
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -268,7 +268,7 @@
         <dependency>
             <groupId>org.jmockit</groupId>
             <artifactId>jmockit</artifactId>
-            <version>${jmockit-version}</version>
+<!--             <version>${jmockit-version}</version> -->
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/modules/swagger-codegen/src/main/java/config/ConfigParser.java b/modules/swagger-codegen/src/main/java/config/ConfigParser.java
index 101fbb0d256..68cbb613f3a 100644
--- a/modules/swagger-codegen/src/main/java/config/ConfigParser.java
+++ b/modules/swagger-codegen/src/main/java/config/ConfigParser.java
@@ -7,11 +7,16 @@ import java.io.File;
 import java.util.Iterator;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class ConfigParser {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(ConfigParser.class);
+
     public static Config read(String location) {
 
-        System.out.println("reading config from " + location);
+        LOGGER.info("reading config from " + location);
 
         ObjectMapper mapper = new ObjectMapper();
 
@@ -27,11 +32,11 @@ public class ConfigParser {
                 if (optionNode.getValue().isValueNode()) {
                     config.setOption(optionNode.getKey(), optionNode.getValue().asText());
                 } else {
-                    System.out.println("omitting non-value node " + optionNode.getKey());
+                    LOGGER.warn("omitting non-value node " + optionNode.getKey());
                 }
             }
         } catch (Exception e) {
-            System.out.println(e.getMessage());
+            LOGGER.error(e.getMessage());
             return null;
         }
 
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java
index d6bbb9fa526..1d92c923c5c 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java
@@ -10,12 +10,18 @@ import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.Reader;
 import java.io.Writer;
+import java.util.Scanner;
 import java.util.regex.Pattern;
 
-public abstract class AbstractGenerator {
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+public abstract class AbstractGenerator {
+    private static final Logger LOGGER = LoggerFactory.getLogger(AbstractGenerator.class);
+
+    @SuppressWarnings("static-method")
     public File writeToFile(String filename, String contents) throws IOException {
-        System.out.println("writing file " + filename);
+        LOGGER.info("writing file " + filename);
         File output = new File(filename);
 
         if (output.getParent() != null && !new File(output.getParent()).exists()) {
@@ -36,10 +42,10 @@ public abstract class AbstractGenerator {
             if (reader == null) {
                 throw new RuntimeException("no file found");
             }
-            java.util.Scanner s = new java.util.Scanner(reader).useDelimiter("\\A");
+            Scanner s = new Scanner(reader).useDelimiter("\\A");
             return s.hasNext() ? s.next() : "";
         } catch (Exception e) {
-            e.printStackTrace();
+            LOGGER.error(e.getMessage());
         }
         throw new RuntimeException("can't load template " + name);
     }
@@ -48,14 +54,11 @@ public abstract class AbstractGenerator {
         try {
             InputStream is = this.getClass().getClassLoader().getResourceAsStream(getCPResourcePath(name));
             if (is == null) {
-                is = new FileInputStream(new File(name));
-            }
-            if (is == null) {
-                throw new RuntimeException("no file found");
+                is = new FileInputStream(new File(name)); // May throw but never return a null value
             }
             return new InputStreamReader(is);
         } catch (Exception e) {
-            e.printStackTrace();
+            LOGGER.error(e.getMessage());
         }
         throw new RuntimeException("can't load template " + name);
     }
@@ -63,6 +66,10 @@ public abstract class AbstractGenerator {
     /**
      * Get the template file path with template dir prepended, and use the
      * library template if exists.
+     *
+     * @param config Codegen config
+     * @param templateFile Template file
+     * @return String Full template file path
      */
     public String getFullTemplateFile(CodegenConfig config, String templateFile) {
         String library = config.getLibrary();
@@ -96,6 +103,7 @@ public abstract class AbstractGenerator {
         return this.getClass().getClassLoader().getResource(getCPResourcePath(name)) != null;
     }
 
+    @SuppressWarnings("static-method")
     public String getCPResourcePath(String name) {
         if (!"/".equals(File.separator)) {
             return name.replaceAll(Pattern.quote(File.separator), "/");
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/ClientOptInput.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/ClientOptInput.java
index 571498c3121..57918dd9b35 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/ClientOptInput.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/ClientOptInput.java
@@ -5,13 +5,8 @@ import io.swagger.codegen.auth.AuthParser;
 import io.swagger.models.Swagger;
 import io.swagger.models.auth.AuthorizationValue;
 
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.util.ArrayList;
 import java.util.List;
 
-import static org.apache.commons.lang3.StringUtils.isNotEmpty;
-
 public class ClientOptInput {
     private CodegenConfig config;
     private ClientOpts opts;
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/Codegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/Codegen.java
index ffb4a0112a5..649f068d16c 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/Codegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/Codegen.java
@@ -1,29 +1,34 @@
 package io.swagger.codegen;
 
-import config.Config;
-import config.ConfigParser;
-import io.swagger.models.Swagger;
-import io.swagger.parser.SwaggerParser;
-import org.apache.commons.cli.BasicParser;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Options;
-
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.ServiceLoader;
 
+import org.apache.commons.cli.BasicParser;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Options;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import config.Config;
+import config.ConfigParser;
+import io.swagger.models.Swagger;
+import io.swagger.parser.SwaggerParser;
+
 /**
  * @deprecated use instead {@link io.swagger.codegen.DefaultGenerator}
  * or cli interface from https://github.com/swagger-api/swagger-codegen/pull/547
  */
 @Deprecated
 public class Codegen extends DefaultGenerator {
+	
+    private static final Logger LOGGER = LoggerFactory.getLogger(Codegen.class);
+	
     static Map<String, CodegenConfig> configs = new HashMap<String, CodegenConfig>();
     static String configString;
     static String debugInfoOptions = "\nThe following additional debug options are available for all codegen targets:" +
@@ -32,10 +37,9 @@ public class Codegen extends DefaultGenerator {
             "\n -DdebugOperations prints operations passed to the template engine" +
             "\n -DdebugSupportingFiles prints additional data passed to the template engine";
 
+    @SuppressWarnings("deprecation")
     public static void main(String[] args) {
 
-        StringBuilder sb = new StringBuilder();
-
         Options options = new Options();
         options.addOption("h", "help", false, "shows this message");
         options.addOption("l", "lang", true, "client language to generate.\nAvailable languages include:\n\t[" + configString + "]");
@@ -113,7 +117,7 @@ public class Codegen extends DefaultGenerator {
                     .swagger(swagger);
             new Codegen().opts(clientOptInput).generate();
         } catch (Exception e) {
-            e.printStackTrace();
+            LOGGER.error(e.getMessage(), e);
         }
     }
 
@@ -138,9 +142,9 @@ public class Codegen extends DefaultGenerator {
         } else {
             // see if it's a class
             try {
-                System.out.println("loading class " + name);
-                Class customClass = Class.forName(name);
-                System.out.println("loaded");
+                LOGGER.debug("loading class " + name);
+                Class<?> customClass = Class.forName(name);
+                LOGGER.debug("loaded");
                 return (CodegenConfig) customClass.newInstance();
             } catch (Exception e) {
                 throw new RuntimeException("can't load class " + name);
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java
index a74e652bb6d..3dc90472247 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java
@@ -18,11 +18,19 @@ public interface CodegenConfig {
     String getHelp();
 
     Map<String, Object> additionalProperties();
+    
+    Map<String, Object> vendorExtensions();
+
+    String testPackage();
 
     String apiPackage();
 
     String apiFileFolder();
 
+    String apiTestFileFolder();
+
+    String apiDocFileFolder();
+
     String fileSuffix();
 
     String outputFolder();
@@ -33,6 +41,10 @@ public interface CodegenConfig {
 
     String modelFileFolder();
 
+    String modelTestFileFolder();
+
+    String modelDocFileFolder();
+
     String modelPackage();
 
     String toApiName(String name);
@@ -87,22 +99,42 @@ public interface CodegenConfig {
 
     Map<String, String> modelTemplateFiles();
 
+    Map<String, String> apiTestTemplateFiles();
+
+    Map<String, String> modelTestTemplateFiles();
+
+    Map<String, String> apiDocTemplateFiles();
+
+    Map<String, String> modelDocTemplateFiles();
+
     Set<String> languageSpecificPrimitives();
 
     void preprocessSwagger(Swagger swagger);
 
     void processSwagger(Swagger swagger);
 
+    String sanitizeTag(String tag);
+
     String toApiFilename(String name);
 
     String toModelFilename(String name);
 
+    String toApiTestFilename(String name);
+
+    String toModelTestFilename(String name);
+    
+    String toApiDocFilename(String name);
+
+    String toModelDocFilename(String name);
+    
     String toModelImport(String name);
 
     String toApiImport(String name);
 
     void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map<String, List<CodegenOperation>> operations);
 
+    Map<String, Object> postProcessAllModels(Map<String, Object> objs);
+    
     Map<String, Object> postProcessModels(Map<String, Object> objs);
 
     Map<String, Object> postProcessOperations(Map<String, Object> objs);
@@ -115,6 +147,10 @@ public interface CodegenConfig {
 
     String apiFilename(String templateName, String tag);
 
+    String apiTestFilename(String templateName, String tag);
+
+    String apiDocFilename(String templateName, String tag);
+
     boolean shouldOverwrite(String filename);
 
     boolean isSkipOverwrite();
@@ -127,6 +163,25 @@ public interface CodegenConfig {
 
     /**
      * Library template (sub-template).
+     *
+     * @return libray template
      */
     String getLibrary();
+
+    void setGitUserId(String gitUserId);
+
+    String getGitUserId();
+
+    void setGitRepoId(String gitRepoId);
+
+    String getGitRepoId();
+
+    void setReleaseNote(String releaseNote);
+
+    String getReleaseNote();
+
+    void setHttpUserAgent(String httpUserAgent);
+
+    String getHttpUserAgent();
+
 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java
index fc2410fa9de..1d97fe829b8 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java
@@ -46,6 +46,9 @@ public class CodegenConstants {
     public static final String SORT_PARAMS_BY_REQUIRED_FLAG = "sortParamsByRequiredFlag";
     public static final String SORT_PARAMS_BY_REQUIRED_FLAG_DESC = "Sort method arguments to place required parameters before optional parameters.";
 
+    public static final String USE_DATETIME_OFFSET = "useDateTimeOffset";
+    public static final String USE_DATETIME_OFFSET_DESC = "Use DateTimeOffset to model date-time properties";
+	
     public static final String ENSURE_UNIQUE_PARAMS = "ensureUniqueParams";
     public static final String ENSURE_UNIQUE_PARAMS_DESC = "Whether to ensure parameter names are unique in an operation (rename parameters that are not).";
 
@@ -54,4 +57,50 @@ public class CodegenConstants {
     public static final String POD_VERSION = "podVersion";
 
     public static final String OPTIONAL_METHOD_ARGUMENT = "optionalMethodArgument";
+    public static final String OPTIONAL_METHOD_ARGUMENT_DESC = "Optional method argument, e.g. void square(int x=10) (.net 4.0+ only).";
+
+    public static final String OPTIONAL_ASSEMBLY_INFO = "optionalAssemblyInfo";
+    public static final String OPTIONAL_ASSEMBLY_INFO_DESC = "Generate AssemblyInfo.cs.";
+
+    public static final String USE_COLLECTION = "useCollection";
+    public static final String USE_COLLECTION_DESC = "Deserialize array types to Collection<T> instead of List<T>.";
+
+    public static final String RETURN_ICOLLECTION = "returnICollection";
+    public static final String RETURN_ICOLLECTION_DESC = "Return ICollection<T> instead of the concrete type.";
+    
+    public static final String OPTIONAL_PROJECT_FILE = "optionalProjectFile";
+    public static final String OPTIONAL_PROJECT_FILE_DESC = "Generate {PackageName}.csproj.";
+    
+    public static final String OPTIONAL_PROJECT_GUID = "packageGuid";
+    public static final String OPTIONAL_PROJECT_GUID_DESC = "The GUID that will be associated with the C# project";
+    
+    public static final String MODEL_PROPERTY_NAMING = "modelPropertyNaming";
+    public static final String MODEL_PROPERTY_NAMING_DESC = "Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name";
+
+    public static final String DOTNET_FRAMEWORK = "targetFramework";
+    public static final String DOTNET_FRAMEWORK_DESC = "The target .NET framework version.";
+
+    public static enum MODEL_PROPERTY_NAMING_TYPE {camelCase, PascalCase, snake_case, original}
+
+    public static final String MODEL_NAME_PREFIX = "modelNamePrefix";
+    public static final String MODEL_NAME_PREFIX_DESC = "Prefix that will be prepended to all model names. Default is the empty string.";
+
+    public static final String MODEL_NAME_SUFFIX = "modelNameSuffix";
+    public static final String MODEL_NAME_SUFFIX_DESC = "Suffix that will be appended to all model names. Default is the empty string.";
+
+    public static final String OPTIONAL_EMIT_DEFAULT_VALUES = "optionalEmitDefaultValues";
+    public static final String OPTIONAL_EMIT_DEFAULT_VALUES_DESC = "Set DataMember's EmitDefaultValue, default false.";
+
+    public static final String GIT_USER_ID = "gitUserId";
+    public static final String GIT_USER_ID_DESC = "Git user ID, e.g. swagger-api.";
+
+    public static final String GIT_REPO_ID = "gitRepoId";
+    public static final String GIT_REPO_ID_DESC = "Git repo ID, e.g. swagger-codegen.";
+
+    public static final String RELEASE_NOTE = "releaseNote";
+    public static final String RELEASE_NOTE_DESC = "Release note, default to 'Minor update'.";
+
+    public static final String HTTP_USER_AGENT = "httpUserAgent";
+    public static final String HTTP_USER_AGENT_DESC = "HTTP user agent, e.g. codegen_csharp_api_client, default to 'Swagger-Codegen/{packageVersion}}/{language}'";
+
 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java
index 4df150f81a8..a7866e5675a 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java
@@ -6,18 +6,35 @@ import java.util.*;
 
 public class CodegenModel {
     public String parent, parentSchema;
+    public List<String> interfaces;
+
+    // References to parent and interface CodegenModels. Only set when code generator supports inheritance.
+    public CodegenModel parentModel;
+    public List<CodegenModel> interfaceModels;
+
     public String name, classname, description, classVarName, modelJson, dataType;
+    public String classFilename; // store the class file name, mainly used for import
     public String unescapedDescription;
+    public String discriminator;
     public String defaultValue;
     public List<CodegenProperty> vars = new ArrayList<CodegenProperty>();
+    public List<CodegenProperty> allVars;
     public List<String> allowableValues;
 
-    // list of all required parameters
-    public Set<String> mandatory = new HashSet<String>();
-    
+    // Sorted sets of required parameters.
+    public Set<String> mandatory = new TreeSet<String>();
+    public Set<String> allMandatory;
+
     public Set<String> imports = new TreeSet<String>();
     public Boolean hasVars, emptyVars, hasMoreModels, hasEnums, isEnum;
     public ExternalDocs externalDocs;
 
     public Map<String, Object> vendorExtensions;
+
+    {
+        // By default these are the same collections. Where the code generator supports inheritance, composed models
+        // store the complete closure of owned and inherited properties in allVars and allMandatory.
+        allVars = vars;
+        allMandatory = mandatory;
+    }
 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java
index c5b9231341e..59c5057ac29 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java
@@ -15,7 +15,7 @@ public class CodegenOperation {
             isListContainer, isMultipart, hasMore = Boolean.TRUE,
             isResponseBinary = Boolean.FALSE, hasReference = Boolean.FALSE;
     public String path, operationId, returnType, httpMethod, returnBaseType,
-            returnContainer, summary, notes, baseName, defaultResponse;
+            returnContainer, summary, notes, baseName, defaultResponse, discriminator;
     public List<Map<String, String>> consumes, produces;
     public CodegenParameter bodyParam;
     public List<CodegenParameter> allParams = new ArrayList<CodegenParameter>();
@@ -32,13 +32,14 @@ public class CodegenOperation {
     public ExternalDocs externalDocs;
     public Map<String, Object> vendorExtensions;
     public String nickname; // legacy support
+    public String operationIdLowerCase; // for mardown documentation
 
     /**
      * Check if there's at least one parameter
      *
      * @return true if parameter exists, false otherwise
      */
-    private boolean nonempty(List<CodegenParameter> params) {
+    private static boolean nonempty(List<CodegenParameter> params) {
         return params != null && params.size() > 0;
     }
 
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenParameter.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenParameter.java
index ab934075a53..d386b4c4dca 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenParameter.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenParameter.java
@@ -7,13 +7,18 @@ import java.util.List;
 
 public class CodegenParameter {
     public Boolean isFormParam, isQueryParam, isPathParam, isHeaderParam,
-            isCookieParam, isBodyParam, isFile, notFile, hasMore, isContainer, 
-            secondaryParam, isBinary, isCollectionFormatMulti;
-    public String baseName, paramName, dataType, collectionFormat, description, baseType, defaultValue;
+            isCookieParam, isBodyParam, hasMore, isContainer,
+            secondaryParam, isCollectionFormatMulti, isPrimitiveType;
+    public String baseName, paramName, dataType, datatypeWithEnum, collectionFormat, description, baseType, defaultValue;
+    public String example; // example value (x-example)
     public String jsonSchema;
+    public Boolean isString, isInteger, isLong, isFloat, isDouble, isByteArray, isBinary, isBoolean, isDate, isDateTime;
+    public Boolean isListContainer, isMapContainer;
+    public Boolean isFile, notFile;
     public boolean isEnum;
     public List<String> _enum;
     public Map<String, Object> allowableValues;
+    public CodegenProperty items;
     public Map<String, Object> vendorExtensions;
 
     /**
@@ -78,6 +83,7 @@ public class CodegenParameter {
         output.baseName = this.baseName;
         output.paramName = this.paramName;
         output.dataType = this.dataType;
+        output.datatypeWithEnum = this.datatypeWithEnum;
         output.collectionFormat = this.collectionFormat;
         output.isCollectionFormatMulti = this.isCollectionFormatMulti;
         output.description = this.description;
@@ -102,6 +108,7 @@ public class CodegenParameter {
         output.multipleOf = this.multipleOf;
         output.jsonSchema = this.jsonSchema;
         output.defaultValue = this.defaultValue;
+        output.example = this.example;
         output.isEnum = this.isEnum;
         if (this._enum != null) {
             output._enum = new ArrayList<String>(this._enum);
@@ -109,7 +116,22 @@ public class CodegenParameter {
         if (this.allowableValues != null) {
             output.allowableValues = new HashMap<String, Object>(this.allowableValues);
         }
+        if (this.items != null) {
+            output.items = this.items;
+        }
         output.vendorExtensions = this.vendorExtensions;
+        output.isBinary = this.isBinary;
+        output.isByteArray = this.isByteArray;
+        output.isString = this.isString;
+        output.isInteger = this.isInteger;
+        output.isLong = this.isLong;
+        output.isDouble = this.isDouble;
+        output.isFloat = this.isFloat;
+        output.isBoolean = this.isBoolean;
+        output.isDate = this.isDate;
+        output.isDateTime = this.isDateTime;
+        output.isListContainer = this.isListContainer;
+        output.isMapContainer = this.isMapContainer;
 
         return output;
     }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenProperty.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenProperty.java
index 87352907ad0..0091204a0ab 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenProperty.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenProperty.java
@@ -33,6 +33,8 @@ public class CodegenProperty {
     public Boolean exclusiveMaximum;
     public Boolean hasMore, required, secondaryParam;
     public Boolean isPrimitiveType, isContainer, isNotContainer;
+    public Boolean isString, isInteger, isLong, isFloat, isDouble, isByteArray, isBinary, isBoolean, isDate, isDateTime;
+    public Boolean isListContainer, isMapContainer;
     public boolean isEnum;
     public Boolean isReadOnly = false;
     public List<String> _enum;
@@ -40,6 +42,62 @@ public class CodegenProperty {
     public CodegenProperty items;
     public Map<String, Object> vendorExtensions;
 
+    @Override
+    public int hashCode()
+    {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((_enum == null) ? 0 : _enum.hashCode());
+        result = prime * result + ((allowableValues == null) ? 0 : allowableValues.hashCode());
+        result = prime * result + ((baseName == null) ? 0 : baseName.hashCode());
+        result = prime * result + ((baseType == null) ? 0 : baseType.hashCode());
+        result = prime * result + ((complexType == null) ? 0 : complexType.hashCode());
+        result = prime * result + ((containerType == null) ? 0 : containerType.hashCode());
+        result = prime * result + ((datatype == null) ? 0 : datatype.hashCode());
+        result = prime * result + ((datatypeWithEnum == null) ? 0 : datatypeWithEnum.hashCode());
+        result = prime * result + ((defaultValue == null) ? 0 : defaultValue.hashCode());
+        result = prime * result + ((defaultValueWithParam == null) ? 0 : defaultValueWithParam.hashCode());
+        result = prime * result + ((description == null) ? 0 : description.hashCode());
+        result = prime * result + ((example == null) ? 0 : example.hashCode());
+        result = prime * result + ((exclusiveMaximum == null) ? 0 : exclusiveMaximum.hashCode());
+        result = prime * result + ((exclusiveMinimum == null) ? 0 : exclusiveMinimum.hashCode());
+        result = prime * result + ((getter == null) ? 0 : getter.hashCode());
+        result = prime * result + ((hasMore == null) ? 0 : hasMore.hashCode());
+        result = prime * result + ((isContainer == null) ? 0 : isContainer.hashCode());
+        result = prime * result + (isEnum ? 1231 : 1237);
+        result = prime * result + ((isNotContainer == null) ? 0 : isNotContainer.hashCode());
+        result = prime * result + ((isPrimitiveType == null) ? 0 : isPrimitiveType.hashCode());
+        result = prime * result + ((isReadOnly == null) ? 0 : isReadOnly.hashCode());
+        result = prime * result + ((items == null) ? 0 : items.hashCode());
+        result = prime * result + ((jsonSchema == null) ? 0 : jsonSchema.hashCode());
+        result = prime * result + ((max == null) ? 0 : max.hashCode());
+        result = prime * result + ((maxLength == null) ? 0 : maxLength.hashCode());
+        result = prime * result + ((maximum == null) ? 0 : maximum.hashCode());
+        result = prime * result + ((min == null) ? 0 : min.hashCode());
+        result = prime * result + ((minLength == null) ? 0 : minLength.hashCode());
+        result = prime * result + ((minimum == null) ? 0 : minimum.hashCode());
+        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        result = prime * result + ((pattern == null) ? 0 : pattern.hashCode());
+        result = prime * result + ((required == null) ? 0 : required.hashCode());
+        result = prime * result + ((secondaryParam == null) ? 0 : secondaryParam.hashCode());
+        result = prime * result + ((setter == null) ? 0 : setter.hashCode());
+        result = prime * result + ((unescapedDescription == null) ? 0 : unescapedDescription.hashCode());
+        result = prime * result + ((vendorExtensions == null) ? 0 : vendorExtensions.hashCode());
+        result = prime * result + ((isString == null) ? 0 : isString.hashCode());
+        result = prime * result + ((isInteger == null) ? 0 : isInteger.hashCode());
+        result = prime * result + ((isLong == null) ? 0 : isLong.hashCode());
+        result = prime * result + ((isFloat == null) ? 0 : isFloat.hashCode());
+        result = prime * result + ((isDouble == null) ? 0 : isDouble.hashCode());
+        result = prime * result + ((isByteArray == null) ? 0 : isByteArray.hashCode());
+        result = prime * result + ((isBinary == null) ? 0 : isBinary.hashCode());
+        result = prime * result + ((isBoolean == null) ? 0 : isBoolean.hashCode());
+        result = prime * result + ((isDate == null) ? 0 : isDate.hashCode());
+        result = prime * result + ((isDateTime == null) ? 0 : isDateTime.hashCode());
+        result = prime * result + ((isMapContainer == null) ? 0 : isMapContainer.hashCode());
+        result = prime * result + ((isListContainer == null) ? 0 : isListContainer.hashCode());
+        return result;
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (obj == null) {
@@ -133,6 +191,9 @@ public class CodegenProperty {
         if (this.isEnum != other.isEnum) {
             return false;
         }
+        if (this.isReadOnly != other.isReadOnly && (this.isReadOnly == null || !this.isReadOnly.equals(other.isReadOnly))) {
+            return false;
+        }
         if (this._enum != other._enum && (this._enum == null || !this._enum.equals(other._enum))) {
             return false;
         }
@@ -142,6 +203,42 @@ public class CodegenProperty {
         if (this.vendorExtensions != other.vendorExtensions && (this.vendorExtensions == null || !this.vendorExtensions.equals(other.vendorExtensions))) {
             return false;
         }
+        if (this.isString != other.isString && (this.isString == null || !this.isString.equals(other.isString))) {
+            return false;
+        }
+        if (this.isInteger != other.isInteger && (this.isInteger == null || !this.isInteger.equals(other.isInteger))) {
+            return false;
+        }
+        if (this.isLong != other.isLong && (this.isLong == null || !this.isLong.equals(other.isLong))) {
+            return false;
+        }
+        if (this.isFloat != other.isFloat && (this.isFloat == null || !this.isFloat.equals(other.isFloat))) {
+            return false;
+        }
+        if (this.isDouble != other.isDouble && (this.isDouble == null || !this.isDouble.equals(other.isDouble))) {
+            return false;
+        }
+        if (this.isByteArray != other.isByteArray && (this.isByteArray == null || !this.isByteArray.equals(other.isByteArray))) {
+            return false;
+        }
+        if (this.isBoolean != other.isBoolean && (this.isBoolean == null || !this.isBoolean.equals(other.isBoolean))) {
+            return false;
+        }
+        if (this.isDate != other.isDate && (this.isDate == null || !this.isDate.equals(other.isDate))) {
+            return false;
+        }
+        if (this.isDateTime != other.isDateTime && (this.isDateTime == null || !this.isDateTime.equals(other.isDateTime))) {
+            return false;
+        }
+        if (this.isBinary != other.isBinary && (this.isBinary == null || !this.isBinary.equals(other.isBinary))) {
+            return false;
+        }
+        if (this.isListContainer != other.isListContainer && (this.isListContainer == null || !this.isListContainer.equals(other.isListContainer))) {
+            return false;
+        }
+        if (this.isMapContainer != other.isMapContainer && (this.isMapContainer == null || !this.isMapContainer.equals(other.isMapContainer))) {
+            return false;
+        }
         return true;
     }
 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
index 1056e854f8a..b2a28287471 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
@@ -2,52 +2,22 @@ package io.swagger.codegen;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Lists;
-
 import io.swagger.codegen.examples.ExampleGenerator;
-import io.swagger.models.ArrayModel;
-import io.swagger.models.ComposedModel;
-import io.swagger.models.Model;
-import io.swagger.models.ModelImpl;
-import io.swagger.models.Operation;
-import io.swagger.models.RefModel;
-import io.swagger.models.Response;
-import io.swagger.models.Swagger;
-import io.swagger.models.auth.ApiKeyAuthDefinition;
-import io.swagger.models.auth.BasicAuthDefinition;
-import io.swagger.models.auth.In;
-import io.swagger.models.auth.OAuth2Definition;
-import io.swagger.models.auth.SecuritySchemeDefinition;
-import io.swagger.models.parameters.BodyParameter;
-import io.swagger.models.parameters.CookieParameter;
-import io.swagger.models.parameters.FormParameter;
-import io.swagger.models.parameters.HeaderParameter;
-import io.swagger.models.parameters.Parameter;
-import io.swagger.models.parameters.PathParameter;
-import io.swagger.models.parameters.QueryParameter;
-import io.swagger.models.parameters.SerializableParameter;
+import io.swagger.models.*;
+import io.swagger.models.auth.*;
+import io.swagger.models.parameters.*;
 import io.swagger.models.properties.*;
 import io.swagger.models.properties.PropertyBuilder.PropertyId;
 import io.swagger.util.Json;
-
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nullable;
-
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
+import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -63,11 +33,18 @@ public class DefaultCodegen {
     protected Set<String> languageSpecificPrimitives = new HashSet<String>();
     protected Map<String, String> importMapping = new HashMap<String, String>();
     protected String modelPackage = "", apiPackage = "", fileSuffix;
+    protected String modelNamePrefix = "", modelNameSuffix = "";
+    protected String testPackage = "";
     protected Map<String, String> apiTemplateFiles = new HashMap<String, String>();
     protected Map<String, String> modelTemplateFiles = new HashMap<String, String>();
+    protected Map<String, String> apiTestTemplateFiles = new HashMap<String, String>();
+    protected Map<String, String> modelTestTemplateFiles = new HashMap<String, String>();
+    protected Map<String, String> apiDocTemplateFiles = new HashMap<String, String>();
+    protected Map<String, String> modelDocTemplateFiles = new HashMap<String, String>();
     protected String templateDir;
     protected String embeddedTemplateDir;
     protected Map<String, Object> additionalProperties = new HashMap<String, Object>();
+    protected Map<String, Object> vendorExtensions = new HashMap<String, Object>();
     protected List<SupportingFile> supportingFiles = new ArrayList<SupportingFile>();
     protected List<CliOption> cliOptions = new ArrayList<CliOption>();
     protected boolean skipOverwrite;
@@ -76,6 +53,8 @@ public class DefaultCodegen {
     protected String library;
     protected Boolean sortParamsByRequiredFlag = true;
     protected Boolean ensureUniqueParams = true;
+    protected String gitUserId, gitRepoId, releaseNote;
+    protected String httpUserAgent;
 
     public List<CliOption> cliOptions() {
         return cliOptions;
@@ -103,45 +82,95 @@ public class DefaultCodegen {
             this.setEnsureUniqueParams(Boolean.valueOf(additionalProperties
                     .get(CodegenConstants.ENSURE_UNIQUE_PARAMS).toString()));
         }
+
+        if(additionalProperties.containsKey(CodegenConstants.MODEL_NAME_PREFIX)){
+            this.setModelNamePrefix((String) additionalProperties.get(CodegenConstants.MODEL_NAME_PREFIX));
+        }
+
+        if(additionalProperties.containsKey(CodegenConstants.MODEL_NAME_SUFFIX)){
+            this.setModelNameSuffix((String) additionalProperties.get(CodegenConstants.MODEL_NAME_SUFFIX));
+        }
+
     }
 
-    // override with any special post-processing
-    public Map<String, Object> postProcessModels(Map<String, Object> objs) {
+    // override with any special post-processing for all models
+    @SuppressWarnings({ "static-method", "unchecked" })
+    public Map<String, Object> postProcessAllModels(Map<String, Object> objs) {
+        if (supportsInheritance) {
+            // Index all CodegenModels by name.
+            Map<String, CodegenModel> allModels = new HashMap<String, CodegenModel>();
+            for (Entry<String, Object> entry : objs.entrySet()) {
+                String modelName = entry.getKey();
+                Map<String, Object> inner = (Map<String, Object>) entry.getValue();
+                List<Map<String, Object>> models = (List<Map<String, Object>>) inner.get("models");
+                for (Map<String, Object> mo : models) {
+                    CodegenModel cm = (CodegenModel) mo.get("model");
+                    allModels.put(modelName, cm);
+                }
+            }
+            // Fix up all parent and interface CodegenModel references.
+            for (CodegenModel cm : allModels.values()) {
+                if (cm.parent != null) {
+                    cm.parentModel = allModels.get(cm.parent);
+                }
+                if (cm.interfaces != null && !cm.interfaces.isEmpty()) {
+                    cm.interfaceModels = new ArrayList<CodegenModel>(cm.interfaces.size());
+                    for (String intf : cm.interfaces) {
+                        CodegenModel intfModel = allModels.get(intf);
+                        if (intfModel != null) {
+                            cm.interfaceModels.add(intfModel);
+                        }
+                    }
+                }
+            }
+        }
         return objs;
     }
 
     // override with any special post-processing
+    @SuppressWarnings("static-method")
+    public Map<String, Object> postProcessModels(Map<String, Object> objs) {
+        return objs;
+    }
+
+
+    // override with any special post-processing
+    @SuppressWarnings("static-method")
     public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
         return objs;
     }
 
     // override with any special post-processing
+    @SuppressWarnings("static-method")
     public Map<String, Object> postProcessSupportingFileData(Map<String, Object> objs) {
         return objs;
     }
 
     // override to post-process any model properties
-    public void postProcessModelProperty(CodegenModel model, CodegenProperty property){}
+    @SuppressWarnings("unused")
+    public void postProcessModelProperty(CodegenModel model, CodegenProperty property){
+    }
 
     // override to post-process any parameters
-    public void postProcessParameter(CodegenParameter parameter){}
+    @SuppressWarnings("unused")
+    public void postProcessParameter(CodegenParameter parameter){
+    }
 
     //override with any special handling of the entire swagger spec
+    @SuppressWarnings("unused")
     public void preprocessSwagger(Swagger swagger) {
     }
 
     // override with any special handling of the entire swagger spec
+    @SuppressWarnings("unused")
     public void processSwagger(Swagger swagger) {
     }
 
     // override with any special text escaping logic
+    @SuppressWarnings("static-method")
     public String escapeText(String input) {
         if (input != null) {
-            input = input.trim();
-            String output = input.replaceAll("\n", "\\\\n");
-            output = output.replace("\r", "\\r");
-            output = output.replace("\"", "\\\"");
-            return output;
+            return StringEscapeUtils.escapeJava(input).replace("\\/", "/");
         }
         return input;
     }
@@ -170,6 +199,10 @@ public class DefaultCodegen {
         return importMapping;
     }
 
+    public String testPackage() {
+        return testPackage;
+    }
+
     public String modelPackage() {
         return modelPackage;
     }
@@ -194,6 +227,22 @@ public class DefaultCodegen {
         }
     }
 
+    public Map<String, String> apiDocTemplateFiles() {
+        return apiDocTemplateFiles;
+    }
+
+    public Map<String, String> modelDocTemplateFiles() {
+        return modelDocTemplateFiles;
+    }
+
+    public Map<String, String> apiTestTemplateFiles() {
+        return apiTestTemplateFiles;
+    }
+
+    public Map<String, String> modelTestTemplateFiles() {
+        return modelTestTemplateFiles;
+    }
+
     public Map<String, String> apiTemplateFiles() {
         return apiTemplateFiles;
     }
@@ -210,10 +259,30 @@ public class DefaultCodegen {
         return outputFolder + "/" + modelPackage().replace('.', '/');
     }
 
+    public String apiTestFileFolder() {
+        return outputFolder + "/" + testPackage().replace('.', '/');
+    }
+
+    public String modelTestFileFolder() {
+        return outputFolder + "/" + testPackage().replace('.', '/');
+    }
+
+    public String apiDocFileFolder() {
+        return outputFolder;
+    }
+
+    public String modelDocFileFolder() {
+        return outputFolder;
+    }
+
     public Map<String, Object> additionalProperties() {
         return additionalProperties;
     }
 
+    public Map<String, Object> vendorExtensions() {
+        return vendorExtensions;
+    }
+
     public List<SupportingFile> supportingFiles() {
         return supportingFiles;
     }
@@ -238,6 +307,14 @@ public class DefaultCodegen {
         this.modelPackage = modelPackage;
     }
 
+    public void setModelNamePrefix(String modelNamePrefix){
+        this.modelNamePrefix = modelNamePrefix;
+    }
+
+    public void setModelNameSuffix(String modelNameSuffix){
+        this.modelNameSuffix = modelNameSuffix;
+    }
+
     public void setApiPackage(String apiPackage) {
         this.apiPackage = apiPackage;
     }
@@ -251,8 +328,8 @@ public class DefaultCodegen {
     }
 
     /**
-     * Return the file name of the Api
-     * 
+     * Return the file name of the Api Test
+     *
      * @param name the file name of the Api
      * @return the file name of the Api
      */
@@ -261,8 +338,28 @@ public class DefaultCodegen {
     }
 
     /**
-     * Return the variable name in the Api
+     * Return the file name of the Api Documentation 
      * 
+     * @param name the file name of the Api
+     * @return the file name of the Api
+     */
+    public String toApiDocFilename(String name) {
+        return toApiName(name);
+    }
+
+    /**
+     * Return the file name of the Api Test
+     *
+     * @param name the file name of the Api
+     * @return the file name of the Api
+     */
+    public String toApiTestFilename(String name) {
+        return toApiName(name) + "Test";
+    }
+
+    /**
+     * Return the variable name in the Api
+     *
      * @param name the varible name of the Api
      * @return the snake-cased variable name
      */
@@ -272,7 +369,7 @@ public class DefaultCodegen {
 
     /**
      * Return the capitalized file name of the model
-     * 
+     *
      * @param name the model name
      * @return the file name of the model
      */
@@ -281,11 +378,32 @@ public class DefaultCodegen {
     }
 
     /**
-     * Return the operation ID (method name)
+     * Return the capitalized file name of the model test
+     *
+     * @param name the model name
+     * @return the file name of the model
+     */
+    public String toModelTestFilename(String name) {
+        return initialCaps(name) + "Test";
+    }
+
+    /**
+     * Return the capitalized file name of the model documentation
      * 
+     * @param name the model name
+     * @return the file name of the model
+     */
+    public String toModelDocFilename(String name) {
+        return initialCaps(name);
+    }
+    
+    /**
+     * Return the operation ID (method name)
+     *
      * @param operationId operation ID
      * @return the sanitized method name
      */
+    @SuppressWarnings("static-method")
     public String toOperationId(String operationId) {
         // throw exception if method name is empty
         if (StringUtils.isEmpty(operationId)) {
@@ -298,7 +416,7 @@ public class DefaultCodegen {
     /**
      * Return the variable name by removing invalid characters and proper escaping if
      * it's a reserved word.
-     * 
+     *
      * @param name the variable name
      * @return the sanitized variable name
      */
@@ -313,12 +431,12 @@ public class DefaultCodegen {
     /**
      * Return the parameter name by removing invalid characters and proper escaping if
      * it's a reserved word.
-     * 
+     *
      * @param name Codegen property object
      * @return the sanitized parameter name
      */
     public String toParamName(String name) {
-        name = removeNonNameElementToCamelCase(name);
+        name = removeNonNameElementToCamelCase(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
         if (reservedWords.contains(name)) {
             return escapeReservedWord(name);
         }
@@ -327,29 +445,31 @@ public class DefaultCodegen {
 
     /**
      * Return the Enum name (e.g. StatusEnum given 'status')
-     * 
+     *
      * @param property Codegen property object
      * @return the Enum name
      */
+    @SuppressWarnings("static-method")
     public String toEnumName(CodegenProperty property) {
         return StringUtils.capitalize(property.name) + "Enum";
     }
-    
+
     /**
      * Return the escaped name of the reserved word
-     * 
+     *
      * @param name the name to be escaped
      * @return the escaped reserved word
      *
      * throws Runtime exception as reserved word is not allowed (default behavior)
      */
+    @SuppressWarnings("static-method")
     public String escapeReservedWord(String name) {
         throw new RuntimeException("reserved word " + name + " not allowed");
     }
 
     /**
      * Return the fully-qualified "Model" name for import
-     * 
+     *
      * @param name the name of the "Model"
      * @return the fully-qualified "Model" name for import
      */
@@ -363,7 +483,7 @@ public class DefaultCodegen {
 
     /**
      * Return the fully-qualified "Api" name for import
-     * 
+     *
      * @param name the name of the "Api"
      * @return the fully-qualified "Api" name for import
      */
@@ -374,7 +494,7 @@ public class DefaultCodegen {
     /**
      * Default constructor.
      * This method will map between Swagger type and language-specified type, as well as mapping
-     * between Swagger type and the corresponding import statement for the language. This will 
+     * between Swagger type and the corresponding import statement for the language. This will
      * also add some language specified CLI options, if any.
      *
      *
@@ -452,6 +572,7 @@ public class DefaultCodegen {
      * @param operation Swagger operation object
      * @return string presentation of the example path
      */
+    @SuppressWarnings("static-method")
     public String generateExamplePath(String path, Operation operation) {
         StringBuilder sb = new StringBuilder();
         sb.append(path);
@@ -528,12 +649,69 @@ public class DefaultCodegen {
         }
     }
 
+    /**
+     * Return the example value of the parameter. 
+     *
+     * @param p Swagger property object
+     */
+    public void setParameterExampleValue(CodegenParameter p) {
+
+    }
+
+    /**
+     * Return the example value of the property
+     *
+     * @param p Swagger property object
+     * @return string presentation of the example value of the property
+     */
+    public String toExampleValue(Property p) {
+        if(p.getExample() != null) {
+            return p.getExample().toString();
+        }
+        if (p instanceof StringProperty) {
+            return "null";
+        } else if (p instanceof BooleanProperty) {
+            return "null";
+        } else if (p instanceof DateProperty) {
+            return "null";
+        } else if (p instanceof DateTimeProperty) {
+            return "null";
+        } else if (p instanceof DoubleProperty) {
+            DoubleProperty dp = (DoubleProperty) p;
+            if (dp.getExample() != null) {
+                return dp.getExample().toString();
+            }
+            return "null";
+        } else if (p instanceof FloatProperty) {
+            FloatProperty dp = (FloatProperty) p;
+            if (dp.getExample() != null) {
+                return dp.getExample().toString();
+            }
+            return "null";
+        } else if (p instanceof IntegerProperty) {
+            IntegerProperty dp = (IntegerProperty) p;
+            if (dp.getExample() != null) {
+                return dp.getExample().toString();
+            }
+            return "null";
+        } else if (p instanceof LongProperty) {
+            LongProperty dp = (LongProperty) p;
+            if (dp.getExample() != null) {
+                return dp.getExample().toString();
+            }
+            return "null";
+        } else {
+            return "null";
+        }
+    }
+
     /**
      * Return the default value of the property
      *
      * @param p Swagger property object
      * @return string presentation of the default value of the property
      */
+    @SuppressWarnings("static-method")
     public String toDefaultValue(Property p) {
         if (p instanceof StringProperty) {
             return "null";
@@ -571,7 +749,7 @@ public class DefaultCodegen {
             return "null";
         }
     }
-    
+
     /**
      * Return the property initialized from a data object
      * Useful for initialization with a plain object in Javascript
@@ -580,42 +758,9 @@ public class DefaultCodegen {
      * @param p Swagger property object
      * @return string presentation of the default value of the property
      */
+    @SuppressWarnings("static-method")
     public String toDefaultValueWithParam(String name, Property p) {
-        if (p instanceof StringProperty) {
-            return " = data." + name + ";";
-        } else if (p instanceof BooleanProperty) {
-            return " = data." + name + ";";
-        } else if (p instanceof DateProperty) {
-            return " = data." + name + ";";
-        } else if (p instanceof DateTimeProperty) {
-            return " = data." + name + ";";
-        } else if (p instanceof DoubleProperty) {
-            DoubleProperty dp = (DoubleProperty) p;
-            if (dp.getDefault() != null) {
-                return dp.getDefault().toString();
-            }
-            return " = data." + name + ";";
-        } else if (p instanceof FloatProperty) {
-            FloatProperty dp = (FloatProperty) p;
-            if (dp.getDefault() != null) {
-                return dp.getDefault().toString();
-            }
-            return " = data." + name + ";";
-        } else if (p instanceof IntegerProperty) {
-            IntegerProperty dp = (IntegerProperty) p;
-            if (dp.getDefault() != null) {
-                return dp.getDefault().toString();
-            }
-            return " = data." + name + ";";
-        } else if (p instanceof LongProperty) {
-            LongProperty dp = (LongProperty) p;
-            if (dp.getDefault() != null) {
-                return dp.getDefault().toString();
-            }
-            return " = data." + name + ";";
-        } else {
-            return " = data." + name + ";";
-        }
+        return " = data." + name + ";";
     }
 
     /**
@@ -623,6 +768,7 @@ public class DefaultCodegen {
      * @param p Swagger property object
      * @return string presentation of the type
      **/
+    @SuppressWarnings("static-method")
     public String getSwaggerType(Property p) {
         String datatype = null;
         if (p instanceof StringProperty && "number".equals(p.getFormat())) {
@@ -651,6 +797,8 @@ public class DefaultCodegen {
             datatype = "map";
         } else if (p instanceof DecimalProperty) {
             datatype = "number";
+        } else if ( p instanceof UUIDProperty) {
+            datatype = "UUID";
         } else if (p instanceof RefProperty) {
             try {
                 RefProperty r = (RefProperty) p;
@@ -661,7 +809,7 @@ public class DefaultCodegen {
             } catch (Exception e) {
                 LOGGER.warn("Error obtaining the datatype from RefProperty:" + p + ". Datatype default to Object");
                 datatype = "Object";
-                e.printStackTrace();
+                LOGGER.error(e.getMessage(), e);
             }
         } else {
             if (p != null) {
@@ -677,6 +825,7 @@ public class DefaultCodegen {
      * @param name string to be snake-cased
      * @return snake-cased string
      */
+    @SuppressWarnings("static-method")
     public String snakeCase(String name) {
         return (name.length() > 0) ? (Character.toLowerCase(name.charAt(0)) + name.substring(1)) : "";
     }
@@ -687,6 +836,7 @@ public class DefaultCodegen {
      * @param name string to be capitalized
      * @return capitalized string
      */
+    @SuppressWarnings("static-method")
     public String initialCaps(String name) {
         return StringUtils.capitalize(name);
     }
@@ -697,6 +847,7 @@ public class DefaultCodegen {
      * @param name name
      * @return a string presentation of the type
      */
+    @SuppressWarnings("static-method")
     public String getTypeDeclaration(String name) {
         return name;
     }
@@ -735,8 +886,8 @@ public class DefaultCodegen {
      * @param name the name of the model
      * @return capitalized model name
      */
-    public String toModelName(String name) {
-        return initialCaps(name);
+    public String toModelName(final String name) {
+        return initialCaps(modelNamePrefix + name + modelNameSuffix);
     }
 
     /**
@@ -769,10 +920,15 @@ public class DefaultCodegen {
         m.unescapedDescription = model.getDescription();
         m.classname = toModelName(name);
         m.classVarName = toVarName(name);
+        m.classFilename = toModelFilename(name);
         m.modelJson = Json.pretty(model);
         m.externalDocs = model.getExternalDocs();
         m.vendorExtensions = model.getVendorExtensions();
 
+        if (model instanceof ModelImpl) {
+            m.discriminator = ((ModelImpl) model).getDiscriminator();
+        }
+
 
         if (model instanceof ArrayModel) {
             ArrayModel am = (ArrayModel) model;
@@ -783,8 +939,18 @@ public class DefaultCodegen {
             // TODO
         } else if (model instanceof ComposedModel) {
             final ComposedModel composed = (ComposedModel) model;
-            Map<String, Property> properties = new HashMap<String, Property>();
+            Map<String, Property> properties = new LinkedHashMap<String, Property>();
             List<String> required = new ArrayList<String>();
+            Map<String, Property> allProperties;
+            List<String> allRequired;
+            if (supportsInheritance) {
+                allProperties = new LinkedHashMap<String, Property>();
+                allRequired = new ArrayList<String>();
+                m.allVars = new ArrayList<CodegenProperty>();
+            } else {
+                allProperties = null;
+                allRequired = null;
+            }
             // parent model
             final RefModel parent = (RefModel) composed.getParent();
             if (parent != null) {
@@ -792,31 +958,29 @@ public class DefaultCodegen {
                 m.parentSchema = parentRef;
                 m.parent = toModelName(parent.getSimpleRef());
                 addImport(m, m.parent);
-                if (!supportsInheritance && allDefinitions != null) {
+                if (allDefinitions != null) {
                     final Model parentModel = allDefinitions.get(m.parentSchema);
-                    if (parentModel instanceof ModelImpl) {
-                        final ModelImpl _parent = (ModelImpl) parentModel;
-                        if (_parent.getProperties() != null) {
-                            properties.putAll(_parent.getProperties());
-                        }
-                        if (_parent.getRequired() != null) {
-                            required.addAll(_parent.getRequired());
-                        }
+                    if (supportsInheritance) {
+                        addProperties(allProperties, allRequired, parentModel, allDefinitions);
+                    } else {
+                        addProperties(properties, required, parentModel, allDefinitions);
                     }
                 }
             }
             // interfaces (intermediate models)
-            if (allDefinitions != null && composed.getInterfaces() != null) {
+            if (composed.getInterfaces() != null) {
+                if (m.interfaces == null)
+                    m.interfaces = new ArrayList<String>();
                 for (RefModel _interface : composed.getInterfaces()) {
                     final String interfaceRef = toModelName(_interface.getSimpleRef());
-                    final Model interfaceModel = allDefinitions.get(interfaceRef);
-                    if (interfaceModel instanceof ModelImpl) {
-                        final ModelImpl _interfaceModel = (ModelImpl) interfaceModel;
-                        if (_interfaceModel.getProperties() != null) {
-                            properties.putAll(_interfaceModel.getProperties());
-                        }
-                        if (_interfaceModel.getRequired() != null) {
-                            required.addAll(_interfaceModel.getRequired());
+                    m.interfaces.add(interfaceRef);
+                    addImport(m, interfaceRef);
+                    if (allDefinitions != null) {
+                        final Model interfaceModel = allDefinitions.get(interfaceRef);
+                        if (supportsInheritance) {
+                            addProperties(allProperties, allRequired, interfaceModel, allDefinitions);
+                        } else {
+                            addProperties(properties, required, interfaceModel, allDefinitions);
                         }
                     }
                 }
@@ -828,15 +992,12 @@ public class DefaultCodegen {
                 child = allDefinitions.get(childRef);
             }
             if (child != null && child instanceof ModelImpl) {
-                final ModelImpl _child = (ModelImpl) child;
-                if (_child.getProperties() != null) {
-                    properties.putAll(_child.getProperties());
-                }
-                if (_child.getRequired() != null) {
-                    required.addAll(_child.getRequired());
+                addProperties(properties, required, child, allDefinitions);
+                if (supportsInheritance) {
+                    addProperties(allProperties, allRequired, child, allDefinitions);
                 }
             }
-            addVars(m, properties, required);
+            addVars(m, properties, required, allProperties, allRequired);
         } else {
             ModelImpl impl = (ModelImpl) model;
             if(impl.getEnum() != null && impl.getEnum().size() > 0) {
@@ -852,7 +1013,7 @@ public class DefaultCodegen {
             addVars(m, impl.getProperties(), impl.getRequired());
         }
 
-        if(m.vars != null) {
+        if (m.vars != null) {
             for(CodegenProperty prop : m.vars) {
                 postProcessModelProperty(m, prop);
             }
@@ -860,6 +1021,28 @@ public class DefaultCodegen {
         return m;
     }
 
+    protected void addProperties(Map<String, Property> properties, List<String> required, Model model,
+            Map<String, Model> allDefinitions) {
+
+        if (model instanceof ModelImpl) {
+            ModelImpl mi = (ModelImpl) model;
+            if (mi.getProperties() != null) {
+                properties.putAll(mi.getProperties());
+            }
+            if (mi.getRequired() != null) {
+                required.addAll(mi.getRequired());
+            }
+        } else if (model instanceof RefModel) {
+            String interfaceRef = toModelName(((RefModel) model).getSimpleRef());
+            Model interfaceModel = allDefinitions.get(interfaceRef);
+            addProperties(properties, required, interfaceModel, allDefinitions);
+        } else if (model instanceof ComposedModel) {
+            for (Model component :((ComposedModel) model).getAllOf()) {
+                addProperties(properties, required, component, allDefinitions);
+            }
+        }
+    }
+
     /**
      * Camelize the method name of the getter and setter
      *
@@ -874,7 +1057,7 @@ public class DefaultCodegen {
         return camelize(toVarName(name));
 
     }
-    
+
     /**
      * Convert Swagger Property object to Codegen Property object
      *
@@ -896,7 +1079,7 @@ public class DefaultCodegen {
         property.unescapedDescription = p.getDescription();
         property.getter = "get" + getterAndSetterCapitalize(name);
         property.setter = "set" + getterAndSetterCapitalize(name);
-        property.example = p.getExample();
+        property.example = toExampleValue(p);
         property.defaultValue = toDefaultValue(p);
         property.defaultValueWithParam = toDefaultValueWithParam(name, p);
         property.jsonSchema = Json.pretty(p);
@@ -929,6 +1112,7 @@ public class DefaultCodegen {
             property.maxLength = sp.getMaxLength();
             property.minLength = sp.getMinLength();
             property.pattern = sp.getPattern();
+            property.isString = true;
             if (sp.getEnum() != null) {
                 List<String> _enum = sp.getEnum();
                 property._enum = _enum;
@@ -940,9 +1124,10 @@ public class DefaultCodegen {
                 property.allowableValues = allowableValues;
             }
         }
-        
+
         if (p instanceof IntegerProperty) {
             IntegerProperty sp = (IntegerProperty) p;
+            property.isInteger = true;
             if (sp.getEnum() != null) {
                 List<Integer> _enum = sp.getEnum();
                 property._enum = new ArrayList<String>();
@@ -957,9 +1142,10 @@ public class DefaultCodegen {
                 property.allowableValues = allowableValues;
             }
         }
-        
+
         if (p instanceof LongProperty) {
             LongProperty sp = (LongProperty) p;
+            property.isLong = true;
             if (sp.getEnum() != null) {
                 List<Long> _enum = sp.getEnum();
                 property._enum = new ArrayList<String>();
@@ -974,9 +1160,22 @@ public class DefaultCodegen {
                 property.allowableValues = allowableValues;
             }
         }
-        
+
+        if (p instanceof BooleanProperty) {
+            property.isBoolean = true;
+        }
+
+        if (p instanceof BinaryProperty) {
+            property.isBinary = true;
+        }
+
+        if (p instanceof ByteArrayProperty) {
+            property.isByteArray = true;
+        }
+
         if (p instanceof DoubleProperty) {
             DoubleProperty sp = (DoubleProperty) p;
+            property.isDouble = true;
             if (sp.getEnum() != null) {
                 List<Double> _enum = sp.getEnum();
                 property._enum = new ArrayList<String>();
@@ -991,9 +1190,10 @@ public class DefaultCodegen {
                 property.allowableValues = allowableValues;
             }
         }
-        
+
         if (p instanceof FloatProperty) {
             FloatProperty sp = (FloatProperty) p;
+            property.isFloat = true;
             if (sp.getEnum() != null) {
                 List<Float> _enum = sp.getEnum();
                 property._enum = new ArrayList<String>();
@@ -1008,9 +1208,10 @@ public class DefaultCodegen {
                 property.allowableValues = allowableValues;
             }
         }
-        
+
         if (p instanceof DateProperty) {
             DateProperty sp = (DateProperty) p;
+            property.isDate = true;
             if (sp.getEnum() != null) {
                 List<String> _enum = sp.getEnum();
                 property._enum = new ArrayList<String>();
@@ -1025,9 +1226,10 @@ public class DefaultCodegen {
                 property.allowableValues = allowableValues;
             }
         }
-        
+
         if (p instanceof DateTimeProperty) {
             DateTimeProperty sp = (DateTimeProperty) p;
+            property.isDateTime = true;
             if (sp.getEnum() != null) {
                 List<String> _enum = sp.getEnum();
                 property._enum = new ArrayList<String>();
@@ -1055,11 +1257,12 @@ public class DefaultCodegen {
 
       	if (p instanceof ArrayProperty) {
         		property.isContainer = true;
+        		property.isListContainer = true;
         		property.containerType = "array";
         		ArrayProperty ap = (ArrayProperty) p;
         		CodegenProperty cp = fromProperty(property.name, ap.getItems());
         		if (cp == null) {
-        			 LOGGER.warn("skipping invalid property " + Json.pretty(p));
+        			LOGGER.warn("skipping invalid property " + Json.pretty(p));
         		} else {
           			property.baseType = getSwaggerType(p);
           			if (!languageSpecificPrimitives.contains(cp.baseType)) {
@@ -1077,9 +1280,11 @@ public class DefaultCodegen {
         		}
       	} else if (p instanceof MapProperty) {
             property.isContainer = true;
+            property.isMapContainer = true;
             property.containerType = "map";
             MapProperty ap = (MapProperty) p;
             CodegenProperty cp = fromProperty("inner", ap.getAdditionalProperties());
+            property.items = cp;
 
             property.baseType = getSwaggerType(p);
             if (!languageSpecificPrimitives.contains(cp.baseType)) {
@@ -1102,7 +1307,12 @@ public class DefaultCodegen {
         }
     }
 
-    private Response findMethodResponse(Map<String, Response> responses) {
+    /**
+     * Override with any special handling of response codes
+     * @param responses Swagger Operation's responses
+     * @return default method response or <tt>null</tt> if not found
+     */
+    protected Response findMethodResponse(Map<String, Response> responses) {
 
         String code = null;
         for (String responseCode : responses.keySet()) {
@@ -1117,7 +1327,7 @@ public class DefaultCodegen {
         }
         return responses.get(code);
     }
-    
+
     /**
      * Convert Swagger Operation object to Codegen Operation object (without providing a Swagger object)
      *
@@ -1130,7 +1340,7 @@ public class DefaultCodegen {
     public CodegenOperation fromOperation(String path, String httpMethod, Operation operation, Map<String, Model> definitions) {
     	return fromOperation(path, httpMethod, operation, definitions, null);
     }
-    
+
     /**
      * Convert Swagger Operation object to Codegen Operation object
      *
@@ -1165,11 +1375,11 @@ public class DefaultCodegen {
                 // empty list, do nothing to override global setting
             }
         } else if (swagger != null && swagger.getConsumes() != null && swagger.getConsumes().size() > 0) {
-            // use consumes defined globally 
+            // use consumes defined globally
             consumes = swagger.getConsumes();
             LOGGER.debug("No consumes defined in operation. Using global consumes (" + swagger.getConsumes() + ") for " + op.operationId);
         }
-        
+
         // if "consumes" is defined (per operation or using global definition)
         if (consumes != null && consumes.size() > 0) {
             List<Map<String, String>> c = new ArrayList<Map<String, String>>();
@@ -1198,11 +1408,11 @@ public class DefaultCodegen {
                 // empty list, do nothing to override global setting
             }
         } else if (swagger != null && swagger.getProduces() != null && swagger.getProduces().size() > 0) {
-            // use produces defined globally 
+            // use produces defined globally
             produces = swagger.getProduces();
             LOGGER.debug("No produces defined in operation. Using global produces (" + swagger.getProduces() + ") for " + op.operationId);
         }
-        
+
         // if "produces" is defined (per operation or using global definition)
         if (produces != null && produces.size() > 0) {
             List<Map<String, String>> c = new ArrayList<Map<String, String>>();
@@ -1263,6 +1473,16 @@ public class DefaultCodegen {
                     op.defaultResponse = toDefaultValue(responseProperty);
                     op.returnType = cm.datatype;
                     op.hasReference = definitions != null && definitions.containsKey(op.returnBaseType);
+
+                    // lookup discriminator
+                    if (definitions != null) {
+                        Model m = definitions.get(op.returnBaseType);
+                        if (m != null) {
+                            CodegenModel cmod = fromModel(op.returnBaseType, m, definitions);
+                            op.discriminator = cmod.discriminator;
+                        }
+                    }
+
                     if (cm.isContainer != null) {
                         op.returnContainer = cm.containerType;
                         if ("map".equals(cm.containerType)) {
@@ -1313,6 +1533,14 @@ public class DefaultCodegen {
                         }
                     }
                 }
+
+                // set isPrimitiveType and baseType for allParams
+                /*if (languageSpecificPrimitives.contains(p.baseType)) {
+                    p.isPrimitiveType = true;
+                    p.baseType = getSwaggerType(p);
+                }*/
+
+
                 allParams.add(p);
                 if (param instanceof QueryParameter) {
                     p.isQueryParam = new Boolean(true);
@@ -1329,11 +1557,14 @@ public class DefaultCodegen {
                     cookieParams.add(p.copy());
                 } else if (param instanceof BodyParameter) {
                     p.isBodyParam = new Boolean(true);
+                    p.isBinary = p.dataType.toLowerCase().startsWith("byte");
                     bodyParam = p;
                     bodyParams.add(p.copy());
                 } else if (param instanceof FormParameter) {
                     if ("file".equalsIgnoreCase(((FormParameter) param).getType())) {
                         p.isFile = true;
+                    } else if("file".equals(p.baseType)){
+                    	p.isFile = true;
                     } else {
                         p.notFile = true;
                     }
@@ -1376,7 +1607,6 @@ public class DefaultCodegen {
         // legacy support
         op.nickname = op.operationId;
 
-
         if (op.allParams.size() > 0) {
             op.hasParams = true;
         }
@@ -1422,7 +1652,7 @@ public class DefaultCodegen {
                 }
             }
             r.dataType = cm.datatype;
-            r.isBinary = cm.datatype.equals("byte[]");
+            r.isBinary = cm.datatype.toLowerCase().startsWith("byte");
             if (cm.isContainer != null) {
                 r.simpleType = false;
                 r.containerType = cm.containerType;
@@ -1441,7 +1671,7 @@ public class DefaultCodegen {
         }
         return r;
     }
-    
+
     /**
      * Convert Swagger Parameter object to Codegen Parameter object
      *
@@ -1481,7 +1711,7 @@ public class DefaultCodegen {
             if (null == type) {
                 LOGGER.warn("Type is NULL for Serializable Parameter: " + param);
             }
-            if ("array".equals(type)) {
+            if ("array".equals(type)) { // for array parameter
                 Property inner = qp.getItems();
                 if (inner == null) {
                     LOGGER.warn("warning!  No inner type supplied for array parameter \"" + qp.getName() + "\", using String");
@@ -1495,8 +1725,9 @@ public class DefaultCodegen {
                 CodegenProperty pr = fromProperty("inner", inner);
                 p.baseType = pr.datatype;
                 p.isContainer = true;
+                p.isListContainer = true;
                 imports.add(pr.baseType);
-            } else if ("object".equals(type)) {
+            } else if ("object".equals(type)) { // for map parameter
                 Property inner = qp.getItems();
                 if (inner == null) {
                     LOGGER.warn("warning!  No inner type supplied for map parameter \"" + qp.getName() + "\", using String");
@@ -1506,6 +1737,8 @@ public class DefaultCodegen {
                 collectionFormat = qp.getCollectionFormat();
                 CodegenProperty pr = fromProperty("inner", inner);
                 p.baseType = pr.datatype;
+                p.isContainer = true;
+                p.isMapContainer = true;
                 imports.add(pr.baseType);
             } else {
                 Map<PropertyId, Object> args = new HashMap<PropertyId, Object>();
@@ -1513,16 +1746,28 @@ public class DefaultCodegen {
                 args.put(PropertyId.ENUM, qp.getEnum());
                 property = PropertyBuilder.build(type, format, args);
             }
+
             if (property == null) {
                 LOGGER.warn("warning!  Property type \"" + type + "\" not found for parameter \"" + param.getName() + "\", using String");
                 property = new StringProperty().description("//TODO automatically added by swagger-codegen.  Type was " + type + " but not supported");
             }
             property.setRequired(param.getRequired());
             CodegenProperty model = fromProperty(qp.getName(), property);
+
+            // set boolean flag (e.g. isString)
+            setParameterBooleanFlagWithCodegenProperty(p, model);
+
             p.dataType = model.datatype;
+            if(model.isEnum) {
+                p.datatypeWithEnum = model.datatypeWithEnum;
+            }
             p.isEnum = model.isEnum;
             p._enum = model._enum;
             p.allowableValues = model.allowableValues;
+            if(model.items != null && model.items.isEnum) {
+                p.datatypeWithEnum = model.datatypeWithEnum;
+                p.items = model.items;
+            }
             p.collectionFormat = collectionFormat;
             if(collectionFormat != null && collectionFormat.equals("multi")) {
                 p.isCollectionFormatMulti = true;
@@ -1535,7 +1780,7 @@ public class DefaultCodegen {
             p.maxLength = qp.getMaxLength();
             p.minLength = qp.getMinLength();
             p.pattern = qp.getPattern();
-            
+
             p.maximum = qp.getMaximum();
             p.exclusiveMaximum = qp.isExclusiveMaximum();
             p.minimum = qp.getMinimum();
@@ -1566,20 +1811,19 @@ public class DefaultCodegen {
                     prop.setRequired(bp.getRequired());
                     CodegenProperty cp = fromProperty("property", prop);
                     if (cp != null) {
+                        p.baseType = cp.baseType;
                         p.dataType = cp.datatype;
-                        if (p.dataType.equals("byte[]")) {
-                            p.isBinary = true;
-                        }
-                        else {
-                            p.isBinary = false;
-                        }
+                        p.isPrimitiveType = cp.isPrimitiveType;
+                        p.isBinary = cp.datatype.toLowerCase().startsWith("byte");
                     }
+
+                    // set boolean flag (e.g. isString)
+                    setParameterBooleanFlagWithCodegenProperty(p, cp);
                 }
             } else if (model instanceof ArrayModel) {
                 // to use the built-in model parsing, we unwrap the ArrayModel
                 // and get a single property from it
                 ArrayModel impl = (ArrayModel) model;
-                CodegenModel cm = fromModel(bp.getName(), impl);
                 // get the single property
                 ArrayProperty ap = new ArrayProperty().items(impl.getItems());
                 ap.setRequired(param.getRequired());
@@ -1589,7 +1833,13 @@ public class DefaultCodegen {
                 }
                 imports.add(cp.baseType);
                 p.dataType = cp.datatype;
+                p.baseType = cp.complexType;
+                p.isPrimitiveType = cp.isPrimitiveType;
                 p.isContainer = true;
+                p.isListContainer = true;
+
+                // set boolean flag (e.g. isString)
+                setParameterBooleanFlagWithCodegenProperty(p, cp);
             } else {
                 Model sub = bp.getSchema();
                 if (sub instanceof RefModel) {
@@ -1605,11 +1855,47 @@ public class DefaultCodegen {
                         name = getTypeDeclaration(name);
                     }
                     p.dataType = name;
+                    p.baseType = name;
                 }
             }
             p.paramName = toParamName(bp.getName());
         }
 
+        // set the example value
+        // if not specified in x-example, generate a default value
+        if (p.vendorExtensions.containsKey("x-example")) {
+            p.example = (String) p.vendorExtensions.get("x-example");
+        } else if (Boolean.TRUE.equals(p.isString)) {
+            p.example = p.paramName + "_example";
+        } else if (Boolean.TRUE.equals(p.isBoolean)) {
+            p.example = new String("true");
+        } else if (Boolean.TRUE.equals(p.isLong)) {
+            p.example = new String("789");
+        } else if (Boolean.TRUE.equals(p.isInteger)) {
+            p.example = new String("56");
+        } else if (Boolean.TRUE.equals(p.isFloat)) {
+            p.example = new String("3.4");
+        } else if (Boolean.TRUE.equals(p.isDouble)) {
+            p.example = new String("1.2");
+        } else if (Boolean.TRUE.equals(p.isBinary)) {
+            p.example = new String("BINARY_DATA_HERE");
+        } else if (Boolean.TRUE.equals(p.isByteArray)) {
+            p.example = new String("B");
+        } else if (Boolean.TRUE.equals(p.isDate)) {
+            p.example = new String("2013-10-20");
+        } else if (Boolean.TRUE.equals(p.isDateTime)) {
+            p.example = new String("2013-10-20T19:20:30+01:00");
+        } else if (param instanceof FormParameter &&
+                ("file".equalsIgnoreCase(((FormParameter) param).getType()) ||
+                "file".equals(p.baseType))) {
+            p.isFile = true;
+            p.example = new String("/path/to/file.txt");
+        }
+
+        // set the parameter excample value
+        // should be overridden by lang codegen
+        setParameterExampleValue(p);
+
         postProcessParameter(p);
         return p;
     }
@@ -1620,6 +1906,7 @@ public class DefaultCodegen {
      * @param schemes a map of Swagger SecuritySchemeDefinition object
      * @return a list of Codegen Security objects
      */
+    @SuppressWarnings("static-method")
     public List<CodegenSecurity> fromSecurity(Map<String, SecuritySchemeDefinition> schemes) {
         if (schemes == null) {
         	return Collections.emptyList();
@@ -1658,14 +1945,14 @@ public class DefaultCodegen {
                         Map<String, Object> scope = new HashMap<String, Object>();
                         scope.put("scope", scopeEntry.getKey());
                         scope.put("description", scopeEntry.getValue());
-                        
+
                         count += 1;
                         if (count < numScopes) {
                             scope.put("hasMore", "true");
                         } else {
                             scope.put("hasMore", null);
                         }
-                        
+
                         scopes.add(scope);
                     }
                     sec.scopes = scopes;
@@ -1678,6 +1965,17 @@ public class DefaultCodegen {
         return secs;
     }
 
+    protected void setReservedWordsLowerCase(List<String> words) {
+      reservedWords = new HashSet<String>();
+      for (String word : words) {
+          reservedWords.add(word.toLowerCase());
+      }
+    }
+
+    protected boolean isReservedWord(String word) {
+        return word != null && reservedWords.contains(word.toLowerCase());
+    }
+
     /**
      * Get operationId from the operation object, and if it's blank, generate a new one from the given parameters.
      *
@@ -1709,8 +2007,8 @@ public class DefaultCodegen {
                     builder.append(part);
                 }
             }
-            operationId = builder.toString();
-            LOGGER.info("generated operationId " + operationId + "\tfor Path: " + httpMethod + " " + path);
+            operationId = sanitizeName(builder.toString());
+            LOGGER.warn("Empty operationId found for path: " + httpMethod + " " + path + ". Renamed to auto-generated operationId: " + operationId);
         }
         return operationId;
     }
@@ -1726,6 +2024,7 @@ public class DefaultCodegen {
             && !languageSpecificPrimitives.contains(type);
     }
 
+    @SuppressWarnings("static-method")
     protected List<Map<String, Object>> toExamples(Map<String, Object> examples) {
         if (examples == null) {
             return null;
@@ -1749,7 +2048,7 @@ public class DefaultCodegen {
         }
     }
 
-    private List<CodegenParameter> addHasMore(List<CodegenParameter> objs) {
+    private static List<CodegenParameter> addHasMore(List<CodegenParameter> objs) {
         if (objs != null) {
             for (int i = 0; i < objs.size(); i++) {
                 if (i > 0) {
@@ -1763,7 +2062,7 @@ public class DefaultCodegen {
         return objs;
     }
 
-    private Map<String, Object> addHasMore(Map<String, Object> objs) {
+    private static Map<String, Object> addHasMore(Map<String, Object> objs) {
         if (objs != null) {
             for (int i = 0; i < objs.size() - 1; i++) {
                 if (i > 0) {
@@ -1786,6 +2085,7 @@ public class DefaultCodegen {
      * @param co Codegen Operation object
      * @param operations map of Codegen operations
      */
+    @SuppressWarnings("static-method")
     public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map<String, List<CodegenOperation>> operations) {
         List<CodegenOperation> opList = operations.get(tag);
         if (opList == null) {
@@ -1806,12 +2106,11 @@ public class DefaultCodegen {
             LOGGER.warn("generated unique operationId `" + uniqueName + "`");
         }
         co.operationId = uniqueName;
+        co.operationIdLowerCase = uniqueName.toLowerCase();
         opList.add(co);
         co.baseName = tag;
     }
 
-
-
     private void addParentContainer(CodegenModel m, String name, Property property) {
         final CodegenProperty tmp = fromProperty(name, property);
         addImport(m, tmp.complexType);
@@ -1840,7 +2139,7 @@ public class DefaultCodegen {
         String secondPattern = "([a-z\\d])([A-Z])";
         String replacementPattern = "$1_$2";
         // Replace package separator with slash.
-        word = word.replaceAll("\\.", "/");
+        word = word.replaceAll("\\.", "/"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
         // Replace $ with two underscores for inner classes.
         word = word.replaceAll("\\$", "__");
         // Replace capital letter with _ plus lowercase letter.
@@ -1857,6 +2156,7 @@ public class DefaultCodegen {
      * @param word The word
      * @return The dashized version of the word, e.g. "my-name"
      */
+    @SuppressWarnings("static-method")
     protected String dashize(String word) {
         return underscore(word).replaceAll("[_ ]", "-");
     }
@@ -1871,7 +2171,7 @@ public class DefaultCodegen {
      * @param name The base name
      * @return The next name for the base name
      */
-    private String generateNextName(String name) {
+    private static String generateNextName(String name) {
         Pattern pattern = Pattern.compile("\\d+\\z");
         Matcher matcher = pattern.matcher(name);
         if (matcher.find()) {
@@ -1889,45 +2189,65 @@ public class DefaultCodegen {
         }
     }
 
-    private void addVars(CodegenModel m, Map<String, Property> properties, Collection<String> required) {
-        if (properties != null && properties.size() > 0) {
+    private void addVars(CodegenModel m, Map<String, Property> properties, List<String> required) {
+        addVars(m, properties, required, null, null);
+    }
+
+    private void addVars(CodegenModel m, Map<String, Property> properties, List<String> required,
+            Map<String, Property> allProperties, List<String> allRequired) {
+
+        if (properties != null && !properties.isEmpty()) {
             m.hasVars = true;
             m.hasEnums = false;
-            final int totalCount = properties.size();
-            final Set<String> mandatory = required == null ? Collections.<String>emptySet() : new HashSet<String>(required);
-            int count = 0;
-            for (Map.Entry<String, Property> entry : properties.entrySet()) {
-                final String key = entry.getKey();
-                final Property prop = entry.getValue();
 
-                if (prop == null) {
-                    LOGGER.warn("null property for " + key);
-                } else {
-                    final CodegenProperty cp = fromProperty(key, prop);
-                    cp.required = mandatory.contains(key) ? true : null;
-                    if (cp.isEnum) {
-                        m.hasEnums = true;
-                    }
-                    count += 1;
-                    if (count != totalCount) {
-                        cp.hasMore = true;
-                    }
-                    if (cp.isContainer != null) {
-                        addImport(m, typeMapping.get("array"));
-                    }
-                    addImport(m, cp.baseType);
-                    addImport(m, cp.complexType);
-                    m.vars.add(cp);
-                }
-            }
-            
-            m.mandatory = mandatory;
-            
+
+            Set<String> mandatory = required == null ? Collections.<String> emptySet()
+                    : new TreeSet<String>(required);
+            addVars(m, m.vars, properties, mandatory);
+            m.allMandatory = m.mandatory = mandatory;
         } else {
             m.emptyVars = true;
             m.hasVars = false;
             m.hasEnums = false;
         }
+
+        if (allProperties != null) {
+            Set<String> allMandatory = allRequired == null ? Collections.<String> emptySet()
+                    : new TreeSet<String>(allRequired);
+            addVars(m, m.allVars, allProperties, allMandatory);
+            m.allMandatory = allMandatory;
+        }
+    }
+
+    private void addVars(CodegenModel m, List<CodegenProperty> vars, Map<String, Property> properties, Set<String> mandatory) {
+        final int totalCount = properties.size();
+        int count = 0;
+        for (Map.Entry<String, Property> entry : properties.entrySet()) {
+            final String key = entry.getKey();
+            final Property prop = entry.getValue();
+
+            if (prop == null) {
+                LOGGER.warn("null property for " + key);
+            } else {
+                final CodegenProperty cp = fromProperty(key, prop);
+                cp.required = mandatory.contains(key) ? true : null;
+                if (cp.isEnum) {
+                    // FIXME: if supporting inheritance, when called a second time for allProperties it is possible for
+                    // m.hasEnums to be set incorrectly if allProperties has enumerations but properties does not.
+                    m.hasEnums = true;
+                }
+                count++;
+                if (count != totalCount) {
+                    cp.hasMore = true;
+                }
+                if (cp.isContainer != null) {
+                    addImport(m, typeMapping.get("array"));
+                }
+                addImport(m, cp.baseType);
+                addImport(m, cp.complexType);
+                vars.add(cp);
+            }
+        }
     }
 
     /**
@@ -1936,9 +2256,10 @@ public class DefaultCodegen {
      * @param name string to be camelize
      * @return camelized string
      */
+    @SuppressWarnings("static-method")
     public String removeNonNameElementToCamelCase(String name) {
         String nonNameElementPattern = "[-_:;#]";
-        name = StringUtils.join(Lists.transform(Lists.newArrayList(name.split(nonNameElementPattern)), new Function<String, String>() {
+        name = StringUtils.join(Lists.transform(Lists.newArrayList(name.split(nonNameElementPattern)), new Function<String, String>() { // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
             @Nullable
             @Override
             public String apply(String input) {
@@ -1950,7 +2271,7 @@ public class DefaultCodegen {
         }
         return name;
     }
-    
+
     /**
      * Camelize name (parameter, property, method, etc) with upper case for first letter
      * copied from Twitter elephant bird
@@ -1975,7 +2296,7 @@ public class DefaultCodegen {
         Pattern p = Pattern.compile("\\/(.?)");
         Matcher m = p.matcher(word);
         while (m.find()) {
-            word = m.replaceFirst("." + m.group(1)/*.toUpperCase()*/);
+            word = m.replaceFirst("." + m.group(1)/*.toUpperCase()*/); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
             m = p.matcher(word);
         }
 
@@ -2004,14 +2325,6 @@ public class DefaultCodegen {
             word = m.replaceAll(rep);
         }
 
-        // Replace two underscores with $ to support inner classes.
-        p = Pattern.compile("(__)(.)");
-        m = p.matcher(word);
-        while (m.find()) {
-            word = m.replaceFirst("\\$" + m.group(2).toUpperCase());
-            m = p.matcher(word);
-        }
-
         // Remove all underscores
         p = Pattern.compile("(_)(.)");
         m = p.matcher(word);
@@ -2032,6 +2345,32 @@ public class DefaultCodegen {
         return apiFileFolder() + '/' + toApiFilename(tag) + suffix;
     }
 
+    /**
+     * Return the full path and API documentation file
+     *
+     * @param templateName template name
+     * @param tag tag
+     *
+     * @return the API documentation file name with full path
+     */
+    public String apiDocFilename(String templateName, String tag) {
+        String suffix = apiDocTemplateFiles().get(templateName);
+        return apiDocFileFolder() + '/' + toApiDocFilename(tag) + suffix;
+    }
+
+    /**
+     * Return the full path and API test file
+     *
+     * @param templateName template name
+     * @param tag tag
+     *
+     * @return the API test file name with full path
+     */
+    public String apiTestFilename(String templateName, String tag) {
+        String suffix = apiTestTemplateFiles().get(templateName);
+        return apiTestFileFolder() + '/' + toApiTestFilename(tag) + suffix;
+    }
+
     public boolean shouldOverwrite(String filename) {
         return !(skipOverwrite && new File(filename).exists());
     }
@@ -2053,6 +2392,11 @@ public class DefaultCodegen {
         return supportedLibraries;
     }
 
+    /**
+     * Set library template (sub-template).
+     *
+     * @param library Library template 
+     */
     public void setLibrary(String library) {
         if (library != null && !supportedLibraries.containsKey(library))
             throw new RuntimeException("unknown library: " + library);
@@ -2061,11 +2405,86 @@ public class DefaultCodegen {
 
     /**
      * Library template (sub-template).
+     *
+     * @return Library template
      */
     public String getLibrary() {
         return library;
     }
 
+    /**
+     * Set Git user ID.
+     *
+     * @param gitUserId Git user ID 
+     */
+    public void setGitUserId(String gitUserId) {
+        this.gitUserId = gitUserId;
+    }
+
+    /**
+     * Git user ID
+     *
+     * @return Git user ID
+     */
+    public String getGitUserId() {
+        return gitUserId;
+    }
+
+    /**
+     * Set Git repo ID.
+     *
+     * @param gitRepoId Git repo ID 
+     */
+    public void setGitRepoId(String gitRepoId) {
+        this.gitRepoId = gitRepoId;
+    }
+
+    /**
+     * Git repo ID
+     *
+     * @return Git repo ID
+     */
+    public String getGitRepoId() {
+        return gitRepoId;
+    }
+
+    /**
+     * Set release note.
+     *
+     * @param releaseNote Release note
+     */
+    public void setReleaseNote(String releaseNote) {
+        this.releaseNote = releaseNote;
+    }
+
+    /**
+     * Release note
+     *
+     * @return Release note
+     */
+    public String getReleaseNote() {
+        return releaseNote;
+    }
+
+    /**
+     * Set HTTP user agent.
+     *
+     * @param httpUserAgent HTTP user agent
+     */
+    public void setHttpUserAgent(String httpUserAgent) {
+        this.httpUserAgent = httpUserAgent;
+    }
+
+    /**
+     * HTTP user agent 
+     *
+     * @return HTTP user agent
+     */
+    public String getHttpUserAgent() {
+        return httpUserAgent;
+    }
+
+    @SuppressWarnings("static-method")
     protected CliOption buildLibraryCliOption(Map<String, String> supportedLibraries) {
         StringBuilder sb = new StringBuilder("library template (sub-template) to use:");
         for (String lib : supportedLibraries.keySet()) {
@@ -2080,20 +2499,26 @@ public class DefaultCodegen {
      * @param name string to be sanitize
      * @return sanitized string
      */
+    @SuppressWarnings("static-method")
     public String sanitizeName(String name) {
         // NOTE: performance wise, we should have written with 2 replaceAll to replace desired
         // character with _ or empty character. Below aims to spell out different cases we've
         // encountered so far and hopefully make it easier for others to add more special
         // cases in the future.
-    	
+
     	// better error handling when map/array type is invalid
     	if (name == null) {
     	    LOGGER.error("String to be sanitized is null. Default to ERROR_UNKNOWN");
     	    return "ERROR_UNKNOWN";
     	}
 
+        // if the name is just '$', map it to 'value' for the time being.
+        if ("$".equals(name)) {
+            return "value";
+        }
+
         // input[] => input
-        name = name.replaceAll("\\[\\]", "");
+        name = name.replaceAll("\\[\\]", ""); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
         // input[a][b] => input_a_b
         name = name.replaceAll("\\[", "_");
@@ -2115,6 +2540,96 @@ public class DefaultCodegen {
         // remove everything else other than word, number and _
         // $php_variable => php_variable
         return name.replaceAll("[^a-zA-Z0-9_]", "");
+    }
 
+    @SuppressWarnings("static-method")
+    public String sanitizeTag(String tag) {
+        // remove spaces and make strong case
+        String[] parts = tag.split(" ");
+        StringBuilder buf = new StringBuilder();
+        for (String part : parts) {
+            if (StringUtils.isNotEmpty(part)) {
+                buf.append(StringUtils.capitalize(part));
+            }
+        }
+        return buf.toString().replaceAll("[^a-zA-Z ]", "");
+    }
+
+    /**
+     * Only write if the file doesn't exist
+     *
+     * @param outputFolder Output folder
+     * @param supportingFile Supporting file
+     */
+    public void writeOptional(String outputFolder, SupportingFile supportingFile) {
+        String folder = "";
+
+        if(outputFolder != null && !"".equals(outputFolder)) {
+            folder += outputFolder + File.separator;
+        }
+        folder += supportingFile.folder;
+        if(!"".equals(folder)) {
+            folder += File.separator + supportingFile.destinationFilename;
+        }
+        else {
+            folder = supportingFile.destinationFilename;
+        }
+        if(!new File(folder).exists()) {
+            supportingFiles.add(supportingFile);
+        } else {
+            LOGGER.info("Skipped overwriting " + supportingFile.destinationFilename + " as the file already exists in " + folder);
+        }
+    }
+
+    /**
+     * Set CodegenParameter boolean flag using CodegenProperty.
+     *
+     * @param parameter Codegen Parameter
+     * @param property  Codegen property
+     */
+    public void setParameterBooleanFlagWithCodegenProperty(CodegenParameter parameter, CodegenProperty property) {
+        if (parameter == null) {
+            LOGGER.error("Codegen Parameter cannnot be null.");
+            return;
+        }
+
+        if (property == null) {
+            LOGGER.error("Codegen Property cannot be null.");
+            return;
+        }
+
+        if (Boolean.TRUE.equals(property.isString)) {
+            parameter.isString = true;
+            parameter.isPrimitiveType = true;
+        } else if (Boolean.TRUE.equals(property.isBoolean)) {
+            parameter.isBoolean = true;
+            parameter.isPrimitiveType = true;
+        } else if (Boolean.TRUE.equals(property.isLong)) {
+            parameter.isLong = true;
+            parameter.isPrimitiveType = true;
+        } else if (Boolean.TRUE.equals(property.isInteger)) {
+            parameter.isInteger = true;
+            parameter.isPrimitiveType = true;
+        } else if (Boolean.TRUE.equals(property.isDouble)) {
+            parameter.isDouble = true;
+            parameter.isPrimitiveType = true;
+        } else if (Boolean.TRUE.equals(property.isFloat)) {
+            parameter.isFloat = true;
+            parameter.isPrimitiveType = true;
+        } else if (Boolean.TRUE.equals(property.isByteArray)) {
+            parameter.isByteArray = true;
+            parameter.isPrimitiveType = true;
+        } else if (Boolean.TRUE.equals(property.isBinary)) {
+            parameter.isByteArray = true;
+            parameter.isPrimitiveType = true;
+        } else if (Boolean.TRUE.equals(property.isDate)) {
+            parameter.isDate = true;
+            parameter.isPrimitiveType = true;
+        } else if (Boolean.TRUE.equals(property.isDateTime)) {
+            parameter.isDateTime = true;
+            parameter.isPrimitiveType = true;
+        } else {
+            LOGGER.debug("Property type is not primitive: " + property.datatype);
+        }
     }
 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
index 79b07f2427b..aebf7e50de5 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
@@ -8,6 +8,7 @@ import io.swagger.models.auth.SecuritySchemeDefinition;
 import io.swagger.models.parameters.Parameter;
 import io.swagger.util.Json;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -15,11 +16,10 @@ import org.slf4j.LoggerFactory;
 import java.io.*;
 import java.util.*;
 
-import static org.apache.commons.lang3.StringUtils.capitalize;
 import static org.apache.commons.lang3.StringUtils.isNotEmpty;
 
 public class DefaultGenerator extends AbstractGenerator implements Generator {
-    Logger LOGGER = LoggerFactory.getLogger(DefaultGenerator.class);
+    protected Logger LOGGER = LoggerFactory.getLogger(DefaultGenerator.class);
 
     protected CodegenConfig config;
     protected ClientOptInput opts;
@@ -129,6 +129,13 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
             if (info.getVersion() != null) {
                 config.additionalProperties().put("version", info.getVersion());
             }
+            if (info.getTermsOfService() != null) {
+                config.additionalProperties().put("termsOfService", info.getTermsOfService());
+            }
+        }
+        
+        if(swagger.getVendorExtensions() != null) {
+        	config.vendorExtensions().putAll(swagger.getVendorExtensions());
         }
 
         StringBuilder hostBuilder = new StringBuilder();
@@ -161,22 +168,63 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
         List<Object> allModels = new ArrayList<Object>();
 
         // models
-        Map<String, Model> definitions = swagger.getDefinitions();
+        final Map<String, Model> definitions = swagger.getDefinitions();
         if (definitions != null) {
-        	List<String> sortedModelKeys = sortModelsByInheritance(definitions);
+        	Set<String> modelKeys = definitions.keySet();
 
             if(generateModels) {
                 if(modelsToGenerate != null && modelsToGenerate.size() > 0) {
-                    List<String> updatedKeys = new ArrayList<String>();
-                    for(String m : sortedModelKeys) {
+                    Set<String> updatedKeys = new HashSet<String>();
+                    for(String m : modelKeys) {
                         if(modelsToGenerate.contains(m)) {
                             updatedKeys.add(m);
                         }
                     }
-                    sortedModelKeys = updatedKeys;
+                    modelKeys = updatedKeys;
                 }
 
-                for (String name : sortedModelKeys) {
+                // store all processed models
+                Map<String,Object> allProcessedModels = new TreeMap<String, Object>(new Comparator<String>() {
+                    @Override
+                    public int compare(String o1, String o2) {
+                        Model model1 = definitions.get(o1);
+                        Model model2 = definitions.get(o2);
+
+                        int model1InheritanceDepth = getInheritanceDepth(model1);
+                        int model2InheritanceDepth = getInheritanceDepth(model2);
+
+                        if (model1InheritanceDepth == model2InheritanceDepth) {
+                            return ObjectUtils.compare(config.toModelName(o1), config.toModelName(o2));
+                        } else if (model1InheritanceDepth > model2InheritanceDepth) {
+                            return 1;
+                        } else {
+                            return -1;
+                        }
+                    }
+
+                    private int getInheritanceDepth(Model model) {
+                        int inheritanceDepth = 0;
+                        Model parent = getParent(model);
+
+                        while (parent != null) {
+                            inheritanceDepth++;
+                            parent = getParent(parent);
+                        }
+
+                        return inheritanceDepth;
+                    }
+
+                    private Model getParent(Model model) {
+                        if (model instanceof ComposedModel) {
+                            return definitions.get(((ComposedModel) model).getParent().getReference());
+                        }
+
+                        return null;
+                    }
+                });
+
+                // process models only
+                for (String name : modelKeys) {
                     try {
                         //don't generate models that have an import mapping
                         if(config.importMapping().containsKey(name)) {
@@ -187,7 +235,28 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
                         Map<String, Model> modelMap = new HashMap<String, Model>();
                         modelMap.put(name, model);
                         Map<String, Object> models = processModels(config, modelMap, definitions);
+                        models.put("classname", config.toModelName(name));
                         models.putAll(config.additionalProperties());
+                        
+                        allProcessedModels.put(name, models);
+
+                    } catch (Exception e) {
+                        throw new RuntimeException("Could not process model '" + name + "'", e);
+                    }
+                }
+                
+                // post process all processed models
+                allProcessedModels = config.postProcessAllModels(allProcessedModels);
+                
+                // generate files based on processed models
+                for (String name: allProcessedModels.keySet()) {
+                	Map<String, Object> models = (Map<String, Object>)allProcessedModels.get(name);
+                
+                	try {
+                        //don't generate models that have an import mapping
+                        if(config.importMapping().containsKey(name)) {
+                            continue;
+                        }
 
                         allModels.add(((List<Object>) models.get("models")).get(0));
 
@@ -211,6 +280,50 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
                             writeToFile(filename, tmpl.execute(models));
                             files.add(new File(filename));
                         }
+
+                        // to generate model test files
+                        for (String templateName : config.modelTestTemplateFiles().keySet()) {
+                            String suffix = config.modelTestTemplateFiles().get(templateName);
+                            String filename = config.modelTestFileFolder() + File.separator + config.toModelTestFilename(name) + suffix;
+                            if (!config.shouldOverwrite(filename)) {
+                                continue;
+                            }
+                            String templateFile = getFullTemplateFile(config, templateName);
+                            String template = readTemplate(templateFile);
+                            Template tmpl = Mustache.compiler()
+                                    .withLoader(new Mustache.TemplateLoader() {
+                                        @Override
+                                        public Reader getTemplate(String name) {
+                                            return getTemplateReader(getFullTemplateFile(config, name + ".mustache"));
+                                        }
+                                    })
+                                    .defaultValue("")
+                                    .compile(template);
+                            writeToFile(filename, tmpl.execute(models));
+                            files.add(new File(filename));
+                        }
+
+                        // to generate model documentation files
+                        for (String templateName : config.modelDocTemplateFiles().keySet()) {
+                            String suffix = config.modelDocTemplateFiles().get(templateName);
+                            String filename = config.modelDocFileFolder() + File.separator + config.toModelDocFilename(name) + suffix;
+                            if (!config.shouldOverwrite(filename)) {
+                                continue;
+                            }
+                            String templateFile = getFullTemplateFile(config, templateName);
+                            String template = readTemplate(templateFile);
+                            Template tmpl = Mustache.compiler()
+                                    .withLoader(new Mustache.TemplateLoader() {
+                                        @Override
+                                        public Reader getTemplate(String name) {
+                                            return getTemplateReader(getFullTemplateFile(config, name + ".mustache"));
+                                        }
+                                    })
+                                    .defaultValue("")
+                                    .compile(template);
+                            writeToFile(filename, tmpl.execute(models));
+                            files.add(new File(filename));
+                        }
                     } catch (Exception e) {
                         throw new RuntimeException("Could not generate model '" + name + "'", e);
                     }
@@ -218,7 +331,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
             }
         }
         if (System.getProperty("debugModels") != null) {
-            System.out.println("############ Model info ############");
+            LOGGER.info("############ Model info ############");
             Json.prettyPrint(allModels);
         }
 
@@ -237,6 +350,12 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
             for (String tag : paths.keySet()) {
                 try {
                     List<CodegenOperation> ops = paths.get(tag);
+                    Collections.sort(ops, new Comparator<CodegenOperation>() {
+                        @Override
+                        public int compare(CodegenOperation one, CodegenOperation another) {
+                            return ObjectUtils.compare(one.operationId, another.operationId);
+                        }
+                    });
                     Map<String, Object> operation = processOperations(config, tag, ops);
 
                     operation.put("basePath", basePath);
@@ -248,6 +367,10 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
                     operation.put("classname", config.toApiName(tag));
                     operation.put("classVarName", config.toApiVarName(tag));
                     operation.put("importPath", config.toApiImport(tag));
+                    
+                    if(!config.vendorExtensions().isEmpty()) {
+                    	operation.put("vendorExtensions", config.vendorExtensions());
+                    }
 
                     // Pass sortParamsByRequiredFlag through to the Mustache template...
                     boolean sortParamsByRequiredFlag = true;
@@ -288,13 +411,61 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
                         writeToFile(filename, tmpl.execute(operation));
                         files.add(new File(filename));
                     }
+
+                    // to generate api test files
+                    for (String templateName : config.apiTestTemplateFiles().keySet()) {
+                        String filename = config.apiTestFilename(templateName, tag);
+                        if (!config.shouldOverwrite(filename) && new File(filename).exists()) {
+                            continue;
+                        }
+
+                        String templateFile = getFullTemplateFile(config, templateName);
+                        String template = readTemplate(templateFile);
+                        Template tmpl = Mustache.compiler()
+                                .withLoader(new Mustache.TemplateLoader() {
+                                    @Override
+                                    public Reader getTemplate(String name) {
+                                        return getTemplateReader(getFullTemplateFile(config, name + ".mustache"));
+                                    }
+                                })
+                                .defaultValue("")
+                                .compile(template);
+
+                        writeToFile(filename, tmpl.execute(operation));
+                        files.add(new File(filename));
+                    }
+
+                    // to generate api documentation files
+                    for (String templateName : config.apiDocTemplateFiles().keySet()) {
+                        String filename = config.apiDocFilename(templateName, tag);
+                        if (!config.shouldOverwrite(filename) && new File(filename).exists()) {
+                            continue;
+                        }
+
+                        String templateFile = getFullTemplateFile(config, templateName);
+                        String template = readTemplate(templateFile);
+                        Template tmpl = Mustache.compiler()
+                                .withLoader(new Mustache.TemplateLoader() {
+                                    @Override
+                                    public Reader getTemplate(String name) {
+                                        return getTemplateReader(getFullTemplateFile(config, name + ".mustache"));
+                                    }
+                                })
+                                .defaultValue("")
+                                .compile(template);
+
+                        writeToFile(filename, tmpl.execute(operation));
+                        files.add(new File(filename));
+                    }
+
                 } catch (Exception e) {
                     throw new RuntimeException("Could not generate api file for '" + tag + "'", e);
                 }
             }
         }
+
         if (System.getProperty("debugOperations") != null) {
-            System.out.println("############ Operation info ############");
+            LOGGER.info("############ Operation info ############");
             Json.prettyPrint(allOperations);
         }
 
@@ -333,7 +504,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
         config.postProcessSupportingFileData(bundle);
 
         if (System.getProperty("debugSupportingFiles") != null) {
-            System.out.println("############ Supporting file info ############");
+            LOGGER.info("############ Supporting file info ############");
             Json.prettyPrint(bundle);
         }
 
@@ -392,18 +563,14 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
                             }
                             File outputFile = new File(outputFilename);
                             OutputStream out = new FileOutputStream(outputFile, false);
-                            if (in != null && out != null) {
-                                System.out.println("writing file " + outputFile);
+                            if (in != null) {
+                            	LOGGER.info("writing file " + outputFile);
                                 IOUtils.copy(in, out);
                             } else {
                                 if (in == null) {
-                                    System.out.println("can't open " + templateFile + " for input");
-                                }
-                                if (out == null) {
-                                    System.out.println("can't open " + outputFile + " for output");
+                                    LOGGER.error("can't open " + templateFile + " for input");
                                 }
                             }
-
                             files.add(outputFile);
                         }
                     }
@@ -412,13 +579,11 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
                 }
             }
         }
-
         config.processSwagger(swagger);
-
         return files;
     }
 
-    private void processMimeTypes(List<String> mimeTypeList, Map<String, Object> operation, String source) {
+    private static void processMimeTypes(List<String> mimeTypeList, Map<String, Object> operation, String source) {
         if (mimeTypeList != null && mimeTypeList.size() > 0) {
             List<Map<String, String>> c = new ArrayList<Map<String, String>>();
             int count = 0;
@@ -439,54 +604,8 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
         }
     }
 
-    private List<String> sortModelsByInheritance(final Map<String, Model> definitions) {
-    	List<String> sortedModelKeys = new ArrayList<String>(definitions.keySet());
-    	Comparator<String> cmp = new Comparator<String>() {
-			@Override
-			public int compare(String o1, String o2) {
-				Model model1 = definitions.get(o1);
-				Model model2 = definitions.get(o2);
-
-				int model1InheritanceDepth = getInheritanceDepth(model1);
-				int model2InheritanceDepth = getInheritanceDepth(model2);
-
-				if (model1InheritanceDepth == model2InheritanceDepth) {
-					return 0;
-				} else if (model1InheritanceDepth > model2InheritanceDepth) {
-					return 1;
-				} else {
-					return -1;
-				}
-			}
-
-			private int getInheritanceDepth(Model model) {
-				int inheritanceDepth = 0;
-				Model parent = getParent(model);
-
-				while (parent != null) {
-					inheritanceDepth++;
-					parent = getParent(parent);
-				}
-
-				return inheritanceDepth;
-			}
-
-			private Model getParent(Model model) {
-				if (model instanceof ComposedModel) {
-					return definitions.get(((ComposedModel) model).getParent().getReference());
-				}
-
-				return null;
-			}
-		};
-
-		Collections.sort(sortedModelKeys, cmp);
-
-		return sortedModelKeys;
-    }
-
     public Map<String, List<CodegenOperation>> processPaths(Map<String, Path> paths) {
-        Map<String, List<CodegenOperation>> ops = new HashMap<String, List<CodegenOperation>>();
+        Map<String, List<CodegenOperation>> ops = new TreeMap<String, List<CodegenOperation>>();
 
         for (String resourcePath : paths.keySet()) {
             Path path = paths.get(resourcePath);
@@ -512,7 +631,8 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
     public void processOperation(String resourcePath, String httpMethod, Operation operation, Map<String, List<CodegenOperation>> operations, Path path) {
         if (operation != null) {
             if (System.getProperty("debugOperations") != null) {
-                LOGGER.debug("processOperation: resourcePath= " + resourcePath + "\t;" + httpMethod + " " + operation + "\n");
+                LOGGER.info("processOperation: resourcePath= " + resourcePath + "\t;" + httpMethod + " " + operation
+                        + "\n");
             }
             List<String> tags = operation.getTags();
             if (tags == null) {
@@ -547,8 +667,8 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
                 try {
                     co = config.fromOperation(resourcePath, httpMethod, operation, swagger.getDefinitions(), swagger);
                     co.tags = new ArrayList<String>();
-                    co.tags.add(sanitizeTag(tag));
-                    config.addOperationToGroup(sanitizeTag(tag), resourcePath, operation, co, operations);
+                    co.tags.add(config.sanitizeTag(tag));
+                    config.addOperationToGroup(config.sanitizeTag(tag), resourcePath, operation, co, operations);
 
                     List<Map<String, List<String>>> securities = operation.getSecurity();
                     if (securities == null && swagger.getSecurity() != null) {
@@ -561,35 +681,29 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
                         continue;
                     }
                     Map<String, SecuritySchemeDefinition> authMethods = new HashMap<String, SecuritySchemeDefinition>();
-                    // NOTE: Use only the first security requirement for now.
-                    // See the "security" field of "Swagger Object":
-                    //  https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#swagger-object
-                    //  "there is a logical OR between the security requirements"
-                    if (securities.size() > 1) {
-                        LOGGER.warn("More than 1 security requirements are found, using only the first one");
-                    }
-                    Map<String, List<String>> security = securities.get(0);
-                    for (String securityName : security.keySet()) {
-                        SecuritySchemeDefinition securityDefinition = fromSecurity(securityName);
-                        if (securityDefinition != null) {
-                            if(securityDefinition instanceof OAuth2Definition) {
-                                OAuth2Definition oauth2Definition = (OAuth2Definition) securityDefinition;
-                                OAuth2Definition oauth2Operation = new OAuth2Definition();
-                                oauth2Operation.setType(oauth2Definition.getType());
-                                oauth2Operation.setAuthorizationUrl(oauth2Definition.getAuthorizationUrl());
-                                oauth2Operation.setFlow(oauth2Definition.getFlow());
-                                oauth2Operation.setTokenUrl(oauth2Definition.getTokenUrl());
-                                oauth2Operation.setScopes(new HashMap<String, String>());
-                                for (String scope : security.get(securityName)) {
-                                    if (oauth2Definition.getScopes().containsKey(scope)) {
-                                        oauth2Operation.addScope(scope, oauth2Definition.getScopes().get(scope));
-                                    }
-                                }
-                                authMethods.put(securityName, oauth2Operation);
-                            } else {
-                                authMethods.put(securityName, securityDefinition);
-                            }
-                        }
+                    for (Map<String, List<String>> security: securities) {
+                      for (String securityName : security.keySet()) {
+                          SecuritySchemeDefinition securityDefinition = fromSecurity(securityName);
+                          if (securityDefinition != null) {
+                              if(securityDefinition instanceof OAuth2Definition) {
+                                  OAuth2Definition oauth2Definition = (OAuth2Definition) securityDefinition;
+                                  OAuth2Definition oauth2Operation = new OAuth2Definition();
+                                  oauth2Operation.setType(oauth2Definition.getType());
+                                  oauth2Operation.setAuthorizationUrl(oauth2Definition.getAuthorizationUrl());
+                                  oauth2Operation.setFlow(oauth2Definition.getFlow());
+                                  oauth2Operation.setTokenUrl(oauth2Definition.getTokenUrl());
+                                  oauth2Operation.setScopes(new HashMap<String, String>());
+                                  for (String scope : security.get(securityName)) {
+                                      if (oauth2Definition.getScopes().containsKey(scope)) {
+                                          oauth2Operation.addScope(scope, oauth2Definition.getScopes().get(scope));
+                                      }
+                                  }
+                                  authMethods.put(securityName, oauth2Operation);
+                              } else {
+                                  authMethods.put(securityName, securityDefinition);
+                              }
+                          }
+                      }
                     }
                     if (!authMethods.isEmpty()) {
                         co.authMethods = config.fromSecurity(authMethods);
@@ -609,22 +723,11 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
         }
     }
 
-    private String generateParameterId(Parameter parameter) {
+    private static String generateParameterId(Parameter parameter) {
         return parameter.getName() + ":" + parameter.getIn();
     }
 
-    protected String sanitizeTag(String tag) {
-        // remove spaces and make strong case
-        String[] parts = tag.split(" ");
-        StringBuilder buf = new StringBuilder();
-        for (String part : parts) {
-            if (isNotEmpty(part)) {
-                buf.append(capitalize(part));
-            }
-        }
-        return buf.toString().replaceAll("[^a-zA-Z ]", "");
-    }
-
+    @SuppressWarnings("static-method")
     public Map<String, Object> processOperations(CodegenConfig config, String tag, List<CodegenOperation> ops) {
         Map<String, Object> operations = new HashMap<String, Object>();
         Map<String, Object> objs = new HashMap<String, Object>();
@@ -685,6 +788,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
         return operations;
     }
 
+    @SuppressWarnings("static-method")
     public Map<String, Object> processModels(CodegenConfig config, Map<String, Model> definitions, Map<String, Model> allDefinitions) {
         Map<String, Object> objs = new HashMap<String, Object>();
         objs.put("package", config.modelPackage());
@@ -695,7 +799,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
             CodegenModel cm = config.fromModel(key, mm, allDefinitions);
             Map<String, Object> mo = new HashMap<String, Object>();
             mo.put("model", cm);
-            mo.put("importPath", config.toModelImport(key));
+            mo.put("importPath", config.toModelImport(cm.classname));
             models.add(mo);
 
             allImports.addAll(cm.imports);
@@ -704,7 +808,6 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
 
         Set<String> importSet = new TreeSet<String>();
         for (String nextImport : allImports) {
-            Map<String, String> im = new HashMap<String, String>();
             String mapping = config.importMapping().get(nextImport);
             if (mapping == null) {
                 mapping = config.toModelImport(nextImport);
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/InlineModelResolver.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/InlineModelResolver.java
index 2e698162182..2f8dc6e3575 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/InlineModelResolver.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/InlineModelResolver.java
@@ -1,21 +1,18 @@
 package io.swagger.codegen;
 
-import com.sun.org.apache.xpath.internal.operations.Mod;
 import io.swagger.models.*;
 import io.swagger.models.parameters.BodyParameter;
 import io.swagger.models.parameters.Parameter;
-import io.swagger.models.parameters.RefParameter;
 import io.swagger.models.properties.*;
 import io.swagger.util.Json;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class InlineModelResolver {
     private Swagger swagger;
     private boolean skipMatches;
@@ -51,12 +48,13 @@ public class InlineModelResolver {
                                     if(model instanceof ModelImpl) {
                                         ModelImpl obj = (ModelImpl) model;
                                         if (obj.getType() == null || "object".equals(obj.getType())) {
-                                            String modelName = uniqueName(bp.getName());
-                                            flattenProperties(obj.getProperties(), pathname);
-
-                                            bp.setSchema(new RefModel(modelName));
-                                            addGenerated(modelName, model);
-                                            swagger.addDefinition(modelName, model);
+                                            if (obj.getProperties() != null && obj.getProperties().size() > 0) {
+                                                flattenProperties(obj.getProperties(), pathname);
+                                                String modelName = uniqueName(bp.getName());
+                                                bp.setSchema(new RefModel(modelName));
+                                                addGenerated(modelName, model);
+                                                swagger.addDefinition(modelName, model);
+                                            }
                                         }
                                     }
                                     else if (model instanceof ArrayModel) {
@@ -64,18 +62,19 @@ public class InlineModelResolver {
                                         Property inner = am.getItems();
 
                                         if(inner instanceof ObjectProperty) {
-                                            String modelName = uniqueName(bp.getName());
                                             ObjectProperty op = (ObjectProperty) inner;
-                                            flattenProperties(op.getProperties(), pathname);
-
-                                            Model innerModel = modelFromProperty(op, modelName);
-                                            String existing = matchGenerated(innerModel);
-                                            if (existing != null) {
-                                                am.setItems(new RefProperty(existing));
-                                            } else {
-                                                am.setItems(new RefProperty(modelName));
-                                                addGenerated(modelName, innerModel);
-                                                swagger.addDefinition(modelName, innerModel);
+                                            if (op.getProperties() != null && op.getProperties().size() > 0) {
+                                                flattenProperties(op.getProperties(), pathname);
+                                                String modelName = uniqueName(bp.getName());
+                                                Model innerModel = modelFromProperty(op, modelName);
+                                                String existing = matchGenerated(innerModel);
+                                                if (existing != null) {
+                                                    am.setItems(new RefProperty(existing));
+                                                } else {
+                                                    am.setItems(new RefProperty(modelName));
+                                                    addGenerated(modelName, innerModel);
+                                                    swagger.addDefinition(modelName, innerModel);
+                                                }
                                             }
                                         }
                                     }
@@ -90,34 +89,37 @@ public class InlineModelResolver {
                             if (response.getSchema() != null) {
                                 Property property = response.getSchema();
                                 if (property instanceof ObjectProperty) {
-                                    String modelName = uniqueName("inline_response_" + key);
                                     ObjectProperty op = (ObjectProperty) property;
-                                    Model model = modelFromProperty(op, modelName);
-                                    String existing = matchGenerated(model);
-                                    if (existing != null) {
-                                        response.setSchema(new RefProperty(existing));
-                                    } else {
-                                        response.setSchema(new RefProperty(modelName));
-                                        addGenerated(modelName, model);
-                                        swagger.addDefinition(modelName, model);
+                                    if (op.getProperties() != null && op.getProperties().size() > 0) {
+                                        String modelName = uniqueName("inline_response_" + key);
+                                        Model model = modelFromProperty(op, modelName);
+                                        String existing = matchGenerated(model);
+                                        if (existing != null) {
+                                            response.setSchema(new RefProperty(existing));
+                                        } else {
+                                            response.setSchema(new RefProperty(modelName));
+                                            addGenerated(modelName, model);
+                                            swagger.addDefinition(modelName, model);
+                                        }
                                     }
                                 } else if (property instanceof ArrayProperty) {
                                     ArrayProperty ap = (ArrayProperty) property;
                                     Property inner = ap.getItems();
 
                                     if(inner instanceof ObjectProperty) {
-                                        String modelName = uniqueName("inline_response_" + key);
                                         ObjectProperty op = (ObjectProperty) inner;
-                                        flattenProperties(op.getProperties(), pathname);
-
-                                        Model innerModel = modelFromProperty(op, modelName);
-                                        String existing = matchGenerated(innerModel);
-                                        if (existing != null) {
-                                            ap.setItems(new RefProperty(existing));
-                                        } else {
-                                            ap.setItems(new RefProperty(modelName));
-                                            addGenerated(modelName, innerModel);
-                                            swagger.addDefinition(modelName, innerModel);
+                                        if (op.getProperties() != null && op.getProperties().size() > 0) {
+                                            flattenProperties(op.getProperties(), pathname);
+                                            String modelName = uniqueName("inline_response_" + key);
+                                            Model innerModel = modelFromProperty(op, modelName);
+                                            String existing = matchGenerated(innerModel);
+                                            if (existing != null) {
+                                                ap.setItems(new RefProperty(existing));
+                                            } else {
+                                                ap.setItems(new RefProperty(modelName));
+                                                addGenerated(modelName, innerModel);
+                                                swagger.addDefinition(modelName, innerModel);
+                                            }
                                         }
                                     }
                                 } else if (property instanceof MapProperty) {
@@ -125,18 +127,19 @@ public class InlineModelResolver {
 
                                     Property innerProperty = mp.getAdditionalProperties();
                                     if(innerProperty instanceof ObjectProperty) {
-                                        String modelName = uniqueName("inline_response_" + key);
                                         ObjectProperty op = (ObjectProperty) innerProperty;
-                                        flattenProperties(op.getProperties(), pathname);
-
-                                        Model innerModel = modelFromProperty(op, modelName);
-                                        String existing = matchGenerated(innerModel);
-                                        if (existing != null) {
-                                            mp.setAdditionalProperties(new RefProperty(existing));
-                                        } else {
-                                            mp.setAdditionalProperties(new RefProperty(modelName));
-                                            addGenerated(modelName, innerModel);
-                                            swagger.addDefinition(modelName, innerModel);
+                                        if (op.getProperties() != null && op.getProperties().size() > 0) {
+                                            flattenProperties(op.getProperties(), pathname);
+                                            String modelName = uniqueName("inline_response_" + key);
+                                            Model innerModel = modelFromProperty(op, modelName);
+                                            String existing = matchGenerated(innerModel);
+                                            if (existing != null) {
+                                                mp.setAdditionalProperties(new RefProperty(existing));
+                                            } else {
+                                                mp.setAdditionalProperties(new RefProperty(modelName));
+                                                addGenerated(modelName, innerModel);
+                                                swagger.addDefinition(modelName, innerModel);
+                                            }
                                         }
                                     }
                                 }
@@ -162,20 +165,20 @@ public class InlineModelResolver {
                     ArrayModel m = (ArrayModel) model;
                     Property inner = m.getItems();
                     if (inner instanceof ObjectProperty) {
-                        String innerModelName = uniqueName(modelName + "_inner");
-                        Model innerModel = modelFromProperty((ObjectProperty) inner, modelName);
-
-                        String existing = matchGenerated(innerModel);
-                        if (existing == null) {
-                            swagger.addDefinition(innerModelName, innerModel);
-                            addGenerated(innerModelName, innerModel);
-                            m.setItems(new RefProperty(innerModelName));
-                        } else {
-                            m.setItems(new RefProperty(existing));
+                        ObjectProperty op = (ObjectProperty) inner;
+                        if (op.getProperties() != null && op.getProperties().size() > 0) {
+                            String innerModelName = uniqueName(modelName + "_inner");
+                            Model innerModel = modelFromProperty(op, innerModelName);
+                            String existing = matchGenerated(innerModel);
+                            if (existing == null) {
+                                swagger.addDefinition(innerModelName, innerModel);
+                                addGenerated(innerModelName, innerModel);
+                                m.setItems(new RefProperty(innerModelName));
+                            } else {
+                                m.setItems(new RefProperty(existing));
+                            }
                         }
                     }
-                } else if (model instanceof ComposedModel) {
-                    ComposedModel m = (ComposedModel) model;
                 }
             }
         }
@@ -199,7 +202,7 @@ public class InlineModelResolver {
     public String uniqueName(String key) {
         int count = 0;
         boolean done = false;
-        key = key.replaceAll("[^a-z_\\.A-Z0-9 ]", "");
+        key = key.replaceAll("[^a-z_\\.A-Z0-9 ]", ""); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
         while (!done) {
             String name = key;
             if (count > 0) {
@@ -223,7 +226,9 @@ public class InlineModelResolver {
         Map<String, Model> modelsToAdd = new HashMap<String, Model>();
         for (String key : properties.keySet()) {
             Property property = properties.get(key);
-            if (property instanceof ObjectProperty && ((ObjectProperty)property).getProperties().size() > 0) {
+            if (property instanceof ObjectProperty &&
+                    ((ObjectProperty)property).getProperties() != null &&
+                    ((ObjectProperty)property).getProperties().size() > 0) {
                 String modelName = uniqueName(path + "_" + key);
 
                 ObjectProperty op = (ObjectProperty) property;
@@ -244,20 +249,19 @@ public class InlineModelResolver {
                 Property inner = ap.getItems();
 
                 if (inner instanceof ObjectProperty) {
-                    String modelName = uniqueName(path + "_" + key);
-
                     ObjectProperty op = (ObjectProperty) inner;
-                    flattenProperties(op.getProperties(), path);
-
-                    Model innerModel = modelFromProperty(op, modelName);
-                    String existing = matchGenerated(innerModel);
-
-                    if (existing != null) {
-                        ap.setItems(new RefProperty(existing));
-                    } else {
-                        ap.setItems(new RefProperty(modelName));
-                        addGenerated(modelName, innerModel);
-                        swagger.addDefinition(modelName, innerModel);
+                    if (op.getProperties() != null && op.getProperties().size() > 0) {
+                        flattenProperties(op.getProperties(), path);
+                        String modelName = uniqueName(path + "_" + key);
+                        Model innerModel = modelFromProperty(op, modelName);
+                        String existing = matchGenerated(innerModel);
+                        if (existing != null) {
+                            ap.setItems(new RefProperty(existing));
+                        } else {
+                            ap.setItems(new RefProperty(modelName));
+                            addGenerated(modelName, innerModel);
+                            swagger.addDefinition(modelName, innerModel);
+                        }
                     }
                 }
             } else if (property instanceof MapProperty) {
@@ -265,23 +269,21 @@ public class InlineModelResolver {
                 Property inner = mp.getAdditionalProperties();
 
                 if (inner instanceof ObjectProperty) {
-                    String modelName = uniqueName(path + "_" + key);
-
                     ObjectProperty op = (ObjectProperty) inner;
-                    flattenProperties(op.getProperties(), path);
-
-                    Model innerModel = modelFromProperty(op, modelName);
-                    String existing = matchGenerated(innerModel);
-
-                    if (existing != null) {
-                        mp.setAdditionalProperties(new RefProperty(existing));
-                    } else {
-                        mp.setAdditionalProperties(new RefProperty(modelName));
-                        addGenerated(modelName, innerModel);
-                        swagger.addDefinition(modelName, innerModel);
+                    if (op.getProperties() != null && op.getProperties().size() > 0) {
+                        flattenProperties(op.getProperties(), path);
+                        String modelName = uniqueName(path + "_" + key);
+                        Model innerModel = modelFromProperty(op, modelName);
+                        String existing = matchGenerated(innerModel);
+                        if (existing != null) {
+                            mp.setAdditionalProperties(new RefProperty(existing));
+                        } else {
+                            mp.setAdditionalProperties(new RefProperty(modelName));
+                            addGenerated(modelName, innerModel);
+                            swagger.addDefinition(modelName, innerModel);
+                        }
                     }
                 }
-            } else {
             }
         }
         if (propsToUpdate.size() > 0) {
@@ -295,53 +297,36 @@ public class InlineModelResolver {
         }
     }
 
-    public Model modelFromProperty(ArrayProperty object, String path) {
-        String access = object.getAccess();
+    @SuppressWarnings("static-method")
+    public Model modelFromProperty(ArrayProperty object, @SuppressWarnings("unused") String path) {
         String description = object.getDescription();
-        String example = object.getExample();
-        String name = object.getName();
-        Integer position = object.getPosition();
-        Boolean readOnly = object.getReadOnly();
-        Boolean required = object.getRequired();
-        String title = object.getTitle();
-        Map<String, Object> extensions = object.getVendorExtensions();
-        Xml xml = object.getXml();
-
-//        object.getItems()
-//        Map<String, Property> properties = object.getProperties();
+        String example = null;
 
+        Object obj = object.getExample();
+        if(obj != null) {
+            example = obj.toString();
+        }
         Property inner = object.getItems();
         if (inner instanceof ObjectProperty) {
             ArrayModel model = new ArrayModel();
             model.setDescription(description);
             model.setExample(example);
-//          model.setName(name);
-//          model.setXml(xml);
-
             model.setItems(object.getItems());
             return model;
         }
-
-//        if(properties != null) {
-//            flattenProperties(properties, path);
-//            model.setProperties(properties);
-//        }
-
         return null;
     }
 
     public Model modelFromProperty(ObjectProperty object, String path) {
-        String access = object.getAccess();
         String description = object.getDescription();
-        String example = object.getExample();
-        String name = object.getName();
-        Integer position = object.getPosition();
-        Boolean readOnly = object.getReadOnly();
-        Boolean required = object.getRequired();
-        String title = object.getTitle();
-        Map<String, Object> extensions = object.getVendorExtensions();
-        Xml xml = object.getXml();
+        String example = null;
 
+        Object obj = object.getExample();
+        if(obj != null) {
+            example = obj.toString();
+        }
+        String name = object.getName();
+        Xml xml = object.getXml();
         Map<String, Property> properties = object.getProperties();
 
         ModelImpl model = new ModelImpl();
@@ -358,17 +343,15 @@ public class InlineModelResolver {
         return model;
     }
 
-    public Model modelFromProperty(MapProperty object, String path) {
-        String access = object.getAccess();
+    @SuppressWarnings("static-method")
+    public Model modelFromProperty(MapProperty object, @SuppressWarnings("unused") String path) {
         String description = object.getDescription();
-        String example = object.getExample();
-        String name = object.getName();
-        Integer position = object.getPosition();
-        Boolean readOnly = object.getReadOnly();
-        Boolean required = object.getRequired();
-        String title = object.getTitle();
-        Map<String, Object> extensions = object.getVendorExtensions();
-        Xml xml = object.getXml();
+        String example = null;
+
+        Object obj = object.getExample();
+        if(obj != null) {
+            example = obj.toString();
+        }
 
         ArrayModel model = new ArrayModel();
         model.setDescription(description);
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/MetaGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/MetaGenerator.java
index 818edab0214..6bbc02130c7 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/MetaGenerator.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/MetaGenerator.java
@@ -2,15 +2,17 @@ package io.swagger.codegen;
 
 import com.samskivert.mustache.Mustache;
 import com.samskivert.mustache.Template;
-import io.swagger.models.Swagger;
 import org.apache.commons.cli.BasicParser;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Options;
 import org.apache.commons.io.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
+import java.io.IOException;
 import java.io.Reader;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -25,6 +27,9 @@ import java.util.ServiceLoader;
  */
 @Deprecated
 public class MetaGenerator extends AbstractGenerator {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(MetaGenerator.class);
+
     static Map<String, CodegenConfig> configs = new HashMap<String, CodegenConfig>();
     static String configString;
 
@@ -57,8 +62,6 @@ public class MetaGenerator extends AbstractGenerator {
     }
 
     protected void generate(String[] args) {
-        StringBuilder sb = new StringBuilder();
-        String targetLanguage = null;
         String outputFolder = null;
         String name = null;
         String targetPackage = "io.swagger.codegen";
@@ -71,12 +74,9 @@ public class MetaGenerator extends AbstractGenerator {
         options.addOption("n", "name", true, "the human-readable name of the generator");
         options.addOption("p", "package", true, "the package to put the main class into (defaults to io.swagger.codegen");
 
-        ClientOptInput clientOptInput = new ClientOptInput();
-        Swagger swagger = null;
         CommandLine cmd = null;
         try {
             CommandLineParser parser = new BasicParser();
-
             cmd = parser.parse(options, args);
             if (cmd.hasOption("h")) {
                 usage(options);
@@ -85,12 +85,11 @@ public class MetaGenerator extends AbstractGenerator {
             if (cmd.hasOption("n")) {
                 name = cmd.getOptionValue("n");
             } else {
-                System.out.println("name is required");
+                System.out.println("name is required"); //FIXME replace by LOGGER
                 usage(options);
                 return;
             }
             if (cmd.hasOption("l")) {
-                targetLanguage = cmd.getOptionValue("l");
             }
             if (cmd.hasOption("p")) {
                 targetPackage = cmd.getOptionValue("p");
@@ -98,7 +97,7 @@ public class MetaGenerator extends AbstractGenerator {
             if (cmd.hasOption("o")) {
                 outputFolder = cmd.getOptionValue("o");
             } else {
-                System.out.println("output folder is required");
+                System.out.println("output folder is required"); // FIXME replace by LOGGER
                 usage(options);
                 return;
             }
@@ -106,7 +105,7 @@ public class MetaGenerator extends AbstractGenerator {
             usage(options);
             return;
         }
-        System.out.println("writing to folder " + outputFolder);
+        LOGGER.info("writing to folder " + outputFolder);
         File outputFolderLocation = new File(outputFolder);
         if (!outputFolderLocation.exists()) {
             outputFolderLocation.mkdirs();
@@ -161,8 +160,6 @@ public class MetaGenerator extends AbstractGenerator {
                                 public Reader getTemplate(String name) {
                                     return getTemplateReader(templateDir + File.separator + name + ".mustache");
                                 }
-
-                                ;
                             })
                             .defaultValue("")
                             .compile(template);
@@ -172,11 +169,11 @@ public class MetaGenerator extends AbstractGenerator {
                 } else {
                     String template = readTemplate(templateDir + File.separator + support.templateFile);
                     FileUtils.writeStringToFile(new File(outputFilename), template);
-                    System.out.println("copying file to " + outputFilename);
+                    LOGGER.info("copying file to " + outputFilename);
                     files.add(new File(outputFilename));
                 }
-            } catch (java.io.IOException e) {
-                e.printStackTrace();
+            } catch (IOException e) {
+                LOGGER.error(e.getMessage(), e);
             }
         }
     }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java
index 53c6ca5ab9b..976376bae68 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java
@@ -11,6 +11,7 @@ public class SupportingFile {
         this.destinationFilename = destinationFilename;
     }
 
+    @Override
     public String toString() {
         StringBuilder builder = new StringBuilder();
         builder.append("SupportingFile:").append("\n");
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/auth/AuthParser.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/auth/AuthParser.java
index 5fb41755184..65896dc5933 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/auth/AuthParser.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/auth/AuthParser.java
@@ -7,9 +7,16 @@ import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import config.ConfigParser;
+
 import static org.apache.commons.lang3.StringUtils.isNotEmpty;
 
 public class AuthParser {
+	
+    private static final Logger LOGGER = LoggerFactory.getLogger(AuthParser.class);
 
     public static List<AuthorizationValue> parse(String urlEncodedAuthStr) {
         List<AuthorizationValue> auths = new ArrayList<AuthorizationValue>();
@@ -18,7 +25,7 @@ public class AuthParser {
             for (String part : parts) {
                 String[] kvPair = part.split(":");
                 if (kvPair.length == 2) {
-                    auths.add(new AuthorizationValue(URLDecoder.decode(kvPair[0]), URLDecoder.decode(kvPair[1]), "header"));
+                    auths.add(new AuthorizationValue(URLDecoder.decode(kvPair[0]), URLDecoder.decode(kvPair[1]), "header")); // FIXME replace the deprecated method by decode(string, encoding). Which encoding is used ? Default UTF-8 ?
                 }
             }
         }
@@ -38,7 +45,7 @@ public class AuthParser {
                             .append(URLEncoder.encode(v.getValue(), "UTF-8"));
                 } catch (Exception e) {
                     // continue
-                    e.printStackTrace();
+                    LOGGER.error(e.getMessage(), e);
                 }
             }
             return b.toString();
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java
index cc9b0ab5d8a..98c57ab341a 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java
@@ -36,7 +36,7 @@ import static org.apache.commons.lang3.StringUtils.isNotEmpty;
  */
 public class CodegenConfigurator {
 
-    public static final Logger LOG = LoggerFactory.getLogger(CodegenConfigurator.class);
+    public static final Logger LOGGER = LoggerFactory.getLogger(CodegenConfigurator.class);
 
     private String lang;
     private String inputSpec;
@@ -48,6 +48,8 @@ public class CodegenConfigurator {
     private String apiPackage;
     private String modelPackage;
     private String invokerPackage;
+    private String modelNamePrefix;
+    private String modelNameSuffix;
     private String groupId;
     private String artifactId;
     private String artifactVersion;
@@ -58,6 +60,10 @@ public class CodegenConfigurator {
     private Map<String, String> additionalProperties = new HashMap<String, String>();
     private Map<String, String> importMappings = new HashMap<String, String>();
     private Set<String> languageSpecificPrimitives = new HashSet<String>();
+    private String gitUserId="YOUR_GIT_USR_ID";
+    private String gitRepoId="YOUR_GIT_REPO_ID";
+    private String releaseNote="Minor update";
+    private String httpUserAgent;
 
     private final Map<String, String> dynamicProperties = new HashMap<String, String>(); //the map that holds the JsonAnySetter/JsonAnyGetter values
 
@@ -97,6 +103,24 @@ public class CodegenConfigurator {
         return this;
     }
 
+    public String getModelNamePrefix() {
+        return modelNamePrefix;
+    }
+
+    public CodegenConfigurator setModelNamePrefix(String prefix) {
+        this.modelNamePrefix = prefix;
+        return this;
+    }
+
+    public String getModelNameSuffix() {
+        return modelNameSuffix;
+    }
+
+    public CodegenConfigurator setModelNameSuffix(String suffix) {
+        this.modelNameSuffix = suffix;
+        return this;
+    }
+
     public boolean isVerbose() {
         return verbose;
     }
@@ -275,6 +299,42 @@ public class CodegenConfigurator {
         return this;
     }
 
+    public String getGitUserId() {
+        return gitUserId;
+    }
+
+    public CodegenConfigurator setGitUserId(String gitUserId) {
+        this.gitUserId = gitUserId;
+        return this;
+    }
+
+    public String getGitRepoId() {
+        return gitRepoId;
+    }
+
+    public CodegenConfigurator setGitRepoId(String gitRepoId) {
+        this.gitRepoId = gitRepoId;
+        return this;
+    }
+
+    public String getReleaseNote() {
+        return releaseNote;
+    }
+
+    public CodegenConfigurator setReleaseNote(String releaseNote) {
+        this.releaseNote = releaseNote;
+        return this;
+    }
+
+    public String getHttpUserAgent() {
+        return httpUserAgent;
+    }
+
+    public CodegenConfigurator setHttpUserAgent(String httpUserAgent) {
+        this.httpUserAgent= httpUserAgent;
+        return this;
+    }
+
     public ClientOptInput toClientOptInput() {
 
         Validate.notEmpty(lang, "language must be specified");
@@ -300,6 +360,12 @@ public class CodegenConfigurator {
         checkAndSetAdditionalProperty(artifactId, CodegenConstants.ARTIFACT_ID);
         checkAndSetAdditionalProperty(artifactVersion, CodegenConstants.ARTIFACT_VERSION);
         checkAndSetAdditionalProperty(templateDir, toAbsolutePathStr(templateDir), CodegenConstants.TEMPLATE_DIR);
+        checkAndSetAdditionalProperty(modelNamePrefix, CodegenConstants.MODEL_NAME_PREFIX);
+        checkAndSetAdditionalProperty(modelNameSuffix, CodegenConstants.MODEL_NAME_SUFFIX);
+        checkAndSetAdditionalProperty(gitUserId, CodegenConstants.GIT_USER_ID);
+        checkAndSetAdditionalProperty(gitRepoId, CodegenConstants.GIT_REPO_ID);
+        checkAndSetAdditionalProperty(releaseNote, CodegenConstants.RELEASE_NOTE);
+        checkAndSetAdditionalProperty(httpUserAgent, CodegenConstants.HTTP_USER_AGENT);
 
         handleDynamicProperties(config);
 
@@ -349,7 +415,7 @@ public class CodegenConfigurator {
         if (!verbose) {
             return;
         }
-        LOG.info("\nVERBOSE MODE: ON. Additional debug options are injected" +
+        LOGGER.info("\nVERBOSE MODE: ON. Additional debug options are injected" +
                 "\n - [debugSwagger] prints the swagger specification as interpreted by the codegen" +
                 "\n - [debugModels] prints models passed to the template engine" +
                 "\n - [debugOperations] prints operations passed to the template engine" +
@@ -392,7 +458,7 @@ public class CodegenConfigurator {
             try {
                 return Json.mapper().readValue(new File(configFile), CodegenConfigurator.class);
             } catch (IOException e) {
-                LOG.error("Unable to deserialize config file: " + configFile, e);
+                LOGGER.error("Unable to deserialize config file: " + configFile, e);
             }
         }
         return null;
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfiguratorUtils.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfiguratorUtils.java
new file mode 100644
index 00000000000..a7592827879
--- /dev/null
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfiguratorUtils.java
@@ -0,0 +1,77 @@
+package io.swagger.codegen.config;
+
+import io.swagger.codegen.utils.OptionUtils;
+import org.apache.commons.lang3.tuple.Pair;
+
+import java.util.*;
+
+/**
+ * Contains shared logic for applying key-value pairs and CSV strings
+ * to specific settings in CodegenConfigurator.
+ *
+ * <p>
+ *     This class exists to facilitate testing. These methods could be applied
+ *     to CodegenConfigurator, but this complicates things when mocking CodegenConfigurator.
+ * </p>
+ */
+public final class CodegenConfiguratorUtils {
+
+    public static void applySystemPropertiesKvp(String systemProperties, CodegenConfigurator configurator) {
+        final Map<String, String> map = createMapFromKeyValuePairs(systemProperties);
+        for (Map.Entry<String, String> entry : map.entrySet()) {
+            configurator.addSystemProperty(entry.getKey(), entry.getValue());
+        }
+    }
+
+    public static void applyInstantiationTypesKvp(String instantiationTypes, CodegenConfigurator configurator) {
+        final Map<String, String> map = createMapFromKeyValuePairs(instantiationTypes);
+        for (Map.Entry<String, String> entry : map.entrySet()) {
+            configurator.addInstantiationType(entry.getKey(), entry.getValue());
+        }
+    }
+
+    public static void applyImportMappingsKvp(String importMappings, CodegenConfigurator configurator) {
+        final Map<String, String> map = createMapFromKeyValuePairs(importMappings);
+        for (Map.Entry<String, String> entry : map.entrySet()) {
+            configurator.addImportMapping(entry.getKey(), entry.getValue());
+        }
+    }
+
+    public static void applyTypeMappingsKvp(String typeMappings, CodegenConfigurator configurator) {
+        final Map<String, String> map = createMapFromKeyValuePairs(typeMappings);
+        for (Map.Entry<String, String> entry : map.entrySet()) {
+            configurator.addTypeMapping(entry.getKey(), entry.getValue());
+        }
+    }
+
+    public static void applyAdditionalPropertiesKvp(String additionalProperties, CodegenConfigurator configurator) {
+        final Map<String, String> map = createMapFromKeyValuePairs(additionalProperties);
+        for (Map.Entry<String, String> entry : map.entrySet()) {
+            configurator.addAdditionalProperty(entry.getKey(), entry.getValue());
+        }
+    }
+
+    public static void applyLanguageSpecificPrimitivesCsv(String languageSpecificPrimitives, CodegenConfigurator configurator) {
+        final Set<String> set = createSetFromCsvList(languageSpecificPrimitives);
+        for (String item : set) {
+            configurator.addLanguageSpecificPrimitive(item);
+        }
+    }
+
+    private static Set<String> createSetFromCsvList(String csvProperty) {
+        final List<String> values = OptionUtils.splitCommaSeparatedList(csvProperty);
+        return new HashSet<String>(values);
+    }
+
+    private static Map<String, String> createMapFromKeyValuePairs(String commaSeparatedKVPairs) {
+        final List<Pair<String, String>> pairs = OptionUtils.parseCommaSeparatedTuples(commaSeparatedKVPairs);
+
+        Map<String, String> result = new HashMap<String, String>();
+
+        for (Pair<String, String> pair : pairs) {
+            result.put(pair.getLeft(), pair.getRight());
+        }
+
+        return result;
+    }
+}
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/ExampleGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/ExampleGenerator.java
index 6d6062e93c8..713a45843d0 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/ExampleGenerator.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/ExampleGenerator.java
@@ -42,7 +42,7 @@ public class ExampleGenerator {
         if (examples == null) {
             if (mediaTypes == null) {
                 // assume application/json for this
-                mediaTypes = Arrays.asList("application/json");
+                mediaTypes = Arrays.asList("application/json"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
             }
             for (String mediaType : mediaTypes) {
                 Map<String, String> kv = new HashMap<String, String>();
@@ -93,9 +93,9 @@ public class ExampleGenerator {
                 };
             }
         } else if (property instanceof DateProperty) {
-            return new java.util.Date(System.currentTimeMillis());
+            return "2000-01-23T04:56:07.000+0000";
         } else if (property instanceof DateTimeProperty) {
-            return new java.util.Date(System.currentTimeMillis());
+            return "2000-01-23T04:56:07.000+0000";
         } else if (property instanceof DecimalProperty) {
             return new BigDecimal(1.3579);
         } else if (property instanceof DoubleProperty) {
@@ -127,7 +127,7 @@ public class ExampleGenerator {
                 return resolveModelToExample(simpleName, mediaType, model, processedModels);
             }
         } else if (property instanceof UUIDProperty) {
-            return "046b6c7f-0b8a-43b9-b35d-6489e6daee91";
+            return "046b6c7f-0b8a-43b9-b35d-6489e6daee91"; 
         }
 
         return "";
@@ -142,16 +142,14 @@ public class ExampleGenerator {
             ModelImpl impl = (ModelImpl) model;
             Map<String, Object> values = new HashMap<String, Object>();
 
-            if (impl != null && impl.getProperties() != null) {
+            if (impl.getProperties() != null) {
                 for (String propertyName : impl.getProperties().keySet()) {
                     Property property = impl.getProperties().get(propertyName);
                     values.put(propertyName, resolvePropertyToExample(mediaType, property, processedModels));
                 }
             }
-
             return values;
         }
-
         return "";
     }
 }
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/XmlExampleGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/XmlExampleGenerator.java
index 15f22dfe8ff..3b7700115e1 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/XmlExampleGenerator.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/XmlExampleGenerator.java
@@ -16,10 +16,8 @@ import io.swagger.models.properties.RefProperty;
 import io.swagger.models.properties.StringProperty;
 import org.codehaus.plexus.util.StringUtils;
 
-import java.text.SimpleDateFormat;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -33,13 +31,11 @@ public class XmlExampleGenerator {
     public static String TAG_END = "</";
     private static String EMPTY = "";
     protected Map<String, Model> examples;
-    protected SimpleDateFormat dtFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
-    protected SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
 
     public XmlExampleGenerator(Map<String, Model> examples) {
         this.examples = examples;
         if (examples == null) {
-            examples = new HashMap<String, Model>();
+            this.examples = new HashMap<String, Model>(); 
         }
     }
 
@@ -74,10 +70,6 @@ public class XmlExampleGenerator {
         Map<String, Property> elements = new LinkedHashMap<String, Property>();
 
         String name = modelName;
-        String namespace;
-        String prefix;
-        Boolean wrapped;
-
         Xml xml = model.getXml();
         if (xml != null) {
             if (xml.getName() != null) {
@@ -117,6 +109,7 @@ public class XmlExampleGenerator {
         return sb.toString();
     }
 
+    @SuppressWarnings("static-method")
     protected String quote(String string) {
         return "\"" + string + "\"";
     }
@@ -173,37 +166,37 @@ public class XmlExampleGenerator {
     protected String getExample(Property property) {
         if (property instanceof DateTimeProperty) {
             if (property.getExample() != null) {
-                return property.getExample();
+                return property.getExample().toString();
             } else {
-                return dtFormat.format(new Date());
+                return "2000-01-23T04:56:07.000Z";
             }
         } else if (property instanceof StringProperty) {
             if (property.getExample() != null) {
-                return property.getExample();
+                return property.getExample().toString();
             } else {
                 return "string";
             }
         } else if (property instanceof DateProperty) {
             if (property.getExample() != null) {
-                return property.getExample();
+                return property.getExample().toString();
             } else {
-                return dateFormat.format(new Date());
+                return "2000-01-23T04:56:07.000Z";
             }
         } else if (property instanceof IntegerProperty) {
             if (property.getExample() != null) {
-                return property.getExample();
+                return property.getExample().toString();
             } else {
                 return "0";
             }
         } else if (property instanceof BooleanProperty) {
             if (property.getExample() != null) {
-                return property.getExample();
+                return property.getExample().toString();
             } else {
                 return "true";
             }
         } else if (property instanceof LongProperty) {
             if (property.getExample() != null) {
-                return property.getExample();
+                return property.getExample().toString();
             } else {
                 return "123456";
             }
@@ -211,14 +204,17 @@ public class XmlExampleGenerator {
         return "not implemented " + property;
     }
 
+    @SuppressWarnings("static-method")
     protected String openTag(String name) {
         return "<" + name + ">";
     }
 
+    @SuppressWarnings("static-method")
     protected String closeTag(String name) {
         return "</" + name + ">";
     }
 
+    @SuppressWarnings("static-method")
     protected String indent(int indent) {
         StringBuffer sb = new StringBuffer();
         for (int i = 0; i < indent; i++) {
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java
new file mode 100644
index 00000000000..db5847d9672
--- /dev/null
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java
@@ -0,0 +1,546 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.*;
+import io.swagger.models.properties.*;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.util.*;
+
+public abstract class AbstractCSharpCodegen extends DefaultCodegen implements CodegenConfig {
+
+    protected boolean optionalAssemblyInfoFlag = true;
+    protected boolean optionalProjectFileFlag = false;
+    protected boolean optionalEmitDefaultValue = false;
+    protected boolean optionalMethodArgumentFlag = true;
+    protected boolean useDateTimeOffsetFlag = false;
+    protected boolean useCollection = false;
+    protected boolean returnICollection = false;
+
+    protected String packageVersion = "1.0.0";
+    protected String packageName = "IO.Swagger";
+    protected String sourceFolder = "src" + File.separator + packageName;
+
+    protected Set<String> collectionTypes;
+    protected Set<String> mapTypes;
+
+    protected Logger LOGGER = LoggerFactory.getLogger(AbstractCSharpCodegen.class);
+
+    public AbstractCSharpCodegen() {
+        super();
+
+        outputFolder = "generated-code" + File.separator + this.getName();
+        embeddedTemplateDir = templateDir = this.getName();
+
+        collectionTypes = new HashSet<String>(
+                Arrays.asList(
+                        "IList", "List",
+                        "ICollection", "Collection",
+                        "IEnumerable")
+        );
+
+        mapTypes = new HashSet<String>(
+                Arrays.asList("IDictionary")
+        );
+
+        setReservedWordsLowerCase(
+                Arrays.asList(
+                        // local variable names in API methods (endpoints)
+                        "localVarPath", "localVarPathParams", "localVarQueryParams", "localVarHeaderParams", 
+                        "localVarFormParams", "localVarFileParams", "localVarStatusCode", "localVarResponse",
+                        "localVarPostBody", "localVarHttpHeaderAccepts", "localVarHttpHeaderAccept",
+                        "localVarHttpContentTypes", "localVarHttpContentType",
+                        "localVarStatusCode",
+                        // C# reserved words
+                        "abstract", "as", "base", "bool", "break", "byte", "case", "catch", "char", "checked",
+                        "class", "const", "continue", "decimal", "default", "delegate", "do", "double", "else",
+                        "enum", "event", "explicit", "extern", "false", "finally", "fixed", "float", "for",
+                        "foreach", "goto", "if", "implicit", "in", "int", "interface", "internal", "is", "lock",
+                        "long", "namespace", "new", "null", "object", "operator", "out", "override", "params",
+                        "private", "protected", "public", "readonly", "ref", "return", "sbyte", "sealed",
+                        "short", "sizeof", "stackalloc", "static", "string", "struct", "switch", "this", "throw",
+                        "true", "try", "typeof", "uint", "ulong", "unchecked", "unsafe", "ushort", "using",
+                        "virtual", "void", "volatile", "while")
+        );
+
+        // TODO: Either include fully qualified names here or handle in DefaultCodegen via lastIndexOf(".") search
+        languageSpecificPrimitives = new HashSet<String>(
+                Arrays.asList(
+                        "String",
+                        "string",
+                        "bool?",
+                        "double?",
+                        "int?",
+                        "long?",
+                        "float?",
+                        "byte[]",
+                        "ICollection",
+                        "Collection",
+                        "List",
+                        "Dictionary",
+                        "DateTime?",
+                        "DateTimeOffset?",
+                        "String",
+                        "Boolean",
+                        "Double",
+                        "Int32",
+                        "Int64",
+                        "Float",
+                        "Guid",
+                        "Stream", // not really a primitive, we include it to avoid model import
+                        "Object")
+        );
+
+        instantiationTypes.put("array", "List");
+        instantiationTypes.put("list", "List");
+        instantiationTypes.put("map", "Dictionary");
+
+        // Nullable types here assume C# 2 support is not part of base
+        typeMapping = new HashMap<String, String>();
+        typeMapping.put("string", "string");
+        typeMapping.put("binary", "byte[]");
+        typeMapping.put("boolean", "bool?");
+        typeMapping.put("integer", "int?");
+        typeMapping.put("float", "float?");
+        typeMapping.put("long", "long?");
+        typeMapping.put("double", "double?");
+        typeMapping.put("number", "double?");
+        typeMapping.put("datetime", "DateTime?");
+        typeMapping.put("date", "DateTime?");
+        typeMapping.put("file", "Stream");
+        typeMapping.put("array", "List");
+        typeMapping.put("list", "List");
+        typeMapping.put("map", "Dictionary");
+        typeMapping.put("object", "Object");
+        typeMapping.put("uuid", "Guid");
+    }
+
+    public void setReturnICollection(boolean returnICollection) {
+        this.returnICollection = returnICollection;
+    }
+
+    public void setOptionalEmitDefaultValue(boolean optionalEmitDefaultValue) {
+        this.optionalEmitDefaultValue = optionalEmitDefaultValue;
+    }
+
+    public void setUseCollection(boolean useCollection) {
+        this.useCollection = useCollection;
+        if (useCollection) {
+            typeMapping.put("array", "Collection");
+            typeMapping.put("list", "Collection");
+
+            instantiationTypes.put("array", "Collection");
+            instantiationTypes.put("list", "Collection");
+        }
+    }
+
+    public void setOptionalMethodArgumentFlag(boolean flag) {
+        this.optionalMethodArgumentFlag = flag;
+    }
+
+    protected void addOption(String key, String description, String defaultValue) {
+        CliOption option = new CliOption(key, description);
+        if (defaultValue != null) option.defaultValue(defaultValue);
+        cliOptions.add(option);
+    }
+
+    protected void addSwitch(String key, String description, Boolean defaultValue) {
+        CliOption option = CliOption.newBoolean(key, description);
+        if (defaultValue != null) option.defaultValue(defaultValue.toString());
+        cliOptions.add(option);
+    }
+
+    public void useDateTimeOffset(boolean flag) {
+        this.useDateTimeOffsetFlag = flag;
+        if (flag) typeMapping.put("datetime", "DateTimeOffset?");
+        else typeMapping.put("datetime", "DateTime?");
+    }
+
+    @Override
+    public void processOpts() {
+        super.processOpts();
+
+        // {{packageVersion}}
+        if (additionalProperties.containsKey(CodegenConstants.PACKAGE_VERSION)) {
+            setPackageVersion((String) additionalProperties.get(CodegenConstants.PACKAGE_VERSION));
+        } else {
+            additionalProperties.put(CodegenConstants.PACKAGE_VERSION, packageVersion);
+        }
+
+        // {{sourceFolder}}
+        if (additionalProperties.containsKey(CodegenConstants.SOURCE_FOLDER)) {
+            setSourceFolder((String) additionalProperties.get(CodegenConstants.SOURCE_FOLDER));
+        } else {
+            additionalProperties.put(CodegenConstants.SOURCE_FOLDER, this.sourceFolder);
+        }
+
+        // {{packageName}}
+        if (additionalProperties.containsKey(CodegenConstants.PACKAGE_NAME)) {
+            setPackageName((String) additionalProperties.get(CodegenConstants.PACKAGE_NAME));
+        } else {
+            additionalProperties.put(CodegenConstants.PACKAGE_NAME, packageName);
+        }
+
+        // {{useDateTimeOffset}}
+        if (additionalProperties.containsKey(CodegenConstants.USE_DATETIME_OFFSET)) {
+            useDateTimeOffset(Boolean.valueOf(additionalProperties.get(CodegenConstants.USE_DATETIME_OFFSET).toString()));
+        }
+        additionalProperties.put(CodegenConstants.USE_DATETIME_OFFSET, useDateTimeOffsetFlag);
+
+        if (additionalProperties.containsKey(CodegenConstants.USE_COLLECTION)) {
+            setUseCollection(Boolean.valueOf(additionalProperties.get(CodegenConstants.USE_COLLECTION).toString()));
+        }
+
+        if (additionalProperties.containsKey(CodegenConstants.RETURN_ICOLLECTION)) {
+            setReturnICollection(Boolean.valueOf(additionalProperties.get(CodegenConstants.RETURN_ICOLLECTION).toString()));
+        }
+
+        if (additionalProperties.containsKey(CodegenConstants.OPTIONAL_EMIT_DEFAULT_VALUES)) {
+            setOptionalEmitDefaultValue(Boolean.valueOf(additionalProperties.get(CodegenConstants.OPTIONAL_EMIT_DEFAULT_VALUES).toString()));
+        }
+    }
+
+    @Override
+    public String toEnumName(CodegenProperty property) {
+        return StringUtils.capitalize(property.name) + "Enum?";
+    }
+
+    @Override
+    public Map<String, Object> postProcessModels(Map<String, Object> objs) {
+        List<Object> models = (List<Object>) objs.get("models");
+        for (Object _mo : models) {
+            Map<String, Object> mo = (Map<String, Object>) _mo;
+            CodegenModel cm = (CodegenModel) mo.get("model");
+            for (CodegenProperty var : cm.vars) {
+                // check to see if model name is same as the property name
+                // which will result in compilation error
+                // if found, prepend with _ to workaround the limitation
+                if (var.name.equals(cm.name)) {
+                    var.name = "_" + var.name;
+                }
+            }
+        }
+        return objs;
+    }
+
+    @Override
+    public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
+        super.postProcessOperations(objs);
+        if (objs != null) {
+            Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
+            if (operations != null) {
+                List<CodegenOperation> ops = (List<CodegenOperation>) operations.get("operation");
+                for (CodegenOperation operation : ops) {
+
+                    // Check return types for collection
+                    if (operation.returnType != null) {
+                        String typeMapping;
+                        int namespaceEnd = operation.returnType.lastIndexOf(".");
+                        if (namespaceEnd > 0) {
+                            typeMapping = operation.returnType.substring(namespaceEnd);
+                        } else {
+                            typeMapping = operation.returnType;
+                        }
+
+                        if (this.collectionTypes.contains(typeMapping)) {
+                            operation.isListContainer = true;
+                            operation.returnContainer = operation.returnType;
+                            if (this.returnICollection && (
+                                    typeMapping.startsWith("List") ||
+                                            typeMapping.startsWith("Collection"))) {
+                                // NOTE: ICollection works for both List<T> and Collection<T>
+                                int genericStart = typeMapping.indexOf("<");
+                                if (genericStart > 0) {
+                                    operation.returnType = "ICollection" + typeMapping.substring(genericStart);
+                                }
+                            }
+                        } else {
+                            operation.returnContainer = operation.returnType;
+                            operation.isMapContainer = this.mapTypes.contains(typeMapping);
+                        }
+                    }
+
+                    processOperation(operation);
+                }
+            }
+        }
+
+        return objs;
+    }
+
+    protected void processOperation(CodegenOperation operation) {
+        // default noop
+    }
+
+    @Override
+    public String apiFileFolder() {
+        return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
+    }
+
+    @Override
+    public String modelFileFolder() {
+        return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
+    }
+
+    @Override
+    public String toModelFilename(String name) {
+        // should be the same as the model name
+        return toModelName(name);
+    }
+
+    @Override
+    public String toOperationId(String operationId) {
+        // throw exception if method name is empty (should not occur as an auto-generated method name will be used)
+        if (StringUtils.isEmpty(operationId)) {
+            throw new RuntimeException("Empty method name (operationId) not allowed");
+        }
+
+        // method name cannot use reserved keyword, e.g. return
+        if (isReservedWord(operationId)) {
+            LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to " + camelize(sanitizeName("call_" + operationId)));
+            operationId = "call_" + operationId;
+        }
+
+        return camelize(sanitizeName(operationId));
+    }
+
+    @Override
+    public String toVarName(String name) {
+        // sanitize name
+        name = sanitizeName(name);
+
+        // if it's all uppper case, do nothing
+        if (name.matches("^[A-Z_]*$")) {
+            return name;
+        }
+
+        // camelize the variable name
+        // pet_id => PetId
+        name = camelize(name);
+
+        // for reserved word or word starting with number, append _
+        if (isReservedWord(name) || name.matches("^\\d.*")) {
+            name = escapeReservedWord(name);
+        }
+
+        return name;
+    }
+
+    @Override
+    public String toParamName(String name) {
+        // sanitize name
+        name = sanitizeName(name);
+
+        // replace - with _ e.g. created-at => created_at
+        name = name.replaceAll("-", "_");
+
+        // if it's all uppper case, do nothing
+        if (name.matches("^[A-Z_]*$")) {
+            return name;
+        }
+
+        // camelize(lower) the variable name
+        // pet_id => petId
+        name = camelize(name, true);
+
+        // for reserved word or word starting with number, append _
+        if (isReservedWord(name) || name.matches("^\\d.*")) {
+            name = escapeReservedWord(name);
+        }
+
+        return name;
+    }
+
+    @Override
+    public String escapeReservedWord(String name) {
+        return "_" + name;
+    }
+
+    /**
+     * Return the example value of the property
+     *
+     * @param p Swagger property object
+     * @return string presentation of the example value of the property
+     */
+    @Override
+    public String toExampleValue(Property p) {
+        if (p instanceof StringProperty) {
+            StringProperty dp = (StringProperty) p;
+            if (dp.getExample() != null) {
+                return "\"" + dp.getExample().toString() + "\"";
+            }
+        } else if (p instanceof BooleanProperty) {
+            BooleanProperty dp = (BooleanProperty) p;
+            if (dp.getExample() != null) {
+                return dp.getExample().toString();
+            }
+        } else if (p instanceof DateProperty) {
+            // TODO
+        } else if (p instanceof DateTimeProperty) {
+            // TODO
+        } else if (p instanceof DoubleProperty) {
+            DoubleProperty dp = (DoubleProperty) p;
+            if (dp.getExample() != null) {
+                return dp.getExample().toString();
+            }
+        } else if (p instanceof FloatProperty) {
+            FloatProperty dp = (FloatProperty) p;
+            if (dp.getExample() != null) {
+                return dp.getExample().toString();
+            }
+        } else if (p instanceof IntegerProperty) {
+            IntegerProperty dp = (IntegerProperty) p;
+            if (dp.getExample() != null) {
+                return dp.getExample().toString();
+            }
+        } else if (p instanceof LongProperty) {
+            LongProperty dp = (LongProperty) p;
+            if (dp.getExample() != null) {
+                return dp.getExample().toString();
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Return the default value of the property
+     *
+     * @param p Swagger property object
+     * @return string presentation of the default value of the property
+     */
+    @Override
+    public String toDefaultValue(Property p) {
+        if (p instanceof StringProperty) {
+            StringProperty dp = (StringProperty) p;
+            if (dp.getDefault() != null) {
+                return "\"" + dp.getDefault().toString() + "\"";
+            }
+        } else if (p instanceof BooleanProperty) {
+            BooleanProperty dp = (BooleanProperty) p;
+            if (dp.getDefault() != null) {
+                return dp.getDefault().toString();
+            }
+        } else if (p instanceof DateProperty) {
+            // TODO
+        } else if (p instanceof DateTimeProperty) {
+            // TODO
+        } else if (p instanceof DoubleProperty) {
+            DoubleProperty dp = (DoubleProperty) p;
+            if (dp.getDefault() != null) {
+                return dp.getDefault().toString();
+            }
+        } else if (p instanceof FloatProperty) {
+            FloatProperty dp = (FloatProperty) p;
+            if (dp.getDefault() != null) {
+                return String.format("%1$sF", dp.getDefault());
+            }
+        } else if (p instanceof IntegerProperty) {
+            IntegerProperty dp = (IntegerProperty) p;
+            if (dp.getDefault() != null) {
+                return dp.getDefault().toString();
+            }
+        } else if (p instanceof LongProperty) {
+            LongProperty dp = (LongProperty) p;
+            if (dp.getDefault() != null) {
+                return dp.getDefault().toString();
+            }
+        }
+
+        return null;
+    }
+
+    @Override
+    public String getSwaggerType(Property p) {
+        String swaggerType = super.getSwaggerType(p);
+        String type;
+        if (typeMapping.containsKey(swaggerType.toLowerCase())) {
+            type = typeMapping.get(swaggerType.toLowerCase());
+            if (languageSpecificPrimitives.contains(type)) {
+                return type;
+            }
+        } else {
+            type = swaggerType;
+        }
+        return toModelName(type);
+    }
+
+    @Override
+    public String getTypeDeclaration(Property p) {
+        if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            Property inner = ap.getItems();
+            return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">";
+        } else if (p instanceof MapProperty) {
+            MapProperty mp = (MapProperty) p;
+            Property inner = mp.getAdditionalProperties();
+
+            return getSwaggerType(p) + "<string, " + getTypeDeclaration(inner) + ">";
+        }
+        return super.getTypeDeclaration(p);
+    }
+
+    @Override
+    public String toModelName(String name) {
+        if (!StringUtils.isEmpty(modelNamePrefix)) {
+            name = modelNamePrefix + "_" + name;
+        }
+
+        if (!StringUtils.isEmpty(modelNameSuffix)) {
+            name = name + "_" + modelNameSuffix;
+        }
+
+        name = sanitizeName(name);
+
+        // model name cannot use reserved keyword, e.g. return
+        if (isReservedWord(name)) {
+            LOGGER.warn(name + " (reserved word) cannot be used as model name. Renamed to " + camelize("model_" + name));
+            name = "model_" + name; // e.g. return => ModelReturn (after camelize)
+        }
+
+        // model name starts with number
+        if (name.matches("^\\d.*")) {
+            LOGGER.warn(name + " (model name starts with number) cannot be used as model name. Renamed to " + camelize("model_" + name));
+            name = "model_" + name; // e.g. 200Response => Model200Response (after camelize)
+        }
+
+        // camelize the model name
+        // phone_number => PhoneNumber
+        return camelize(name);
+    }
+
+    @Override
+    public String apiTestFileFolder() {
+        return outputFolder + ".Test";
+    }
+
+    @Override
+    public String modelTestFileFolder() {
+        return outputFolder + ".Test";
+    }
+
+    @Override
+    public String toApiTestFilename(String name) {
+        return toApiName(name) + "Tests";
+    }
+
+    @Override
+    public String toModelTestFilename(String name) {
+        return toModelName(name) + "Tests";
+    }
+
+
+    public void setPackageName(String packageName) {
+        this.packageName = packageName;
+    }
+
+    public void setPackageVersion(String packageVersion) {
+        this.packageVersion = packageVersion;
+    }
+
+    public void setSourceFolder(String sourceFolder) {
+        this.sourceFolder = sourceFolder;
+    }
+}
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaJAXRSServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaJAXRSServerCodegen.java
new file mode 100644
index 00000000000..4069dded643
--- /dev/null
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaJAXRSServerCodegen.java
@@ -0,0 +1,192 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CodegenOperation;
+import io.swagger.codegen.CodegenParameter;
+import io.swagger.codegen.CodegenResponse;
+import io.swagger.codegen.CodegenType;
+import io.swagger.models.Operation;
+import io.swagger.models.Path;
+import io.swagger.models.Swagger;
+
+import java.util.*;
+
+public abstract class AbstractJavaJAXRSServerCodegen extends JavaClientCodegen
+{
+    /**
+     * Name of the sub-directory in "src/main/resource" where to find the
+     * Mustache template for the JAX-RS Codegen.
+     */
+    protected static final String JAXRS_TEMPLATE_DIRECTORY_NAME = "JavaJaxRS";
+    protected String implFolder = "src/main/java";
+    protected String title = "Swagger Server";
+
+    public AbstractJavaJAXRSServerCodegen()
+    {
+        super();
+    }
+
+    // ================
+    // ABSTRACT METHODS
+    // ================
+
+    @Override
+    public abstract String getHelp();
+
+    @Override
+    public abstract String getName();
+
+    // ===============
+    // COMMONS METHODS
+    // ===============
+
+    @Override
+    public CodegenType getTag()
+    {
+        return CodegenType.SERVER;
+    }
+
+    @Override
+    public void preprocessSwagger(Swagger swagger) {
+        if ( "/".equals(swagger.getBasePath()) ) {
+            swagger.setBasePath("");
+        }
+
+        String host = swagger.getHost();
+        String port = "8080"; // Default value for a JEE Server
+        if ( host != null ) {
+            String[] parts = host.split(":");
+            if ( parts.length > 1 ) {
+                port = parts[1];
+            }
+        }
+        this.additionalProperties.put("serverPort", port);
+        if ( swagger.getPaths() != null ) {
+            for ( String pathname : swagger.getPaths().keySet() ) {
+                Path path = swagger.getPath(pathname);
+                if ( path.getOperations() != null ) {
+                    for ( Operation operation : path.getOperations() ) {
+                        if ( operation.getTags() != null ) {
+                            List<Map<String, String>> tags = new ArrayList<Map<String, String>>();
+                            for ( String tag : operation.getTags() ) {
+                                Map<String, String> value = new HashMap<String, String>();
+                                value.put("tag", tag);
+                                value.put("hasMore", "true");
+                                tags.add(value);
+                            }
+                            if ( tags.size() > 0 ) {
+                                tags.get(tags.size() - 1).remove("hasMore");
+                            }
+                            if ( operation.getTags().size() > 0 ) {
+                                String tag = operation.getTags().get(0);
+                                operation.setTags(Arrays.asList(tag));
+                            }
+                            operation.setVendorExtension("x-tags", tags);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
+        @SuppressWarnings("unchecked")
+        Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
+        if ( operations != null ) {
+            @SuppressWarnings("unchecked")
+            List<CodegenOperation> ops = (List<CodegenOperation>) operations.get("operation");
+            for ( CodegenOperation operation : ops ) {
+                boolean isMultipartPost = false;
+                List<Map<String, String>> consumes = operation.consumes;
+                if(consumes != null) {
+                    for(Map<String, String> consume : consumes) {
+                        String mt = consume.get("mediaType");
+                        if(mt != null) {
+                            if(mt.startsWith("multipart/form-data")) {
+                                isMultipartPost = true;
+                            }
+                        }
+                    }
+                }
+
+                for(CodegenParameter parameter : operation.allParams) {
+                    if(isMultipartPost) {
+                        parameter.vendorExtensions.put("x-multipart", "true");
+                    }
+                }
+
+                List<CodegenResponse> responses = operation.responses;
+                if ( responses != null ) {
+                    for ( CodegenResponse resp : responses ) {
+                        if ( "0".equals(resp.code) ) {
+                            resp.code = "200";
+                        }
+                    }
+                }
+                if ( operation.returnType == null ) {
+                    operation.returnType = "void";
+                } else if ( operation.returnType.startsWith("List") ) {
+                    String rt = operation.returnType;
+                    int end = rt.lastIndexOf(">");
+                    if ( end > 0 ) {
+                        operation.returnType = rt.substring("List<".length(), end).trim();
+                        operation.returnContainer = "List";
+                    }
+                } else if ( operation.returnType.startsWith("Map") ) {
+                    String rt = operation.returnType;
+                    int end = rt.lastIndexOf(">");
+                    if ( end > 0 ) {
+                        operation.returnType = rt.substring("Map<".length(), end).split(",")[1].trim();
+                        operation.returnContainer = "Map";
+                    }
+                } else if ( operation.returnType.startsWith("Set") ) {
+                    String rt = operation.returnType;
+                    int end = rt.lastIndexOf(">");
+                    if ( end > 0 ) {
+                        operation.returnType = rt.substring("Set<".length(), end).trim();
+                        operation.returnContainer = "Set";
+                    }
+                }
+            }
+        }
+        return objs;
+    }
+
+    @Override
+    public String toApiName(final String name) {
+        String computed = name;
+        if ( computed.length() == 0 ) {
+            return "DefaultApi";
+        }
+        computed = sanitizeName(computed);
+        return camelize(computed) + "Api";
+    }
+
+    @Override
+    public String apiFilename(String templateName, String tag) {
+        String result = super.apiFilename(templateName, tag);
+
+        if ( templateName.endsWith("Impl.mustache") ) {
+            int ix = result.lastIndexOf('/');
+            result = result.substring(0, ix) + "/impl" + result.substring(ix, result.length() - 5) + "ServiceImpl.java";
+            result = result.replace(apiFileFolder(), implFileFolder(implFolder));
+        } else if ( templateName.endsWith("Factory.mustache") ) {
+            int ix = result.lastIndexOf('/');
+            result = result.substring(0, ix) + "/factories" + result.substring(ix, result.length() - 5) + "ServiceFactory.java";
+            result = result.replace(apiFileFolder(), implFileFolder(implFolder));
+        } else if ( templateName.endsWith("Service.mustache") ) {
+            int ix = result.lastIndexOf('.');
+            result = result.substring(0, ix) + "Service.java";
+        }
+        return result;
+    }
+
+    private String implFileFolder(String output) {
+        return outputFolder + "/" + output + "/" + apiPackage().replace('.', '/');
+    }
+
+    @Override
+    public boolean shouldOverwrite(String filename) {
+        return super.shouldOverwrite(filename) && !filename.endsWith("ServiceImpl.java") && !filename.endsWith("ServiceFactory.java");
+    }
+}
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java
index cdfc01d2f82..5389c509d76 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java
@@ -9,22 +9,21 @@ import java.io.File;
 import org.apache.commons.lang.StringUtils;
 
 public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen implements CodegenConfig {
-	@Override
-	public CodegenType getTag() {
-		return CodegenType.CLIENT;
-	}
+
+    protected String modelPropertyNaming= "camelCase";
 
 	public AbstractTypeScriptClientCodegen() {
 	    super();
 		supportsInheritance = true;
-		reservedWords = new HashSet<String>(Arrays.asList(
+		setReservedWordsLowerCase(Arrays.asList(
                     // local variable names used in API methods (endpoints)
-                    "path", "queryParameters", "headerParams", "formParams", "useFormData", "deferred",
-                    "requestOptions", 
+                    "varLocalPath", "queryParameters", "headerParams", "formParams", "useFormData", "varLocalDeferred",
+                    "requestOptions",
                     // Typescript reserved words
                     "abstract", "await", "boolean", "break", "byte", "case", "catch", "char", "class", "const", "continue", "debugger", "default", "delete", "do", "double", "else", "enum", "export", "extends", "false", "final", "finally", "float", "for", "function", "goto", "if", "implements", "import", "in", "instanceof", "int", "interface", "let", "long", "native", "new", "null", "package", "private", "protected", "public", "return", "short", "static", "super", "switch", "synchronized", "this", "throw", "transient", "true", "try", "typeof", "var", "void", "volatile", "while", "with", "yield"));
 
 		languageSpecificPrimitives = new HashSet<String>(Arrays.asList(
+				"string",
 				"String",
 				"boolean",
 				"Boolean",
@@ -32,9 +31,14 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
 				"Integer",
 				"Long",
 				"Float",
-				"Object"));
+				"Object",
+                "Array",
+                "Date",
+                "number",
+                "any"
+                ));
 		instantiationTypes.put("array", "Array");
-		
+
 	    typeMapping = new HashMap<String, String>();
 	    typeMapping.put("Array", "Array");
 	    typeMapping.put("array", "Array");
@@ -52,7 +56,27 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
 	    typeMapping.put("integer", "number");
 	    typeMapping.put("Map", "any");
 	    typeMapping.put("DateTime", "Date");
-	   
+        //TODO binary should be mapped to byte array
+        // mapped to String as a workaround
+        typeMapping.put("binary", "string");
+
+        cliOptions.add(new CliOption(CodegenConstants.MODEL_PROPERTY_NAMING, CodegenConstants.MODEL_PROPERTY_NAMING_DESC).defaultValue("camelCase"));
+
+
+	}
+
+    @Override
+    public void processOpts() {
+        super.processOpts();
+        if (additionalProperties.containsKey(CodegenConstants.MODEL_PROPERTY_NAMING)) {
+            setModelPropertyNaming((String) additionalProperties.get(CodegenConstants.MODEL_PROPERTY_NAMING));
+        }
+    }
+
+
+	@Override
+	public CodegenType getTag() {
+	    return CodegenType.CLIENT;
 	}
 
 	@Override
@@ -71,9 +95,9 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
 	}
 
 	@Override
-	public String toVarName(String name) {
+	public String toParamName(String name) {
 		// replace - with _ e.g. created-at => created_at
-		name = name.replaceAll("-", "_");
+		name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
 		// if it's all uppper case, do nothing
 		if (name.matches("^[A-Z_]*$"))
@@ -84,24 +108,43 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
 		name = camelize(name, true);
 
 		// for reserved word or word starting with number, append _
-		if (reservedWords.contains(name) || name.matches("^\\d.*"))
+		if (isReservedWord(name) || name.matches("^\\d.*"))
 			name = escapeReservedWord(name);
 
 		return name;
 	}
 
 	@Override
-	public String toParamName(String name) {
+	public String toVarName(String name) {
 		// should be the same as variable name
-		return toVarName(name);
+		return getNameUsingModelPropertyNaming(name);
 	}
 
 	@Override
 	public String toModelName(String name) {
-		// model name cannot use reserved keyword, e.g. return
-		if (reservedWords.contains(name))
-			throw new RuntimeException(name
-					+ " (reserved word) cannot be used as a model name");
+        name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
+
+        if (!StringUtils.isEmpty(modelNamePrefix)) {
+            name = modelNamePrefix + "_" + name;
+        }
+
+        if (!StringUtils.isEmpty(modelNameSuffix)) {
+            name = name + "_" + modelNameSuffix;
+        }
+
+        // model name cannot use reserved keyword, e.g. return
+        if (isReservedWord(name)) {
+            String modelName = camelize("model_" + name);
+            LOGGER.warn(name + " (reserved word) cannot be used as model name. Renamed to " + modelName);
+            return modelName;
+        }
+
+        // model name starts with number
+        if (name.matches("^\\d.*")) {
+            String modelName = camelize("model_" + name); // e.g. 200Response => Model200Response (after camelize)
+            LOGGER.warn(name + " (model name starts with number) cannot be used as model name. Renamed to " + modelName);
+            return modelName;
+        }
 
 		// camelize the model name
 		// phone_number => PhoneNumber
@@ -140,22 +183,50 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
 				return type;
 		} else
 			type = swaggerType;
-		return type;
+		return toModelName(type);
 	}
 
-        @Override
-        public String toOperationId(String operationId) {
-            // throw exception if method name is empty
-            if (StringUtils.isEmpty(operationId)) {
-                throw new RuntimeException("Empty method name (operationId) not allowed");
-            }
-    
-            // method name cannot use reserved keyword, e.g. return
-            // append _ at the beginning, e.g. _return
-            if (reservedWords.contains(operationId)) {
-                return escapeReservedWord(camelize(sanitizeName(operationId), true));
-            }
-    
-            return camelize(sanitizeName(operationId), true);
+    @Override
+    public String toOperationId(String operationId) {
+        // throw exception if method name is empty
+        if (StringUtils.isEmpty(operationId)) {
+            throw new RuntimeException("Empty method name (operationId) not allowed");
         }
+
+        // method name cannot use reserved keyword, e.g. return
+        // append _ at the beginning, e.g. _return
+        if (isReservedWord(operationId)) {
+            return escapeReservedWord(camelize(sanitizeName(operationId), true));
+        }
+
+        return camelize(sanitizeName(operationId), true);
+    }
+
+    public void setModelPropertyNaming(String naming) {
+        if ("original".equals(naming) || "camelCase".equals(naming) ||
+            "PascalCase".equals(naming) || "snake_case".equals(naming)) {
+            this.modelPropertyNaming = naming;
+        } else {
+            throw new IllegalArgumentException("Invalid model property naming '" +
+              naming + "'. Must be 'original', 'camelCase', " +
+              "'PascalCase' or 'snake_case'");
+        }
+    }
+
+    public String getModelPropertyNaming() {
+        return this.modelPropertyNaming;
+    }
+
+    public String getNameUsingModelPropertyNaming(String name) {
+        switch (CodegenConstants.MODEL_PROPERTY_NAMING_TYPE.valueOf(getModelPropertyNaming())) {
+            case original:    return name;
+            case camelCase:   return camelize(name, true);
+            case PascalCase:  return camelize(name);
+            case snake_case:  return underscore(name);
+            default:            throw new IllegalArgumentException("Invalid model property naming '" +
+                                    name + "'. Must be 'original', 'camelCase', " +
+                                    "'PascalCase' or 'snake_case'");
+        }
+
+    }
 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AkkaScalaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AkkaScalaClientCodegen.java
index aa5d314184b..8c95183d1c2 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AkkaScalaClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AkkaScalaClientCodegen.java
@@ -63,7 +63,9 @@ public class AkkaScalaClientCodegen extends DefaultCodegen implements CodegenCon
      * unmarshalling problems and any other RuntimeException will be considered as ApiErrors.
      */
     protected boolean onlyOneSuccess = true;
-    Logger LOGGER = LoggerFactory.getLogger(AkkaScalaClientCodegen.class);
+
+    @SuppressWarnings("hiding")
+    protected Logger LOGGER = LoggerFactory.getLogger(AkkaScalaClientCodegen.class);
 
     public AkkaScalaClientCodegen() {
         super();
@@ -74,7 +76,7 @@ public class AkkaScalaClientCodegen extends DefaultCodegen implements CodegenCon
         apiPackage = mainPackage + ".api";
         modelPackage = mainPackage + ".model";
 
-        reservedWords = new HashSet<String>(
+        setReservedWordsLowerCase(
                 Arrays.asList(
                         "abstract", "case", "catch", "class", "def", "do", "else", "extends",
                         "false", "final", "finally", "for", "forSome", "if", "implicit",
@@ -274,7 +276,7 @@ public class AkkaScalaClientCodegen extends DefaultCodegen implements CodegenCon
         if (capitalized) {
             identifier = StringUtils.capitalize(identifier);
         }
-        if (identifier.matches("[a-zA-Z_$][\\w_$]+") && !reservedWords.contains(identifier)) {
+        if (identifier.matches("[a-zA-Z_$][\\w_$]+") && !isReservedWord(identifier)) {
             return identifier;
         }
         return escapeReservedWord(identifier);
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java
index 8137dbb9793..c0bead5c695 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java
@@ -7,7 +7,6 @@ import io.swagger.codegen.CodegenType;
 import io.swagger.codegen.DefaultCodegen;
 import io.swagger.codegen.SupportingFile;
 import io.swagger.models.properties.ArrayProperty;
-import io.swagger.models.properties.BooleanProperty;
 import io.swagger.models.properties.MapProperty;
 import io.swagger.models.properties.Property;
 
@@ -16,8 +15,11 @@ import java.util.Arrays;
 import java.util.HashSet;
 
 import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfig {
+    private static final Logger LOGGER = LoggerFactory.getLogger(AndroidClientCodegen.class);
     public static final String USE_ANDROID_MAVEN_GRADLE_PLUGIN = "useAndroidMavenGradlePlugin";
     protected String invokerPackage = "io.swagger.client";
     protected String groupId = "io.swagger";
@@ -40,15 +42,21 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi
         apiPackage = "io.swagger.client.api";
         modelPackage = "io.swagger.client.model";
 
-        reservedWords = new HashSet<String>(
+        setReservedWordsLowerCase(
                 Arrays.asList(
-                        "abstract", "continue", "for", "new", "switch", "assert",
-                        "default", "if", "package", "synchronized", "boolean", "do", "goto", "private",
-                        "this", "break", "double", "implements", "protected", "throw", "byte", "else",
-                        "import", "public", "throws", "case", "enum", "instanceof", "return", "transient",
-                        "catch", "extends", "int", "short", "try", "char", "final", "interface", "static",
-                        "void", "class", "finally", "long", "strictfp", "volatile", "const", "float",
-                        "native", "super", "while")
+                    // local variable names used in API methods (endpoints)
+                    "localVarPostBody", "localVarPath", "localVarQueryParams", "localVarHeaderParams",
+                    "localVarFormParams", "localVarContentTypes", "localVarContentType",
+                    "localVarResponse", "localVarBuilder", "authNames", "basePath", "apiInvoker",
+
+                    // android reserved words
+                    "abstract", "continue", "for", "new", "switch", "assert",
+                    "default", "if", "package", "synchronized", "boolean", "do", "goto", "private",
+                    "this", "break", "double", "implements", "protected", "throw", "byte", "else",
+                    "import", "public", "throws", "case", "enum", "instanceof", "return", "transient",
+                    "catch", "extends", "int", "short", "try", "char", "final", "interface", "static",
+                    "void", "class", "finally", "long", "strictfp", "volatile", "const", "float",
+                    "native", "super", "while")
         );
 
         languageSpecificPrimitives = new HashSet<String>(
@@ -60,10 +68,13 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi
                         "Integer",
                         "Long",
                         "Float",
+                        "byte[]",
                         "Object")
         );
         instantiationTypes.put("array", "ArrayList");
         instantiationTypes.put("map", "HashMap");
+        typeMapping.put("date", "Date");
+        typeMapping.put("file", "File");
 
         cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC));
         cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC));
@@ -133,8 +144,10 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi
         String type = null;
         if (typeMapping.containsKey(swaggerType)) {
             type = typeMapping.get(swaggerType);
-            if (languageSpecificPrimitives.contains(type)) {
-                return toModelName(type);
+            if (languageSpecificPrimitives.contains(type) || type.indexOf(".") >= 0 ||
+                type.equals("Map") || type.equals("List") ||
+                type.equals("File") || type.equals("Date")) {
+                return type;
             }
         } else {
             type = swaggerType;
@@ -144,8 +157,11 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi
 
     @Override
     public String toVarName(String name) {
+        // sanitize name
+        name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
+
         // replace - with _ e.g. created-at => created_at
-        name = name.replaceAll("-", "_");
+        name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
         // if it's all uppper case, do nothing
         if (name.matches("^[A-Z_]*$")) {
@@ -157,7 +173,7 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi
         name = camelize(name, true);
 
         // for reserved word or word starting with number, append _
-        if (reservedWords.contains(name) || name.matches("^\\d.*")) {
+        if (isReservedWord(name) || name.matches("^\\d.*")) {
             name = escapeReservedWord(name);
         }
 
@@ -172,14 +188,34 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi
 
     @Override
     public String toModelName(String name) {
-        // model name cannot use reserved keyword, e.g. return
-        if (reservedWords.contains(name)) {
-            throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
+        // add prefix, suffix if needed
+        if (!StringUtils.isEmpty(modelNamePrefix)) {
+            name = modelNamePrefix + "_" + name;
+        }
+
+        if (!StringUtils.isEmpty(modelNameSuffix)) {
+            name = name + "_" + modelNameSuffix;
         }
 
         // camelize the model name
         // phone_number => PhoneNumber
-        return camelize(name);
+        name = camelize(sanitizeName(name));
+
+        // model name cannot use reserved keyword, e.g. return
+        if (isReservedWord(name)) {
+            String modelName = "Model" + name;
+            LOGGER.warn(name + " (reserved word) cannot be used as model name. Renamed to " + modelName);
+            return modelName;
+        }
+
+        // model name starts with number
+        if (name.matches("^\\d.*")) {
+            String modelName = "Model" + name; // e.g. 200Response => Model200Response (after camelize)
+            LOGGER.warn(name + " (model name starts with number) cannot be used as model name. Renamed to " + modelName);
+            return modelName;
+        }
+
+        return name;
     }
 
     @Override
@@ -195,12 +231,16 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi
             throw new RuntimeException("Empty method name (operationId) not allowed");
         }
 
+        operationId = camelize(sanitizeName(operationId), true);
+
         // method name cannot use reserved keyword, e.g. return
-        if (reservedWords.contains(operationId)) {
-            throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+        if (isReservedWord(operationId)) {
+            String newOperationId = camelize("call_" + operationId, true);
+            LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to " + newOperationId);
+            return newOperationId;
         }
 
-        return camelize(operationId, true);
+        return operationId;
     }
 
     @Override
@@ -272,6 +312,8 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi
                 (sourceFolder + File.separator + invokerPackage).replace(".", File.separator), "ApiException.java"));
         supportingFiles.add(new SupportingFile("Pair.mustache",
                 (sourceFolder + File.separator + invokerPackage).replace(".", File.separator), "Pair.java"));
+        supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
+        supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
     }
 
     private void addSupportingFilesForVolley() {
@@ -281,10 +323,6 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi
         supportingFiles.add(new SupportingFile("manifest.mustache", projectFolder, "AndroidManifest.xml"));
         supportingFiles.add(new SupportingFile("apiInvoker.mustache",
                 (sourceFolder + File.separator + invokerPackage).replace(".", File.separator), "ApiInvoker.java"));
-        supportingFiles.add(new SupportingFile("responses.mustache",
-                (sourceFolder + File.separator + invokerPackage).replace(".", File.separator), "Responses.java"));
-        // supportingFiles.add(new SupportingFile("httpPatch.mustache",
-        //        (sourceFolder + File.separator + invokerPackage).replace(".", File.separator), "HttpPatch.java"));
         supportingFiles.add(new SupportingFile("jsonUtil.mustache",
                 (sourceFolder + File.separator + invokerPackage).replace(".", File.separator), "JsonUtil.java"));
         supportingFiles.add(new SupportingFile("apiException.mustache",
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AspNet5ServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AspNet5ServerCodegen.java
new file mode 100644
index 00000000000..cf8915974e6
--- /dev/null
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AspNet5ServerCodegen.java
@@ -0,0 +1,127 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.*;
+import io.swagger.models.properties.*;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.util.*;
+
+public class AspNet5ServerCodegen extends AbstractCSharpCodegen {
+
+    @SuppressWarnings("hiding")
+    protected Logger LOGGER = LoggerFactory.getLogger(AspNet5ServerCodegen.class);
+
+    public AspNet5ServerCodegen() {
+        super();
+
+        outputFolder = "generated-code" + File.separator + this.getName();
+
+        modelTemplateFiles.put("model.mustache", ".cs");
+        apiTemplateFiles.put("controller.mustache", ".cs");
+
+        // contextually reserved words
+        setReservedWordsLowerCase(
+            Arrays.asList("var", "async", "await", "dynamic", "yield")
+        );
+
+        cliOptions.clear();
+
+        // CLI options
+        addOption(CodegenConstants.PACKAGE_NAME,
+                "C# package name (convention: Title.Case).",
+                this.packageName);
+
+        addOption(CodegenConstants.PACKAGE_VERSION,
+                "C# package version.",
+                this.packageVersion);
+
+        addOption(CodegenConstants.SOURCE_FOLDER,
+                CodegenConstants.SOURCE_FOLDER_DESC,
+                sourceFolder);
+
+        // CLI Switches
+        addSwitch(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG,
+                CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG_DESC,
+                this.sortParamsByRequiredFlag);
+
+        addSwitch(CodegenConstants.USE_DATETIME_OFFSET,
+                CodegenConstants.USE_DATETIME_OFFSET_DESC,
+                this.useDateTimeOffsetFlag);
+
+        addSwitch(CodegenConstants.USE_COLLECTION,
+                CodegenConstants.USE_COLLECTION_DESC,
+                this.useCollection);
+
+        addSwitch(CodegenConstants.RETURN_ICOLLECTION,
+                CodegenConstants.RETURN_ICOLLECTION_DESC,
+                this.returnICollection);
+    }
+
+    @Override
+    public CodegenType getTag() {
+        return CodegenType.SERVER;
+    }
+
+    @Override
+    public String getName() {
+        return "aspnet5";
+    }
+
+    @Override
+    public String getHelp() {
+        return "Generates an ASP.NET 5 Web API server.";
+    }
+
+    @Override
+    public void processOpts() {
+        super.processOpts();
+
+        apiPackage = packageName + ".Controllers";
+        modelPackage = packageName + ".Models";
+
+        supportingFiles.add(new SupportingFile("global.json", "", "global.json"));
+        supportingFiles.add(new SupportingFile("build.mustache", "", "build.sh"));
+        supportingFiles.add(new SupportingFile("Dockerfile.mustache", this.sourceFolder, "Dockerfile"));
+        supportingFiles.add(new SupportingFile("gitignore", this.sourceFolder, ".gitignore"));
+        supportingFiles.add(new SupportingFile("appsettings.json", this.sourceFolder, "appsettings.json"));
+
+        supportingFiles.add(new SupportingFile("project.mustache", this.sourceFolder, "project.json"));
+        supportingFiles.add(new SupportingFile("Startup.mustache", this.sourceFolder, "Startup.cs"));
+
+        supportingFiles.add(new SupportingFile("Properties" + File.separator + "launchSettings.json", this.sourceFolder + File.separator + "Properties", "launchSettings.json"));
+
+        supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "README.md", this.sourceFolder + File.separator + "wwwroot", "README.md"));
+        supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "index.html", this.sourceFolder + File.separator + "wwwroot", "index.html"));
+        supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "web.config", this.sourceFolder + File.separator + "wwwroot", "web.config"));
+    }
+
+    @Override
+    public String apiFileFolder() {
+        return outputFolder + File.separator + sourceFolder + File.separator + "Controllers";
+    }
+
+    @Override
+    public String modelFileFolder() {
+        return outputFolder + File.separator + sourceFolder + File.separator + "Models";
+    }
+
+    @Override
+    protected void processOperation(CodegenOperation operation) {
+        super.processOperation(operation);
+
+        // HACK: Unlikely in the wild, but we need to clean operation paths for MVC Routing
+        if (operation.path != null) {
+            String original = operation.path;
+            operation.path = operation.path.replace("?", "/");
+            if (!original.equals(operation.path)) {
+                LOGGER.warn("Normalized " + original + " to " + operation.path + ". Please verify generated source.");
+            }
+        }
+
+        // Converts, for example, PUT to HttpPut for controller attributes
+        operation.httpMethod = "Http" + operation.httpMethod.substring(0, 1) + operation.httpMethod.substring(1).toLowerCase();
+    }
+}
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AsyncScalaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AsyncScalaClientCodegen.java
index 310b4788dd0..17fd4ab57b6 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AsyncScalaClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AsyncScalaClientCodegen.java
@@ -23,8 +23,6 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 
-import org.apache.commons.lang.StringUtils;
-
 public class AsyncScalaClientCodegen extends DefaultCodegen implements CodegenConfig {
     protected String invokerPackage = "io.swagger.client";
     protected String groupId = "io.swagger";
@@ -45,13 +43,18 @@ public class AsyncScalaClientCodegen extends DefaultCodegen implements CodegenCo
         apiPackage = "io.swagger.client.api";
         modelPackage = "io.swagger.client.model";
 
-        reservedWords = new HashSet<String>(
+        setReservedWordsLowerCase(
                 Arrays.asList(
-                        "abstract", "case", "catch", "class", "def", "do", "else", "extends",
-                        "false", "final", "finally", "for", "forSome", "if", "implicit",
-                        "import", "lazy", "match", "new", "null", "object", "override", "package",
-                        "private", "protected", "return", "sealed", "super", "this", "throw",
-                        "trait", "try", "true", "type", "val", "var", "while", "with", "yield")
+                    // local variable names used in API methods (endpoints)
+                    "config", "path", "contentTypes", "contentType", "queryParams", "headerParams",
+                    "formParams", "postBody", "resFuture", "client", "reader",
+
+                    // scala reserved words
+                    "abstract", "case", "catch", "class", "def", "do", "else", "extends",
+                    "false", "final", "finally", "for", "forSome", "if", "implicit",
+                    "import", "lazy", "match", "new", "null", "object", "override", "package",
+                    "private", "protected", "return", "sealed", "super", "this", "throw",
+                    "trait", "try", "true", "type", "val", "var", "while", "with", "yield")
         );
 
         additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java
index aa776731e9c..0db384adf8b 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java
@@ -1,14 +1,19 @@
 package io.swagger.codegen.languages;
 
+import com.google.common.collect.ImmutableBiMap;
+import com.google.common.collect.ImmutableMap;
 import io.swagger.codegen.CodegenConfig;
 import io.swagger.codegen.CodegenConstants;
 import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.CodegenModel;
 import io.swagger.codegen.DefaultCodegen;
 import io.swagger.codegen.SupportingFile;
 import io.swagger.codegen.CodegenProperty;
 import io.swagger.codegen.CodegenModel;
+import io.swagger.codegen.CodegenOperation;
 import io.swagger.models.properties.*;
 import io.swagger.codegen.CliOption;
+import io.swagger.models.Model;
 
 import java.io.File;
 import java.util.Arrays;
@@ -16,121 +21,120 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.ArrayList;
+import java.util.Iterator;
 
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.WordUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig {
+public class CSharpClientCodegen extends AbstractCSharpCodegen {
+    @SuppressWarnings({"unused", "hiding"})
     private static final Logger LOGGER = LoggerFactory.getLogger(CSharpClientCodegen.class);
-    protected boolean optionalMethodArgumentFlag = true;
+    private static final String NET45 = "v4.5";
+    private static final String NET35 = "v3.5";
+    private static final String DATA_TYPE_WITH_ENUM_EXTENSION = "plainDatatypeWithEnum";
+
+    protected String packageGuid = "{" + java.util.UUID.randomUUID().toString().toUpperCase() + "}";
     protected String packageTitle = "Swagger Library";
     protected String packageProductName = "SwaggerLibrary";
     protected String packageDescription = "A library generated from a Swagger doc";
     protected String packageCompany = "Swagger";
     protected String packageCopyright = "No Copyright";
-    protected String packageName = "IO.Swagger";
-    protected String packageVersion = "1.0.0";
     protected String clientPackage = "IO.Swagger.Client";
-    protected String sourceFolder = "src" + File.separator + "main" + File.separator + "csharp";
+    protected String localVariablePrefix = "";
+
+    protected String targetFramework = NET45;
+    protected String targetFrameworkNuget = "net45";
+    protected boolean supportsAsync = Boolean.TRUE;
+
+
+    protected final Map<String, String> frameworks;
 
     public CSharpClientCodegen() {
         super();
-        outputFolder = "generated-code" + File.separator + "csharp";
         modelTemplateFiles.put("model.mustache", ".cs");
         apiTemplateFiles.put("api.mustache", ".cs");
-        embeddedTemplateDir = templateDir = "csharp";
-        apiPackage = "IO.Swagger.Api";
-        modelPackage = "IO.Swagger.Model";
 
-        reservedWords = new HashSet<String>(
-                Arrays.asList(
-                    // local variable names in API methods (endpoints)
-                    "path_", "pathParams", "queryParams", "headerParams", "formParams", "fileParams",
-                    "postBody", "http_header_accepts", "http_header_accept", "apiKeyValue", "response",
-                    "statusCode",
-                    // C# reserved words
-                    "abstract", "as", "base", "bool", "break", "byte", "case", "catch", "char", "checked",
-                    "class", "const", "continue", "decimal", "default", "delegate", "do", "double", "else",
-                    "enum", "event", "explicit", "extern", "false", "finally", "fixed", "float", "for",
-                    "foreach", "goto", "if", "implicit", "in", "int", "interface", "internal", "is", "lock",
-                    "long", "namespace", "new", "null", "object", "operator", "out", "override", "params",
-                    "private", "protected", "public", "readonly", "ref", "return", "sbyte", "sealed",
-                    "short", "sizeof", "stackalloc", "static", "string", "struct", "switch", "this", "throw",
-                    "true", "try", "typeof", "uint", "ulong", "unchecked", "unsafe", "ushort", "using",
-                    "virtual", "void", "volatile", "while")
-        );
+        modelTestTemplateFiles.put("model_test.mustache", ".cs");
+        apiTestTemplateFiles.put("api_test.mustache", ".cs");
 
-
-        languageSpecificPrimitives = new HashSet<String>(
-                Arrays.asList(
-                        "String",
-                        "string",
-                        "bool?",
-                        "double?",
-                        "int?",
-                        "long?",
-                        "float?",
-                        "byte[]",
-                        "List",
-                        "Dictionary",
-                        "DateTime?",
-                        "String",
-                        "Boolean",
-                        "Double",
-                        "Integer",
-                        "Long",
-                        "Float",
-                        "Stream", // not really a primitive, we include it to avoid model import
-                        "Object")
-        );
-        instantiationTypes.put("array", "List");
-        instantiationTypes.put("map", "Dictionary");
-
-        typeMapping = new HashMap<String, String>();
-        typeMapping.put("string", "string");
-        typeMapping.put("boolean", "bool?");
-        typeMapping.put("integer", "int?");
-        typeMapping.put("float", "float?");
-        typeMapping.put("long", "long?");
-        typeMapping.put("double", "double?");
-        typeMapping.put("number", "double?");
-        typeMapping.put("datetime", "DateTime?");
-        typeMapping.put("date", "DateTime?");
-        typeMapping.put("file", "Stream");
-        typeMapping.put("array", "List");
-        typeMapping.put("list", "List");
-        typeMapping.put("map", "Dictionary");
-        typeMapping.put("object", "Object");
+        // C# client default
+        setSourceFolder("src" + File.separator + "main" + File.separator + "csharp");
 
         cliOptions.clear();
-        cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "C# package name (convention: Camel.Case).")
-                .defaultValue("IO.Swagger"));
-        cliOptions.add(new CliOption(CodegenConstants.PACKAGE_VERSION, "C# package version.").defaultValue("1.0.0"));
-        cliOptions.add(CliOption.newBoolean(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG,
-                CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG_DESC).defaultValue(Boolean.TRUE.toString()));
-        cliOptions.add(CliOption.newBoolean(CodegenConstants.OPTIONAL_METHOD_ARGUMENT, "C# Optional method argument, " +
-                "e.g. void square(int x=10) (.net 4.0+ only)."));
+
+        // CLI options
+        addOption(CodegenConstants.PACKAGE_NAME,
+                "C# package name (convention: Title.Case).",
+                this.packageName);
+
+        addOption(CodegenConstants.PACKAGE_VERSION,
+                "C# package version.",
+                this.packageVersion);
+
+        addOption(CodegenConstants.SOURCE_FOLDER,
+                CodegenConstants.SOURCE_FOLDER_DESC,
+                sourceFolder);
+
+        addOption(CodegenConstants.OPTIONAL_PROJECT_GUID,
+                CodegenConstants.OPTIONAL_PROJECT_GUID_DESC,
+                null);
+
+        CliOption framework = new CliOption(
+                CodegenConstants.DOTNET_FRAMEWORK,
+                CodegenConstants.DOTNET_FRAMEWORK_DESC
+        );
+        frameworks = new ImmutableMap.Builder<String, String>()
+                .put(NET35, ".NET Framework 3.5 compatible")
+                .put(NET45, ".NET Framework 4.5+ compatible")
+                .build();
+        framework.defaultValue(this.targetFramework);
+        framework.setEnum(frameworks);
+        cliOptions.add(framework);
+
+        // CLI Switches
+        addSwitch(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG,
+                CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG_DESC,
+                this.sortParamsByRequiredFlag);
+
+        addSwitch(CodegenConstants.USE_DATETIME_OFFSET,
+                CodegenConstants.USE_DATETIME_OFFSET_DESC,
+                this.useDateTimeOffsetFlag);
+
+        addSwitch(CodegenConstants.USE_COLLECTION,
+                CodegenConstants.USE_COLLECTION_DESC,
+                this.useCollection);
+
+        addSwitch(CodegenConstants.RETURN_ICOLLECTION,
+                CodegenConstants.RETURN_ICOLLECTION_DESC,
+                this.returnICollection);
+
+        addSwitch(CodegenConstants.OPTIONAL_METHOD_ARGUMENT,
+                "C# Optional method argument, e.g. void square(int x=10) (.net 4.0+ only).",
+                this.optionalMethodArgumentFlag);
+
+        addSwitch(CodegenConstants.OPTIONAL_ASSEMBLY_INFO,
+                CodegenConstants.OPTIONAL_ASSEMBLY_INFO_DESC,
+                this.optionalAssemblyInfoFlag);
+
+        addSwitch(CodegenConstants.OPTIONAL_PROJECT_FILE,
+                CodegenConstants.OPTIONAL_PROJECT_FILE_DESC,
+                this.optionalProjectFileFlag);
+
+        addSwitch(CodegenConstants.OPTIONAL_EMIT_DEFAULT_VALUES,
+                CodegenConstants.OPTIONAL_EMIT_DEFAULT_VALUES_DESC,
+                this.optionalEmitDefaultValue);
     }
 
     @Override
     public void processOpts() {
         super.processOpts();
 
-        if (additionalProperties.containsKey(CodegenConstants.PACKAGE_VERSION)) {
-            setPackageVersion((String) additionalProperties.get(CodegenConstants.PACKAGE_VERSION));
-        } else {
-            additionalProperties.put(CodegenConstants.PACKAGE_VERSION, packageVersion);
-        }
-
-        if (additionalProperties.containsKey(CodegenConstants.PACKAGE_NAME)) {
-            setPackageName((String) additionalProperties.get(CodegenConstants.PACKAGE_NAME));
-            apiPackage = packageName + ".Api";
-            modelPackage = packageName + ".Model";
-            clientPackage = packageName + ".Client";
-        } else {
-            additionalProperties.put(CodegenConstants.PACKAGE_NAME, packageName);
-        }
+        apiPackage = packageName + ".Api";
+        modelPackage = packageName + ".Model";
+        clientPackage = packageName + ".Client";
 
         additionalProperties.put("clientPackage", clientPackage);
 
@@ -140,27 +144,109 @@ public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig
         additionalProperties.put("packageDescription", packageDescription);
         additionalProperties.put("packageCompany", packageCompany);
         additionalProperties.put("packageCopyright", packageCopyright);
+        additionalProperties.put("emitDefaultValue", optionalEmitDefaultValue);
+
+        if (additionalProperties.containsKey(CodegenConstants.DOTNET_FRAMEWORK)) {
+            setTargetFramework((String) additionalProperties.get(CodegenConstants.DOTNET_FRAMEWORK));
+        }
+
+        if (NET35.equals(this.targetFramework)) {
+            setTargetFrameworkNuget("net35");
+            setSupportsAsync(Boolean.FALSE);
+            if(additionalProperties.containsKey("supportsAsync")){
+                additionalProperties.remove("supportsAsync");
+            }
+        } else {
+            setTargetFrameworkNuget("net45");
+            setSupportsAsync(Boolean.TRUE);
+            additionalProperties.put("supportsAsync", this.supportsAsync);
+        }
+
+        additionalProperties.put("targetFrameworkNuget", this.targetFrameworkNuget);
+
+        if (additionalProperties.containsKey(CodegenConstants.OPTIONAL_PROJECT_FILE)) {
+            setOptionalProjectFileFlag(Boolean.valueOf(
+                    additionalProperties.get(CodegenConstants.OPTIONAL_PROJECT_FILE).toString()));
+        }
+
+        if (additionalProperties.containsKey(CodegenConstants.OPTIONAL_PROJECT_GUID)) {
+            setPackageGuid((String) additionalProperties.get(CodegenConstants.OPTIONAL_PROJECT_GUID));
+        }
+        additionalProperties.put("packageGuid", packageGuid);
 
         if (additionalProperties.containsKey(CodegenConstants.OPTIONAL_METHOD_ARGUMENT)) {
             setOptionalMethodArgumentFlag(Boolean.valueOf(additionalProperties
                     .get(CodegenConstants.OPTIONAL_METHOD_ARGUMENT).toString()));
         }
         additionalProperties.put("optionalMethodArgument", optionalMethodArgumentFlag);
-        
-        supportingFiles.add(new SupportingFile("Configuration.mustache",
-                sourceFolder + File.separator + clientPackage.replace(".", java.io.File.separator), "Configuration.cs"));
-        supportingFiles.add(new SupportingFile("ApiClient.mustache",
-                sourceFolder + File.separator + clientPackage.replace(".", java.io.File.separator), "ApiClient.cs"));
-        supportingFiles.add(new SupportingFile("ApiException.mustache",
-                sourceFolder + File.separator + clientPackage.replace(".", java.io.File.separator), "ApiException.cs"));
-        supportingFiles.add(new SupportingFile("ApiResponse.mustache",
-                sourceFolder + File.separator + clientPackage.replace(".", java.io.File.separator), "ApiResponse.cs"));
-        supportingFiles.add(new SupportingFile("Newtonsoft.Json.dll", "bin", "Newtonsoft.Json.dll"));
-        supportingFiles.add(new SupportingFile("RestSharp.dll", "bin", "RestSharp.dll"));
-        supportingFiles.add(new SupportingFile("compile.mustache", "", "compile.bat"));
-        supportingFiles.add(new SupportingFile("README.md", "", "README.md"));
-        supportingFiles.add(new SupportingFile("AssemblyInfo.mustache", "src" + File.separator + "Properties", "AssemblyInfo.cs"));
 
+        if (additionalProperties.containsKey(CodegenConstants.OPTIONAL_ASSEMBLY_INFO)) {
+            setOptionalAssemblyInfoFlag(Boolean.valueOf(additionalProperties
+                    .get(CodegenConstants.OPTIONAL_ASSEMBLY_INFO).toString()));
+        }
+
+        String packageFolder = sourceFolder + File.separator + packageName.replace(".", java.io.File.separator);
+        String clientPackageDir = sourceFolder + File.separator + clientPackage.replace(".", java.io.File.separator);
+
+        //Compute the relative path to the bin directory where the external assemblies live
+        //This is necessary to properly generate the project file
+        int packageDepth = packageFolder.length() - packageFolder.replace(java.io.File.separator, "").length();
+        String binRelativePath = "..\\";
+        for (int i = 0; i < packageDepth; i = i + 1)
+            binRelativePath += "..\\";
+        binRelativePath += "vendor\\";
+        additionalProperties.put("binRelativePath", binRelativePath);
+
+        supportingFiles.add(new SupportingFile("Configuration.mustache",
+                clientPackageDir, "Configuration.cs"));
+        supportingFiles.add(new SupportingFile("ApiClient.mustache",
+                clientPackageDir, "ApiClient.cs"));
+        supportingFiles.add(new SupportingFile("ApiException.mustache",
+                clientPackageDir, "ApiException.cs"));
+        supportingFiles.add(new SupportingFile("ApiResponse.mustache",
+                clientPackageDir, "ApiResponse.cs"));
+
+        supportingFiles.add(new SupportingFile("compile.mustache", "", "compile.bat"));
+        supportingFiles.add(new SupportingFile("compile-mono.sh.mustache", "", "compile-mono.sh"));
+        supportingFiles.add(new SupportingFile("packages.config.mustache", "vendor" + java.io.File.separator, "packages.config"));
+        supportingFiles.add(new SupportingFile("README.md", "", "README.md"));
+        supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
+        supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
+
+
+        if (optionalAssemblyInfoFlag) {
+            supportingFiles.add(new SupportingFile("AssemblyInfo.mustache", packageFolder + File.separator + "Properties", "AssemblyInfo.cs"));
+        }
+        if (optionalProjectFileFlag) {
+            supportingFiles.add(new SupportingFile("Project.mustache", packageFolder, clientPackage + ".csproj"));
+        }
+    }
+
+    @Override
+    public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
+        super.postProcessOperations(objs);
+        if (objs != null) {
+            Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
+            if (operations != null) {
+                List<CodegenOperation> ops = (List<CodegenOperation>) operations.get("operation");
+                for (CodegenOperation operation : ops) {
+                    if (operation.returnType != null) {
+                        operation.returnContainer = operation.returnType;
+                        if (this.returnICollection && (
+                                operation.returnType.startsWith("List") ||
+                                        operation.returnType.startsWith("Collection"))) {
+                            // NOTE: ICollection works for both List<T> and Collection<T>
+                            int genericStart = operation.returnType.indexOf("<");
+                            if (genericStart > 0) {
+                                operation.returnType = "ICollection" + operation.returnType.substring(genericStart);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return objs;
     }
 
     @Override
@@ -178,132 +264,179 @@ public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig
         return "Generates a CSharp client library.";
     }
 
-    @Override
-    public String escapeReservedWord(String name) {
-        return "_" + name;
+    public void setOptionalAssemblyInfoFlag(boolean flag) {
+        this.optionalAssemblyInfoFlag = flag;
     }
 
     @Override
-    public String apiFileFolder() {
-        return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
-    }
-
-    @Override
-    public String modelFileFolder() {
-        return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
-    }
-
-    @Override
-    public String toVarName(String name) {
-        // sanitize name 
-        name = sanitizeName(name);
-
-        // if it's all uppper case, do nothing
-        if (name.matches("^[A-Z_]*$")) {
-            return name;
+    public CodegenModel fromModel(String name, Model model, Map<String, Model> allDefinitions) {
+        CodegenModel codegenModel = super.fromModel(name, model, allDefinitions);
+        if (allDefinitions != null && codegenModel != null && codegenModel.parent != null && codegenModel.hasEnums) {
+            final Model parentModel = allDefinitions.get(toModelName(codegenModel.parent));
+            final CodegenModel parentCodegenModel = super.fromModel(codegenModel.parent, parentModel);
+            codegenModel = this.reconcileInlineEnums(codegenModel, parentCodegenModel);
         }
 
-        // camelize the variable name
-        // pet_id => PetId
-        name = camelize(name);
+        return codegenModel;
+    }
 
-        // for reserved word or word starting with number, append _
-        if (reservedWords.contains(name) || name.matches("^\\d.*")) {
-            name = escapeReservedWord(name);
-        }
+    public void setOptionalProjectFileFlag(boolean flag) {
+        this.optionalProjectFileFlag = flag;
+    }
 
-        return name;
+    public void setPackageGuid(String packageGuid) {
+        this.packageGuid = packageGuid;
     }
 
     @Override
-    public String toParamName(String name) {
-        // replace - with _ e.g. created-at => created_at
-        name = name.replaceAll("-", "_");
+    public Map<String, Object> postProcessModels(Map<String, Object> objMap) {
+    	Map<String, Object> objs = super.postProcessModels(objMap);
+    	
+        List<Object> models = (List<Object>) objs.get("models");
+        for (Object _mo : models) {
+            Map<String, Object> mo = (Map<String, Object>) _mo;
+            CodegenModel cm = (CodegenModel) mo.get("model");
+            for (CodegenProperty var : cm.vars) {
+                Map<String, Object> allowableValues = var.allowableValues;
+                
+                // handle ArrayProperty
+                if (var.items != null) {
+                    allowableValues = var.items.allowableValues;
+                }
+                
+                if (allowableValues == null) {
+                    continue;
+                }
+                List<String> values = (List<String>) allowableValues.get("values");
+                if (values == null) {
+                    continue;
+                }
 
-        // if it's all uppper case, do nothing
-        if (name.matches("^[A-Z_]*$")) {
-            return name;
-        }
+                // put "enumVars" map into `allowableValues", including `name` and `value`
+                List<Map<String, String>> enumVars = new ArrayList<Map<String, String>>();
+                String commonPrefix = findCommonPrefixOfVars(values);
+                int truncateIdx = commonPrefix.length();
+                for (String value : values) {
+                    Map<String, String> enumVar = new HashMap<String, String>();
+                    String enumName;
+                    if (truncateIdx == 0) {
+                        enumName = value;
+                    } else {
+                        enumName = value.substring(truncateIdx);
+                        if ("".equals(enumName)) {
+                            enumName = value;
+                        }
+                    }
+                    enumVar.put("name", toEnumVarName(enumName));
+                    enumVar.put("jsonname", value);
+                    enumVar.put("value", value);
+                    enumVars.add(enumVar);
+                }
+                allowableValues.put("enumVars", enumVars);
+                // handle default value for enum, e.g. available => StatusEnum.AVAILABLE
 
-        // camelize(lower) the variable name
-        // pet_id => petId
-        name = camelize(name, true);
+                // HACK: strip ? from enum
+                if (var.datatypeWithEnum != null) {
+                    var.vendorExtensions.put(DATA_TYPE_WITH_ENUM_EXTENSION, var.datatypeWithEnum.substring(0, var.datatypeWithEnum.length() - 1));
+                }
+                
+                if (var.defaultValue != null) {
+                    String enumName = null;
+                    
+                    for (Map<String, String> enumVar : enumVars) {
+                    	
+                        if (var.defaultValue.replace("\"", "").equals(enumVar.get("value"))) {
+                            enumName = enumVar.get("name");
+                            break;
+                        }
+                    }
+                    if (enumName != null && var.vendorExtensions.containsKey(DATA_TYPE_WITH_ENUM_EXTENSION)) {
+                        var.defaultValue = var.vendorExtensions.get(DATA_TYPE_WITH_ENUM_EXTENSION) + "." + enumName;
+                    }
+                }
 
-        // for reserved word or word starting with number, append _
-        if (reservedWords.contains(name) || name.matches("^\\d.*")) {
-            name = escapeReservedWord(name);
-        }
-
-        return name;
-    }
-
-    @Override
-    public String toModelName(String name) {
-        // model name cannot use reserved keyword, e.g. return
-        if (reservedWords.contains(name)) {
-            throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
-        }
-
-        // camelize the model name
-        // phone_number => PhoneNumber
-        return camelize(name);
-    }
-
-    @Override
-    public String toModelFilename(String name) {
-        // should be the same as the model name
-        return toModelName(name);
-    }
-
-
-    @Override
-    public String getTypeDeclaration(Property p) {
-        if (p instanceof ArrayProperty) {
-            ArrayProperty ap = (ArrayProperty) p;
-            Property inner = ap.getItems();
-            return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">";
-        } else if (p instanceof MapProperty) {
-            MapProperty mp = (MapProperty) p;
-            Property inner = mp.getAdditionalProperties();
-
-            return getSwaggerType(p) + "<string, " + getTypeDeclaration(inner) + ">";
-        }
-        return super.getTypeDeclaration(p);
-    }
-
-    @Override
-    public String getSwaggerType(Property p) {
-        String swaggerType = super.getSwaggerType(p);
-        String type = null;
-        if (typeMapping.containsKey(swaggerType.toLowerCase())) {
-            type = typeMapping.get(swaggerType.toLowerCase());
-            if (languageSpecificPrimitives.contains(type)) {
-                return type;
             }
+        }
+
+        return objs;
+    }
+
+    public void setTargetFramework(String dotnetFramework) {
+        if(!frameworks.containsKey(dotnetFramework)){
+            LOGGER.warn("Invalid .NET framework version, defaulting to " + this.targetFramework);
         } else {
-            type = swaggerType;
+            this.targetFramework = dotnetFramework;
         }
-        return toModelName(type);
+        LOGGER.info("Generating code for .NET Framework " + this.targetFramework);
     }
 
-    @Override
-    public String toOperationId(String operationId) {
-        // throw exception if method name is empty
-        if (StringUtils.isEmpty(operationId)) {
-            throw new RuntimeException("Empty method name (operationId) not allowed");
+    private CodegenModel reconcileInlineEnums(CodegenModel codegenModel, CodegenModel parentCodegenModel) {
+        // This generator uses inline classes to define enums, which breaks when
+        // dealing with models that have subTypes. To clean this up, we will analyze
+        // the parent and child models, look for enums that match, and remove
+        // them from the child models and leave them in the parent.
+        // Because the child models extend the parents, the enums will be available via the parent.
+
+        // Only bother with reconciliation if the parent model has enums.
+        if (parentCodegenModel.hasEnums) {
+
+            // Get the properties for the parent and child models
+            final List<CodegenProperty> parentModelCodegenProperties = parentCodegenModel.vars;
+            List<CodegenProperty> codegenProperties = codegenModel.vars;
+
+            // Iterate over all of the parent model properties
+            boolean removedChildEnum = false;
+            for (CodegenProperty parentModelCodegenPropery : parentModelCodegenProperties) {
+                // Look for enums
+                if (parentModelCodegenPropery.isEnum) {
+                    // Now that we have found an enum in the parent class,
+                    // and search the child class for the same enum.
+                    Iterator<CodegenProperty> iterator = codegenProperties.iterator();
+                    while (iterator.hasNext()) {
+                        CodegenProperty codegenProperty = iterator.next();
+                        if (codegenProperty.isEnum && codegenProperty.equals(parentModelCodegenPropery)) {
+                            // We found an enum in the child class that is
+                            // a duplicate of the one in the parent, so remove it.
+                            iterator.remove();
+                            removedChildEnum = true;
+                        }
+                    }
+                }
+            }
+            
+            if(removedChildEnum) {
+                // If we removed an entry from this model's vars, we need to ensure hasMore is updated
+                int count = 0, numVars = codegenProperties.size();
+                for(CodegenProperty codegenProperty : codegenProperties) {
+                    count += 1;
+                    codegenProperty.hasMore = (count < numVars) ? true : null;
+                }
+                codegenModel.vars = codegenProperties;
+            }
         }
 
-        // method name cannot use reserved keyword, e.g. return
-        if (reservedWords.contains(operationId)) {
-            throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+        return codegenModel;
+    }
+
+    private String findCommonPrefixOfVars(List<String> vars) {
+        String prefix = StringUtils.getCommonPrefix(vars.toArray(new String[vars.size()]));
+        // exclude trailing characters that should be part of a valid variable
+        // e.g. ["status-on", "status-off"] => "status-" (not "status-o")
+        return prefix.replaceAll("[a-zA-Z0-9]+\\z", "");
+    }
+
+    private String toEnumVarName(String value) {
+        String var = value.replaceAll("_", " ");
+        var = WordUtils.capitalizeFully(var);
+        var = var.replaceAll("\\W+", "");
+
+        if (var.matches("\\d.*")) {
+            return "_" + var;
+        } else {
+            return var;
         }
-
-        return camelize(sanitizeName(operationId));
     }
 
-    public void setOptionalMethodArgumentFlag(boolean flag) {
-        this.optionalMethodArgumentFlag = flag;
-    }
 
     public void setPackageName(String packageName) {
         this.packageName = packageName;
@@ -313,68 +446,11 @@ public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig
         this.packageVersion = packageVersion;
     }
 
-    @Override
-    public Map<String, Object> postProcessModels(Map<String, Object> objs) {
-        List<Object> models = (List<Object>) objs.get("models");
-        for (Object _mo : models) {
-            Map<String, Object> mo = (Map<String, Object>) _mo;
-            CodegenModel cm = (CodegenModel) mo.get("model");
-            for (CodegenProperty var : cm.vars) {
-               // check to see if model name is same as the property name
-               // which will result in compilation error
-               // if found, prepend with _ to workaround the limitation
-               if (var.name.equals(cm.name)) {
-                   var.name = "_" + var.name; 
-               }
-            }
-        }
-        return objs;
+    public void setTargetFrameworkNuget(String targetFrameworkNuget) {
+        this.targetFrameworkNuget = targetFrameworkNuget;
     }
 
-    /**
-     * Return the default value of the property
-     *
-     * @param p Swagger property object
-     * @return string presentation of the default value of the property
-     */
-    @Override
-    public String toDefaultValue(Property p) {
-        if (p instanceof StringProperty) {
-            StringProperty dp = (StringProperty) p;
-            if (dp.getDefault() != null) {
-                return "\"" + dp.getDefault().toString() + "\"";
-            }
-        } else if (p instanceof BooleanProperty) {
-            BooleanProperty dp = (BooleanProperty) p;
-            if (dp.getDefault() != null) {
-                return dp.getDefault().toString();
-            }
-        } else if (p instanceof DateProperty) {
-            // TODO
-        } else if (p instanceof DateTimeProperty) {
-            // TODO
-        } else if (p instanceof DoubleProperty) {
-            DoubleProperty dp = (DoubleProperty) p;
-            if (dp.getDefault() != null) {
-                return dp.getDefault().toString();
-            }
-        } else if (p instanceof FloatProperty) {
-            FloatProperty dp = (FloatProperty) p;
-            if (dp.getDefault() != null) {
-                return dp.getDefault().toString();
-            }
-        } else if (p instanceof IntegerProperty) {
-            IntegerProperty dp = (IntegerProperty) p;
-            if (dp.getDefault() != null) {
-                return dp.getDefault().toString();
-            }
-        } else if (p instanceof LongProperty) {
-            LongProperty dp = (LongProperty) p;
-            if (dp.getDefault() != null) {
-                return dp.getDefault().toString();
-            }
-        }
-
-        return null;
+    public void setSupportsAsync(Boolean supportsAsync){
+        this.supportsAsync = supportsAsync;
     }
 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ClojureClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ClojureClientCodegen.java
index d4a8ada06b9..2c60a30754b 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ClojureClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ClojureClientCodegen.java
@@ -143,6 +143,13 @@ public class ClojureClientCodegen extends DefaultCodegen implements CodegenConfi
         final String baseNamespaceFolder = sourceFolder + File.separator + namespaceToFolder(baseNamespace);
         supportingFiles.add(new SupportingFile("project.mustache", "", "project.clj"));
         supportingFiles.add(new SupportingFile("core.mustache", baseNamespaceFolder, "core.clj"));
+        supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
+        supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
+    }
+
+    @Override
+    public String sanitizeTag(String tag) {
+        return tag.replaceAll("[^a-zA-Z_]+", "_");
     }
 
     @Override
@@ -160,6 +167,11 @@ public class ClojureClientCodegen extends DefaultCodegen implements CodegenConfi
         return dashize(sanitizeName(operationId));
     }
 
+    @Override
+    public String toApiFilename(String name) {
+        return underscore(toApiName(name));
+    }
+
     @Override
     public String toApiName(String name) {
         return dashize(name);
@@ -172,7 +184,7 @@ public class ClojureClientCodegen extends DefaultCodegen implements CodegenConfi
 
     @Override
     public String toVarName(String name) {
-        name = name.replaceAll("[^a-zA-Z0-9_-]+", "");
+        name = name.replaceAll("[^a-zA-Z0-9_-]+", ""); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
         name = dashize(name);
         return name;
     }
@@ -196,6 +208,7 @@ public class ClojureClientCodegen extends DefaultCodegen implements CodegenConfi
         return operations;
     }
 
+    @SuppressWarnings("static-method")
     protected String namespaceToFolder(String ns) {
         return ns.replace(".", File.separator).replace("-", "_");
     }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java
index 3ad108e2e61..c08ae3456b1 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java
@@ -31,12 +31,12 @@ public class CsharpDotNet2ClientCodegen extends DefaultCodegen implements Codege
         apiPackage = "IO.Swagger.Api";
         modelPackage = "IO.Swagger.Model";
 
-        reservedWords = new HashSet<String>(
+        setReservedWordsLowerCase(
                 Arrays.asList(
                     // local variable names in API methods (endpoints)
                     "path", "queryParams", "headerParams", "formParams", "fileParams", "postBody",
                     "authSettings", "response", "StatusCode",
-                    // C# reserved word 
+                    // C# reserved word
                     "abstract", "as", "base", "bool", "break", "byte", "case", "catch", "char", "checked", "class", "const", "continue", "decimal", "default", "delegate", "do", "double", "else", "enum", "event", "explicit", "extern", "false", "finally", "fixed", "float", "for", "foreach", "goto", "if", "implicit", "in", "int", "interface", "internal", "is", "lock", "long", "namespace", "new", "null", "object", "operator", "out", "override", "params", "private", "protected", "public", "readonly", "ref", "return", "sbyte", "sealed", "short", "sizeof", "stackalloc", "static", "string", "struct", "switch", "this", "throw", "true", "try", "typeof", "uint", "ulong", "unchecked", "unsafe", "ushort", "using", "virtual", "void", "volatile", "while")
         );
 
@@ -114,7 +114,7 @@ public class CsharpDotNet2ClientCodegen extends DefaultCodegen implements Codege
         } else {
             additionalProperties.put(CLIENT_PACKAGE, clientPackage);
         }
-        
+
         supportingFiles.add(new SupportingFile("Configuration.mustache",
                 sourceFolder + File.separator + clientPackage.replace(".", java.io.File.separator), "Configuration.cs"));
         supportingFiles.add(new SupportingFile("ApiClient.mustache",
@@ -172,7 +172,7 @@ public class CsharpDotNet2ClientCodegen extends DefaultCodegen implements Codege
     @Override
     public String toVarName(String name) {
         // replace - with _ e.g. created-at => created_at
-        name = name.replaceAll("-", "_");
+        name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
         // if it's all uppper case, do nothing
         if (name.matches("^[A-Z_]*$")) {
@@ -184,7 +184,7 @@ public class CsharpDotNet2ClientCodegen extends DefaultCodegen implements Codege
         name = camelize(name);
 
         // for reserved word or word starting with number, append _
-        if (reservedWords.contains(name) || name.matches("^\\d.*")) {
+        if (isReservedWord(name) || name.matches("^\\d.*")) {
             name = escapeReservedWord(name);
         }
 
@@ -206,7 +206,7 @@ public class CsharpDotNet2ClientCodegen extends DefaultCodegen implements Codege
         name = camelize(name, true);
 
         // for reserved word or word starting with number, append _
-        if (reservedWords.contains(name) || name.matches("^\\d.*")) {
+        if (isReservedWord(name) || name.matches("^\\d.*")) {
             name = escapeReservedWord(name);
         }
 
@@ -215,8 +215,10 @@ public class CsharpDotNet2ClientCodegen extends DefaultCodegen implements Codege
 
     @Override
     public String toModelName(String name) {
+        name = sanitizeName(name);
+
         // model name cannot use reserved keyword, e.g. return
-        if (reservedWords.contains(name)) {
+        if (isReservedWord(name)) {
             throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
         }
 
@@ -265,7 +267,7 @@ public class CsharpDotNet2ClientCodegen extends DefaultCodegen implements Codege
     @Override
     public String toOperationId(String operationId) {
         // method name cannot use reserved keyword, e.g. return
-        if (reservedWords.contains(operationId)) {
+        if (isReservedWord(operationId)) {
             throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
         }
 
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/DartClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/DartClientCodegen.java
index 7d11f2a8183..cb2547b67a0 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/DartClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/DartClientCodegen.java
@@ -35,7 +35,7 @@ public class DartClientCodegen extends DefaultCodegen implements CodegenConfig {
         apiPackage = "lib.api";
         modelPackage = "lib.model";
 
-        reservedWords = new HashSet<String>(
+        setReservedWordsLowerCase(
                 Arrays.asList(
                         "abstract", "as", "assert", "async", "async*", "await",
                         "break", "case", "catch", "class", "const", "continue",
@@ -76,6 +76,9 @@ public class DartClientCodegen extends DefaultCodegen implements CodegenConfig {
         typeMapping.put("Date", "DateTime");
         typeMapping.put("date", "DateTime");
         typeMapping.put("File", "MultipartFile");
+        //TODO binary should be mapped to byte array
+        // mapped to String as a workaround
+        typeMapping.put("binary", "String");
 
         cliOptions.add(new CliOption(BROWSER_CLIENT, "Is the client browser based"));
         cliOptions.add(new CliOption(PUB_NAME, "Name in generated pubspec"));
@@ -147,6 +150,9 @@ public class DartClientCodegen extends DefaultCodegen implements CodegenConfig {
         supportingFiles.add(new SupportingFile("auth/http_basic_auth.mustache", authFolder, "http_basic_auth.dart"));
         supportingFiles.add(new SupportingFile("auth/api_key_auth.mustache", authFolder, "api_key_auth.dart"));
         supportingFiles.add(new SupportingFile("auth/oauth.mustache", authFolder, "oauth.dart"));
+        supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
+        supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
+
     }
 
 
@@ -168,7 +174,7 @@ public class DartClientCodegen extends DefaultCodegen implements CodegenConfig {
     @Override
     public String toVarName(String name) {
         // replace - with _ e.g. created-at => created_at
-        name = name.replaceAll("-", "_");
+        name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
         // if it's all uppper case, do nothing
         if (name.matches("^[A-Z_]*$")) {
@@ -180,7 +186,7 @@ public class DartClientCodegen extends DefaultCodegen implements CodegenConfig {
         name = camelize(name, true);
 
         // for reserved word or word starting with number, append _
-        if (reservedWords.contains(name) || name.matches("^\\d.*")) {
+        if (isReservedWord(name) || name.matches("^\\d.*")) {
             name = escapeReservedWord(name);
         }
 
@@ -196,7 +202,7 @@ public class DartClientCodegen extends DefaultCodegen implements CodegenConfig {
     @Override
     public String toModelName(String name) {
         // model name cannot use reserved keyword, e.g. return
-        if (reservedWords.contains(name)) {
+        if (isReservedWord(name)) {
             throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
         }
 
@@ -218,15 +224,10 @@ public class DartClientCodegen extends DefaultCodegen implements CodegenConfig {
     @Override
     public String toDefaultValue(Property p) {
         if (p instanceof MapProperty) {
-            MapProperty ap = (MapProperty) p;
-            String inner = getSwaggerType(ap.getAdditionalProperties());
             return "{}";
         } else if (p instanceof ArrayProperty) {
-            ArrayProperty ap = (ArrayProperty) p;
-            String inner = getSwaggerType(ap.getItems());
             return "[]";
         }
-
         return super.toDefaultValue(p);
     }
 
@@ -263,7 +264,7 @@ public class DartClientCodegen extends DefaultCodegen implements CodegenConfig {
     @Override
     public String toOperationId(String operationId) {
         // method name cannot use reserved keyword, e.g. return
-        if (reservedWords.contains(operationId)) {
+        if (isReservedWord(operationId)) {
             throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
         }
 
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlashClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlashClientCodegen.java
index dac3d23b22a..b5699a93a34 100755
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlashClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlashClientCodegen.java
@@ -29,7 +29,7 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig
     protected String packageVersion;
 
     protected String invokerPackage = "io.swagger";
-    protected String sourceFolder = "src/main/flex";
+    protected String sourceFolder = "flash";
 
     public FlashClientCodegen() {
         super();
@@ -63,12 +63,15 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig
         typeMapping.put("DateTime", "Date");
         typeMapping.put("object", "Object");
         typeMapping.put("file", "File");
+        //TODO binary should be mapped to byte array
+        // mapped to String as a workaround
+        typeMapping.put("binary", "String");
 
         importMapping = new HashMap<String, String>();
         importMapping.put("File", "flash.filesystem.File");
 
-        // from 
-        reservedWords = new HashSet<String>(Arrays.asList("add", "for", "lt", "tellTarget", "and",
+        // from
+        setReservedWordsLowerCase(Arrays.asList("add", "for", "lt", "tellTarget", "and",
                 "function", "ne", "this", "break", "ge", "new", "typeof", "continue", "gt", "not",
                 "var", "delete", "if", "on", "void", "do", "ifFrameLoaded", "onClipEvent", "while",
                 "else", "in", "or", "with", "eq", "le", "return"));
@@ -80,7 +83,7 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig
                 .defaultValue("1.0.0"));
         cliOptions.add(new CliOption(CodegenConstants.INVOKER_PACKAGE, CodegenConstants.INVOKER_PACKAGE_DESC));
         cliOptions.add(new CliOption(CodegenConstants.SOURCE_FOLDER, "source folder for generated " +
-                "code. e.g. src/main/flex"));
+                "code. e.g. flash"));
 
     }
 
@@ -121,8 +124,7 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig
         //modelPackage = invokerPackage + File.separatorChar + "client" + File.separatorChar + "model";
         //apiPackage = invokerPackage + File.separatorChar + "client" + File.separatorChar + "api";
 
-        final String invokerFolder = (sourceFolder + File.separator + invokerPackage + File.separator
-                + "swagger" + File.separator).replace(".", File.separator).replace('.', File.separatorChar);
+        final String invokerFolder = (sourceFolder + File.separator + "src/" + invokerPackage + File.separator).replace(".", File.separator).replace('.', File.separatorChar);
 
         supportingFiles.add(new SupportingFile("ApiInvoker.as", invokerFolder + "common", "ApiInvoker.as"));
         supportingFiles.add(new SupportingFile("ApiUrlHelper.as", invokerFolder + "common", "ApiUrlHelper.as"));
@@ -130,14 +132,15 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig
         supportingFiles.add(new SupportingFile("ListWrapper.as", invokerFolder + "common", "ListWrapper.as"));
         supportingFiles.add(new SupportingFile("SwaggerApi.as", invokerFolder + "common", "SwaggerApi.as"));
         supportingFiles.add(new SupportingFile("XMLWriter.as", invokerFolder + "common", "XMLWriter.as"));
-        supportingFiles.add(new SupportingFile("ApiError.as", invokerFolder + "exception", "ApiErrors.as"));
+        supportingFiles.add(new SupportingFile("ApiError.as", invokerFolder + "exception", "ApiError.as"));
         supportingFiles.add(new SupportingFile("ApiErrorCodes.as", invokerFolder + "exception", "ApiErrorCodes.as"));
         supportingFiles.add(new SupportingFile("ApiClientEvent.as", invokerFolder + "event", "ApiClientEvent.as"));
         supportingFiles.add(new SupportingFile("Response.as", invokerFolder + "event", "Response.as"));
         supportingFiles.add(new SupportingFile("build.properties", sourceFolder, "build.properties"));
         supportingFiles.add(new SupportingFile("build.xml", sourceFolder, "build.xml"));
-        supportingFiles.add(new SupportingFile("AirExecutorApp-app.xml", sourceFolder + File.separatorChar
-                + "bin", "AirExecutorApp-app.xml"));
+        supportingFiles.add(new SupportingFile("README.txt", sourceFolder, "README.txt"));
+        //supportingFiles.add(new SupportingFile("AirExecutorApp-app.xml", sourceFolder + File.separatorChar
+        //        + "bin", "AirExecutorApp-app.xml"));
         supportingFiles.add(new SupportingFile("ASAXB-0.1.1.swc", sourceFolder + File.separatorChar
                 + "lib", "ASAXB-0.1.1.swc"));
         supportingFiles.add(new SupportingFile("as3corelib.swc", sourceFolder + File.separatorChar
@@ -150,6 +153,8 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig
                 + File.separator + "lib" + File.separator + "ext", "flexunit-cilistener-4.1.0_RC2-28-3.5.0.12683.swc"));
         supportingFiles.add(new SupportingFile("flexunit-core-flex-4.0.0.2-sdk3.5.0.12683.swc", sourceFolder
                 + File.separator + "lib" + File.separator + "ext", "flexunit-core-flex-4.0.0.2-sdk3.5.0.12683.swc"));
+        supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
+        supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
     }
 
     private static String dropDots(String str) {
@@ -178,26 +183,19 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig
 
     @Override
     public String apiFileFolder() {
-        return (outputFolder + File.separatorChar + sourceFolder + File.separatorChar
+        return (outputFolder + File.separatorChar + sourceFolder + File.separatorChar + "src/"
                 + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
     }
 
     @Override
     public String modelFileFolder() {
-        return (outputFolder + File.separatorChar + sourceFolder + File.separatorChar
+        return (outputFolder + File.separatorChar + sourceFolder + File.separatorChar + "src/"
                 + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
     }
 
     @Override
     public String getTypeDeclaration(Property p) {
-        if (p instanceof ArrayProperty) {
-            ArrayProperty ap = (ArrayProperty) p;
-            Property inner = ap.getItems();
-            return getSwaggerType(p);
-        } else if (p instanceof MapProperty) {
-            MapProperty mp = (MapProperty) p;
-            Property inner = mp.getAdditionalProperties();
-
+        if (p instanceof ArrayProperty || p instanceof MapProperty) {
             return getSwaggerType(p);
         }
         return super.getTypeDeclaration(p);
@@ -253,22 +251,18 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig
             }
             return "0";
         } else if (p instanceof MapProperty) {
-            MapProperty ap = (MapProperty) p;
-            String inner = getSwaggerType(ap.getAdditionalProperties());
             return "new Dictionary()";
         } else if (p instanceof ArrayProperty) {
-            ArrayProperty ap = (ArrayProperty) p;
-            String inner = getSwaggerType(ap.getItems());
             return "new Array()";
         } else {
-            return "null";
+            return "NaN";
         }
     }
 
     @Override
     public String toVarName(String name) {
         // replace - with _ e.g. created-at => created_at
-        name = name.replaceAll("-", "_");
+        name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
         // if it's all uppper case, convert to lower case
         if (name.matches("^[A-Z_]*$")) {
@@ -280,7 +274,7 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig
         name = camelize(dropDots(name), true);
 
         // for reserved word or word starting with number, append _
-        if (reservedWords.contains(name) || name.matches("^\\d.*")) {
+        if (isReservedWord(name) || name.matches("^\\d.*")) {
             name = escapeReservedWord(name);
         }
 
@@ -295,9 +289,20 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig
 
     @Override
     public String toModelName(String name) {
+        if (!StringUtils.isEmpty(modelNamePrefix)) {
+            name = modelNamePrefix + "_" + name;
+        }
+
+        if (!StringUtils.isEmpty(modelNameSuffix)) {
+            name = name + "_" + modelNameSuffix;
+        }
+
+        name = sanitizeName(name);
+
         // model name cannot use reserved keyword, e.g. return
-        if (reservedWords.contains(name)) {
-            throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
+        if (isReservedWord(name)) {
+            LOGGER.warn(name + " (reserved word) cannot be used as model name. Renamed to " + camelize("model_" + name));
+            name = "model_" + name; // e.g. return => ModelReturn (after camelize)
         }
 
         // camelize the model name
@@ -307,20 +312,14 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig
 
     @Override
     public String toModelFilename(String name) {
-        // model name cannot use reserved keyword, e.g. return
-        if (reservedWords.contains(name)) {
-            throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
-        }
-
-        // underscore the model file name
-        // PhoneNumber => phone_number
-        return camelize(dropDots(name));
+        // leverage toModelName
+        return dropDots(toModelName(name));
     }
 
     @Override
     public String toApiFilename(String name) {
         // replace - with _ e.g. created-at => created_at
-        name = name.replaceAll("-", "_");
+        name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
         // e.g. PhoneNumberApi.rb => phone_number_api.rb
         return camelize(name) + "Api";
@@ -351,8 +350,9 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig
         }
 
         // method name cannot use reserved keyword, e.g. return
-        if (reservedWords.contains(operationId)) {
-            throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+        if (isReservedWord(operationId)) {
+            LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to " + underscore(sanitizeName("call_" + operationId)));
+            operationId = "call_" + operationId;
         }
 
         return underscore(operationId);
@@ -373,7 +373,4 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig
     public void setSourceFolder(String sourceFolder) {
         this.sourceFolder = sourceFolder;
     }
-
 }
-
-
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java
index 483e841d735..c795345bcea 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java
@@ -4,6 +4,8 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
+
+import config.ConfigParser;
 import io.swagger.codegen.*;
 import io.swagger.models.HttpMethod;
 import io.swagger.models.Operation;
@@ -14,7 +16,13 @@ import io.swagger.util.Yaml;
 import java.io.File;
 import java.util.*;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConfig {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(FlaskConnexionCodegen.class);
+
     public static final String CONTROLLER_PACKAGE = "controllerPackage";
     public static final String DEFAULT_CONTROLLER = "defaultController";
 
@@ -65,7 +73,7 @@ public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConf
         embeddedTemplateDir = templateDir = "flaskConnexion";
 
         // from https://docs.python.org/release/2.5.4/ref/keywords.html
-        reservedWords = new HashSet<String>(
+        setReservedWordsLowerCase(
                 Arrays.asList(
                         "and", "del", "from", "not", "while", "as", "elif", "global", "or", "with",
                         "assert", "else", "if", "pass", "yield", "break", "except", "import",
@@ -167,8 +175,8 @@ public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConf
      */
     @Override
     public String getHelp() {
-        return "Generates a python server library using the connexion project.  By default, " +
-                "it will also generate service classes--which you can disable with the `-Dnoservice` environment variable.";
+        return "Generates a Python server library using the Connexion project. By default, " +
+               "it will also generate service classes -- which you can disable with the `-Dnoservice` environment variable.";
     }
 
     @Override
@@ -249,7 +257,7 @@ public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConf
     }
 
     @SuppressWarnings("unchecked")
-    private List<Map<String, Object>> getOperations(Map<String, Object> objs) {
+    private static List<Map<String, Object>> getOperations(Map<String, Object> objs) {
         List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
         Map<String, Object> apiInfo = (Map<String, Object>) objs.get("apiInfo");
         List<Map<String, Object>> apis = (List<Map<String, Object>>) apiInfo.get("apis");
@@ -259,7 +267,7 @@ public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConf
         return result;
     }
 
-    private List<Map<String, Object>> sortOperationsByPath(List<CodegenOperation> ops) {
+    private static List<Map<String, Object>> sortOperationsByPath(List<CodegenOperation> ops) {
         Multimap<String, CodegenOperation> opsByPath = ArrayListMultimap.create();
 
         for (CodegenOperation op : ops) {
@@ -289,7 +297,7 @@ public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConf
             try {
                 objs.put("swagger-yaml", Yaml.mapper().writeValueAsString(swagger));
             } catch (JsonProcessingException e) {
-                e.printStackTrace();
+                LOGGER.error(e.getMessage(), e);
             }
         }
         for (Map<String, Object> operations : getOperations(objs)) {
@@ -304,7 +312,7 @@ public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConf
 
     @Override
     public String toOperationId(String operationId) {
-        operationId = super.toOperationId(operationId);
+        operationId = super.toOperationId(operationId); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
         // Use the part after the last dot, e.g.
         //     controllers.defaultController.addPet => addPet
         operationId = operationId.replaceAll(".*\\.", "");
@@ -312,4 +320,4 @@ public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConf
         //     addPet => add_pet
         return underscore(operationId);
     }
-}
\ No newline at end of file
+}
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java
new file mode 100644
index 00000000000..007b3a8f36b
--- /dev/null
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java
@@ -0,0 +1,336 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.*;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.Property;
+
+import java.io.File;
+import java.util.*;
+
+import org.apache.commons.lang.StringUtils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class GoClientCodegen extends DefaultCodegen implements CodegenConfig {
+    static Logger LOGGER = LoggerFactory.getLogger(GoClientCodegen.class);
+
+    protected String packageName = "swagger";
+    protected String packageVersion = "1.0.0";
+
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
+    }
+
+    public String getName() {
+        return "go";
+    }
+
+    public String getHelp() {
+        return "Generates a Go client library (beta).";
+    }
+
+    public GoClientCodegen() {
+        super();
+        outputFolder = "generated-code/go";
+        modelTemplateFiles.put("model.mustache", ".go");
+        apiTemplateFiles.put("api.mustache", ".go");
+        templateDir = "go";
+
+        setReservedWordsLowerCase(
+            Arrays.asList(
+                "break", "default", "func", "interface", "select",
+                "case", "defer", "go", "map", "struct",
+                "chan", "else", "goto", "package", "switch",
+                "const", "fallthrough", "if", "range", "type",
+                "continue", "for", "import", "return", "var", "error")
+                // Added "error" as it's used so frequently that it may as well be a keyword
+        );
+
+        defaultIncludes = new HashSet<String>(
+                Arrays.asList(
+                    "map",
+                    "array")
+                );
+
+        languageSpecificPrimitives = new HashSet<String>(
+            Arrays.asList(
+                "string",
+                "bool",
+                "uint",
+                "uint32",
+                "uint64",
+                "int",
+                "int32",
+                "int64",
+                "float32",
+                "float64",
+                "complex64",
+                "complex128",
+                "rune",
+                "byte")
+            );
+
+        instantiationTypes.clear();
+        /*instantiationTypes.put("array", "GoArray");
+        instantiationTypes.put("map", "GoMap");*/
+
+        typeMapping.clear();
+        typeMapping.put("integer", "int32");
+        typeMapping.put("long", "int64");
+        typeMapping.put("float", "float32");
+        typeMapping.put("double", "float64");
+        typeMapping.put("boolean", "bool");
+        typeMapping.put("string", "string");
+        typeMapping.put("Date", "time.Time");
+        typeMapping.put("DateTime", "time.Time");
+        typeMapping.put("password", "string");
+        typeMapping.put("File", "*os.File");
+        typeMapping.put("file", "*os.File");
+        // map binary to string as a workaround
+        // the correct solution is to use []byte
+        typeMapping.put("binary", "string");
+
+        importMapping = new HashMap<String, String>();
+        importMapping.put("time.Time", "time");
+        importMapping.put("*os.File", "os");
+
+        cliOptions.clear();
+        cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "Go package name (convention: lowercase).")
+                .defaultValue("swagger"));
+        cliOptions.add(new CliOption(CodegenConstants.PACKAGE_VERSION, "Go package version.")
+                .defaultValue("1.0.0"));
+
+    }
+
+    @Override
+    public void processOpts() {
+        //super.processOpts();
+
+        if (additionalProperties.containsKey(CodegenConstants.PACKAGE_NAME)) {
+            setPackageName((String) additionalProperties.get(CodegenConstants.PACKAGE_NAME));
+        }
+        else {
+            setPackageName("swagger");
+        }
+
+        if (additionalProperties.containsKey(CodegenConstants.PACKAGE_VERSION)) {
+            setPackageVersion((String) additionalProperties.get(CodegenConstants.PACKAGE_VERSION));
+        }
+        else {
+            setPackageVersion("1.0.0");
+        }
+
+        additionalProperties.put(CodegenConstants.PACKAGE_NAME, packageName);
+        additionalProperties.put(CodegenConstants.PACKAGE_VERSION, packageVersion);
+
+        modelPackage = packageName;
+        apiPackage = packageName;
+
+        supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
+        supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
+        supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
+    }
+
+    @Override
+    public String escapeReservedWord(String name)
+    {
+        // Can't start with an underscore, as our fields need to start with an
+        // UppercaseLetter so that Go treats them as public/visible.
+
+        // Options?
+        // - MyName
+        // - AName
+        // - TheName
+        // - XName
+        // - X_Name
+        // ... or maybe a suffix?
+        // - Name_ ... think this will work.
+
+        // FIXME: This should also really be a customizable option
+        return camelize(name) + '_';
+    }
+
+    @Override
+    public String apiFileFolder() {
+        return outputFolder + File.separator + packageName;
+    }
+
+    public String modelFileFolder() {
+        return outputFolder + File.separator + packageName;
+    }
+
+    @Override
+    public String toVarName(String name) {
+        // replace - with _ e.g. created-at => created_at
+        name = name.replaceAll("-", "_");
+
+        // if it's all uppper case, do nothing
+        if (name.matches("^[A-Z_]*$"))
+            return name;
+
+        // camelize (lower first character) the variable name
+        // pet_id => PetId
+        name = camelize(name);
+
+        // for reserved word or word starting with number, append _
+        if(isReservedWord(name) || name.matches("^\\d.*"))
+            name = escapeReservedWord(name);
+
+        return name;
+    }
+
+    @Override
+    public String toParamName(String name) {
+        // params should be lowerCamelCase. E.g. "person Person", instead of
+        // "Person Person".
+        //
+        // REVISIT: Actually, for idiomatic go, the param name should
+        // really should just be a letter, e.g. "p Person"), but we'll get
+        // around to that some other time... Maybe.
+        return camelize(toVarName(name), true);
+    }
+
+    @Override
+    public String toModelName(String name) {
+        if (!StringUtils.isEmpty(modelNamePrefix)) {
+            name = modelNamePrefix + "_" + name;
+        }
+
+        if (!StringUtils.isEmpty(modelNameSuffix)) {
+            name = name + "_" + modelNameSuffix;
+        }
+
+        name = sanitizeName(name);
+
+        // model name cannot use reserved keyword, e.g. return
+        if (isReservedWord(name)) {
+            LOGGER.warn(name + " (reserved word) cannot be used as model name. Renamed to " + camelize("model_" + name));
+            name = "model_" + name; // e.g. return => ModelReturn (after camelize)
+        }
+
+        // camelize the model name
+        // phone_number => PhoneNumber
+        return camelize(name);
+    }
+
+    @Override
+    public String toModelFilename(String name) {
+        // should be the same as the model name
+        return toModelName(name);
+    }
+
+    @Override
+    public String getTypeDeclaration(Property p) {
+        if(p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            Property inner = ap.getItems();
+            return "[]" + getTypeDeclaration(inner);
+        }
+        else if (p instanceof MapProperty) {
+            MapProperty mp = (MapProperty) p;
+            Property inner = mp.getAdditionalProperties();
+
+            return getSwaggerType(p) + "[string]" + getTypeDeclaration(inner);
+        }
+        //return super.getTypeDeclaration(p);
+
+        // Not using the supertype invocation, because we want to UpperCamelize
+        // the type.
+        String swaggerType = getSwaggerType(p);
+        if (typeMapping.containsKey(swaggerType)) {
+            return typeMapping.get(swaggerType);
+        }
+
+        if(typeMapping.containsValue(swaggerType)) {
+            return swaggerType;
+        }
+
+        if(languageSpecificPrimitives.contains(swaggerType)) {
+            return swaggerType;
+        }
+
+        return camelize(swaggerType, false);
+    }
+
+    @Override
+    public String getSwaggerType(Property p) {
+        String swaggerType = super.getSwaggerType(p);
+        String type = null;
+        if(typeMapping.containsKey(swaggerType)) {
+            type = typeMapping.get(swaggerType);
+            if(languageSpecificPrimitives.contains(type))
+                return (type);
+        }
+        else
+            type = swaggerType;
+        return type;
+    }
+
+    @Override
+    public String toOperationId(String operationId) {
+        // method name cannot use reserved keyword, e.g. return
+        if (isReservedWord(operationId)) {
+            LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to " + camelize(sanitizeName("call_" + operationId)));
+            operationId = "call_" + operationId;
+        }
+
+        return camelize(operationId);
+    }
+
+    @Override
+    public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
+        @SuppressWarnings("unchecked")
+        Map<String, Object> objectMap = (Map<String, Object>) objs.get("operations");
+        @SuppressWarnings("unchecked")
+        List<CodegenOperation> operations = (List<CodegenOperation>) objectMap.get("operation");
+        for (CodegenOperation operation : operations) {
+            // http method verb conversion (e.g. PUT => Put)
+            operation.httpMethod = camelize(operation.httpMethod.toLowerCase());
+        }
+
+        // remove model imports to avoid error
+        List<Map<String, String>> imports = (List<Map<String, String>>) objs.get("imports");
+        if (imports == null)
+            return objs;
+
+        Iterator<Map<String, String>> iterator = imports.iterator();
+        while (iterator.hasNext()) {
+            String _import = iterator.next().get("import");
+            if (_import.startsWith(apiPackage()))
+                iterator.remove();
+        }
+
+        return objs;
+    }
+
+    @Override
+    public Map<String, Object> postProcessModels(Map<String, Object> objs) {
+        // remove model imports to avoid error
+        List<Map<String, String>> imports = (List<Map<String, String>>) objs.get("imports");
+        final String prefix = modelPackage();
+        Iterator<Map<String, String>> iterator = imports.iterator();
+        while (iterator.hasNext()) {
+            String _import = iterator.next().get("import");
+            if (_import.startsWith(prefix))
+                iterator.remove();
+        }
+        return objs;
+    }
+
+    @Override
+    protected boolean needToImport(String type) {
+        return !defaultIncludes.contains(type)
+            && !languageSpecificPrimitives.contains(type);
+    }
+
+    public void setPackageName(String packageName) {
+        this.packageName = packageName;
+    }
+
+    public void setPackageVersion(String packageVersion) {
+        this.packageVersion = packageVersion;
+    }
+
+}
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/HaskellServantCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/HaskellServantCodegen.java
new file mode 100644
index 00000000000..23f431d9a93
--- /dev/null
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/HaskellServantCodegen.java
@@ -0,0 +1,345 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.*;
+import io.swagger.models.properties.*;
+import io.swagger.models.Model;
+import io.swagger.models.Operation;
+import io.swagger.models.Swagger;
+
+import java.util.*;
+import java.io.File;
+
+public class HaskellServantCodegen extends DefaultCodegen implements CodegenConfig {
+
+  // source folder where to write the files
+  protected String sourceFolder = "src";
+  protected String apiVersion = "0.0.1";
+
+  /**
+   * Configures the type of generator.
+   *
+   * @return  the CodegenType for this generator
+   * @see     io.swagger.codegen.CodegenType
+   */
+  public CodegenType getTag() {
+    return CodegenType.SERVER;
+  }
+
+  /**
+   * Configures a friendly name for the generator.  This will be used by the generator
+   * to select the library with the -l flag.
+   *
+   * @return the friendly name for the generator
+   */
+  public String getName() {
+    return "haskell-servant";
+  }
+
+  /**
+   * Returns human-friendly help for the generator.  Provide the consumer with help
+   * tips, parameters here
+   *
+   * @return A string value for the help message
+   */
+  public String getHelp() {
+    return "Generates a HaskellServantCodegen library.";
+  }
+
+  public HaskellServantCodegen() {
+    super();
+
+    // set the output folder here
+    outputFolder = "generated-code/HaskellServantCodegen";
+
+    /**
+     * Models.  You can write model files using the modelTemplateFiles map.
+     * if you want to create one template for file, you can do so here.
+     * for multiple files for model, just put another entry in the `modelTemplateFiles` with
+     * a different extension
+     */
+    modelTemplateFiles.put(
+      "model.mustache", // the template to use
+      ".hs");       // the extension for each file to write
+
+    /**
+     * Api classes.  You can write classes for each Api file with the apiTemplateFiles map.
+     * as with models, add multiple entries with different extensions for multiple files per
+     * class
+     */
+    apiTemplateFiles.put(
+      "api.mustache",   // the template to use
+      ".hs");       // the extension for each file to write
+
+    /**
+     * Template Location.  This is the location which templates will be read from.  The generator
+     * will use the resource stream to attempt to read the templates.
+     */
+    embeddedTemplateDir = templateDir = "haskell-servant";
+
+    /**
+     * Api Package.  Optional, if needed, this can be used in templates
+     */
+    apiPackage = "Api";
+
+    /**
+     * Model Package.  Optional, if needed, this can be used in templates
+     */
+    modelPackage = "Model";
+
+    /**
+     * Reserved words.  Override this with reserved words specific to your language
+     */
+    // from https://wiki.haskell.org/Keywords
+    setReservedWordsLowerCase(
+        Arrays.asList(
+            "as", "case", "of",
+            "class", "data", // "data family", "data instance",
+            "default", "deriving", // "deriving instance",
+            "do",
+            "forall", "foreign", "hiding",
+            "id",
+            "if", "then", "else",
+            "import", "infix", "infixl", "infixr",
+            "instance", "let", "in",
+            "mdo", "module", "newtype",
+            "proc", "qualified", "rec",
+            "type", // "type family", "type instance",
+            "where"
+        )
+    );
+
+    /**
+     * Additional Properties.  These values can be passed to the templates and
+     * are available in models, apis, and supporting files
+     */
+    additionalProperties.put("apiVersion", apiVersion);
+
+    /**
+     * Supporting Files.  You can write single files for the generator with the
+     * entire object tree available.  If the input file has a suffix of `.mustache
+     * it will be processed by the template engine.  Otherwise, it will be copied
+     */
+    supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
+    supportingFiles.add(new SupportingFile("stack.mustache", "", "stack.yaml"));
+    supportingFiles.add(new SupportingFile("haskell-servant-codegen.mustache", "", "haskell-servant-codegen.cabal"));
+    supportingFiles.add(new SupportingFile("Setup.mustache", "", "Setup.hs"));
+    supportingFiles.add(new SupportingFile("LICENSE", "", "LICENSE"));
+    supportingFiles.add(new SupportingFile("Apis.mustache", "lib", "Apis.hs"));
+    supportingFiles.add(new SupportingFile("Utils.mustache", "lib", "Utils.hs"));
+    supportingFiles.add(new SupportingFile("Client.mustache", "client", "Main.hs"));
+    supportingFiles.add(new SupportingFile("Server.mustache", "server", "Main.hs"));
+
+    /**
+     * Language Specific Primitives.  These types will not trigger imports by
+     * the client generator
+     */
+    languageSpecificPrimitives = new HashSet<String>(
+      Arrays.asList(
+        "Bool",
+        "String",
+        "Int",
+        "Integer",
+        "Float",
+        "Char",
+        "Double",
+        "List",
+        "FilePath"
+        )
+    );
+
+    typeMapping.clear();
+    // typeMapping.put("enum", "NSString");
+    typeMapping.put("array", "List");
+    typeMapping.put("set", "Set");
+    typeMapping.put("boolean", "Bool");
+    typeMapping.put("string", "String");
+    typeMapping.put("int", "Int");
+    typeMapping.put("long", "Integer");
+    typeMapping.put("float", "Float");
+    // typeMapping.put("byte", "Byte");
+    typeMapping.put("short", "Int");
+    typeMapping.put("char", "Char");
+    typeMapping.put("double", "Double");
+    typeMapping.put("DateTime", "Integer");
+    // typeMapping.put("object", "Map");
+    typeMapping.put("file", "FilePath");
+
+    importMapping.clear();
+    importMapping.put("Map", "qualified Data.Map as Map");
+
+    cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC));
+    cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC));
+  }
+
+  /**
+   * Escapes a reserved word as defined in the `reservedWords` array. Handle escaping
+   * those terms here.  This logic is only called if a variable matches the reseved words
+   *
+   * @return the escaped term
+   */
+  @Override
+  public String escapeReservedWord(String name) {
+    return name + "_";
+  }
+
+  /**
+   * Location to write model files.  You can use the modelPackage() as defined when the class is
+   * instantiated
+   */
+  public String modelFileFolder() {
+    return outputFolder + File.separatorChar + "lib" + File.separatorChar + modelPackage().replace('.', File.separatorChar);
+  }
+
+  /**
+   * Location to write api files.  You can use the apiPackage() as defined when the class is
+   * instantiated
+   */
+  @Override
+  public String apiFileFolder() {
+    return outputFolder + File.separatorChar + "lib" + File.separatorChar + apiPackage().replace('.', File.separatorChar);
+  }
+
+  /**
+   * Optional - type declaration.  This is a String which is used by the templates to instantiate your
+   * types.  There is typically special handling for different property types
+   *
+   * @return a string value used as the `dataType` field for model templates, `returnType` for api templates
+   */
+  @Override
+  public String getTypeDeclaration(Property p) {
+    if(p instanceof ArrayProperty) {
+      ArrayProperty ap = (ArrayProperty) p;
+      Property inner = ap.getItems();
+      return "[" + getTypeDeclaration(inner) + "]";
+    }
+    else if (p instanceof MapProperty) {
+      MapProperty mp = (MapProperty) p;
+      Property inner = mp.getAdditionalProperties();
+      return "Map.Map String " + getTypeDeclaration(inner);
+    }
+    return super.getTypeDeclaration(p);
+  }
+
+  /**
+   * Optional - swagger type conversion.  This is used to map swagger types in a `Property` into
+   * either language specific types via `typeMapping` or into complex models if there is not a mapping.
+   *
+   * @return a string value of the type or complex model for this property
+   * @see io.swagger.models.properties.Property
+   */
+  @Override
+  public String getSwaggerType(Property p) {
+    String swaggerType = super.getSwaggerType(p);
+    String type = null;
+    if(typeMapping.containsKey(swaggerType)) {
+      type = typeMapping.get(swaggerType);
+      if(languageSpecificPrimitives.contains(type))
+        return toModelName(type);
+    }
+    else
+      type = swaggerType;
+    return toModelName(type);
+  }
+
+  private String capturePath(String path, List<CodegenParameter> pathParams) {
+    for (CodegenParameter p : pathParams) {
+      String pName = "{"+p.baseName+"}";
+      if (path.indexOf(pName) >= 0) {
+        path = path.replace(pName, "Capture " + "\""+p.baseName+"\" " + p.dataType);
+      }
+    }
+    return path;
+  }
+
+  private String queryPath(String path, List<CodegenParameter> queryParams) {
+    for (CodegenParameter p : queryParams) {
+      path += " :> QueryParam \"" + p.baseName + "\" " + p.dataType;
+    }
+    return path;
+  }
+
+  private String bodyPath(String path, List<CodegenParameter> bodyParams) {
+    for (CodegenParameter p : bodyParams) {
+      path += " :> ReqBody '[JSON] " + p.dataType;
+    }
+    return path;
+  }
+
+  private String formPath(String path, List<CodegenParameter> formParams) {
+    String names = "Form";
+    for (CodegenParameter p : formParams) {
+      if(p.dataType.equals("FilePath")){
+        // file data processing
+      }
+      names += p.baseName;
+    }
+    if(formParams.size() > 0){
+      path += " :> ReqBody '[FormUrlEncoded] " + names;
+    }
+    return path;
+  }
+
+  private String headerPath(String path, List<CodegenParameter> headerParams) {
+    for (CodegenParameter p : headerParams) {
+      path += " :> Header \"" + p.baseName + "\" " + p.dataType;
+    }
+    return path;
+  }
+
+
+  private String filterReturnType(String rt) {
+    if (rt == null || rt.equals("null")) {
+      return "()";
+    } else if (rt.indexOf(" ") >= 0) {
+      return "(" + rt + ")";
+    }
+    return rt;
+  }
+
+  private String addReturnPath(String path, String httpMethod, String returnType) {
+    return path + " :> " + upperCaseFirst(httpMethod) + " '[JSON] " + filterReturnType(returnType);
+  }
+
+  private String joinStrings(String sep, List<String> ss) {
+    StringBuilder sb = new StringBuilder();
+    for (String s : ss) {
+      if (sb.length() > 0) {
+        sb.append(sep);
+      }
+      sb.append(s);
+    }
+    return sb.toString();
+  }
+
+  private String replacePathSplitter(String path) {
+    String[] ps = path.replaceFirst("/", "").split("/", 0);
+    List<String> rs = new ArrayList<String>();
+    for (String p : ps) {
+      if (p.indexOf("{") < 0) {
+        rs.add("\"" + p + "\"");
+      } else {
+        rs.add(p);
+      }
+    }
+    return joinStrings(" :> ", rs);
+  }
+
+  private String upperCaseFirst(String str) {
+    char[] array = str.toLowerCase().toCharArray();
+    array[0] = Character.toUpperCase(array[0]);
+    return new String(array);
+  }
+
+  private String parseScheme(String basePath) {
+    return "Http";
+  }
+
+  @Override
+  public CodegenOperation fromOperation(String resourcePath, String httpMethod, Operation operation, Map<String, Model> definitions, Swagger swagger){
+    CodegenOperation op = super.fromOperation(resourcePath, httpMethod, operation, definitions, swagger);
+    String path = op.path;
+    op.nickname = addReturnPath(headerPath(formPath(bodyPath(queryPath(capturePath(replacePathSplitter(path), op.pathParams), op.queryParams), op.bodyParams), op.formParams), op.headerParams), op.httpMethod, op.returnType);
+    return op;
+  }
+
+}
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JMeterCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JMeterCodegen.java
index 429d992b7ef..903cb7ba76e 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JMeterCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JMeterCodegen.java
@@ -5,8 +5,6 @@ import io.swagger.models.Operation;
 import io.swagger.models.Path;
 import io.swagger.models.Swagger;
 import io.swagger.models.properties.*;
-import org.apache.commons.lang.StringUtils;
-
 import java.util.*;
 import java.io.File;
 
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFServerCodegen.java
new file mode 100644
index 00000000000..5321e3a59db
--- /dev/null
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFServerCodegen.java
@@ -0,0 +1,101 @@
+
+package io.swagger.codegen.languages;
+
+import java.io.File;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import io.swagger.codegen.CliOption;
+import io.swagger.codegen.CodegenConstants;
+import io.swagger.codegen.CodegenModel;
+import io.swagger.codegen.CodegenOperation;
+import io.swagger.codegen.CodegenProperty;
+import io.swagger.models.Operation;
+
+public class JavaCXFServerCodegen extends AbstractJavaJAXRSServerCodegen
+{	
+	public JavaCXFServerCodegen()
+	{
+        super();
+        supportsInheritance = true;
+        sourceFolder = "src/gen/java";
+        invokerPackage = "io.swagger.api";
+        artifactId = "swagger-jaxrs-server";
+        outputFolder = "generated-code/JavaJaxRS-CXF";
+
+        modelTemplateFiles.put("model.mustache", ".java");
+        apiTemplateFiles.put("api.mustache", ".java");
+        apiPackage = "io.swagger.api";
+        modelPackage = "io.swagger.model";
+
+        additionalProperties.put("title", title);
+
+        typeMapping.put("date", "LocalDate");
+        typeMapping.put("DateTime", "javax.xml.datatype.XMLGregorianCalendar"); // Map DateTime fields to Java standart class 'XMLGregorianCalendar'
+
+        importMapping.put("LocalDate", "org.joda.time.LocalDate");
+
+        super.embeddedTemplateDir = templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "cxf";
+
+        for ( int i = 0; i < cliOptions.size(); i++ ) {
+            if ( CodegenConstants.LIBRARY.equals(cliOptions.get(i).getOpt()) ) {
+                cliOptions.remove(i);
+                break;
+            }
+        }
+                
+        CliOption library = new CliOption(CodegenConstants.LIBRARY, "library template (sub-template) to use");
+        library.setDefault(DEFAULT_LIBRARY);
+
+        Map<String, String> supportedLibraries = new LinkedHashMap<String,String>();
+
+        supportedLibraries.put(DEFAULT_LIBRARY, "CXF");
+        library.setEnum(supportedLibraries);
+
+        cliOptions.add(library);
+        cliOptions.add(new CliOption(CodegenConstants.IMPL_FOLDER, CodegenConstants.IMPL_FOLDER_DESC));	
+        cliOptions.add(new CliOption("title", "a title describing the application"));
+	}
+	
+	@Override
+	public void processOpts()
+	{
+		super.processOpts();
+		sourceFolder = "gen" + File.separator + "java";
+		supportingFiles.clear(); // Don't need extra files provided by AbstractJAX-RS & Java Codegen
+      
+		//TODO
+		//final String invokerFolder = (sourceFolder + '/' + invokerPackage).replace(".", "/");
+        //supportingFiles.add(new SupportingFile("CXF2InterfaceComparator.mustache", invokerFolder, "CXF2InterfaceComparator.java"));
+	} 
+
+	@Override
+	public String getName()
+	{
+		return "jaxrs-cxf";
+	}
+
+    @Override
+    public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map<String, List<CodegenOperation>> operations) {
+        super.addOperationToGroup(tag, resourcePath, operation, co, operations);        
+        co.subresourceOperation = !co.path.isEmpty();
+    }
+    
+    @Override
+    public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
+        super.postProcessModelProperty(model, property);
+        model.imports.remove("ApiModelProperty");
+        model.imports.remove("ApiModel");
+        model.imports.remove("JsonSerialize");
+        model.imports.remove("ToStringSerializer");
+        model.imports.remove("JsonValue");
+        model.imports.remove("JsonProperty");
+    }
+    
+    @Override
+    public String getHelp()
+    {
+        return "Generates a Java JAXRS Server application based on Apache CXF framework.";
+    }
+}
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
index 0658e3ad6f3..380a1eee2a1 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
@@ -9,18 +9,27 @@ import io.swagger.models.Swagger;
 import io.swagger.models.parameters.FormParameter;
 import io.swagger.models.parameters.Parameter;
 import io.swagger.models.properties.*;
+import org.apache.commons.lang.BooleanUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.util.*;
+import java.util.regex.Pattern;
 
 public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
+    @SuppressWarnings("hiding")
     private static final Logger LOGGER = LoggerFactory.getLogger(JavaClientCodegen.class);
     public static final String FULL_JAVA_UTIL = "fullJavaUtil";
     public static final String DEFAULT_LIBRARY = "<default>";
+    public static final String DATE_LIBRARY = "dateLibrary";
+    public static final String USE_RX_JAVA = "useRxJava";
 
+    public static final String RETROFIT_1 = "retrofit";
+    public static final String RETROFIT_2 = "retrofit2";
+
+    protected String dateLibrary = "default";
     protected String invokerPackage = "io.swagger.client";
     protected String groupId = "io.swagger";
     protected String artifactId = "swagger-java-client";
@@ -32,6 +41,9 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
     protected String javaUtilPrefix = "";
     protected Boolean serializableModel = false;
     protected boolean serializeBigDecimalAsString = false;
+    protected boolean useRxJava = false;
+    protected boolean hideGenerationTimestamp = false;
+
 
     public JavaClientCodegen() {
         super();
@@ -42,20 +54,21 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
         apiPackage = "io.swagger.client.api";
         modelPackage = "io.swagger.client.model";
 
-        reservedWords = new HashSet<String>(
-                Arrays.asList(
-                        // used as internal variables, can collide with parameter names
-                        "path", "queryParams", "headerParams", "formParams", "postBody", "accepts", "accept", "contentTypes",
-                        "contentType", "authNames",
+        setReservedWordsLowerCase(
+            Arrays.asList(
+                // used as internal variables, can collide with parameter names
+                "localVarPath", "localVarQueryParams", "localVarHeaderParams", "localVarFormParams",
+                "localVarPostBody", "localVarAccepts", "localVarAccept", "localVarContentTypes",
+                "localVarContentType", "localVarAuthNames", "localReturnType",
 
-                        // language reserved words
-                        "abstract", "continue", "for", "new", "switch", "assert",
-                        "default", "if", "package", "synchronized", "boolean", "do", "goto", "private",
-                        "this", "break", "double", "implements", "protected", "throw", "byte", "else",
-                        "import", "public", "throws", "case", "enum", "instanceof", "return", "transient",
-                        "catch", "extends", "int", "short", "try", "char", "final", "interface", "static",
-                        "void", "class", "finally", "long", "strictfp", "volatile", "const", "float",
-                        "native", "super", "while")
+                // language reserved words
+                "abstract", "continue", "for", "new", "switch", "assert",
+                "default", "if", "package", "synchronized", "boolean", "do", "goto", "private",
+                "this", "break", "double", "implements", "protected", "throw", "byte", "else",
+                "import", "public", "throws", "case", "enum", "instanceof", "return", "transient",
+                "catch", "extends", "int", "short", "try", "char", "final", "interface", "static",
+                "void", "class", "finally", "long", "strictfp", "volatile", "const", "float",
+                "native", "super", "while")
         );
 
         languageSpecificPrimitives = new HashSet<String>(
@@ -72,6 +85,8 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
         );
         instantiationTypes.put("array", "ArrayList");
         instantiationTypes.put("map", "HashMap");
+        typeMapping.put("date", "Date");
+        typeMapping.put("file", "File");
 
         cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC));
         cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC));
@@ -85,18 +100,29 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
         cliOptions.add(CliOption.newBoolean(CodegenConstants.SERIALIZE_BIG_DECIMAL_AS_STRING, CodegenConstants
                 .SERIALIZE_BIG_DECIMAL_AS_STRING_DESC));
         cliOptions.add(CliOption.newBoolean(FULL_JAVA_UTIL, "whether to use fully qualified name for classes under java.util"));
+        cliOptions.add(CliOption.newBoolean(USE_RX_JAVA, "Whether to use the RxJava adapter with the retrofit2 library."));
+        cliOptions.add(new CliOption("hideGenerationTimestamp", "hides the timestamp when files were generated"));
 
         supportedLibraries.put(DEFAULT_LIBRARY, "HTTP client: Jersey client 1.18. JSON processing: Jackson 2.4.2");
         supportedLibraries.put("feign", "HTTP client: Netflix Feign 8.1.1");
         supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.6");
         supportedLibraries.put("okhttp-gson", "HTTP client: OkHttp 2.4.0. JSON processing: Gson 2.3.1");
-        supportedLibraries.put("retrofit", "HTTP client: OkHttp 2.4.0. JSON processing: Gson 2.3.1 (Retrofit 1.9.0)");
-        supportedLibraries.put("retrofit2", "HTTP client: OkHttp 2.5.0. JSON processing: Gson 2.4 (Retrofit 2.0.0-beta2)");
+        supportedLibraries.put(RETROFIT_1, "HTTP client: OkHttp 2.4.0. JSON processing: Gson 2.3.1 (Retrofit 1.9.0)");
+        supportedLibraries.put(RETROFIT_2, "HTTP client: OkHttp 2.5.0. JSON processing: Gson 2.4 (Retrofit 2.0.0-beta4). Enable the RxJava adapter using '-DuseRxJava=true'.");
+
         CliOption library = new CliOption(CodegenConstants.LIBRARY, "library template (sub-template) to use");
         library.setDefault(DEFAULT_LIBRARY);
         library.setEnum(supportedLibraries);
         library.setDefault(DEFAULT_LIBRARY);
         cliOptions.add(library);
+
+        CliOption dateLibrary = new CliOption(DATE_LIBRARY, "Option. Date library to use");
+        Map<String, String> dateOptions = new HashMap<String, String>();
+        dateOptions.put("java8", "Java 8 native");
+        dateOptions.put("joda", "Joda");
+        dateLibrary.setEnum(dateOptions);
+
+        cliOptions.add(dateLibrary);
     }
 
     @Override
@@ -172,12 +198,18 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
         if (additionalProperties.containsKey(FULL_JAVA_UTIL)) {
             this.setFullJavaUtil(Boolean.valueOf(additionalProperties.get(FULL_JAVA_UTIL).toString()));
         }
+
+        if (additionalProperties.containsKey(USE_RX_JAVA)) {
+            this.setUseRxJava(Boolean.valueOf(additionalProperties.get(USE_RX_JAVA).toString()));
+        }
         if (fullJavaUtil) {
             javaUtilPrefix = "java.util.";
         }
         additionalProperties.put(FULL_JAVA_UTIL, fullJavaUtil);
         additionalProperties.put("javaUtilPrefix", javaUtilPrefix);
 
+        importMapping.put("List", "java.util.List");
+
         if (fullJavaUtil) {
             typeMapping.put("array", "java.util.List");
             typeMapping.put("map", "java.util.Map");
@@ -211,26 +243,25 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
         importMapping.put("StringUtil", invokerPackage + ".StringUtil");
 
         final String invokerFolder = (sourceFolder + '/' + invokerPackage).replace(".", "/");
-        supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
-        supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
-        supportingFiles.add(new SupportingFile("build.gradle.mustache", "", "build.gradle"));
-        supportingFiles.add(new SupportingFile("settings.gradle.mustache", "", "settings.gradle"));
-        supportingFiles.add(new SupportingFile("gradle.properties.mustache", "", "gradle.properties"));
-        supportingFiles.add(new SupportingFile("manifest.mustache", projectFolder, "AndroidManifest.xml"));
-        supportingFiles.add(new SupportingFile("ApiClient.mustache", invokerFolder, "ApiClient.java"));
+        writeOptional(outputFolder, new SupportingFile("pom.mustache", "", "pom.xml"));
+        writeOptional(outputFolder, new SupportingFile("README.mustache", "", "README.md"));
+        writeOptional(outputFolder, new SupportingFile("build.gradle.mustache", "", "build.gradle"));
+        writeOptional(outputFolder, new SupportingFile("settings.gradle.mustache", "", "settings.gradle"));
+        writeOptional(outputFolder, new SupportingFile("gradle.properties.mustache", "", "gradle.properties"));
+        writeOptional(outputFolder, new SupportingFile("manifest.mustache", projectFolder, "AndroidManifest.xml"));
+        writeOptional(outputFolder, new SupportingFile("ApiClient.mustache", invokerFolder, "ApiClient.java"));
         supportingFiles.add(new SupportingFile("StringUtil.mustache", invokerFolder, "StringUtil.java"));
 
         final String authFolder = (sourceFolder + '/' + invokerPackage + ".auth").replace(".", "/");
         if ("feign".equals(getLibrary())) {
             supportingFiles.add(new SupportingFile("FormAwareEncoder.mustache", invokerFolder, "FormAwareEncoder.java"));
-        } else {
-            supportingFiles.add(new SupportingFile("auth/HttpBasicAuth.mustache", authFolder, "HttpBasicAuth.java"));
-            supportingFiles.add(new SupportingFile("auth/ApiKeyAuth.mustache", authFolder, "ApiKeyAuth.java"));
-            supportingFiles.add(new SupportingFile("auth/OAuth.mustache", authFolder, "OAuth.java"));
-            supportingFiles.add(new SupportingFile("auth/OAuthFlow.mustache", authFolder, "OAuthFlow.java"));
         }
+        supportingFiles.add(new SupportingFile("auth/HttpBasicAuth.mustache", authFolder, "HttpBasicAuth.java"));
+        supportingFiles.add(new SupportingFile("auth/ApiKeyAuth.mustache", authFolder, "ApiKeyAuth.java"));
+        supportingFiles.add(new SupportingFile("auth/OAuth.mustache", authFolder, "OAuth.java"));
+        supportingFiles.add(new SupportingFile("auth/OAuthFlow.mustache", authFolder, "OAuthFlow.java"));
 
-        if (!("feign".equals(getLibrary()) || "retrofit".equals(getLibrary()) || "retrofit2".equals(getLibrary()))) {
+        if (!("feign".equals(getLibrary()) || usesAnyRetrofitLibrary())) {
             supportingFiles.add(new SupportingFile("apiException.mustache", invokerFolder, "ApiException.java"));
             supportingFiles.add(new SupportingFile("Configuration.mustache", invokerFolder, "Configuration.java"));
             supportingFiles.add(new SupportingFile("Pair.mustache", invokerFolder, "Pair.java"));
@@ -247,12 +278,44 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
             supportingFiles.add(new SupportingFile("ProgressResponseBody.mustache", invokerFolder, "ProgressResponseBody.java"));
             // "build.sbt" is for development with SBT
             supportingFiles.add(new SupportingFile("build.sbt.mustache", "", "build.sbt"));
-        } else if ("retrofit".equals(getLibrary()) || "retrofit2".equals(getLibrary())) {
+        } else if (usesAnyRetrofitLibrary()) {
             supportingFiles.add(new SupportingFile("auth/OAuthOkHttpClient.mustache", authFolder, "OAuthOkHttpClient.java"));
             supportingFiles.add(new SupportingFile("CollectionFormats.mustache", invokerFolder, "CollectionFormats.java"));
         } else if("jersey2".equals(getLibrary())) {
             supportingFiles.add(new SupportingFile("JSON.mustache", invokerFolder, "JSON.java"));
         }
+
+        if(additionalProperties.containsKey(DATE_LIBRARY)) {
+            this.dateLibrary = additionalProperties.get(DATE_LIBRARY).toString();
+        }
+
+        if("joda".equals(dateLibrary)) {
+            typeMapping.put("date", "LocalDate");
+            typeMapping.put("DateTime", "DateTime");
+
+            importMapping.put("LocalDate", "org.joda.time.LocalDate");
+            importMapping.put("DateTime", "org.joda.time.DateTime");
+        }
+        else if ("java8".equals(dateLibrary)) {
+            additionalProperties.put("java8", "true");
+            additionalProperties.put("javaVersion", "1.8");
+            typeMapping.put("date", "LocalDate");
+            typeMapping.put("DateTime", "LocalDateTime");
+            importMapping.put("LocalDate", "java.time.LocalDate");
+            importMapping.put("LocalDateTime", "java.time.LocalDateTime");
+        }
+
+        supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
+        supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
+
+    }
+
+    private boolean usesAnyRetrofitLibrary() {
+        return getLibrary() != null && getLibrary().contains(RETROFIT_1);
+    }
+
+    private boolean usesRetrofit2Library() {
+        return getLibrary() != null && getLibrary().contains(RETROFIT_2);
     }
 
     private void sanitizeConfig() {
@@ -293,7 +356,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
     @Override
     public String toVarName(String name) {
         // sanitize name
-        name = sanitizeName(name);
+        name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
         if("_".equals(name)) {
           name = "_u";
@@ -309,7 +372,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
         name = camelize(name, true);
 
         // for reserved word or word starting with number, append _
-        if (reservedWords.contains(name) || name.matches("^\\d.*")) {
+        if (isReservedWord(name) || name.matches("^\\d.*")) {
             name = escapeReservedWord(name);
         }
 
@@ -323,17 +386,28 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
     }
 
     @Override
-    public String toModelName(String name) {
-        name = sanitizeName(name);
-
-        // model name cannot use reserved keyword, e.g. return
-        if (reservedWords.contains(name)) {
-            throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
-        }
+    public String toModelName(final String name) {
+        final String sanitizedName = sanitizeName(modelNamePrefix + name + modelNameSuffix);
 
         // camelize the model name
         // phone_number => PhoneNumber
-        return camelize(name);
+        final String camelizedName = camelize(sanitizedName);
+
+        // model name cannot use reserved keyword, e.g. return
+        if (isReservedWord(camelizedName)) {
+            final String modelName = "Model" + camelizedName;
+            LOGGER.warn(camelizedName + " (reserved word) cannot be used as model name. Renamed to " + modelName);
+            return modelName;
+        }
+
+        // model name starts with number
+        if (name.matches("^\\d.*")) {
+            final String modelName = "Model" + camelizedName; // e.g. 200Response => Model200Response (after camelize)
+            LOGGER.warn(name + " (model name starts with number) cannot be used as model name. Renamed to " + modelName);
+            return modelName;
+        }
+
+        return camelizedName;
     }
 
     @Override
@@ -429,7 +503,9 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
         String type = null;
         if (typeMapping.containsKey(swaggerType)) {
             type = typeMapping.get(swaggerType);
-            if (languageSpecificPrimitives.contains(type) || type.indexOf(".") >= 0) {
+            if (languageSpecificPrimitives.contains(type) || type.indexOf(".") >= 0 ||
+                type.equals("Map") || type.equals("List") ||
+                type.equals("File") || type.equals("Date")) {
                 return type;
             }
         } else {
@@ -448,22 +524,28 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
             throw new RuntimeException("Empty method/operation name (operationId) not allowed");
         }
 
+        operationId = camelize(sanitizeName(operationId), true);
+
         // method name cannot use reserved keyword, e.g. return
-        if (reservedWords.contains(operationId)) {
-            throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+        if (isReservedWord(operationId)) {
+            String newOperationId = camelize("call_" + operationId, true);
+            LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to " + newOperationId);
+            return newOperationId;
         }
 
-        return camelize(sanitizeName(operationId), true);
+        return operationId;
     }
 
     @Override
     public CodegenModel fromModel(String name, Model model, Map<String, Model> allDefinitions) {
         CodegenModel codegenModel = super.fromModel(name, model, allDefinitions);
-
+        if(codegenModel.description != null) {
+            codegenModel.imports.add("ApiModel");
+        }
         if (allDefinitions != null && codegenModel != null && codegenModel.parentSchema != null && codegenModel.hasEnums) {
             final Model parentModel = allDefinitions.get(codegenModel.parentSchema);
             final CodegenModel parentCodegenModel = super.fromModel(codegenModel.parent, parentModel);
-            codegenModel = this.reconcileInlineEnums(codegenModel, parentCodegenModel);
+            codegenModel = JavaClientCodegen.reconcileInlineEnums(codegenModel, parentCodegenModel);
         }
 
         return codegenModel;
@@ -482,18 +564,24 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
             }
         }
 
-        if(model.isEnum == null || model.isEnum) {
+        if ("array".equals(property.containerType)) {
+          model.imports.add("ArrayList");
+        } else if ("map".equals(property.containerType)) {
+          model.imports.add("HashMap");
+        }
+
+        if(!BooleanUtils.toBoolean(model.isEnum)) {
             // needed by all pojos, but not enums
             model.imports.add("ApiModelProperty");
             model.imports.add("ApiModel");
-            // comment out below as it's in the model template 
+            // comment out below as it's in the model template
             //model.imports.add("Objects");
 
             final String lib = getLibrary();
             if(StringUtils.isEmpty(lib) || "feign".equals(lib) || "jersey2".equals(lib)) {
                 model.imports.add("JsonProperty");
 
-                if(model.hasEnums != null || model.hasEnums == true) {
+                if(BooleanUtils.toBoolean(model.hasEnums)) {
                   model.imports.add("JsonValue");
                 }
             }
@@ -512,6 +600,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
         for (Object _mo : models) {
             Map<String, Object> mo = (Map<String, Object>) _mo;
             CodegenModel cm = (CodegenModel) mo.get("model");
+
             for (CodegenProperty var : cm.vars) {
                 Map<String, Object> allowableValues = var.allowableValues;
 
@@ -568,7 +657,18 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
 
     @Override
     public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
-        if("retrofit".equals(getLibrary()) || "retrofit2".equals(getLibrary())) {
+        // Remove imports of List, ArrayList, Map and HashMap as they are
+        // imported in the template already.
+        List<Map<String, String>> imports = (List<Map<String, String>>) objs.get("imports");
+        Pattern pattern = Pattern.compile("java\\.util\\.(List|ArrayList|Map|HashMap)");
+        for (Iterator<Map<String, String>> itr = imports.iterator(); itr.hasNext();) {
+            String _import = itr.next().get("import");
+            if (pattern.matcher(_import).matches()) {
+              itr.remove();
+            }
+        }
+
+        if(usesAnyRetrofitLibrary()) {
             Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
             if (operations != null) {
                 List<CodegenOperation> ops = (List<CodegenOperation>) operations.get("operation");
@@ -584,7 +684,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
                     if (operation.returnType == null) {
                         operation.returnType = "Void";
                     }
-                    if ("retrofit2".equals(getLibrary()) && StringUtils.isNotEmpty(operation.path) && operation.path.startsWith("/"))
+                    if (usesRetrofit2Library() && StringUtils.isNotEmpty(operation.path) && operation.path.startsWith("/"))
                     	operation.path = operation.path.substring(1);
                 }
             }
@@ -618,7 +718,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
         }
     }
 
-    private String getAccept(Operation operation) {
+    private static String getAccept(Operation operation) {
         String accepts = null;
         String defaultContentType = "application/json";
         if (operation.getProduces() != null && !operation.getProduces().isEmpty()) {
@@ -649,14 +749,14 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
         return super.needToImport(type) && type.indexOf(".") < 0;
     }
 
-    private String findCommonPrefixOfVars(List<String> vars) {
+    private static String findCommonPrefixOfVars(List<String> vars) {
         String prefix = StringUtils.getCommonPrefix(vars.toArray(new String[vars.size()]));
         // exclude trailing characters that should be part of a valid variable
         // e.g. ["status-on", "status-off"] => "status-" (not "status-o")
         return prefix.replaceAll("[a-zA-Z0-9]+\\z", "");
     }
 
-    private String toEnumVarName(String value) {
+    private static String toEnumVarName(String value) {
         String var = value.replaceAll("\\W+", "_").toUpperCase();
         if (var.matches("\\d.*")) {
             return "_" + var;
@@ -665,7 +765,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
         }
     }
 
-    private CodegenModel reconcileInlineEnums(CodegenModel codegenModel, CodegenModel parentCodegenModel) {
+    private static CodegenModel reconcileInlineEnums(CodegenModel codegenModel, CodegenModel parentCodegenModel) {
         // This generator uses inline classes to define enums, which breaks when
         // dealing with models that have subTypes. To clean this up, we will analyze
         // the parent and child models, look for enums that match, and remove
@@ -698,7 +798,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
                     }
                 }
             }
-            
+
             if(removedChildEnum) {
                 // If we removed an entry from this model's vars, we need to ensure hasMore is updated
                 int count = 0, numVars = codegenProperties.size();
@@ -749,8 +849,8 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
         this.serializableModel = serializableModel;
     }
 
-    private String sanitizePackageName(String packageName) {
-        packageName = packageName.trim();
+    private static String sanitizePackageName(String packageName) {
+        packageName = packageName.trim(); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
         packageName = packageName.replaceAll("[^a-zA-Z0-9_\\.]", "_");
         if(Strings.isNullOrEmpty(packageName)) {
             return "invalidPackageName";
@@ -761,4 +861,12 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
     public void setFullJavaUtil(boolean fullJavaUtil) {
         this.fullJavaUtil = fullJavaUtil;
     }
+
+    public void setUseRxJava(boolean useRxJava) {
+        this.useRxJava = useRxJava;
+    }
+
+    public void setDateLibrary(String library) {
+        this.dateLibrary = library;
+    }
 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java
index 01ca02f185d..24f7fddc524 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java
@@ -8,16 +8,21 @@ import io.swagger.models.properties.ArrayProperty;
 import io.swagger.models.properties.MapProperty;
 import io.swagger.models.properties.Property;
 import io.swagger.util.Yaml;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.*;
 
-public class JavaInflectorServerCodegen extends JavaClientCodegen implements CodegenConfig {
-    protected String title = "Swagger Inflector";
+public class JavaInflectorServerCodegen extends JavaClientCodegen {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(JavaInflectorServerCodegen.class);
+
+    protected String title = "Swagger Inflector";
+    protected String implFolder = "src/main/java";
     public JavaInflectorServerCodegen() {
         super();
 
-        sourceFolder = "src/main/java";
+        sourceFolder = "src/gen/java";
         modelTemplateFiles.put("model.mustache", ".java");
         apiTemplateFiles.put("api.mustache", ".java");
         embeddedTemplateDir = templateDir = "JavaInflector";
@@ -35,6 +40,7 @@ public class JavaInflectorServerCodegen extends JavaClientCodegen implements Cod
 
         languageSpecificPrimitives = new HashSet<String>(
                 Arrays.asList(
+                        "byte[]",
                         "String",
                         "boolean",
                         "Boolean",
@@ -65,10 +71,10 @@ public class JavaInflectorServerCodegen extends JavaClientCodegen implements Cod
         super.processOpts();
 
         supportingFiles.clear();
-        supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
-        supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
-        supportingFiles.add(new SupportingFile("web.mustache", "src/main/webapp/WEB-INF", "web.xml"));
-        supportingFiles.add(new SupportingFile("inflector.mustache", "", "inflector.yaml"));
+        writeOptional(outputFolder, new SupportingFile("pom.mustache", "", "pom.xml"));
+        writeOptional(outputFolder, new SupportingFile("README.mustache", "", "README.md"));
+        writeOptional(outputFolder, new SupportingFile("web.mustache", "src/main/webapp/WEB-INF", "web.xml"));
+        writeOptional(outputFolder, new SupportingFile("inflector.mustache", "", "inflector.yaml"));
         supportingFiles.add(new SupportingFile("swagger.mustache",
                         "src/main/swagger",
                         "swagger.yaml")
@@ -77,21 +83,6 @@ public class JavaInflectorServerCodegen extends JavaClientCodegen implements Cod
                 (sourceFolder + '/' + invokerPackage).replace(".", "/"), "StringUtil.java"));
     }
 
-    @Override
-    public String getTypeDeclaration(Property p) {
-        if (p instanceof ArrayProperty) {
-            ArrayProperty ap = (ArrayProperty) p;
-            Property inner = ap.getItems();
-            return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">";
-        } else if (p instanceof MapProperty) {
-            MapProperty mp = (MapProperty) p;
-            Property inner = mp.getAdditionalProperties();
-
-            return getTypeDeclaration(inner);
-        }
-        return super.getTypeDeclaration(p);
-    }
-
     @Override
     public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map<String, List<CodegenOperation>> operations) {
         String basePath = resourcePath;
@@ -155,6 +146,18 @@ public class JavaInflectorServerCodegen extends JavaClientCodegen implements Cod
         return objs;
     }
 
+    public String apiFilename(String templateName, String tag) {
+        String result = super.apiFilename(templateName, tag);
+
+        if ( templateName.endsWith("api.mustache") ) {
+            int ix = result.indexOf(sourceFolder);
+            String beg = result.substring(0, ix);
+            String end = result.substring(ix + sourceFolder.length());
+            new java.io.File(beg + implFolder).mkdirs();
+            result = beg + implFolder + end;
+        }
+        return result;
+    }
 
     @Override
     public Map<String, Object> postProcessSupportingFileData(Map<String, Object> objs) {
@@ -163,7 +166,7 @@ public class JavaInflectorServerCodegen extends JavaClientCodegen implements Cod
             try {
                 objs.put("swagger-yaml", Yaml.mapper().writeValueAsString(swagger));
             } catch (JsonProcessingException e) {
-                e.printStackTrace();
+                LOGGER.error(e.getMessage(), e);
             }
         }
         return super.postProcessSupportingFileData(objs);
@@ -174,12 +177,7 @@ public class JavaInflectorServerCodegen extends JavaClientCodegen implements Cod
         if (name.length() == 0) {
             return "DefaultController";
         }
-        name = name.replaceAll("[^a-zA-Z0-9]+", "_");
+        name = name.replaceAll("[^a-zA-Z0-9]+", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
         return camelize(name)+ "Controller";
     }
-
-    @Override
-    public boolean shouldOverwrite(String filename) {
-        return super.shouldOverwrite(filename);
-    }
 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJerseyServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJerseyServerCodegen.java
new file mode 100644
index 00000000000..3b3a6dbc280
--- /dev/null
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJerseyServerCodegen.java
@@ -0,0 +1,155 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.*;
+import io.swagger.models.Operation;
+
+import java.io.File;
+import java.util.*;
+
+public class JavaJerseyServerCodegen extends AbstractJavaJAXRSServerCodegen {
+    public JavaJerseyServerCodegen() {
+        super();
+
+        sourceFolder = "src/gen/java";
+        invokerPackage = "io.swagger.api";
+        artifactId = "swagger-jaxrs-server";
+        outputFolder = "generated-code/JavaJaxRS-Jersey";
+
+        modelTemplateFiles.put("model.mustache", ".java");
+        apiTemplateFiles.put("api.mustache", ".java");
+        apiTemplateFiles.put("apiService.mustache", ".java");
+        apiTemplateFiles.put("apiServiceImpl.mustache", ".java");
+        apiTemplateFiles.put("apiServiceFactory.mustache", ".java");
+        apiPackage = "io.swagger.api";
+        modelPackage = "io.swagger.model";
+
+        additionalProperties.put("title", title);
+
+        embeddedTemplateDir = templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "jersey1_18";
+
+        for ( int i = 0; i < cliOptions.size(); i++ ) {
+            if ( CodegenConstants.LIBRARY.equals(cliOptions.get(i).getOpt()) ) {
+                cliOptions.remove(i);
+                break;
+            }
+        }
+
+        CliOption library = new CliOption(CodegenConstants.LIBRARY, "library template (sub-template) to use");
+        library.setDefault(DEFAULT_LIBRARY);
+
+        Map<String, String> supportedLibraries = new LinkedHashMap<String, String>();
+
+        supportedLibraries.put(DEFAULT_LIBRARY, "Jersey core 1.18.1");
+        supportedLibraries.put("jersey2", "Jersey core 2.x");
+        library.setEnum(supportedLibraries);
+
+        cliOptions.add(library);
+        cliOptions.add(new CliOption(CodegenConstants.IMPL_FOLDER, CodegenConstants.IMPL_FOLDER_DESC));
+        cliOptions.add(new CliOption("title", "a title describing the application"));
+    }
+
+    @Override
+    public String getName()
+    {
+        return "jaxrs"; // TODO should be renamed as "jaxrs-jersey"
+    }
+
+    @Override
+    public String getHelp()
+    {
+        return "Generates a Java JAXRS Server application based on Jersey framework.";
+    }
+
+    @Override
+    public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
+        super.postProcessModelProperty(model, property);
+        if("null".equals(property.example)) {
+            property.example = null;
+        }
+    }
+
+    @Override
+    public void processOpts() {
+        super.processOpts();
+
+        if ( additionalProperties.containsKey(CodegenConstants.IMPL_FOLDER) ) {
+            implFolder = (String) additionalProperties.get(CodegenConstants.IMPL_FOLDER);
+        }
+
+        supportingFiles.clear();
+        writeOptional(outputFolder, new SupportingFile("pom.mustache", "", "pom.xml"));
+        writeOptional(outputFolder, new SupportingFile("README.mustache", "", "README.md"));
+        supportingFiles.add(new SupportingFile("ApiException.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "ApiException.java"));
+        supportingFiles.add(new SupportingFile("ApiOriginFilter.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "ApiOriginFilter.java"));
+        supportingFiles.add(new SupportingFile("ApiResponseMessage.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "ApiResponseMessage.java"));
+        supportingFiles.add(new SupportingFile("NotFoundException.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "NotFoundException.java"));
+        supportingFiles.add(new SupportingFile("jacksonJsonProvider.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "JacksonJsonProvider.java"));
+        writeOptional(outputFolder, new SupportingFile("bootstrap.mustache", (implFolder + '/' + apiPackage).replace(".", "/"), "Bootstrap.java"));
+
+        writeOptional(outputFolder, new SupportingFile("web.mustache", ("src/main/webapp/WEB-INF"), "web.xml"));
+        supportingFiles.add(new SupportingFile("StringUtil.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "StringUtil.java"));
+
+        if ( additionalProperties.containsKey("dateLibrary") ) {
+            setDateLibrary(additionalProperties.get("dateLibrary").toString());
+            additionalProperties.put(dateLibrary, "true");
+        }
+        if(DEFAULT_LIBRARY.equals(library) || library == null) {
+            if(templateDir.startsWith(JAXRS_TEMPLATE_DIRECTORY_NAME)) {
+                // set to the default location
+                templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "jersey1_18";
+            }
+            else {
+                templateDir += File.separator + "jersey1_18";
+            }
+        }
+        if("jersey2".equals(library)) {
+            if(templateDir.startsWith(JAXRS_TEMPLATE_DIRECTORY_NAME)) {
+                // set to the default location
+                templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "jersey2";
+            }
+            else {
+                templateDir += File.separator + "jersey2";
+            }
+        }
+
+        if ( "joda".equals(dateLibrary) ) {
+            supportingFiles.add(new SupportingFile("JodaDateTimeProvider.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "JodaDateTimeProvider.java"));
+            supportingFiles.add(new SupportingFile("JodaLocalDateProvider.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "JodaLocalDateProvider.java"));
+        } else if ( "java8".equals(dateLibrary) ) {
+            supportingFiles.add(new SupportingFile("LocalDateTimeProvider.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "LocalDateTimeProvider.java"));
+            supportingFiles.add(new SupportingFile("LocalDateProvider.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "LocalDateProvider.java"));
+        }
+    }
+
+    @Override
+    public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map<String, List<CodegenOperation>> operations) {
+        String basePath = resourcePath;
+        if (basePath.startsWith("/")) {
+            basePath = basePath.substring(1);
+        }
+        int pos = basePath.indexOf("/");
+        if (pos > 0) {
+            basePath = basePath.substring(0, pos);
+        }
+
+        if (basePath == "") {
+            basePath = "default";
+        } else {
+            if (co.path.startsWith("/" + basePath)) {
+                co.path = co.path.substring(("/" + basePath).length());
+            }
+            co.subresourceOperation = !co.path.isEmpty();
+        }
+        List<CodegenOperation> opList = operations.get(basePath);
+        if (opList == null) {
+            opList = new ArrayList<CodegenOperation>();
+            operations.put(basePath, opList);
+        }
+        opList.add(co);
+        co.baseName = basePath;
+    }
+
+    public void hideGenerationTimestamp(boolean hideGenerationTimestamp) {
+        this.hideGenerationTimestamp = hideGenerationTimestamp;
+    }
+}
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaResteasyServerCodegen.java
similarity index 73%
rename from modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java
rename to modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaResteasyServerCodegen.java
index 5814751d63c..060c96c317e 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaResteasyServerCodegen.java
@@ -4,22 +4,26 @@ import io.swagger.codegen.*;
 import io.swagger.models.Operation;
 import io.swagger.models.Path;
 import io.swagger.models.Swagger;
+import org.apache.commons.lang.StringUtils;
 
 import java.io.File;
 import java.util.*;
 
-public class JaxRSServerCodegen extends JavaClientCodegen implements CodegenConfig {
+public class JavaResteasyServerCodegen extends JavaClientCodegen implements CodegenConfig {
+
     protected String dateLibrary = "default";
     protected String title = "Swagger Server";
     protected String implFolder = "src/main/java";
 
     public static final String DATE_LIBRARY = "dateLibrary";
-    public JaxRSServerCodegen() {
+
+    public JavaResteasyServerCodegen() {
+
         super();
 
         sourceFolder = "src/gen/java";
         invokerPackage = "io.swagger.api";
-        artifactId = "swagger-jaxrs-server";
+        artifactId = "swagger-jaxrs-resteasy-server";
 
         outputFolder = "generated-code/javaJaxRS";
         modelTemplateFiles.put("model.mustache", ".java");
@@ -31,11 +35,11 @@ public class JaxRSServerCodegen extends JavaClientCodegen implements CodegenConf
         modelPackage = "io.swagger.model";
 
         additionalProperties.put("title", title);
-        
-        embeddedTemplateDir = templateDir = "JavaJaxRS" + File.separator + "jersey1_18";
 
-        for(int i = 0; i < cliOptions.size(); i++) {
-            if(CodegenConstants.LIBRARY.equals(cliOptions.get(i).getOpt())) {
+        embeddedTemplateDir = templateDir = "JavaJaxRS" + File.separator + "resteasy";
+
+        for (int i = 0; i < cliOptions.size(); i++) {
+            if (CodegenConstants.LIBRARY.equals(cliOptions.get(i).getOpt())) {
                 cliOptions.remove(i);
                 break;
             }
@@ -54,8 +58,7 @@ public class JaxRSServerCodegen extends JavaClientCodegen implements CodegenConf
 
         Map<String, String> supportedLibraries = new LinkedHashMap<String, String>();
 
-        supportedLibraries.put(DEFAULT_LIBRARY, "Jersey core 1.18.1");
-//        supportedLibraries.put("jersey2", "Jersey2 core library 2.x");
+        supportedLibraries.put(DEFAULT_LIBRARY, "Resteasy core 3.0.11");
         library.setEnum(supportedLibraries);
 
         cliOptions.add(library);
@@ -69,29 +72,27 @@ public class JaxRSServerCodegen extends JavaClientCodegen implements CodegenConf
 
     @Override
     public String getName() {
-        return "jaxrs";
+        return "jaxrs-resteasy";
     }
 
     @Override
     public String getHelp() {
-        return "Generates a Java JAXRS Server application.";
+        return "Generates a Java JAXRS-Resteasy Server application.";
     }
 
     @Override
     public void processOpts() {
         super.processOpts();
-        
-        if(additionalProperties.containsKey(CodegenConstants.IMPL_FOLDER)) {
-        	implFolder = (String) additionalProperties.get(CodegenConstants.IMPL_FOLDER);
+
+        if (additionalProperties.containsKey(CodegenConstants.IMPL_FOLDER)) {
+            implFolder = (String) additionalProperties.get(CodegenConstants.IMPL_FOLDER);
         }
 
-//        if("jersey2".equals(getLibrary())) {
-//            embeddedTemplateDir = templateDir = "JavaJaxRS" + File.separator + "jersey2";
-//        }
-
         supportingFiles.clear();
-        supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
-        supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
+        writeOptional(outputFolder, new SupportingFile("pom.mustache", "", "pom.xml"));
+        writeOptional(outputFolder, new SupportingFile("gradle.mustache", "", "build.gradle"));
+        writeOptional(outputFolder, new SupportingFile("settingsGradle.mustache", "", "settings.gradle"));
+        writeOptional(outputFolder, new SupportingFile("README.mustache", "", "README.md"));
         supportingFiles.add(new SupportingFile("ApiException.mustache",
                 (sourceFolder + '/' + apiPackage).replace(".", "/"), "ApiException.java"));
         supportingFiles.add(new SupportingFile("ApiOriginFilter.mustache",
@@ -100,29 +101,35 @@ public class JaxRSServerCodegen extends JavaClientCodegen implements CodegenConf
                 (sourceFolder + '/' + apiPackage).replace(".", "/"), "ApiResponseMessage.java"));
         supportingFiles.add(new SupportingFile("NotFoundException.mustache",
                 (sourceFolder + '/' + apiPackage).replace(".", "/"), "NotFoundException.java"));
-        supportingFiles.add(new SupportingFile("web.mustache",
+        writeOptional(outputFolder, new SupportingFile("web.mustache",
                 ("src/main/webapp/WEB-INF"), "web.xml"));
+        writeOptional(outputFolder, new SupportingFile("jboss-web.mustache",
+                ("src/main/webapp/WEB-INF"), "jboss-web.xml"));
+        writeOptional(outputFolder, new SupportingFile("RestApplication.mustache",
+                (sourceFolder + '/' + invokerPackage).replace(".", "/"), "RestApplication.java"));
         supportingFiles.add(new SupportingFile("StringUtil.mustache",
-                (sourceFolder + '/' + apiPackage).replace(".", "/"), "StringUtil.java"));
+                (sourceFolder + '/' + invokerPackage).replace(".", "/"), "StringUtil.java"));
 
         if (additionalProperties.containsKey("dateLibrary")) {
             setDateLibrary(additionalProperties.get("dateLibrary").toString());
             additionalProperties.put(dateLibrary, "true");
         }
 
-        if("joda".equals(dateLibrary)) {
+        if ("joda".equals(dateLibrary)) {
             typeMapping.put("date", "LocalDate");
             typeMapping.put("DateTime", "DateTime");
 
             importMapping.put("LocalDate", "org.joda.time.LocalDate");
             importMapping.put("DateTime", "org.joda.time.DateTime");
 
+            supportingFiles.add(new SupportingFile("JacksonConfig.mustache",
+                    (sourceFolder + '/' + invokerPackage).replace(".", "/"), "JacksonConfig.java"));
+
             supportingFiles.add(new SupportingFile("JodaDateTimeProvider.mustache",
                     (sourceFolder + '/' + apiPackage).replace(".", "/"), "JodaDateTimeProvider.java"));
             supportingFiles.add(new SupportingFile("JodaLocalDateProvider.mustache",
                     (sourceFolder + '/' + apiPackage).replace(".", "/"), "JodaLocalDateProvider.java"));
-        }
-        else if ("java8".equals(dateLibrary)) {
+        } else if ("java8".equals(dateLibrary)) {
             additionalProperties.put("java8", "true");
             additionalProperties.put("javaVersion", "1.8");
             typeMapping.put("date", "LocalDate");
@@ -165,38 +172,39 @@ public class JaxRSServerCodegen extends JavaClientCodegen implements CodegenConf
         co.baseName = basePath;
     }
 
+
     @Override
     public void preprocessSwagger(Swagger swagger) {
-        if("/".equals(swagger.getBasePath())) {
+        if ("/".equals(swagger.getBasePath())) {
             swagger.setBasePath("");
         }
 
         String host = swagger.getHost();
         String port = "8080";
-        if(host != null) {
+        if (host != null) {
             String[] parts = host.split(":");
-            if(parts.length > 1) {
+            if (parts.length > 1) {
                 port = parts[1];
             }
         }
         this.additionalProperties.put("serverPort", port);
-        if(swagger != null && swagger.getPaths() != null) {
-            for(String pathname : swagger.getPaths().keySet()) {
+        if (swagger != null && swagger.getPaths() != null) {
+            for (String pathname : swagger.getPaths().keySet()) {
                 Path path = swagger.getPath(pathname);
-                if(path.getOperations() != null) {
-                    for(Operation operation : path.getOperations()) {
-                        if(operation.getTags() != null) {
+                if (path.getOperations() != null) {
+                    for (Operation operation : path.getOperations()) {
+                        if (operation.getTags() != null) {
                             List<Map<String, String>> tags = new ArrayList<Map<String, String>>();
-                            for(String tag : operation.getTags()) {
+                            for (String tag : operation.getTags()) {
                                 Map<String, String> value = new HashMap<String, String>();
                                 value.put("tag", tag);
                                 value.put("hasMore", "true");
                                 tags.add(value);
                             }
-                            if(tags.size() > 0) {
+                            if (tags.size() > 0) {
                                 tags.get(tags.size() - 1).remove("hasMore");
                             }
-                            if(operation.getTags().size() > 0) {
+                            if (operation.getTags().size() > 0) {
                                 String tag = operation.getTags().get(0);
                                 operation.setTags(Arrays.asList(tag));
                             }
@@ -208,12 +216,22 @@ public class JaxRSServerCodegen extends JavaClientCodegen implements CodegenConf
         }
     }
 
+
     @Override
     public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
+
         Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
         if (operations != null) {
             List<CodegenOperation> ops = (List<CodegenOperation>) operations.get("operation");
             for (CodegenOperation operation : ops) {
+                if (operation.hasConsumes == Boolean.TRUE) {
+                    Map<String, String> firstType = operation.consumes.get(0);
+                    if (firstType != null) {
+                        if ("multipart/form-data".equals(firstType.get("mediaType"))) {
+                            operation.isMultipart = Boolean.TRUE;
+                        }
+                    }
+                }
                 List<CodegenResponse> responses = operation.responses;
                 if (responses != null) {
                     for (CodegenResponse resp : responses) {
@@ -260,6 +278,7 @@ public class JaxRSServerCodegen extends JavaClientCodegen implements CodegenConf
         return camelize(name) + "Api";
     }
 
+
     @Override
     public String apiFilename(String templateName, String tag) {
 
@@ -283,6 +302,7 @@ public class JaxRSServerCodegen extends JavaClientCodegen implements CodegenConf
         return result;
     }
 
+
     private String implFileFolder(String output) {
         return outputFolder + "/" + output + "/" + apiPackage().replace('.', '/');
     }
@@ -295,4 +315,31 @@ public class JaxRSServerCodegen extends JavaClientCodegen implements CodegenConf
     public void setDateLibrary(String library) {
         this.dateLibrary = library;
     }
-}
+
+    @Override
+    public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
+        if(serializeBigDecimalAsString) {
+            if (property.baseType.equals("BigDecimal")) {
+                // we serialize BigDecimal as `string` to avoid precision loss
+                property.vendorExtensions.put("extraAnnotation", "@JsonSerialize(using = ToStringSerializer.class)");
+
+                // this requires some more imports to be added for this model...
+                model.imports.add("ToStringSerializer");
+                model.imports.add("JsonSerialize");
+            }
+        }
+
+        if(model.isEnum == null || model.isEnum) {
+
+            final String lib = getLibrary();
+            if(StringUtils.isEmpty(lib)) {
+                model.imports.add("JsonProperty");
+
+                if(model.hasEnums != null || model.hasEnums == true) {
+                    model.imports.add("JsonValue");
+                }
+            }
+        }
+        return;
+    }
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java
index ac680d59463..d9c93e4f69e 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java
@@ -7,16 +7,32 @@ import io.swagger.codegen.CodegenConfig;
 import io.swagger.codegen.CodegenConstants;
 import io.swagger.codegen.CodegenModel;
 import io.swagger.codegen.CodegenOperation;
+import io.swagger.codegen.CodegenParameter;
 import io.swagger.codegen.CodegenProperty;
 import io.swagger.codegen.CodegenType;
-import io.swagger.codegen.DefaultCodegen;
 import io.swagger.codegen.SupportingFile;
-import io.swagger.models.*;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.models.Info;
+import io.swagger.models.License;
+import io.swagger.models.Model;
+import io.swagger.models.Operation;
+import io.swagger.models.Swagger;
 import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.BooleanProperty;
+import io.swagger.models.properties.DateProperty;
+import io.swagger.models.properties.DateTimeProperty;
+import io.swagger.models.properties.DoubleProperty;
+import io.swagger.models.properties.FloatProperty;
+import io.swagger.models.properties.IntegerProperty;
 import io.swagger.models.properties.LongProperty;
 import io.swagger.models.properties.MapProperty;
 import io.swagger.models.properties.Property;
 import io.swagger.models.properties.RefProperty;
+import io.swagger.models.properties.StringProperty;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -27,26 +43,33 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class JavascriptClientCodegen extends DefaultCodegen implements CodegenConfig {
+    @SuppressWarnings("hiding")
     private static final Logger LOGGER = LoggerFactory.getLogger(JavascriptClientCodegen.class);
 
-    private static final String PROJECT_NAME = "projectName";
-    private static final String MODULE_NAME = "moduleName";
-    private static final String PROJECT_DESCRIPTION = "projectDescription";
-    private static final String PROJECT_VERSION = "projectVersion";
-    private static final String PROJECT_LICENSE_NAME = "projectLicenseName";
+    public static final String PROJECT_NAME = "projectName";
+    public static final String MODULE_NAME = "moduleName";
+    public static final String PROJECT_DESCRIPTION = "projectDescription";
+    public static final String PROJECT_VERSION = "projectVersion";
+    public static final String PROJECT_LICENSE_NAME = "projectLicenseName";
+    public static final String USE_PROMISES = "usePromises";
+    public static final String USE_INHERITANCE = "useInheritance";
+    public static final String EMIT_MODEL_METHODS = "emitModelMethods";
+    public static final String EMIT_JS_DOC = "emitJSDoc";
 
     protected String projectName;
     protected String moduleName;
     protected String projectDescription;
     protected String projectVersion;
+    protected String projectLicenseName;
 
     protected String sourceFolder = "src";
     protected String localVariablePrefix = "";
+    protected boolean usePromises;
+    protected boolean emitModelMethods;
+    protected boolean emitJSDoc = true;
+    protected String apiDocPath = "docs/";
+    protected String modelDocPath = "docs/";
 
     public JavascriptClientCodegen() {
         super();
@@ -56,9 +79,11 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
         templateDir = "Javascript";
         apiPackage = "api";
         modelPackage = "model";
+        modelDocTemplateFiles.put("model_doc.mustache", ".md");
+        apiDocTemplateFiles.put("api_doc.mustache", ".md");
 
         // reference: http://www.w3schools.com/js/js_reserved.asp
-        reservedWords = new HashSet<String>(
+        setReservedWordsLowerCase(
                 Arrays.asList(
                         "abstract", "arguments", "boolean", "break", "byte",
                         "case", "catch", "char", "class", "const",
@@ -84,8 +109,36 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
         );
         defaultIncludes = new HashSet<String>(languageSpecificPrimitives);
 
+        instantiationTypes.put("array", "Array");
+        instantiationTypes.put("list", "Array");
+        instantiationTypes.put("map", "Object");
+        typeMapping.clear();
+        typeMapping.put("array", "Array");
+        typeMapping.put("map", "Object");
+        typeMapping.put("List", "Array");
+        typeMapping.put("boolean", "Boolean");
+        typeMapping.put("string", "String");
+        typeMapping.put("int", "Integer"); // Huh? What is JS Integer?
+        typeMapping.put("float", "Number");
+        typeMapping.put("number", "Number");
+        typeMapping.put("DateTime", "Date"); // Should this be dateTime?
+        typeMapping.put("Date", "Date"); // Should this be date?
+        typeMapping.put("long", "Integer");
+        typeMapping.put("short", "Integer");
+        typeMapping.put("char", "String");
+        typeMapping.put("double", "Number");
+        typeMapping.put("object", "Object");
+        typeMapping.put("integer", "Integer");
+        // binary not supported in JavaScript client right now, using String as a workaround
+        typeMapping.put("ByteArray", "String"); // I don't see ByteArray defined in the Swagger docs.
+        typeMapping.put("binary", "String");
+
+        importMapping.clear();
+
         cliOptions.add(new CliOption(CodegenConstants.SOURCE_FOLDER, CodegenConstants.SOURCE_FOLDER_DESC).defaultValue("src"));
         cliOptions.add(new CliOption(CodegenConstants.LOCAL_VARIABLE_PREFIX, CodegenConstants.LOCAL_VARIABLE_PREFIX_DESC));
+        cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC));
+        cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC));
         cliOptions.add(new CliOption(PROJECT_NAME,
                 "name of the project (Default: generated from info.title or \"swagger-js-client\")"));
         cliOptions.add(new CliOption(MODULE_NAME,
@@ -96,6 +149,18 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
                 "version of the project (Default: using info.version or \"1.0.0\")"));
         cliOptions.add(new CliOption(PROJECT_LICENSE_NAME,
                 "name of the license the project uses (Default: using info.license.name)"));
+        cliOptions.add(new CliOption(USE_PROMISES,
+                "use Promises as return values from the client API, instead of superagent callbacks")
+                .defaultValue(Boolean.FALSE.toString()));
+        cliOptions.add(new CliOption(EMIT_MODEL_METHODS,
+                "generate getters and setters for model properties")
+                .defaultValue(Boolean.FALSE.toString()));
+        cliOptions.add(new CliOption(EMIT_JS_DOC,
+                "generate JSDoc comments")
+                .defaultValue(Boolean.TRUE.toString()));
+        cliOptions.add(new CliOption(USE_INHERITANCE,
+                "use JavaScript prototype chains & delegation for inheritance")
+                .defaultValue(Boolean.TRUE.toString()));
     }
 
     @Override
@@ -117,56 +182,54 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
     public void processOpts() {
         super.processOpts();
 
-        typeMapping = new HashMap<String, String>();
-        typeMapping.put("array", "Array");
-        typeMapping.put("List", "Array");
-        typeMapping.put("map", "Object");
-        typeMapping.put("object", "Object");
-        typeMapping.put("boolean", "Boolean");
-        typeMapping.put("char", "String");
-        typeMapping.put("string", "String");
-        typeMapping.put("short", "Integer");
-        typeMapping.put("int", "Integer");
-        typeMapping.put("integer", "Integer");
-        typeMapping.put("long", "Integer");
-        typeMapping.put("float", "Number");
-        typeMapping.put("double", "Number");
-        typeMapping.put("number", "Number");
-        typeMapping.put("DateTime", "Date");
-
-        importMapping.clear();
+        if (additionalProperties.containsKey(PROJECT_NAME)) {
+            setProjectName(((String) additionalProperties.get(PROJECT_NAME)));
+        }
+        if (additionalProperties.containsKey(MODULE_NAME)) {
+            setModuleName(((String) additionalProperties.get(MODULE_NAME)));
+        }
+        if (additionalProperties.containsKey(PROJECT_DESCRIPTION)) {
+            setProjectDescription(((String) additionalProperties.get(PROJECT_DESCRIPTION)));
+        }
+        if (additionalProperties.containsKey(PROJECT_VERSION)) {
+            setProjectVersion(((String) additionalProperties.get(PROJECT_VERSION)));
+        }
+        if (additionalProperties.containsKey(PROJECT_LICENSE_NAME)) {
+            setProjectLicenseName(((String) additionalProperties.get(PROJECT_LICENSE_NAME)));
+        }
+        if (additionalProperties.containsKey(CodegenConstants.LOCAL_VARIABLE_PREFIX)) {
+            setLocalVariablePrefix((String) additionalProperties.get(CodegenConstants.LOCAL_VARIABLE_PREFIX));
+        }
+        if (additionalProperties.containsKey(CodegenConstants.SOURCE_FOLDER)) {
+            setSourceFolder((String) additionalProperties.get(CodegenConstants.SOURCE_FOLDER));
+        }
+        if (additionalProperties.containsKey(USE_PROMISES)) {
+            setUsePromises(Boolean.parseBoolean((String)additionalProperties.get(USE_PROMISES)));
+        }
+        if (additionalProperties.containsKey(USE_INHERITANCE)) {
+            setUseInheritance(Boolean.parseBoolean((String)additionalProperties.get(USE_INHERITANCE)));
+        } else {
+            supportsInheritance = true;
+        }
+        if (additionalProperties.containsKey(EMIT_MODEL_METHODS)) {
+            setEmitModelMethods(Boolean.parseBoolean((String)additionalProperties.get(EMIT_MODEL_METHODS)));
+        }
+        if (additionalProperties.containsKey(EMIT_JS_DOC)) {
+            setEmitJSDoc(Boolean.parseBoolean((String)additionalProperties.get(EMIT_JS_DOC)));
+        }
     }
 
     @Override
     public void preprocessSwagger(Swagger swagger) {
         super.preprocessSwagger(swagger);
 
-        if (additionalProperties.containsKey(PROJECT_NAME)) {
-            projectName = ((String) additionalProperties.get(PROJECT_NAME));
-        }
-        if (additionalProperties.containsKey(MODULE_NAME)) {
-            moduleName = ((String) additionalProperties.get(MODULE_NAME));
-        }
-        if (additionalProperties.containsKey(PROJECT_DESCRIPTION)) {
-            projectDescription = ((String) additionalProperties.get(PROJECT_DESCRIPTION));
-        }
-        if (additionalProperties.containsKey(PROJECT_VERSION)) {
-            projectVersion = ((String) additionalProperties.get(PROJECT_VERSION));
-        }
-        if (additionalProperties.containsKey(CodegenConstants.LOCAL_VARIABLE_PREFIX)) {
-            localVariablePrefix = (String) additionalProperties.get(CodegenConstants.LOCAL_VARIABLE_PREFIX);
-        }
-        if (additionalProperties.containsKey(CodegenConstants.SOURCE_FOLDER)) {
-            sourceFolder = (String) additionalProperties.get(CodegenConstants.SOURCE_FOLDER);
-        }
-
         if (swagger.getInfo() != null) {
             Info info = swagger.getInfo();
-            if (projectName == null &&  info.getTitle() != null) {
+            if (StringUtils.isBlank(projectName) && info.getTitle() != null) {
                 // when projectName is not specified, generate it from info.title
                 projectName = dashize(info.getTitle());
             }
-            if (projectVersion == null) {
+            if (StringUtils.isBlank(projectVersion)) {
                 // when projectVersion is not specified, use info.version
                 projectVersion = info.getVersion();
             }
@@ -174,22 +237,23 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
                 // when projectDescription is not specified, use info.description
                 projectDescription = info.getDescription();
             }
-            if (info.getLicense() != null) {
-                License license = info.getLicense();
-                if (additionalProperties.get(PROJECT_LICENSE_NAME) == null) {
+            if (additionalProperties.get(PROJECT_LICENSE_NAME) == null) {
+                // when projectLicense is not specified, use info.license
+                if (info.getLicense() != null) {
+                    License license = info.getLicense();
                     additionalProperties.put(PROJECT_LICENSE_NAME, license.getName());
                 }
             }
         }
 
         // default values
-        if (projectName == null) {
+        if (StringUtils.isBlank(projectName)) {
             projectName = "swagger-js-client";
         }
-        if (moduleName == null) {
+        if (StringUtils.isBlank(moduleName)) {
             moduleName = camelize(underscore(projectName));
         }
-        if (projectVersion == null) {
+        if (StringUtils.isBlank(projectVersion)) {
             projectVersion = "1.0.0";
         }
         if (projectDescription == null) {
@@ -200,11 +264,24 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
         additionalProperties.put(MODULE_NAME, moduleName);
         additionalProperties.put(PROJECT_DESCRIPTION, escapeText(projectDescription));
         additionalProperties.put(PROJECT_VERSION, projectVersion);
+        additionalProperties.put(CodegenConstants.API_PACKAGE, apiPackage);
         additionalProperties.put(CodegenConstants.LOCAL_VARIABLE_PREFIX, localVariablePrefix);
+        additionalProperties.put(CodegenConstants.MODEL_PACKAGE, modelPackage);
         additionalProperties.put(CodegenConstants.SOURCE_FOLDER, sourceFolder);
+        additionalProperties.put(USE_PROMISES, usePromises);
+        additionalProperties.put(USE_INHERITANCE, supportsInheritance);
+        additionalProperties.put(EMIT_MODEL_METHODS, emitModelMethods);
+        additionalProperties.put(EMIT_JS_DOC, emitJSDoc);
+
+        // make api and model doc path available in mustache template
+        additionalProperties.put("apiDocPath", apiDocPath);
+        additionalProperties.put("modelDocPath", modelDocPath);
 
         supportingFiles.add(new SupportingFile("package.mustache", "", "package.json"));
         supportingFiles.add(new SupportingFile("index.mustache", sourceFolder, "index.js"));
+        supportingFiles.add(new SupportingFile("ApiClient.mustache", sourceFolder, "ApiClient.js"));
+        supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
+        supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
     }
 
     @Override
@@ -214,18 +291,82 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
 
     @Override
     public String apiFileFolder() {
-        return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
+        return outputFolder + '/' + sourceFolder + '/' + apiPackage().replace('.', '/');
     }
 
     @Override
     public String modelFileFolder() {
-        return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
+        return outputFolder + '/' + sourceFolder + '/' + modelPackage().replace('.', '/');
+    }
+
+    public void setSourceFolder(String sourceFolder) {
+        this.sourceFolder = sourceFolder;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public void setLocalVariablePrefix(String localVariablePrefix) {
+        this.localVariablePrefix = localVariablePrefix;
+    }
+
+    public void setModuleName(String moduleName) {
+        this.moduleName = moduleName;
+    }
+
+    public void setProjectDescription(String projectDescription) {
+        this.projectDescription = projectDescription;
+    }
+
+    public void setProjectVersion(String projectVersion) {
+        this.projectVersion = projectVersion;
+    }
+
+    public void setProjectLicenseName(String projectLicenseName) {
+        this.projectLicenseName = projectLicenseName;
+    }
+
+    public void setUsePromises(boolean usePromises) {
+        this.usePromises = usePromises;
+    }
+
+    public void setUseInheritance(boolean useInheritance) {
+        this.supportsInheritance = useInheritance;
+    }
+
+    public void setEmitModelMethods(boolean emitModelMethods) {
+        this.emitModelMethods = emitModelMethods;
+    }
+
+    public void setEmitJSDoc(boolean emitJSDoc) {
+        this.emitJSDoc = emitJSDoc;
+    }
+
+    @Override
+    public String apiDocFileFolder() {
+        return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
+    }
+
+    @Override
+    public String modelDocFileFolder() {
+        return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
+    }
+
+    @Override
+    public String toApiDocFilename(String name) {
+        return toApiName(name);
+    }
+
+    @Override
+    public String toModelDocFilename(String name) {
+        return toModelName(name);
     }
 
     @Override
     public String toVarName(String name) {
         // sanitize name
-        name = sanitizeName(name);
+        name = sanitizeName(name);  // FIXME parameter should not be assigned. Also declare it as "final"
 
         if("_".equals(name)) {
           name = "_u";
@@ -241,7 +382,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
         name = camelize(name, true);
 
         // for reserved word or word starting with number, append _
-        if (reservedWords.contains(name) || name.matches("^\\d.*")) {
+        if (isReservedWord(name) || name.matches("^\\d.*")) {
             name = escapeReservedWord(name);
         }
 
@@ -256,16 +397,35 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
 
     @Override
     public String toModelName(String name) {
-        name = sanitizeName(name);
+        name = sanitizeName(name);  // FIXME parameter should not be assigned. Also declare it as "final"
 
-        // model name cannot use reserved keyword, e.g. return
-        if (reservedWords.contains(name)) {
-            throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
+        if (!StringUtils.isEmpty(modelNamePrefix)) {
+            name = modelNamePrefix + "_" + name;
+        }
+
+        if (!StringUtils.isEmpty(modelNameSuffix)) {
+            name = name + "_" + modelNameSuffix;
         }
 
         // camelize the model name
         // phone_number => PhoneNumber
-        return camelize(name);
+        name = camelize(name);
+
+        // model name cannot use reserved keyword, e.g. return
+        if (isReservedWord(name)) {
+            String modelName = "Model" + name;
+            LOGGER.warn(name + " (reserved word) cannot be used as model name. Renamed to " + modelName);
+            return modelName;
+        }
+
+        // model name starts with number
+        if (name.matches("^\\d.*")) {
+            String modelName = "Model" + name; // e.g. 200Response => Model200Response (after camelize)
+            LOGGER.warn(name + " (model name starts with number) cannot be used as model name. Renamed to " + modelName);
+            return modelName;
+        }
+
+        return name;
     }
 
     @Override
@@ -289,58 +449,153 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
         if (p instanceof ArrayProperty) {
             ArrayProperty ap = (ArrayProperty) p;
             Property inner = ap.getItems();
-            return getSwaggerType(p); // TODO: + "/* <" + getTypeDeclaration(inner) + "> */";
+            return "[" + getTypeDeclaration(inner) + "]";
         } else if (p instanceof MapProperty) {
             MapProperty mp = (MapProperty) p;
             Property inner = mp.getAdditionalProperties();
-
-            return getSwaggerType(p) + "<String, " + getTypeDeclaration(inner) + ">";
+            return "{String: " + getTypeDeclaration(inner) + "}";
         }
         return super.getTypeDeclaration(p);
     }
 
     @Override
     public String toDefaultValue(Property p) {
-        if (p instanceof ArrayProperty) {
-            return "[]";
-        } else if (p instanceof MapProperty) {
-            return "{}";
+        if (p instanceof StringProperty) {
+            StringProperty dp = (StringProperty) p;
+            if (dp.getDefault() != null) {
+                return "'" + dp.getDefault() + "'";
+            }
+        } else if (p instanceof BooleanProperty) {
+            BooleanProperty dp = (BooleanProperty) p;
+            if (dp.getDefault() != null) {
+                return dp.getDefault().toString();
+            }
+        } else if (p instanceof DateProperty) {
+            // TODO
+        } else if (p instanceof DateTimeProperty) {
+            // TODO
+        } else if (p instanceof DoubleProperty) {
+            DoubleProperty dp = (DoubleProperty) p;
+            if (dp.getDefault() != null) {
+                return dp.getDefault().toString();
+            }
+        } else if (p instanceof FloatProperty) {
+            FloatProperty dp = (FloatProperty) p;
+            if (dp.getDefault() != null) {
+                return dp.getDefault().toString();
+            }
+        } else if (p instanceof IntegerProperty) {
+            IntegerProperty dp = (IntegerProperty) p;
+            if (dp.getDefault() != null) {
+                return dp.getDefault().toString();
+            }
         } else if (p instanceof LongProperty) {
             LongProperty dp = (LongProperty) p;
             if (dp.getDefault() != null) {
-                return dp.getDefault().toString()+"l";
+                return dp.getDefault().toString();
             }
-           return "null";
-
-           // added for Javascript
-        } else if (p instanceof RefProperty) {
-            RefProperty rp = (RefProperty)p;
-            return "new " +rp.getSimpleRef()  + "()";
         }
 
-        return super.toDefaultValue(p);
+        return null;
     }
 
-
     @Override
     public String toDefaultValueWithParam(String name, Property p) {
-        if (p instanceof ArrayProperty) {
-            return  " = new Array();";
-        } else if (p instanceof MapProperty) {
-            return " = {}";
-        } else if (p instanceof LongProperty) {
-            LongProperty dp = (LongProperty) p;
-            return " = data." + name + ";";
-
-           // added for Javascript
-        } else if (p instanceof RefProperty) {
-            RefProperty rp = (RefProperty)p;
-            return ".constructFromObject(data." + name + ");";
+        String type = normalizeType(getTypeDeclaration(p));
+        if (p instanceof RefProperty) {
+            return " = " + type + ".constructFromObject(data['" + name + "']);";
+        } else {
+          return " = ApiClient.convertToType(data['" + name + "'], " + type + ");";
         }
-
-        return super.toDefaultValueWithParam(name, p);
     }
 
+    @Override
+    public void setParameterExampleValue(CodegenParameter p) {
+        String example;
+
+        if (p.defaultValue == null) {
+            example = p.example;
+        } else {
+            example = p.defaultValue;
+        }
+
+        String type = p.baseType;
+        if (type == null) {
+            type = p.dataType;
+        }
+
+        typeMapping.put("array", "Array");
+        typeMapping.put("List", "Array");
+        typeMapping.put("map", "Object");
+        typeMapping.put("object", "Object");
+        typeMapping.put("boolean", "Boolean");
+        typeMapping.put("char", "String");
+        typeMapping.put("string", "String");
+        typeMapping.put("short", "Integer");
+        typeMapping.put("int", "Integer");
+        typeMapping.put("integer", "Integer");
+        typeMapping.put("long", "Integer");
+        typeMapping.put("float", "Number");
+        typeMapping.put("double", "Number");
+        typeMapping.put("number", "Number");
+        typeMapping.put("DateTime", "Date");
+        typeMapping.put("Date", "Date");
+        typeMapping.put("file", "File");
+        // binary not supported in JavaScript client right now, using String as a workaround
+        typeMapping.put("binary", "String");
+
+        if ("String".equals(type)) {
+            if (example == null) {
+                example = p.paramName + "_example";
+            }
+            example = "\"" + escapeText(example) + "\"";
+        } else if ("Integer".equals(type)) {
+            if (example == null) {
+                example = "56";
+            }
+        } else if ("Number".equals(type)) {
+            if (example == null) {
+                example = "3.4";
+            }
+        } else if ("Boolean".equals(type)) {
+            if (example == null) {
+                example = "true";
+            }
+        } else if ("File".equals(type)) {
+            if (example == null) {
+                example = "/path/to/file";
+            }
+            example = "\"" + escapeText(example) + "\"";
+        } else if ("Date".equals(type)) {
+            if (example == null) {
+                example = "2013-10-20T19:20:30+01:00";
+            }
+            example = "new Date(\"" + escapeText(example) + "\")";
+        } else if (!languageSpecificPrimitives.contains(type)) {
+            // type is a model class, e.g. User
+            example = "new " + moduleName + "." + type + "()";
+        }
+
+        if (example == null) {
+            example = "null";
+        } else if (Boolean.TRUE.equals(p.isListContainer)) {
+            example = "[" + example + "]";
+        } else if (Boolean.TRUE.equals(p.isMapContainer)) {
+            example = "{key: " + example + "}";
+        }
+
+        p.example = example;
+    }
+
+    /**
+     * Normalize type by wrapping primitive types with single quotes.
+     *
+     * @param type Primitive type
+     * @return Normalized type
+     */
+    public String normalizeType(String type) {
+      return type.replaceAll("\\b(Boolean|Integer|Number|String|Date)\\b", "'$1'");
+    }
 
     @Override
     public String getSwaggerType(Property p) {
@@ -367,12 +622,51 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
             throw new RuntimeException("Empty method/operation name (operationId) not allowed");
         }
 
+        operationId = camelize(sanitizeName(operationId), true);
+
         // method name cannot use reserved keyword, e.g. return
-        if (reservedWords.contains(operationId)) {
-            throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+        if (isReservedWord(operationId)) {
+            String newOperationId = camelize("call_" + operationId, true);
+            LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to " + newOperationId);
+            return newOperationId;
         }
 
-        return camelize(sanitizeName(operationId), true);
+        return operationId;
+    }
+
+    @Override
+    public CodegenOperation fromOperation(String path, String httpMethod, Operation operation, Map<String, Model> definitions, Swagger swagger) {
+      CodegenOperation op = super.fromOperation(path, httpMethod, operation, definitions, swagger);
+      if (op.returnType != null) {
+        op.returnType = normalizeType(op.returnType);
+      }
+
+      // Set vendor-extension to be used in template:
+      //     x-codegen-hasMoreRequired
+      //     x-codegen-hasMoreOptional
+      //     x-codegen-hasRequiredParams
+      CodegenParameter lastRequired = null;
+      CodegenParameter lastOptional = null;
+      for (CodegenParameter p : op.allParams) {
+          if (p.required != null && p.required) {
+              lastRequired = p;
+          } else {
+              lastOptional = p;
+          }
+      }
+      for (CodegenParameter p : op.allParams) {
+          if (p == lastRequired) {
+              p.vendorExtensions.put("x-codegen-hasMoreRequired", false);
+          } else if (p == lastOptional) {
+              p.vendorExtensions.put("x-codegen-hasMoreOptional", false);
+          } else {
+              p.vendorExtensions.put("x-codegen-hasMoreRequired", true);
+              p.vendorExtensions.put("x-codegen-hasMoreOptional", true);
+          }
+      }
+      op.vendorExtensions.put("x-codegen-hasRequiredParams", lastRequired != null);
+
+      return op;
     }
 
     @Override
@@ -382,21 +676,162 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
         if (allDefinitions != null && codegenModel != null && codegenModel.parent != null && codegenModel.hasEnums) {
             final Model parentModel = allDefinitions.get(toModelName(codegenModel.parent));
             final CodegenModel parentCodegenModel = super.fromModel(codegenModel.parent, parentModel);
-            codegenModel = this.reconcileInlineEnums(codegenModel, parentCodegenModel);
+            codegenModel = JavascriptClientCodegen.reconcileInlineEnums(codegenModel, parentCodegenModel);
         }
 
         return codegenModel;
     }
 
+    private String trimBrackets(String s) {
+        if (s != null) {
+            int beginIdx = s.charAt(0) == '[' ? 1 : 0;
+            int endIdx = s.length();
+            if (s.charAt(endIdx - 1) == ']')
+                endIdx--;
+            return s.substring(beginIdx, endIdx);
+        }
+        return null;
+    }
+
+    private String getModelledType(String dataType) {
+        return "module:" + (StringUtils.isEmpty(modelPackage) ? "" : (modelPackage + "/")) + dataType;
+    }
+
+    private String getJSDocTypeWithBraces(CodegenModel cm, CodegenProperty cp) {
+        return "{" + getJSDocType(cm, cp) + "}";
+    }
+
+    private String getJSDocType(CodegenModel cm, CodegenProperty cp) {
+        if (Boolean.TRUE.equals(cp.isContainer)) {
+            if (cp.containerType.equals("array"))
+                return "Array.<" + getJSDocType(cm, cp.items) + ">";
+            else if (cp.containerType.equals("map"))
+                return "Object.<String, " + getJSDocType(cm, cp.items) + ">";
+        }
+        String dataType = trimBrackets(cp.datatypeWithEnum);
+        if (cp.isEnum) {
+            dataType = cm.classname + '.' + dataType;
+        }
+        if (isModelledType(cp))
+            dataType = getModelledType(dataType);
+        return dataType;
+    }
+
+    private boolean isModelledType(CodegenProperty cp) {
+        // N.B. enums count as modelled types, file is not modelled (SuperAgent uses some 3rd party library).
+        return cp.isEnum || !languageSpecificPrimitives.contains(cp.baseType == null ? cp.datatype : cp.baseType);
+    }
+
+    private String getJSDocTypeWithBraces(CodegenParameter cp) {
+        return "{" + getJSDocType(cp) + "}";
+    }
+
+    private String getJSDocType(CodegenParameter cp) {
+        String dataType = trimBrackets(cp.dataType);
+        if (isModelledType(cp))
+            dataType = getModelledType(dataType);
+        if (Boolean.TRUE.equals(cp.isListContainer)) {
+            return "Array.<" + dataType + ">";
+        } else if (Boolean.TRUE.equals(cp.isMapContainer)) {
+            return "Object.<String, " + dataType + ">";
+        }
+        return dataType;
+    }
+
+    private boolean isModelledType(CodegenParameter cp) {
+        // N.B. enums count as modelled types, file is not modelled (SuperAgent uses some 3rd party library).
+        return cp.isEnum || !languageSpecificPrimitives.contains(cp.baseType == null ? cp.dataType : cp.baseType);
+    }
+
+    private String getJSDocTypeWithBraces(CodegenOperation co) {
+        String jsDocType = getJSDocType(co);
+        return jsDocType == null ? null : "{" + jsDocType + "}";
+    }
+
+    private String getJSDocType(CodegenOperation co) {
+        String returnType = trimBrackets(co.returnType);
+        if (returnType != null) {
+            if (isModelledType(co))
+                returnType = getModelledType(returnType);
+            if (Boolean.TRUE.equals(co.isListContainer)) {
+                return "Array.<" + returnType + ">";
+            } else if (Boolean.TRUE.equals(co.isMapContainer)) {
+                return "Object.<String, " + returnType + ">";
+            }
+        }
+        return returnType;
+    }
+
+    private boolean isModelledType(CodegenOperation co) {
+        // This seems to be the only way to tell whether an operation return type is modelled.
+        return !Boolean.TRUE.equals(co.returnTypeIsPrimitive);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
+        // Generate and store argument list string of each operation into
+        // vendor-extension: x-codegen-argList.
+        Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
+        if (operations != null) {
+            List<CodegenOperation> ops = (List<CodegenOperation>) operations.get("operation");
+            for (CodegenOperation operation : ops) {
+                List<String> argList = new ArrayList<String>();
+                boolean hasOptionalParams = false;
+                for (CodegenParameter p : operation.allParams) {
+                    if (p.required != null && p.required) {
+                        argList.add(p.paramName);
+                    } else {
+                      hasOptionalParams = true;
+                    }
+                }
+                if (hasOptionalParams) {
+                    argList.add("opts");
+                }
+                if (!usePromises) {
+                    argList.add("callback");
+                }
+                operation.vendorExtensions.put("x-codegen-argList", StringUtils.join(argList, ", "));
+
+                // Store JSDoc type specification into vendor-extension: x-jsdoc-type.
+                for (CodegenParameter cp : operation.allParams) {
+                    String jsdocType = getJSDocTypeWithBraces(cp);
+                    cp.vendorExtensions.put("x-jsdoc-type", jsdocType);
+                }
+                String jsdocType = getJSDocTypeWithBraces(operation);
+                operation.vendorExtensions.put("x-jsdoc-type", jsdocType);
+            }
+        }
+        return objs;
+    }
+
+    @SuppressWarnings("unchecked")
     @Override
     public Map<String, Object> postProcessModels(Map<String, Object> objs) {
         List<Object> models = (List<Object>) objs.get("models");
         for (Object _mo : models) {
             Map<String, Object> mo = (Map<String, Object>) _mo;
             CodegenModel cm = (CodegenModel) mo.get("model");
+
+            // Collect each model's required property names in *document order*.
+            // NOTE: can't use 'mandatory' as it is built from ModelImpl.getRequired(), which sorts names
+            // alphabetically and in any case the document order of 'required' and 'properties' can differ.
+            List<String> required = new ArrayList<String>();
+            List<String> allRequired = supportsInheritance ? new ArrayList<String>() : required;
+            cm.vendorExtensions.put("x-required", required);
+            cm.vendorExtensions.put("x-all-required", allRequired);
+
             for (CodegenProperty var : cm.vars) {
                 Map<String, Object> allowableValues = var.allowableValues;
 
+                // Add JSDoc @type value for this property.
+                String jsDocType = getJSDocTypeWithBraces(cm, var);
+                var.vendorExtensions.put("x-jsdoc-type", jsDocType);
+
+                if (Boolean.TRUE.equals(var.required)) {
+                    required.add(var.name);
+                }
+
                 // handle ArrayProperty
                 if (var.items != null) {
                     allowableValues = var.items.allowableValues;
@@ -431,30 +866,29 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
                 }
                 allowableValues.put("enumVars", enumVars);
             }
-        }
-        return objs;
-    }
 
-    @Override
-    public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
-        if("retrofit".equals(getLibrary())) {
-            Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
-            if (operations != null) {
-                List<CodegenOperation> ops = (List<CodegenOperation>) operations.get("operation");
-                for (CodegenOperation operation : ops) {
-                    if (operation.hasConsumes == Boolean.TRUE) {
-                        Map<String, String> firstType = operation.consumes.get(0);
-                        if (firstType != null) {
-                            if ("multipart/form-data".equals(firstType.get("mediaType"))) {
-                                operation.isMultipart = Boolean.TRUE;
-                            }
-                        }
-                    }
-                    if (operation.returnType == null) {
-                        operation.returnType = "Void";
+            if (supportsInheritance) {
+                for (CodegenProperty var : cm.allVars) {
+                    if (Boolean.TRUE.equals(var.required)) {
+                        allRequired.add(var.name);
                     }
                 }
             }
+
+            // set vendor-extension: x-codegen-hasMoreRequired
+            CodegenProperty lastRequired = null;
+            for (CodegenProperty var : cm.vars) {
+                if (var.required != null && var.required) {
+                    lastRequired = var;
+                }
+            }
+            for (CodegenProperty var : cm.vars) {
+                if (var == lastRequired) {
+                    var.vendorExtensions.put("x-codegen-hasMoreRequired", false);
+                } else if (var.required != null && var.required) {
+                    var.vendorExtensions.put("x-codegen-hasMoreRequired", true);
+                }
+            }
         }
         return objs;
     }
@@ -465,14 +899,14 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
             && !languageSpecificPrimitives.contains(type);
     }
 
-    private String findCommonPrefixOfVars(List<String> vars) {
+    private static String findCommonPrefixOfVars(List<String> vars) {
         String prefix = StringUtils.getCommonPrefix(vars.toArray(new String[vars.size()]));
         // exclude trailing characters that should be part of a valid variable
         // e.g. ["status-on", "status-off"] => "status-" (not "status-o")
         return prefix.replaceAll("[a-zA-Z0-9]+\\z", "");
     }
 
-    private String toEnumVarName(String value) {
+    private static String toEnumVarName(String value) {
         String var = value.replaceAll("\\W+", "_").toUpperCase();
         if (var.matches("\\d.*")) {
             return "_" + var;
@@ -481,7 +915,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
         }
     }
 
-    private CodegenModel reconcileInlineEnums(CodegenModel codegenModel, CodegenModel parentCodegenModel) {
+    private static CodegenModel reconcileInlineEnums(CodegenModel codegenModel, CodegenModel parentCodegenModel) {
         // This generator uses inline classes to define enums, which breaks when
         // dealing with models that have subTypes. To clean this up, we will analyze
         // the parent and child models, look for enums that match, and remove
@@ -529,7 +963,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
         return codegenModel;
     }
 
-    private String sanitizePackageName(String packageName) {
+    private static String sanitizePackageName(String packageName) { // FIXME parameter should not be assigned. Also declare it as "final"
         packageName = packageName.trim();
         packageName = packageName.replaceAll("[^a-zA-Z0-9_\\.]", "_");
         if(Strings.isNullOrEmpty(packageName)) {
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClosureAngularClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClosureAngularClientCodegen.java
new file mode 100644
index 00000000000..5b26a84cfc2
--- /dev/null
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClosureAngularClientCodegen.java
@@ -0,0 +1,227 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CodegenModel;
+import io.swagger.codegen.*;
+import io.swagger.models.properties.*;
+
+import java.util.TreeSet;
+import java.util.*;
+import java.io.File;
+
+import org.apache.commons.lang.StringUtils;
+
+public class JavascriptClosureAngularClientCodegen extends DefaultCodegen implements CodegenConfig {
+    public JavascriptClosureAngularClientCodegen() {
+        super();
+
+        supportsInheritance = false;
+        setReservedWordsLowerCase(Arrays.asList("abstract",
+            "continue", "for", "new", "switch", "assert", "default", "if",
+            "package", "synchronized", "do", "goto", "private",
+            "this", "break", "double", "implements", "protected", "throw",
+            "byte", "else", "import", "public", "throws", "case", "enum",
+            "instanceof", "return", "transient", "catch", "extends", "int",
+            "short", "try", "char", "final", "interface", "static", "void",
+            "class", "finally", "const", "super", "while"));
+
+        languageSpecificPrimitives = new HashSet<String>(Arrays.asList(
+            "string",
+            "boolean",
+            "number",
+            "Object",
+            "Blob",
+            "Date"));
+        instantiationTypes.put("array", "Array");
+
+        typeMapping = new HashMap<String, String>();
+        typeMapping.put("Array", "Array");
+        typeMapping.put("array", "Array");
+        typeMapping.put("List", "Array");
+        typeMapping.put("boolean", "boolean");
+        typeMapping.put("string", "string");
+        typeMapping.put("int", "number");
+        typeMapping.put("float", "number");
+        typeMapping.put("number", "number");
+        typeMapping.put("long", "number");
+        typeMapping.put("short", "number");
+        typeMapping.put("char", "string");
+        typeMapping.put("double", "number");
+        typeMapping.put("object", "Object");
+        typeMapping.put("Object", "Object");
+        typeMapping.put("File", "Blob");
+        typeMapping.put("file", "Blob");
+        typeMapping.put("integer", "number");
+        typeMapping.put("Map", "Object");
+        typeMapping.put("map", "Object");
+        typeMapping.put("DateTime", "Date");
+
+        importMapping = new HashMap<String, String>();
+        defaultIncludes = new HashSet<String>(Arrays.asList(
+            "Object",
+            "Array",
+            "Blob"
+        ));
+
+        typeMapping.put("binary", "string");
+
+        outputFolder = "generated-code/javascript-closure-angular";
+        modelTemplateFiles.put("model.mustache", ".js");
+        apiTemplateFiles.put("api.mustache", ".js");
+        embeddedTemplateDir = templateDir = "Javascript-Closure-Angular";
+        apiPackage = "API.Client";
+        modelPackage = "API.Client";
+    }
+
+    @Override
+    public String getName() {
+        return "javascript-closure-angular";
+    }
+
+    @Override
+    public String getHelp() {
+        return "Generates a Javascript AngularJS client library annotated with Google Closure Compiler annotations" +
+            "(https://developers.google.com/closure/compiler/docs/js-for-compiler?hl=en)";
+    }
+
+    @Override
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
+    }
+
+    @Override
+    public String escapeReservedWord(String name) {
+        return "_" + name;
+    }
+
+    @Override
+    public String apiFileFolder() {
+        return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
+    }
+
+    public String modelFileFolder() {
+        return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);
+    }
+
+    @Override
+    public String toVarName(String name) {
+        // replace - with _ e.g. created-at => created_at
+        name = name.replaceAll("-", "_");
+
+        // if it's all uppper case, do nothing
+        if (name.matches("^[A-Z_]*$"))
+            return name;
+
+        // camelize the variable name
+        // pet_id => PetId
+        name = camelize(name, true);
+
+        // for reserved word or word starting with number, append _
+        if (isReservedWord(name) || name.matches("^\\d.*"))
+            name = escapeReservedWord(name);
+
+        return name;
+    }
+
+    @Override
+    public String toParamName(String name) {
+        // should be the same as variable name
+        return toVarName(name);
+    }
+
+    @Override
+    public String toModelName(String name) {
+        if (!StringUtils.isEmpty(modelNamePrefix)) {
+            name = modelNamePrefix + "_" + name;
+        }
+
+        if (!StringUtils.isEmpty(modelNameSuffix)) {
+            name = name + "_" + modelNameSuffix;
+        }
+
+        // model name cannot use reserved keyword, e.g. return
+        if (isReservedWord(name)) {
+            LOGGER.warn(name + " (reserved word) cannot be used as model name. Renamed to " + camelize("model_" + name));
+            name = "model_" + name; // e.g. return => ModelReturn (after camelize)
+        }
+
+        // camelize the model name
+        // phone_number => PhoneNumber
+        return camelize(name);
+    }
+
+    @Override
+    public String toModelFilename(String name) {
+        // should be the same as the model name
+        return toModelName(name);
+    }
+
+    @Override
+    public String getTypeDeclaration(Property p) {
+        if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            Property inner = ap.getItems();
+            return getSwaggerType(p) + "<!" + getTypeDeclaration(inner) + ">";
+        } else if (p instanceof MapProperty) {
+            MapProperty mp = (MapProperty) p;
+            Property inner = mp.getAdditionalProperties();
+            return "Object<!string, "+ getTypeDeclaration(inner) + ">";
+        } else if (p instanceof FileProperty) {
+            return "Object";
+        }
+        String type = super.getTypeDeclaration(p);
+        if (type.equals("boolean") ||
+                type.equals("Date") ||
+                type.equals("number") ||
+                type.equals("string")) {
+            return type;
+                }
+        return apiPackage + "." + type;
+    }
+
+    @Override
+    public String getSwaggerType(Property p) {
+        String swaggerType = super.getSwaggerType(p);
+        String type = null;
+        if (typeMapping.containsKey(swaggerType)) {
+            type = typeMapping.get(swaggerType);
+            if (languageSpecificPrimitives.contains(type)) {
+                return type;
+            }
+        } else
+            type = swaggerType;
+        return type;
+    }
+
+    @Override
+    public Map<String, Object> postProcessModels(Map<String, Object> objs) {
+
+        List<Object> models = (List<Object>) objs.get("models");
+        for (Object _mo : models) {
+            Map<String, Object> mo = (Map<String, Object>) _mo;
+            CodegenModel cm = (CodegenModel) mo.get("model");
+            cm.imports = new TreeSet(cm.imports);
+            for (CodegenProperty var : cm.vars) {
+                // handle default value for enum, e.g. available => StatusEnum.available
+                if (var.isEnum && var.defaultValue != null && !"null".equals(var.defaultValue)) {
+                    var.defaultValue = var.datatypeWithEnum + "." + var.defaultValue;
+                }
+            }
+        }
+        return objs;
+    }
+
+    @Override
+    public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
+        if (objs.get("imports") instanceof List) {
+            List<Map<String, String>> imports = (ArrayList<Map<String, String>>)objs.get("imports");
+            Collections.sort(imports, new Comparator<Map<String, String>>() {
+                public int compare(Map<String, String> o1, Map<String, String> o2) {
+                    return o1.get("import").compareTo(o2.get("import"));
+                }
+            });
+            objs.put("imports", imports);
+        }
+        return objs;
+    }
+
+}
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java
index d4bb00bb652..bf1cdcbb900 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java
@@ -8,10 +8,11 @@ import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
-
 import io.swagger.codegen.*;
-import io.swagger.models.Swagger;
+import io.swagger.models.*;
 import io.swagger.util.Yaml;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -20,6 +21,9 @@ import java.util.*;
 import java.util.Map.Entry;
 
 public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(NodeJSServerCodegen.class);
+
     protected String apiVersion = "1.0.0";
     protected int serverPort = 8080;
     protected String projectName = "swagger-server";
@@ -56,7 +60,7 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig
         /**
          * Reserved words.  Override this with reserved words specific to your language
          */
-        reservedWords = new HashSet<String>(
+        setReservedWordsLowerCase(
                 Arrays.asList(
                         "break", "case", "class", "catch", "const", "continue", "debugger",
                         "default", "delete", "do", "else", "export", "extends", "finally",
@@ -85,18 +89,9 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig
                         "api",
                         "swagger.yaml")
         );
-        supportingFiles.add(new SupportingFile("index.mustache",
-                        "",
-                        "index.js")
-        );
-        supportingFiles.add(new SupportingFile("package.mustache",
-                        "",
-                        "package.json")
-        );
-        supportingFiles.add(new SupportingFile("README.mustache",
-                        "",
-                        "README.md")
-        );
+        writeOptional(outputFolder, new SupportingFile("index.mustache", "", "index.js"));
+        writeOptional(outputFolder, new SupportingFile("package.mustache", "", "package.json"));
+        writeOptional(outputFolder, new SupportingFile("README.mustache", "", "README.md"));
         if (System.getProperty("noservice") == null) {
             apiTemplateFiles.put(
                     "service.mustache",   // the template to use
@@ -128,7 +123,7 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig
      */
     @Override
     public String getName() {
-        return "nodejs";
+        return "nodejs-server";
     }
 
     /**
@@ -184,6 +179,7 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig
         List<CodegenOperation> operations = (List<CodegenOperation>) objectMap.get("operation");
         for (CodegenOperation operation : operations) {
             operation.httpMethod = operation.httpMethod.toLowerCase();
+
             List<CodegenParameter> params = operation.allParams;
             if (params != null && params.size() == 0) {
                 operation.allParams = null;
@@ -211,7 +207,7 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig
     }
 
     @SuppressWarnings("unchecked")
-    private List<Map<String, Object>> getOperations(Map<String, Object> objs) {
+    private static List<Map<String, Object>> getOperations(Map<String, Object> objs) {
         List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
         Map<String, Object> apiInfo = (Map<String, Object>) objs.get("apiInfo");
         List<Map<String, Object>> apis = (List<Map<String, Object>>) apiInfo.get("apis");
@@ -221,7 +217,7 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig
         return result;
     }
 
-    private List<Map<String, Object>> sortOperationsByPath(List<CodegenOperation> ops) {
+    private static List<Map<String, Object>> sortOperationsByPath(List<CodegenOperation> ops) {
         Multimap<String, CodegenOperation> opsByPath = ArrayListMultimap.create();
 
         for (CodegenOperation op : ops) {
@@ -246,10 +242,6 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig
 
     @Override
     public void preprocessSwagger(Swagger swagger) {
-        if ("/".equals(swagger.getBasePath())) {
-            swagger.setBasePath("");
-        }
-
         String host = swagger.getHost();
         String port = "8080";
         if (host != null) {
@@ -259,6 +251,40 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig
             }
         }
         this.additionalProperties.put("serverPort", port);
+
+        if (swagger.getInfo() != null) {
+            Info info = swagger.getInfo();
+            if (info.getTitle() != null) {
+                // when info.title is defined, use it for projectName
+                // used in package.json
+                projectName = dashize(info.getTitle());
+                this.additionalProperties.put("projectName", projectName);
+            }
+        }
+
+        // need vendor extensions for x-swagger-router-controller
+        Map<String, Path> paths = swagger.getPaths();
+        if(paths != null) {
+            for(String pathname : paths.keySet()) {
+                Path path = paths.get(pathname);
+                Map<HttpMethod, Operation> operationMap = path.getOperationMap();
+                if(operationMap != null) {
+                    for(HttpMethod method : operationMap.keySet()) {
+                        Operation operation = operationMap.get(method);
+                        String tag = "default";
+                        if(operation.getTags() != null && operation.getTags().size() > 0) {
+                            tag = toApiName(operation.getTags().get(0));
+                        }
+                        if(operation.getOperationId() == null) {
+                            operation.setOperationId(getOrGenerateOperationId(operation, pathname, method.toString()));
+                        }
+                        if(operation.getVendorExtensions().get("x-swagger-router-controller") == null) {
+                            operation.getVendorExtensions().put("x-swagger-router-controller", sanitizeTag(tag));
+                        }
+                    }
+                }
+            }
+        }
     }
 
         @Override
@@ -276,7 +302,7 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig
                 });
                 objs.put("swagger-yaml", Yaml.mapper().registerModule(module).writeValueAsString(swagger));
             } catch (JsonProcessingException e) {
-                e.printStackTrace();
+                LOGGER.error(e.getMessage(), e);
             }
         }
         for (Map<String, Object> operations : getOperations(objs)) {
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
index dd002a12b19..4ec5fa0693b 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
@@ -3,6 +3,7 @@ package io.swagger.codegen.languages;
 import io.swagger.codegen.CliOption;
 import io.swagger.codegen.CodegenConfig;
 import io.swagger.codegen.CodegenConstants;
+import io.swagger.codegen.CodegenOperation;
 import io.swagger.codegen.CodegenProperty;
 import io.swagger.codegen.CodegenType;
 import io.swagger.codegen.DefaultCodegen;
@@ -13,6 +14,8 @@ import java.io.File;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
@@ -36,7 +39,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
 
     public ObjcClientCodegen() {
         super();
-        
+
         outputFolder = "generated-code" + File.separator + "objc";
         modelTemplateFiles.put("model-header.mustache", ".h");
         modelTemplateFiles.put("model-body.mustache", ".m");
@@ -57,7 +60,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         defaultIncludes.add("NSDictionary");
         defaultIncludes.add("NSMutableArray");
         defaultIncludes.add("NSMutableDictionary");
-        
+
         languageSpecificPrimitives.clear();
         languageSpecificPrimitives.add("NSNumber");
         languageSpecificPrimitives.add("NSString");
@@ -84,15 +87,18 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         typeMapping.put("List", "NSArray");
         typeMapping.put("object", "NSObject");
         typeMapping.put("file", "NSURL");
+        //TODO binary should be mapped to byte array
+        // mapped to String as a workaround
+        typeMapping.put("binary", "NSString");
 
 
         // ref: http://www.tutorialspoint.com/objective_c/objective_c_basic_syntax.htm
-        reservedWords = new HashSet<String>(
-                Arrays.asList(
+        setReservedWordsLowerCase(
+              Arrays.asList(
                     // local variable names in API methods (endpoints)
                     "resourcePath", "pathParams", "queryParams", "headerParams",
                     "responseContentType", "requestContentType", "authSettings",
-                    "formParams", "files", "bodyParam",
+                    "formParams", "localVarFiles", "bodyParam",
                     // objc reserved words
                     "auto", "else", "long", "switch",
                     "break", "enum", "register", "typedef",
@@ -168,19 +174,19 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         if (additionalProperties.containsKey(CLASS_PREFIX)) {
             setClassPrefix((String) additionalProperties.get(CLASS_PREFIX));
         }
-        
+
         if (additionalProperties.containsKey(AUTHOR_NAME)) {
             setAuthorName((String) additionalProperties.get(AUTHOR_NAME));
         }
-        
+
         if (additionalProperties.containsKey(AUTHOR_EMAIL)) {
             setAuthorEmail((String) additionalProperties.get(AUTHOR_EMAIL));
         }
-        
+
         if (additionalProperties.containsKey(GIT_REPO_URL)) {
             setGitRepoURL((String) additionalProperties.get(GIT_REPO_URL));
         }
-        
+
         if (additionalProperties.containsKey(LICENSE)) {
             setLicense((String) additionalProperties.get(LICENSE));
         }
@@ -214,17 +220,17 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         supportingFiles.add(new SupportingFile("Configuration-header.mustache", swaggerFolder, classPrefix + "Configuration.h"));
         supportingFiles.add(new SupportingFile("podspec.mustache", "", podName + ".podspec"));
         supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
+        supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
+        supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
+
+
     }
 
     @Override
     public String toInstantiationType(Property p) {
         if (p instanceof MapProperty) {
-            MapProperty ap = (MapProperty) p;
-            String inner = getSwaggerType(ap.getAdditionalProperties());
             return instantiationTypes.get("map");
         } else if (p instanceof ArrayProperty) {
-            ArrayProperty ap = (ArrayProperty) p;
-            String inner = getSwaggerType(ap.getItems());
             return instantiationTypes.get("array");
         } else {
             return null;
@@ -247,12 +253,12 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         if (typeMapping.containsKey(swaggerType)) {
             type = typeMapping.get(swaggerType);
             if (languageSpecificPrimitives.contains(type) && !foundationClasses.contains(type)) {
-                return toModelName(type);
+                return toModelNameWithoutReservedWordCheck(type);
             }
         } else {
             type = swaggerType;
         }
-        return toModelName(type);
+        return toModelNameWithoutReservedWordCheck(type);
     }
 
     @Override
@@ -312,7 +318,32 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
 
     @Override
     public String toModelName(String type) {
-        type = type.replaceAll("[^0-9a-zA-Z_]", "_");
+        // model name cannot use reserved keyword
+        if (reservedWords.contains(type)) {
+            LOGGER.warn(type+ " (reserved word) cannot be used as model name. Renamed to " + ("model_" + type) + " before further processing");
+            type = "model_" + type; // e.g. return => ModelReturn (after camelize)
+        }
+
+        // model name starts with number
+        /* no need for the fix below as objc model starts with prefix (e.g. SWG)
+        if (type.matches("^\\d.*")) {
+            LOGGER.warn(type + " (model name starts with number) cannot be used as model name. Renamed to " + camelize("model_" + type));
+            type = "model_" + type; // e.g. 200Response => Model200Response (after camelize)
+        }
+        */
+
+        return toModelNameWithoutReservedWordCheck(type);
+    }
+
+    /*
+     * Convert input to proper model name according to ObjC style guide
+     * without checking for reserved words
+     *
+     * @param type Model anme
+     * @return model Name in ObjC style guide
+     */
+    public String toModelNameWithoutReservedWordCheck(String type) {
+        type = type.replaceAll("[^0-9a-zA-Z_]", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
         // language build-in classes
         if (typeMapping.keySet().contains(type) ||
@@ -324,7 +355,15 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         }
         // custom classes
         else {
-            return classPrefix + camelize(type);
+            if (!StringUtils.isEmpty(modelNameSuffix)) { // set model suffix
+                type = type + "_" + modelNameSuffix;
+            }
+
+            if (!StringUtils.isEmpty(modelNamePrefix)) { // set model prefix
+                type = modelNamePrefix + "_" + type;
+            }
+
+            return classPrefix + camelize(type); // add class prefix
         }
     }
 
@@ -372,7 +411,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
     @Override
     public String toVarName(String name) {
         // sanitize name
-        name = sanitizeName(name);
+        name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
         // if it's all upper case, do noting
         if (name.matches("^[A-Z_]$")) {
@@ -390,7 +429,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         name = camelize(name, true);
 
         // for reserved word or word starting with number, prepend `_`
-        if (reservedWords.contains(name) || name.matches("^\\d.*")) {
+        if (isReservedWord(name) || name.matches("^\\d.*")) {
             name = escapeReservedWord(name);
         }
 
@@ -409,6 +448,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         return "_" + name;
     }
 
+    @SuppressWarnings("static-method")
     public String escapeSpecialWord(String name) {
         return "var_" + name;
     }
@@ -421,8 +461,9 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         }
 
         // method name cannot use reserved keyword, e.g. return
-        if (reservedWords.contains(operationId)) {
-            throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+        if (isReservedWord(operationId)) {
+            LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to " + camelize(sanitizeName("call_" + operationId), true));
+            operationId = "call_" + operationId;
         }
 
         return camelize(sanitizeName(operationId), true);
@@ -439,23 +480,38 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
     public void setPodVersion(String podVersion) {
         this.podVersion = podVersion;
     }
-    
+
     public void setAuthorEmail(String authorEmail) {
         this.authorEmail = authorEmail;
     }
-    
+
     public void setAuthorName(String authorName) {
         this.authorName = authorName;
     }
-    
+
     public void setGitRepoURL(String gitRepoURL) {
         this.gitRepoURL = gitRepoURL;
     }
-    
+
     public void setLicense(String license) {
         this.license = license;
     }
 
+    @Override
+    public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
+        Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
+        if (operations != null) {
+            List<CodegenOperation> ops = (List<CodegenOperation>) operations.get("operation");
+            for (CodegenOperation operation : ops) {
+                if (!operation.allParams.isEmpty()) {
+                    String firstParamName = operation.allParams.get(0).paramName;
+                    operation.vendorExtensions.put("firstParamAltName", camelize(firstParamName));
+                }
+            }
+        }
+        return objs;
+    }
+
     /**
      * Return the default value of the property
      *
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java
index 4f8a1fb2a9f..f264a86b6a5 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java
@@ -1,27 +1,44 @@
 package io.swagger.codegen.languages;
 
 import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenParameter;
 import io.swagger.codegen.CodegenType;
 import io.swagger.codegen.DefaultCodegen;
 import io.swagger.codegen.SupportingFile;
 import io.swagger.codegen.CodegenConstants;
 import io.swagger.codegen.CliOption;
 import io.swagger.models.properties.ArrayProperty;
-import io.swagger.models.properties.BooleanProperty;
 import io.swagger.models.properties.MapProperty;
 import io.swagger.models.properties.Property;
+import io.swagger.models.properties.StringProperty;
+import io.swagger.models.properties.LongProperty;
+import io.swagger.models.properties.IntegerProperty;
+import io.swagger.models.properties.FloatProperty;
+import io.swagger.models.properties.DoubleProperty;
+import io.swagger.models.properties.BooleanProperty;
+import io.swagger.models.properties.BinaryProperty;
+import io.swagger.models.properties.ByteArrayProperty;
+import io.swagger.models.properties.DateTimeProperty;
+import io.swagger.models.properties.DateProperty;
+
 
 import java.io.File;
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.regex.Matcher;
 
 import org.apache.commons.lang.StringUtils;
 
 public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig {
     public static final String MODULE_NAME = "moduleName";
     public static final String MODULE_VERSION = "moduleVersion";
-    protected String moduleName = "SwaggerClient";
+    protected String moduleName = "WWW::SwaggerClient";
+    protected String modulePathPart = moduleName.replaceAll("::", Matcher.quoteReplacement(File.separator));
     protected String moduleVersion = "1.0.0";
+    protected String apiDocPath = "docs/";
+    protected String modelDocPath = "docs/";
+
+    protected static int emptyFunctionNameCounter = 0;
 
     public PerlClientCodegen() {
         super();
@@ -29,10 +46,14 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig {
         outputFolder = "generated-code" + File.separatorChar + "perl";
         modelTemplateFiles.put("object.mustache", ".pm");
         apiTemplateFiles.put("api.mustache", ".pm");
+        modelTestTemplateFiles.put("object_test.mustache", ".t");
+        apiTestTemplateFiles.put("api_test.mustache", ".t");
+        modelDocTemplateFiles.put("object_doc.mustache", ".md");
+        apiDocTemplateFiles.put("api_doc.mustache", ".md");
         embeddedTemplateDir = templateDir = "perl";
 
 
-        reservedWords = new HashSet<String>(
+        setReservedWordsLowerCase(
                 Arrays.asList(
                         "else", "lock", "qw",
                         "__END__", "elsif", "lt", "qx",
@@ -43,7 +64,8 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig {
                         "cmp", "ge", "package", "until",
                         "continue", "gt", "q", "while",
                         "CORE", "if", "qq", "xor",
-                        "do", "le", "qr", "y"
+                        "do", "le", "qr", "y",
+                        "return"
                 )
         );
 
@@ -70,9 +92,12 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig {
         typeMapping.put("array", "ARRAY");
         typeMapping.put("map", "HASH");
         typeMapping.put("object", "object");
+        //TODO binary should be mapped to byte array
+        // mapped to String as a workaround
+        typeMapping.put("binary", "string");
 
         cliOptions.clear();
-        cliOptions.add(new CliOption(MODULE_NAME, "Perl module name (convention: CamelCase).").defaultValue("SwaggerClient"));
+        cliOptions.add(new CliOption(MODULE_NAME, "Perl module name (convention: CamelCase or Long::Module).").defaultValue("SwaggerClient"));
         cliOptions.add(new CliOption(MODULE_VERSION, "Perl module version.").defaultValue("1.0.0"));
         cliOptions.add(CliOption.newBoolean(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG,
                 CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG_DESC).defaultValue(Boolean.TRUE.toString()));
@@ -94,17 +119,24 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig {
 
         if (additionalProperties.containsKey(MODULE_NAME)) {
             setModuleName((String) additionalProperties.get(MODULE_NAME));
+            setModulePathPart(moduleName.replaceAll("::", Matcher.quoteReplacement(File.separator)));
         } else {
             additionalProperties.put(MODULE_NAME, moduleName);
         }
 
-        supportingFiles.add(new SupportingFile("ApiClient.mustache", ("lib/WWW/" + moduleName).replace('/', File.separatorChar), "ApiClient.pm"));
-        supportingFiles.add(new SupportingFile("Configuration.mustache", ("lib/WWW/" + moduleName).replace('/', File.separatorChar), "Configuration.pm"));
-        supportingFiles.add(new SupportingFile("ApiFactory.mustache", ("lib/WWW/" + moduleName).replace('/', File.separatorChar), "ApiFactory.pm"));
-        supportingFiles.add(new SupportingFile("Role.mustache", ("lib/WWW/" + moduleName).replace('/', File.separatorChar), "Role.pm"));
-        supportingFiles.add(new SupportingFile("AutoDoc.mustache", ("lib/WWW/" + moduleName + "/Role").replace('/', File.separatorChar), "AutoDoc.pm"));
+        // make api and model doc path available in mustache template
+        additionalProperties.put("apiDocPath", apiDocPath);
+        additionalProperties.put("modelDocPath", modelDocPath);
+
+        supportingFiles.add(new SupportingFile("ApiClient.mustache", ("lib/" + modulePathPart).replace('/', File.separatorChar), "ApiClient.pm"));
+        supportingFiles.add(new SupportingFile("Configuration.mustache", ("lib/" + modulePathPart).replace('/', File.separatorChar), "Configuration.pm"));
+        supportingFiles.add(new SupportingFile("ApiFactory.mustache", ("lib/" + modulePathPart).replace('/', File.separatorChar), "ApiFactory.pm"));
+        supportingFiles.add(new SupportingFile("Role.mustache", ("lib/" + modulePathPart).replace('/', File.separatorChar), "Role.pm"));
+        supportingFiles.add(new SupportingFile("AutoDoc.mustache", ("lib/" + modulePathPart + "/Role").replace('/', File.separatorChar), "AutoDoc.pm"));
         supportingFiles.add(new SupportingFile("autodoc.script.mustache", "bin", "autodoc"));
         supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
+        supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
+        supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
     }
 
     @Override
@@ -129,12 +161,32 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig {
 
     @Override
     public String apiFileFolder() {
-        return (outputFolder + "/lib/WWW/" + moduleName + apiPackage()).replace('/', File.separatorChar);
+        return (outputFolder + "/lib/" + modulePathPart + apiPackage()).replace('/', File.separatorChar);
     }
 
     @Override
     public String modelFileFolder() {
-        return (outputFolder + "/lib/WWW/" + moduleName + modelPackage()).replace('/', File.separatorChar);
+        return (outputFolder + "/lib/" + modulePathPart + modelPackage()).replace('/', File.separatorChar);
+    }
+
+    @Override
+    public String apiTestFileFolder() {
+        return (outputFolder + "/t").replace('/', File.separatorChar);
+    }
+
+    @Override
+    public String modelTestFileFolder() {
+        return (outputFolder + "/t").replace('/', File.separatorChar);
+    }
+
+    @Override
+    public String apiDocFileFolder() {
+        return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
+    }
+
+    @Override
+    public String modelDocFileFolder() {
+        return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
     }
 
     @Override
@@ -166,12 +218,48 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig {
         if (type == null) {
             return null;
         }
-        return type;
+        return toModelName(type);
     }
 
     @Override
     public String toDefaultValue(Property p) {
-        return "null";
+        if (p instanceof StringProperty) {
+            StringProperty dp = (StringProperty) p;
+            if (dp.getDefault() != null) {
+                return "'" + dp.getDefault().toString() + "'";
+            }
+        } else if (p instanceof BooleanProperty) {
+            BooleanProperty dp = (BooleanProperty) p;
+            if (dp.getDefault() != null) {
+                return dp.getDefault().toString();
+            }
+        } else if (p instanceof DateProperty) {
+            // TODO
+        } else if (p instanceof DateTimeProperty) {
+            // TODO
+        } else if (p instanceof DoubleProperty) {
+            DoubleProperty dp = (DoubleProperty) p;
+            if (dp.getDefault() != null) {
+                return dp.getDefault().toString();
+            }
+        } else if (p instanceof FloatProperty) {
+            FloatProperty dp = (FloatProperty) p;
+            if (dp.getDefault() != null) {
+                return dp.getDefault().toString();
+            }
+        } else if (p instanceof IntegerProperty) {
+            IntegerProperty dp = (IntegerProperty) p;
+            if (dp.getDefault() != null) {
+                return dp.getDefault().toString();
+            }
+        } else if (p instanceof LongProperty) {
+            LongProperty dp = (LongProperty) p;
+            if (dp.getDefault() != null) {
+                return dp.getDefault().toString();
+            }
+        }
+
+        return null;
     }
 
 
@@ -179,14 +267,13 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig {
     public String toVarName(String name) {
         // return the name in underscore style
         // PhoneNumber => phone_number
-        name = underscore(name);
+        name = underscore(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
         // parameter name starting with number won't compile
         // need to escape it by appending _ at the beginning
         if (name.matches("^\\d.*")) {
             name = "_" + name;
         }
-
         return name;
     }
 
@@ -198,9 +285,27 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig {
 
     @Override
     public String toModelName(String name) {
+        name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
+
         // model name cannot use reserved keyword
-        if (reservedWords.contains(name)) {
-            escapeReservedWord(name); // e.g. return => _return
+        if (isReservedWord(name)) {
+            LOGGER.warn(name + " (reserved word) cannot be used as model name. Renamed to " + camelize("model_" + name));
+            name = "model_" + name;
+        }
+
+        // model name starts with number
+        if (name.matches("^\\d.*")) {
+            LOGGER.warn(name + " (model name starts with number) cannot be used as model name. Renamed to " + camelize("model_" + name));
+            name = "model_" + name; // e.g. 200Response => Model200Response (after camelize)
+        }
+
+        // add prefix/suffic to model name
+        if (!StringUtils.isEmpty(modelNamePrefix)) {
+            name = modelNamePrefix + "_" + name;
+        }
+
+        if (!StringUtils.isEmpty(modelNameSuffix)) {
+            name = name + "_" + modelNameSuffix;
         }
 
         // camelize the model name
@@ -214,10 +319,30 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig {
         return toModelName(name);
     }
 
+    @Override
+    public String toModelTestFilename(String name) {
+        return toModelFilename(name) + "Test";
+    }
+
+    @Override
+    public String toModelDocFilename(String name) {
+        return toModelFilename(name);
+    }
+
+    @Override
+    public String toApiTestFilename(String name) {
+        return toApiFilename(name) + "Test";
+    }
+
+    @Override
+    public String toApiDocFilename(String name) {
+        return toApiFilename(name);
+    }
+
     @Override
     public String toApiFilename(String name) {
         // replace - with _ e.g. created-at => created_at
-        name = name.replaceAll("-", "_");
+        name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
         // e.g. phone_number_api.rb => PhoneNumberApi.rb
         return camelize(name) + "Api";
@@ -234,14 +359,17 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig {
 
     @Override
     public String toOperationId(String operationId) {
-        // throw exception if method name is empty
+        //rename to empty_function_name_1 (e.g.) if method name is empty
         if (StringUtils.isEmpty(operationId)) {
-            throw new RuntimeException("Empty method name (operationId) not allowed");
+            operationId = underscore("empty_function_name_" + emptyFunctionNameCounter++);
+            LOGGER.warn("Empty method name (operationId) found. Renamed to " + operationId);
+            return operationId;
         }
 
         // method name cannot use reserved keyword, e.g. return
-        if (reservedWords.contains(operationId)) {
-            throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+        if (isReservedWord(operationId)) {
+            LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to " + underscore("call_" + operationId));
+            return underscore("call_" + operationId);
         }
 
         return underscore(operationId);
@@ -251,7 +379,27 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig {
         this.moduleName = moduleName;
     }
 
+    public void setModulePathPart(String modulePathPart) {
+        this.modulePathPart = modulePathPart;
+    }
+
     public void setModuleVersion(String moduleVersion) {
         this.moduleVersion = moduleVersion;
     }
+
+    @Override
+    public void setParameterExampleValue(CodegenParameter p) {
+        if (Boolean.TRUE.equals(p.isString) || Boolean.TRUE.equals(p.isBinary) || 
+                Boolean.TRUE.equals(p.isByteArray) || Boolean.TRUE.equals(p.isFile)) {
+            p.example = "'" + p.example + "'";
+        } else if (Boolean.TRUE.equals(p.isBoolean)) {
+            if (Boolean.parseBoolean(p.example))
+                p.example = new String("1");
+            else
+                p.example = new String("0");
+        } else if (Boolean.TRUE.equals(p.isDateTime) || Boolean.TRUE.equals(p.isDate)) {
+            p.example = "DateTime->from_epoch(epoch => str2time('" + p.example + "'))";
+        }
+
+    }
 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java
index 3e3ae868e3f..e8ee2e0d1ad 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java
@@ -3,6 +3,7 @@ package io.swagger.codegen.languages;
 import io.swagger.codegen.CliOption;
 import io.swagger.codegen.CodegenConfig;
 import io.swagger.codegen.CodegenConstants;
+import io.swagger.codegen.CodegenParameter;
 import io.swagger.codegen.CodegenType;
 import io.swagger.codegen.DefaultCodegen;
 import io.swagger.codegen.SupportingFile;
@@ -20,6 +21,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
+    @SuppressWarnings("hiding")
     static Logger LOGGER = LoggerFactory.getLogger(PhpClientCodegen.class);
 
     public static final String VARIABLE_NAMING_CONVENTION = "variableNamingConvention";
@@ -34,21 +36,30 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
     protected String artifactVersion = "1.0.0";
     protected String srcBasePath = "lib";
     protected String variableNamingConvention= "snake_case";
+    protected String apiDocPath = "docs/";
+    protected String modelDocPath = "docs/";
 
     public PhpClientCodegen() {
         super();
 
+        supportsInheritance = true;
         outputFolder = "generated-code" + File.separator + "php";
         modelTemplateFiles.put("model.mustache", ".php");
         apiTemplateFiles.put("api.mustache", ".php");
+        modelTestTemplateFiles.put("model_test.mustache", ".php");
+        apiTestTemplateFiles.put("api_test.mustache", ".php");
         embeddedTemplateDir = templateDir = "php";
         apiPackage = invokerPackage + "\\Api";
         modelPackage = invokerPackage + "\\Model";
+        testPackage = invokerPackage + "\\Tests";
 
-        reservedWords = new HashSet<String>(
+        modelDocTemplateFiles.put("model_doc.mustache", ".md");
+        apiDocTemplateFiles.put("api_doc.mustache", ".md");
+
+        setReservedWordsLowerCase(
                 Arrays.asList(
                     // local variables used in api methods (endpoints)
-                    "resourcePath", "method", "httpBody", "queryParams", "headerParams",
+                    "resourcePath", "httpBody", "queryParams", "headerParams",
                     "formParams", "_header_accept", "_tempBody",
 
                     // PHP reserved words
@@ -97,6 +108,7 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
         typeMapping.put("array", "array");
         typeMapping.put("list", "array");
         typeMapping.put("object", "object");
+        typeMapping.put("binary", "string");
 
         cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC));
         cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC));
@@ -105,8 +117,8 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
         cliOptions.add(new CliOption(CodegenConstants.INVOKER_PACKAGE, "The main namespace to use for all classes. e.g. Yay\\Pets"));
         cliOptions.add(new CliOption(PACKAGE_PATH, "The main package name for classes. e.g. GeneratedPetstore"));
         cliOptions.add(new CliOption(SRC_BASE_PATH, "The directory under packagePath to serve as source root."));
-        cliOptions.add(new CliOption(COMPOSER_VENDOR_NAME, "The vendor name used in the composer package name. The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name. e.g. yaypets"));
-        cliOptions.add(new CliOption(COMPOSER_PROJECT_NAME, "The project name used in the composer package name. The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name. e.g. petstore-client"));
+        cliOptions.add(new CliOption(COMPOSER_VENDOR_NAME, "The vendor name used in the composer package name. The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name. e.g. yaypets. IMPORTANT NOTE (2016/03): composerVendorName will be deprecated and replaced by gitUserId in the next swagger-codegen release"));
+        cliOptions.add(new CliOption(COMPOSER_PROJECT_NAME, "The project name used in the composer package name. The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name. e.g. petstore-client. IMPORTANT NOTE (2016/03): composerProjectName will be deprecated and replaced by gitRepoId in the next swagger-codegen release"));
         cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_VERSION, "The version to use in the composer package version field. e.g. 1.2.3"));
     }
 
@@ -115,9 +127,9 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
     }
 
     public String toPackagePath(String packageName, String basePath) {
-        packageName = packageName.replace(invokerPackage, "");
+        packageName = packageName.replace(invokerPackage, ""); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
         if (basePath != null && basePath.length() > 0) {
-            basePath = basePath.replaceAll("[\\\\/]?$", "") + File.separatorChar;
+            basePath = basePath.replaceAll("[\\\\/]?$", "") + File.separatorChar; // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
         }
 
         String regFirstPathSeparator;
@@ -173,13 +185,13 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
         } else {
             additionalProperties.put(SRC_BASE_PATH, srcBasePath);
         }
-        
+
         if (additionalProperties.containsKey(CodegenConstants.INVOKER_PACKAGE)) {
             this.setInvokerPackage((String) additionalProperties.get(CodegenConstants.INVOKER_PACKAGE));
         } else {
             additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
         }
-        
+
         if (!additionalProperties.containsKey(CodegenConstants.MODEL_PACKAGE)) {
             additionalProperties.put(CodegenConstants.MODEL_PACKAGE, modelPackage);
         }
@@ -187,19 +199,19 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
         if (!additionalProperties.containsKey(CodegenConstants.API_PACKAGE)) {
             additionalProperties.put(CodegenConstants.API_PACKAGE, apiPackage);
         }
-                
+
         if (additionalProperties.containsKey(COMPOSER_PROJECT_NAME)) {
             this.setComposerProjectName((String) additionalProperties.get(COMPOSER_PROJECT_NAME));
         } else {
             additionalProperties.put(COMPOSER_PROJECT_NAME, composerProjectName);
         }
-        
+
         if (additionalProperties.containsKey(COMPOSER_VENDOR_NAME)) {
             this.setComposerVendorName((String) additionalProperties.get(COMPOSER_VENDOR_NAME));
         } else {
             additionalProperties.put(COMPOSER_VENDOR_NAME, composerVendorName);
         }
-        
+
         if (additionalProperties.containsKey(CodegenConstants.ARTIFACT_VERSION)) {
             this.setArtifactVersion((String) additionalProperties.get(CodegenConstants.ARTIFACT_VERSION));
         } else {
@@ -209,15 +221,23 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
         if (additionalProperties.containsKey(VARIABLE_NAMING_CONVENTION)) {
             this.setParameterNamingConvention((String) additionalProperties.get(VARIABLE_NAMING_CONVENTION));
         }
-        
+
         additionalProperties.put("escapedInvokerPackage", invokerPackage.replace("\\", "\\\\"));
 
+        // make api and model doc path available in mustache template
+        additionalProperties.put("apiDocPath", apiDocPath);
+        additionalProperties.put("modelDocPath", modelDocPath);
+
         supportingFiles.add(new SupportingFile("configuration.mustache", toPackagePath(invokerPackage, srcBasePath), "Configuration.php"));
         supportingFiles.add(new SupportingFile("ApiClient.mustache", toPackagePath(invokerPackage, srcBasePath), "ApiClient.php"));
         supportingFiles.add(new SupportingFile("ApiException.mustache", toPackagePath(invokerPackage, srcBasePath), "ApiException.php"));
         supportingFiles.add(new SupportingFile("ObjectSerializer.mustache", toPackagePath(invokerPackage, srcBasePath), "ObjectSerializer.php"));
         supportingFiles.add(new SupportingFile("composer.mustache", getPackagePath(), "composer.json"));
         supportingFiles.add(new SupportingFile("autoload.mustache", getPackagePath(), "autoload.php"));
+        supportingFiles.add(new SupportingFile("README.mustache", getPackagePath(), "README.md"));
+        supportingFiles.add(new SupportingFile(".travis.yml", getPackagePath(), ".travis.yml"));
+        supportingFiles.add(new SupportingFile("git_push.sh.mustache", getPackagePath(), "git_push.sh"));
+
     }
 
     @Override
@@ -235,6 +255,38 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
         return (outputFolder + "/" + toPackagePath(modelPackage, srcBasePath));
     }
 
+    @Override
+    public String apiTestFileFolder() {
+        return (outputFolder + "/" + toPackagePath(testPackage, srcBasePath));
+    }
+
+    @Override
+    public String modelTestFileFolder() {
+        return (outputFolder + "/" + toPackagePath(testPackage, srcBasePath));
+    }
+
+    @Override
+    public String apiDocFileFolder() {
+        //return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
+        return (outputFolder + "/" + getPackagePath() + "/" + apiDocPath);
+    }
+
+    @Override
+    public String modelDocFileFolder() {
+        //return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
+        return (outputFolder + "/" + getPackagePath() + "/" + modelDocPath);
+    }
+
+    @Override
+    public String toModelDocFilename(String name) {
+        return toModelName(name);
+    }
+
+    @Override
+    public String toApiDocFilename(String name) {
+        return toApiName(name);
+    }
+
     @Override
     public String getTypeDeclaration(Property p) {
         if (p instanceof ArrayProperty) {
@@ -284,7 +336,7 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
     public void setInvokerPackage(String invokerPackage) {
         this.invokerPackage = invokerPackage;
     }
-        
+
     public void setArtifactVersion(String artifactVersion) {
         this.artifactVersion = artifactVersion;
     }
@@ -296,7 +348,7 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
     public void setSrcBasePath(String srcBasePath) {
         this.srcBasePath = srcBasePath;
     }
-    
+
     public void setParameterNamingConvention(String variableNamingConvention) {
         this.variableNamingConvention = variableNamingConvention;
     }
@@ -304,7 +356,7 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
     public void setComposerVendorName(String composerVendorName) {
         this.composerVendorName = composerVendorName;
     }
-    
+
     public void setComposerProjectName(String composerProjectName) {
         this.composerProjectName = composerProjectName;
     }
@@ -312,7 +364,7 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
     @Override
     public String toVarName(String name) {
         // sanitize name
-        name = sanitizeName(name);
+        name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
         if ("camelCase".equals(variableNamingConvention)) {
           // return the name in camelCase style
@@ -341,17 +393,32 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
 
     @Override
     public String toModelName(String name) {
+        // remove [ 
+        name = name.replaceAll("\\]", "");
+
         // Note: backslash ("\\") is allowed for e.g. "\\DateTime"
-        name = name.replaceAll("[^\\w\\\\]+", "_");
+        name = name.replaceAll("[^\\w\\\\]+", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
         // remove dollar sign
         name = name.replaceAll("$", "");
 
         // model name cannot use reserved keyword
-        if (reservedWords.contains(name)) {
-            escapeReservedWord(name); // e.g. return => _return
+        if (isReservedWord(name)) {
+            LOGGER.warn(name + " (reserved word) cannot be used as model name. Renamed to " + camelize("model_" + name));
+            name = "model_" + name; // e.g. return => ModelReturn (after camelize)
         }
 
+        // model name starts with number
+        if (name.matches("^\\d.*")) {
+            LOGGER.warn(name + " (model name starts with number) cannot be used as model name. Renamed to " + camelize("model_" + name));
+            name = "model_" + name; // e.g. 200Response => Model200Response (after camelize)
+        }
+
+        // add prefix and/or suffic only if name does not start wth \ (e.g. \DateTime)
+        if (!name.matches("^\\\\.*")) {
+            name = modelNamePrefix + name + modelNameSuffix;
+        }
+        
         // camelize the model name
         // phone_number => PhoneNumber
         return camelize(name);
@@ -363,6 +430,12 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
         return toModelName(name);
     }
 
+    @Override
+    public String toModelTestFilename(String name) {
+        // should be the same as the model name
+        return toModelName(name) + "Test";
+    }
+
     @Override
     public String toOperationId(String operationId) {
         // throw exception if method name is empty
@@ -371,8 +444,9 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
         }
 
         // method name cannot use reserved keyword, e.g. return
-        if (reservedWords.contains(operationId)) {
-            throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+        if (isReservedWord(operationId)) {
+            LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to " + camelize(sanitizeName("call_" + operationId), true));
+            operationId = "call_" + operationId;
         }
 
         return camelize(sanitizeName(operationId), true);
@@ -425,4 +499,69 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
         return null;
     }
 
+    @Override
+    public void setParameterExampleValue(CodegenParameter p) {
+        String example;
+
+        if (p.defaultValue == null) {
+            example = p.example;
+        } else {
+            example = p.defaultValue;
+        }
+
+        String type = p.baseType;
+        if (type == null) {
+            type = p.dataType;
+        }
+
+        if ("String".equalsIgnoreCase(type)) {
+            if (example == null) {
+                example = p.paramName + "_example";
+            }
+            example = "\"" + escapeText(example) + "\"";
+        } else if ("Integer".equals(type) || "int".equals(type)) {
+            if (example == null) {
+                example = "56";
+            }
+        } else if ("Float".equalsIgnoreCase(type) || "Double".equalsIgnoreCase(type)) {
+            if (example == null) {
+                example = "3.4";
+            }
+        } else if ("BOOLEAN".equalsIgnoreCase(type) || "bool".equalsIgnoreCase(type)) {
+            if (example == null) {
+                example = "True";
+            }
+        } else if ("\\SplFileObject".equalsIgnoreCase(type)) {
+            if (example == null) {
+                example = "/path/to/file";
+            }
+            example = "\"" + escapeText(example) + "\"";
+        } else if ("Date".equalsIgnoreCase(type)) {
+            if (example == null) {
+                example = "2013-10-20";
+            }
+            example = "new \\DateTime(\"" + escapeText(example) + "\")";
+        } else if ("DateTime".equalsIgnoreCase(type)) {
+            if (example == null) {
+                example = "2013-10-20T19:20:30+01:00";
+            }
+            example = "new \\DateTime(\"" + escapeText(example) + "\")";
+        } else if (!languageSpecificPrimitives.contains(type)) {
+            // type is a model class, e.g. User
+            example = "new " + type + "()";
+        } else {
+            LOGGER.warn("Type " + type + " not handled properly in setParameterExampleValue");
+        }
+
+        if (example == null) {
+            example = "NULL";
+        } else if (Boolean.TRUE.equals(p.isListContainer)) {
+            example = "array(" + example + ")";
+        } else if (Boolean.TRUE.equals(p.isMapContainer)) {
+            example = "array('key' => " + example + ")";
+        }
+
+        p.example = example;
+    }
+
 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java
index 02ce858d0cd..2b10bdd86d0 100755
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java
@@ -51,13 +51,16 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig
         typeMapping.put("DateTime", "datetime");
         typeMapping.put("object", "object");
         typeMapping.put("file", "file");
+        //TODO binary should be mapped to byte array
+        // mapped to String as a workaround
+        typeMapping.put("binary", "str");
 
         // from https://docs.python.org/release/2.5.4/ref/keywords.html
-        reservedWords = new HashSet<String>(
+        setReservedWordsLowerCase(
                 Arrays.asList(
                     // local variable name used in API methods (endpoints)
-                    "all_params", "resource_path", "method", "path_params", "query_params",
-                    "header_params", "form_params", "files", "body_params",  "auth_settings",
+                    "all_params", "resource_path", "path_params", "query_params",
+                    "header_params", "form_params", "local_var_files", "body_params",  "auth_settings",
                     // python reserved words
                     "and", "del", "from", "not", "while", "as", "elif", "global", "or", "with",
                     "assert", "else", "if", "pass", "yield", "break", "except", "import",
@@ -107,6 +110,8 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig
         supportingFiles.add(new SupportingFile("__init__package.mustache", swaggerFolder, "__init__.py"));
         supportingFiles.add(new SupportingFile("__init__model.mustache", modelPackage, "__init__.py"));
         supportingFiles.add(new SupportingFile("__init__api.mustache", apiPackage, "__init__.py"));
+        supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
+        supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
     }
 
     private static String dropDots(String str) {
@@ -176,7 +181,7 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig
     @Override
     public String toVarName(String name) {
         // sanitize name
-        name = sanitizeName(name);
+        name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
         // remove dollar sign
         name = name.replaceAll("$", "");
@@ -194,7 +199,7 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig
         name = name.replaceAll("^_*", "");
 
         // for reserved word or word starting with number, append _
-        if (reservedWords.contains(name) || name.matches("^\\d.*")) {
+        if (isReservedWord(name) || name.matches("^\\d.*")) {
             name = escapeReservedWord(name);
         }
 
@@ -209,14 +214,28 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig
 
     @Override
     public String toModelName(String name) {
-        name = sanitizeName(name);
-
+        name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
         // remove dollar sign
         name = name.replaceAll("$", "");
 
         // model name cannot use reserved keyword, e.g. return
-        if (reservedWords.contains(name)) {
-            throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
+        if (isReservedWord(name)) {
+            LOGGER.warn(name + " (reserved word) cannot be used as model name. Renamed to " + camelize("model_" + name));
+            name = "model_" + name; // e.g. return => ModelReturn (after camelize)
+        }
+
+        // model name starts with number
+        if (name.matches("^\\d.*")) {
+            LOGGER.warn(name + " (model name starts with number) cannot be used as model name. Renamed to " + camelize("model_" + name));
+            name = "model_" + name; // e.g. 200Response => Model200Response (after camelize)
+        }
+
+        if (!StringUtils.isEmpty(modelNamePrefix)) {
+            name = modelNamePrefix + "_" + name;
+        }
+
+        if (!StringUtils.isEmpty(modelNameSuffix)) {
+            name = name + "_" + modelNameSuffix;
         }
 
         // camelize the model name
@@ -226,9 +245,28 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig
 
     @Override
     public String toModelFilename(String name) {
+        name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
+        // remove dollar sign
+        name = name.replaceAll("$", "");
+
         // model name cannot use reserved keyword, e.g. return
-        if (reservedWords.contains(name)) {
-            throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
+        if (isReservedWord(name)) {
+            LOGGER.warn(name + " (reserved word) cannot be used as model filename. Renamed to " + underscore(dropDots("model_" + name)));
+            name = "model_" + name; // e.g. return => ModelReturn (after camelize)
+        }
+
+        // model name starts with number
+        if (name.matches("^\\d.*")) {
+            LOGGER.warn(name + " (model name starts with number) cannot be used as model name. Renamed to " + underscore("model_" + name));
+            name = "model_" + name; // e.g. 200Response => Model200Response (after camelize)
+        }
+
+        if (!StringUtils.isEmpty(modelNamePrefix)) {
+            name = modelNamePrefix + "_" + name;
+        }
+
+        if (!StringUtils.isEmpty(modelNameSuffix)) {
+            name = name + "_" + modelNameSuffix;
         }
 
         // underscore the model file name
@@ -264,14 +302,15 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig
 
     @Override
     public String toOperationId(String operationId) {
-        // throw exception if method name is empty
+        // throw exception if method name is empty (should not occur as an auto-generated method name will be used)
         if (StringUtils.isEmpty(operationId)) {
             throw new RuntimeException("Empty method name (operationId) not allowed");
         }
 
         // method name cannot use reserved keyword, e.g. return
-        if (reservedWords.contains(operationId)) {
-            throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+        if (isReservedWord(operationId)) {
+            LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to " + underscore(sanitizeName("call_" + operationId)));
+            operationId = "call_" + operationId;
         }
 
         return underscore(sanitizeName(operationId));
@@ -290,7 +329,11 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig
      *
      * (PEP 0008) Python packages should also have short, all-lowercase names,
      * although the use of underscores is discouraged.
+     *
+     * @param packageName Package name
+     * @return Python package name that conforms to PEP 0008
      */
+    @SuppressWarnings("static-method")
     public String generatePackageName(String packageName) {
         return underscore(packageName.replaceAll("[^\\w]+", ""));
     }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Qt5CPPGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Qt5CPPGenerator.java
index 18ba3718068..ff75d795656 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Qt5CPPGenerator.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Qt5CPPGenerator.java
@@ -76,7 +76,7 @@ public class Qt5CPPGenerator extends DefaultCodegen implements CodegenConfig {
         /**
          * Reserved words.  Override this with reserved words specific to your language
          */
-        reservedWords = new HashSet<String>(
+        setReservedWordsLowerCase(
                 Arrays.asList(
                         "sample1",  // replace with static values
                         "sample2")
@@ -121,6 +121,9 @@ public class Qt5CPPGenerator extends DefaultCodegen implements CodegenConfig {
         typeMapping.put("map", "QMap");
         typeMapping.put("file", "SWGHttpRequestInputFileElement");
         typeMapping.put("object", PREFIX + "Object");
+        //TODO binary should be mapped to byte array
+        // mapped to String as a workaround
+        typeMapping.put("binary", "QString");
 
         importMapping = new HashMap<String, String>();
 
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java
index 766e5f74f30..2eedc14ed27 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java
@@ -3,26 +3,53 @@ package io.swagger.codegen.languages;
 import io.swagger.codegen.CliOption;
 import io.swagger.codegen.CodegenConfig;
 import io.swagger.codegen.CodegenConstants;
+import io.swagger.codegen.CodegenOperation;
+import io.swagger.codegen.CodegenParameter;
 import io.swagger.codegen.CodegenType;
 import io.swagger.codegen.DefaultCodegen;
 import io.swagger.codegen.SupportingFile;
+import io.swagger.models.Model;
+import io.swagger.models.Operation;
+import io.swagger.models.Swagger;
 import io.swagger.models.properties.*;
 
 import java.io.File;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig {
+    private static final Logger LOGGER = LoggerFactory.getLogger(RubyClientCodegen.class);
     public static final String GEM_NAME = "gemName";
     public static final String MODULE_NAME = "moduleName";
     public static final String GEM_VERSION = "gemVersion";
+    public static final String GEM_LICENSE = "gemLicense";
+    public static final String GEM_HOMEPAGE = "gemHomepage";
+    public static final String GEM_SUMMARY = "gemSummary";
+    public static final String GEM_DESCRIPTION = "gemDescription";
+    public static final String GEM_AUTHOR = "gemAuthor";
+    public static final String GEM_AUTHOR_EMAIL = "gemAuthorEmail";
+
     protected String gemName;
     protected String moduleName;
     protected String gemVersion = "1.0.0";
+    protected String specFolder = "spec";
     protected String libFolder = "lib";
+    protected String gemLicense = "Apache-2.0";
+    protected String gemHomepage = "http://swagger.io";
+    protected String gemSummary = "A ruby wrapper for the swagger APIs";
+    protected String gemDescription = "This gem maps to a swagger API";
+    protected String gemAuthor = "";
+    protected String gemAuthorEmail = "";
+    protected String apiDocPath = "docs/";
+    protected String modelDocPath = "docs/";
+
+    protected static int emptyMethodNameCounter = 0;
 
     public RubyClientCodegen() {
         super();
@@ -31,15 +58,17 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig {
         outputFolder = "generated-code" + File.separator + "ruby";
         modelTemplateFiles.put("model.mustache", ".rb");
         apiTemplateFiles.put("api.mustache", ".rb");
+        modelDocTemplateFiles.put("model_doc.mustache", ".md");
+        apiDocTemplateFiles.put("api_doc.mustache", ".md");
         embeddedTemplateDir = templateDir = "ruby";
 
-        typeMapping.clear();
-        languageSpecificPrimitives.clear();
+        modelTestTemplateFiles.put("model_test.mustache", ".rb");
+        apiTestTemplateFiles.put("api_test.mustache", ".rb");
 
-        reservedWords = new HashSet<String>(
+        setReservedWordsLowerCase(
                 Arrays.asList(
                     // local variable names used in API methods (endpoints)
-                    "path", "query_params", "header_params", "_header_accept", "_header_accept_result",
+                    "local_var_path", "query_params", "header_params", "_header_accept", "_header_accept_result",
                     "_header_content_type", "form_params", "post_body", "auth_names",
                     // ruby reserved keywords
                     "__FILE__", "and", "def", "end", "in", "or", "self", "unless", "__LINE__",
@@ -49,11 +78,25 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig {
                     "if", "not", "return", "undef", "yield")
         );
 
+        typeMapping.clear();
+        languageSpecificPrimitives.clear();
+
+        // primitives in ruby lang
         languageSpecificPrimitives.add("int");
         languageSpecificPrimitives.add("array");
         languageSpecificPrimitives.add("map");
         languageSpecificPrimitives.add("string");
+        // primitives in the typeMapping
+        languageSpecificPrimitives.add("String");
+        languageSpecificPrimitives.add("Integer");
+        languageSpecificPrimitives.add("Float");
+        languageSpecificPrimitives.add("Date");
         languageSpecificPrimitives.add("DateTime");
+        languageSpecificPrimitives.add("BOOLEAN");
+        languageSpecificPrimitives.add("Array");
+        languageSpecificPrimitives.add("Hash");
+        languageSpecificPrimitives.add("File");
+        languageSpecificPrimitives.add("Object");
 
         typeMapping.put("string", "String");
         typeMapping.put("char", "String");
@@ -72,6 +115,7 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig {
         typeMapping.put("map", "Hash");
         typeMapping.put("object", "Object");
         typeMapping.put("file", "File");
+        typeMapping.put("binary", "String");
 
         // remove modelPackage and apiPackage added by default
         Iterator<CliOption> itr = cliOptions.iterator();
@@ -87,6 +131,23 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig {
         cliOptions.add(new CliOption(MODULE_NAME, "top module name (convention: CamelCase, usually corresponding" +
                 " to gem name).").defaultValue("SwaggerClient"));
         cliOptions.add(new CliOption(GEM_VERSION, "gem version.").defaultValue("1.0.0"));
+
+        cliOptions.add(new CliOption(GEM_LICENSE, "gem license. ").
+                defaultValue("Apache-2.0"));
+
+        cliOptions.add(new CliOption(GEM_HOMEPAGE, "gem homepage. ").
+                defaultValue("http://swagger.io"));
+
+        cliOptions.add(new CliOption(GEM_SUMMARY, "gem summary. ").
+                defaultValue("A ruby wrapper for the swagger APIs"));
+
+        cliOptions.add(new CliOption(GEM_DESCRIPTION, "gem description. ").
+                defaultValue("This gem maps to a swagger API"));
+
+        cliOptions.add(new CliOption(GEM_AUTHOR, "gem author (only one is supported)."));
+
+        cliOptions.add(new CliOption(GEM_AUTHOR_EMAIL, "gem author email (only one is supported)."));
+
     }
 
     @Override
@@ -114,11 +175,39 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig {
 
         if (additionalProperties.containsKey(GEM_VERSION)) {
             setGemVersion((String) additionalProperties.get(GEM_VERSION));
-        } else {
+        }else {
             // not set, pass the default value to template
             additionalProperties.put(GEM_VERSION, gemVersion);
         }
 
+        if (additionalProperties.containsKey(GEM_LICENSE)) {
+            setGemLicense((String) additionalProperties.get(GEM_LICENSE));
+        }
+
+        if (additionalProperties.containsKey(GEM_HOMEPAGE)) {
+            setGemHomepage((String) additionalProperties.get(GEM_HOMEPAGE));
+        }
+
+        if (additionalProperties.containsKey(GEM_SUMMARY)) {
+            setGemSummary((String) additionalProperties.get(GEM_SUMMARY));
+        }
+
+        if (additionalProperties.containsKey(GEM_DESCRIPTION)) {
+            setGemDescription((String) additionalProperties.get(GEM_DESCRIPTION));
+        }
+
+        if (additionalProperties.containsKey(GEM_AUTHOR)) {
+            setGemAuthor((String) additionalProperties.get(GEM_AUTHOR));
+        }
+
+        if (additionalProperties.containsKey(GEM_AUTHOR_EMAIL)) {
+            setGemAuthorEmail((String) additionalProperties.get(GEM_AUTHOR_EMAIL));
+        }
+
+        // make api and model doc path available in mustache template
+        additionalProperties.put("apiDocPath", apiDocPath);
+        additionalProperties.put("modelDocPath", modelDocPath);
+
         // use constant model/api package (folder path)
         setModelPackage("models");
         setApiPackage("api");
@@ -130,7 +219,39 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig {
         supportingFiles.add(new SupportingFile("api_error.mustache", gemFolder, "api_error.rb"));
         supportingFiles.add(new SupportingFile("configuration.mustache", gemFolder, "configuration.rb"));
         supportingFiles.add(new SupportingFile("version.mustache", gemFolder, "version.rb"));
-        String modelFolder = gemFolder + File.separator + modelPackage.replace("/", File.separator);
+        supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
+        supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
+        supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
+    }
+
+    @Override
+    public CodegenOperation fromOperation(String path, String httpMethod, Operation operation, Map<String, Model> definitions, Swagger swagger) {
+        CodegenOperation op = super.fromOperation(path, httpMethod, operation, definitions, swagger);
+        // Set vendor-extension to be used in template:
+        //     x-codegen-hasMoreRequired
+        //     x-codegen-hasMoreOptional
+        //     x-codegen-hasRequiredParams
+        CodegenParameter lastRequired = null;
+        CodegenParameter lastOptional = null;
+        for (CodegenParameter p : op.allParams) {
+            if (p.required != null && p.required) {
+                lastRequired = p;
+            } else {
+                lastOptional = p;
+            }
+        }
+        for (CodegenParameter p : op.allParams) {
+            if (p == lastRequired) {
+                p.vendorExtensions.put("x-codegen-hasMoreRequired", false);
+            } else if (p == lastOptional) {
+                p.vendorExtensions.put("x-codegen-hasMoreOptional", false);
+            } else {
+                p.vendorExtensions.put("x-codegen-hasMoreRequired", true);
+                p.vendorExtensions.put("x-codegen-hasMoreOptional", true);
+            }
+        }
+        op.vendorExtensions.put("x-codegen-hasRequiredParams", lastRequired != null);
+        return op;
     }
 
     @Override
@@ -150,14 +271,22 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig {
 
     /**
      * Generate Ruby module name from the gem name, e.g. use "SwaggerClient" for "swagger_client".
+     *
+     * @param gemName Ruby gem name
+     * @return Ruby module naame
      */
+    @SuppressWarnings("static-method")
     public String generateModuleName(String gemName) {
         return camelize(gemName.replaceAll("[^\\w]+", "_"));
     }
 
     /**
      * Generate Ruby gem name from the module name, e.g. use "swagger_client" for "SwaggerClient".
+     *
+     * @param  moduleName Ruby module naame
+     * @return Ruby gem name
      */
+    @SuppressWarnings("static-method")
     public String generateGemName(String moduleName) {
         return underscore(moduleName.replaceAll("[^\\w]+", ""));
     }
@@ -177,6 +306,26 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig {
         return outputFolder + File.separator + libFolder + File.separator + gemName + File.separator + modelPackage.replace("/", File.separator);
     }
 
+    @Override
+    public String apiTestFileFolder() {
+        return outputFolder + File.separator + specFolder + File.separator + apiPackage.replace("/", File.separator);
+    }
+
+    @Override
+    public String modelTestFileFolder() {
+        return outputFolder + File.separator + specFolder + File.separator + modelPackage.replace("/", File.separator);
+    }
+
+    @Override
+    public String apiDocFileFolder() {
+        return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
+    }
+
+    @Override
+    public String modelDocFileFolder() {
+        return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
+    }
+
     @Override
     public String getTypeDeclaration(Property p) {
         if (p instanceof ArrayProperty) {
@@ -243,14 +392,13 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig {
         if (type == null) {
             return null;
         }
-        return type;
+        return toModelName(type);
     }
 
     @Override
     public String toVarName(String name) {
         // sanitize name
-        name = sanitizeName(name);
-
+        name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
         // if it's all uppper case, convert to lower case
         if (name.matches("^[A-Z_]*$")) {
             name = name.toLowerCase();
@@ -261,7 +409,7 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig {
         name = underscore(name);
 
         // for reserved word or word starting with number, append _
-        if (reservedWords.contains(name) || name.matches("^\\d.*")) {
+        if (isReservedWord(name) || name.matches("^\\d.*")) {
             name = escapeReservedWord(name);
         }
 
@@ -276,11 +424,27 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig {
 
     @Override
     public String toModelName(String name) {
-        name = sanitizeName(name);
+        name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
+
+        if (!StringUtils.isEmpty(modelNamePrefix)) {
+            name = modelNamePrefix + "_" + name;
+        }
+
+        if (!StringUtils.isEmpty(modelNameSuffix)) {
+            name = name + "_" + modelNameSuffix;
+        }
 
         // model name cannot use reserved keyword, e.g. return
-        if (reservedWords.contains(name)) {
-            throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
+        if (isReservedWord(name)) {
+            String modelName = camelize("Model" + name);
+            LOGGER.warn(name + " (reserved word) cannot be used as model name. Renamed to " + modelName);
+            return modelName;
+        }
+
+        // model name starts with number
+        if (name.matches("^\\d.*")) {
+            LOGGER.warn(name + " (model name starts with number) cannot be used as model name. Renamed to " + camelize("model_" + name));
+            name = "model_" + name; // e.g. 200Response => Model200Response (after camelize)
         }
 
         // camelize the model name
@@ -290,9 +454,26 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig {
 
     @Override
     public String toModelFilename(String name) {
+        name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
+
+        if (!StringUtils.isEmpty(modelNamePrefix)) {
+            name = modelNamePrefix + "_" + name;
+        }
+
+        if (!StringUtils.isEmpty(modelNameSuffix)) {
+            name = name + "_" + modelNameSuffix;
+        }
         // model name cannot use reserved keyword, e.g. return
-        if (reservedWords.contains(name)) {
-            throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
+        if (isReservedWord(name)) {
+            String filename = underscore("model_" + name);
+            LOGGER.warn(name + " (reserved word) cannot be used as model filename. Renamed to " + filename);
+            return filename;
+        }
+
+        // model name starts with number
+        if (name.matches("^\\d.*")) {
+            LOGGER.warn(name + " (model name starts with number) cannot be used as model name. Renamed to " + underscore("model_" + name));
+            name = "model_" + name; // e.g. 200Response => model_200_response
         }
 
         // underscore the model file name
@@ -300,15 +481,35 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig {
         return underscore(name);
     }
 
+    @Override
+    public String toModelDocFilename(String name) {
+        return toModelName(name);
+    }
+
     @Override
     public String toApiFilename(String name) {
         // replace - with _ e.g. created-at => created_at
-        name = name.replaceAll("-", "_");
+        name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
         // e.g. PhoneNumberApi.rb => phone_number_api.rb
         return underscore(name) + "_api";
     }
 
+    @Override
+    public String toApiDocFilename(String name) {
+        return toApiName(name);
+    }
+
+    @Override
+    public String toApiTestFilename(String name) {
+        return toApiFilename(name) + "_spec";
+    }
+
+    @Override
+    public String toModelTestFilename(String name) {
+        return toModelFilename(name) + "_spec";
+    }
+
     @Override
     public String toApiName(String name) {
         if (name.length() == 0) {
@@ -320,27 +521,89 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig {
 
     @Override
     public String toOperationId(String operationId) {
-        // throw exception if method name is empty
+        // rename to empty_method_name_1 (e.g.) if method name is empty
         if (StringUtils.isEmpty(operationId)) {
-            throw new RuntimeException("Empty method name (operationId) not allowed");
+            operationId = underscore("empty_method_name_" + emptyMethodNameCounter++);
+            LOGGER.warn("Empty method name (operationId) found. Renamed to " + operationId);
+            return operationId;
         }
 
         // method name cannot use reserved keyword, e.g. return
-        if (reservedWords.contains(operationId)) {
-            throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+        if (isReservedWord(operationId)) {
+            String newOperationId = underscore("call_" + operationId);
+            LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to " + newOperationId);
+            return newOperationId;
         }
 
         return underscore(sanitizeName(operationId));
     }
 
     @Override
-    public String toModelImport(String name) {
-        return gemName + "/" + modelPackage() + "/" + toModelFilename(name);
+    public String toApiImport(String name) {
+        return gemName + "/" + apiPackage() + "/" + toApiFilename(name);
     }
 
     @Override
-    public String toApiImport(String name) {
-        return gemName + "/" + apiPackage() + "/" + toApiFilename(name);
+    public void setParameterExampleValue(CodegenParameter p) {
+        String example;
+
+        if (p.defaultValue == null) {
+            example = p.example;
+        } else {
+            example = p.defaultValue;
+        }
+
+        String type = p.baseType;
+        if (type == null) {
+            type = p.dataType;
+        }
+
+        if ("String".equals(type)) {
+            if (example == null) {
+                example = p.paramName + "_example";
+            }
+            example = "\"" + escapeText(example) + "\"";
+        } else if ("Integer".equals(type)) {
+            if (example == null) {
+                example = "56";
+            }
+        } else if ("Float".equals(type)) {
+            if (example == null) {
+                example = "3.4";
+            }
+        } else if ("BOOLEAN".equals(type)) {
+            if (example == null) {
+                example = "true";
+            }
+        } else if ("File".equals(type)) {
+            if (example == null) {
+                example = "/path/to/file";
+            }
+            example = "File.new(\"" + escapeText(example) + "\")";
+        } else if ("Date".equals(type)) {
+            if (example == null) {
+                example = "2013-10-20";
+            }
+            example = "Date.parse(\"" + escapeText(example) + "\")";
+        } else if ("DateTime".equals(type)) {
+            if (example == null) {
+                example = "2013-10-20T19:20:30+01:00";
+            }
+            example = "DateTime.parse(\"" + escapeText(example) + "\")";
+        } else if (!languageSpecificPrimitives.contains(type)) {
+            // type is a model class, e.g. User
+            example = moduleName + "::" + type + ".new";
+        }
+
+        if (example == null) {
+            example = "nil";
+        } else if (Boolean.TRUE.equals(p.isListContainer)) {
+            example = "[" + example + "]";
+        } else if (Boolean.TRUE.equals(p.isMapContainer)) {
+            example = "{'key' => " + example + "}";
+        }
+
+        p.example = example;
     }
 
     public void setGemName(String gemName) {
@@ -354,4 +617,28 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig {
     public void setGemVersion(String gemVersion) {
         this.gemVersion = gemVersion;
     }
+
+    public void setGemDescription(String gemDescription) {
+        this.gemDescription = gemDescription;
+    }
+
+    public void setGemSummary(String gemSummary) {
+        this.gemSummary = gemSummary;
+    }
+
+    public void setGemLicense(String gemLicense) {
+        this.gemLicense = gemLicense;
+    }
+
+    public void setGemHomepage(String gemHomepage) {
+        this.gemHomepage = gemHomepage;
+    }
+
+    public void setGemAuthor(String gemAuthor) {
+        this.gemAuthor = gemAuthor;
+    }
+
+    public void setGemAuthorEmail(String gemAuthorEmail) {
+        this.gemAuthorEmail = gemAuthorEmail;
+    }
 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaClientCodegen.java
index 9469cbb8e81..993ef095441 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaClientCodegen.java
@@ -47,13 +47,18 @@ public class ScalaClientCodegen extends DefaultCodegen implements CodegenConfig
         apiPackage = "io.swagger.client.api";
         modelPackage = "io.swagger.client.model";
 
-        reservedWords = new HashSet<String>(
+        setReservedWordsLowerCase(
                 Arrays.asList(
-                        "abstract", "case", "catch", "class", "def", "do", "else", "extends",
-                        "false", "final", "finally", "for", "forSome", "if", "implicit",
-                        "import", "lazy", "match", "new", "null", "object", "override", "package",
-                        "private", "protected", "return", "sealed", "super", "this", "throw",
-                        "trait", "try", "true", "type", "val", "var", "while", "with", "yield")
+                    // local variable names used in API methods (endpoints)
+                    "path", "contentTypes", "contentType", "queryParams", "headerParams",
+                    "formParams", "postBody", "mp", "basePath", "apiInvoker",
+
+                    // scala reserved words
+                    "abstract", "case", "catch", "class", "def", "do", "else", "extends",
+                    "false", "final", "finally", "for", "forSome", "if", "implicit",
+                    "import", "lazy", "match", "new", "null", "object", "override", "package",
+                    "private", "protected", "return", "sealed", "super", "this", "throw",
+                    "trait", "try", "true", "type", "val", "var", "while", "with", "yield")
         );
 
         additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
@@ -67,6 +72,8 @@ public class ScalaClientCodegen extends DefaultCodegen implements CodegenConfig
         supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
         supportingFiles.add(new SupportingFile("apiInvoker.mustache",
                 (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiInvoker.scala"));
+        supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
+        supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
 
         importMapping.remove("List");
         importMapping.remove("Set");
@@ -91,6 +98,9 @@ public class ScalaClientCodegen extends DefaultCodegen implements CodegenConfig
         typeMapping.put("double", "Double");
         typeMapping.put("object", "Any");
         typeMapping.put("file", "File");
+        //TODO binary should be mapped to byte array
+        // mapped to String as a workaround
+        typeMapping.put("binary", "String");
 
         languageSpecificPrimitives = new HashSet<String>(
                 Arrays.asList(
@@ -102,6 +112,7 @@ public class ScalaClientCodegen extends DefaultCodegen implements CodegenConfig
                         "Long",
                         "Float",
                         "Object",
+                        "Any",
                         "List",
                         "Map")
         );
@@ -227,7 +238,7 @@ public class ScalaClientCodegen extends DefaultCodegen implements CodegenConfig
         }
 
         // method name cannot use reserved keyword, e.g. return
-        if (reservedWords.contains(operationId)) {
+        if (isReservedWord(operationId)) {
             throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
         }
 
@@ -247,4 +258,67 @@ public class ScalaClientCodegen extends DefaultCodegen implements CodegenConfig
         return objs;
     }
 
+    @Override
+    public String toVarName(String name) {
+        // sanitize name
+        name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
+
+        if("_".equals(name)) {
+          name = "_u";
+        }
+
+        // if it's all uppper case, do nothing
+        if (name.matches("^[A-Z_]*$")) {
+            return name;
+        }
+
+        // camelize (lower first character) the variable name
+        // pet_id => petId
+        name = camelize(name, true);
+
+        // for reserved word or word starting with number, append _
+        if (isReservedWord(name) || name.matches("^\\d.*")) {
+            name = escapeReservedWord(name);
+        }
+
+        return name;
+    }
+
+    @Override
+    public String toParamName(String name) {
+        // should be the same as variable name
+        return toVarName(name);
+    }
+
+    @Override
+    public String toModelName(final String name) {
+        final String sanitizedName = sanitizeName(modelNamePrefix + name + modelNameSuffix);
+
+        // camelize the model name
+        // phone_number => PhoneNumber
+        final String camelizedName = camelize(sanitizedName);
+
+        // model name cannot use reserved keyword, e.g. return
+        if (isReservedWord(camelizedName)) {
+            final String modelName = "Model" + camelizedName;
+            LOGGER.warn(camelizedName + " (reserved word) cannot be used as model name. Renamed to " + modelName);
+            return modelName;
+        }
+
+        // model name starts with number
+        if (name.matches("^\\d.*")) {
+            final String modelName = "Model" + camelizedName; // e.g. 200Response => Model200Response (after camelize)
+            LOGGER.warn(name + " (model name starts with number) cannot be used as model name. Renamed to " + modelName);
+            return modelName;
+        }
+
+        return camelizedName;
+    }
+
+    @Override
+    public String toModelFilename(String name) {
+        // should be the same as the model name
+        return toModelName(name);
+    }
+
 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalatraServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalatraServerCodegen.java
index 5d6da580130..d3fb0bf1881 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalatraServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalatraServerCodegen.java
@@ -34,7 +34,7 @@ public class ScalatraServerCodegen extends DefaultCodegen implements CodegenConf
         apiPackage = "com.wordnik.client.api";
         modelPackage = "com.wordnik.client.model";
 
-        reservedWords = new HashSet<String>(
+        setReservedWordsLowerCase(
                 Arrays.asList(
                         "abstract", "continue", "for", "new", "switch", "assert",
                         "default", "if", "package", "synchronized", "boolean", "do", "goto", "private",
@@ -67,6 +67,9 @@ public class ScalatraServerCodegen extends DefaultCodegen implements CodegenConf
 
         typeMapping.put("integer", "Int");
         typeMapping.put("long", "Long");
+        //TODO binary should be mapped to byte array
+        // mapped to String as a workaround
+        typeMapping.put("binary", "String");
 
         additionalProperties.put("appName", "Swagger Sample");
         additionalProperties.put("appName", "Swagger Sample");
@@ -193,4 +196,4 @@ public class ScalatraServerCodegen extends DefaultCodegen implements CodegenConf
         }
         return toModelName(type);
     }
-}
\ No newline at end of file
+}
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SilexServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SilexServerCodegen.java
index 4effb480048..11ffc278e3d 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SilexServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SilexServerCodegen.java
@@ -37,7 +37,7 @@ public class SilexServerCodegen extends DefaultCodegen implements CodegenConfig
 
         embeddedTemplateDir = templateDir = "silex";
 
-        reservedWords = new HashSet<String>(
+        setReservedWordsLowerCase(
                 Arrays.asList(
                         "__halt_compiler", "abstract", "and", "array", "as", "break", "callable", "case", "catch", "class", "clone", "const", "continue", "declare", "default", "die", "do", "echo", "else", "elseif", "empty", "enddeclare", "endfor", "endforeach", "endif", "endswitch", "endwhile", "eval", "exit", "extends", "final", "for", "foreach", "function", "global", "goto", "if", "implements", "include", "include_once", "instanceof", "insteadof", "interface", "isset", "list", "namespace", "new", "or", "print", "private", "protected", "public", "require", "require_once", "return", "static", "switch", "throw", "trait", "try", "unset", "use", "var", "while", "xor")
         );
@@ -81,6 +81,9 @@ public class SilexServerCodegen extends DefaultCodegen implements CodegenConfig
         typeMapping.put("array", "array");
         typeMapping.put("list", "array");
         typeMapping.put("object", "object");
+        //TODO binary should be mapped to byte array
+        // mapped to String as a workaround
+        typeMapping.put("binary", "string");
 
         supportingFiles.add(new SupportingFile("README.mustache", packagePath.replace('/', File.separatorChar), "README.md"));
         supportingFiles.add(new SupportingFile("composer.json", packagePath.replace('/', File.separatorChar), "composer.json"));
@@ -162,7 +165,7 @@ public class SilexServerCodegen extends DefaultCodegen implements CodegenConfig
     public String toVarName(String name) {
         // return the name in underscore style
         // PhoneNumber => phone_number
-        name = underscore(name);
+        name = underscore(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
         // parameter name starting with number won't compile
         // need to escape it by appending _ at the beginning
@@ -182,7 +185,7 @@ public class SilexServerCodegen extends DefaultCodegen implements CodegenConfig
     @Override
     public String toModelName(String name) {
         // model name cannot use reserved keyword
-        if (reservedWords.contains(name)) {
+        if (isReservedWord(name)) {
             escapeReservedWord(name); // e.g. return => _return
         }
 
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SinatraServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SinatraServerCodegen.java
index e478c00341e..bb7706b13fe 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SinatraServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SinatraServerCodegen.java
@@ -2,7 +2,6 @@ package io.swagger.codegen.languages;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 
-import io.swagger.codegen.CliOption;
 import io.swagger.codegen.CodegenConfig;
 import io.swagger.codegen.CodegenType;
 import io.swagger.codegen.DefaultCodegen;
@@ -19,8 +18,13 @@ import java.util.HashSet;
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class SinatraServerCodegen extends DefaultCodegen implements CodegenConfig {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(SinatraServerCodegen.class);
+
     protected String gemName;
     protected String moduleName;
     protected String gemVersion = "1.0.0";
@@ -39,7 +43,7 @@ public class SinatraServerCodegen extends DefaultCodegen implements CodegenConfi
         typeMapping.clear();
         languageSpecificPrimitives.clear();
 
-        reservedWords = new HashSet<String>(
+        setReservedWordsLowerCase(
                 Arrays.asList(
                         "__FILE__", "and", "def", "end", "in", "or", "self", "unless", "__LINE__",
                         "begin", "defined?", "ensure", "module", "redo", "super", "until", "BEGIN",
@@ -60,6 +64,9 @@ public class SinatraServerCodegen extends DefaultCodegen implements CodegenConfi
         typeMapping.put("String", "string");
         typeMapping.put("List", "array");
         typeMapping.put("map", "map");
+        //TODO binary should be mapped to byte array
+        // mapped to String as a workaround
+        typeMapping.put("binary", "string");
 
         // remove modelPackage and apiPackage added by default
         cliOptions.clear();
@@ -146,7 +153,7 @@ public class SinatraServerCodegen extends DefaultCodegen implements CodegenConfi
     @Override
     public String toVarName(String name) {
         // replace - with _ e.g. created-at => created_at
-        name = name.replaceAll("-", "_");
+        name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
         // if it's all uppper case, convert to lower case
         if (name.matches("^[A-Z_]*$")) {
@@ -158,7 +165,7 @@ public class SinatraServerCodegen extends DefaultCodegen implements CodegenConfi
         name = underscore(name);
 
         // for reserved word or word starting with number, append _
-        if (reservedWords.contains(name) || name.matches("^\\d.*")) {
+        if (isReservedWord(name) || name.matches("^\\d.*")) {
             name = escapeReservedWord(name);
         }
 
@@ -174,7 +181,7 @@ public class SinatraServerCodegen extends DefaultCodegen implements CodegenConfi
     @Override
     public String toModelName(String name) {
         // model name cannot use reserved keyword, e.g. return
-        if (reservedWords.contains(name)) {
+        if (isReservedWord(name)) {
             throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
         }
 
@@ -186,7 +193,7 @@ public class SinatraServerCodegen extends DefaultCodegen implements CodegenConfi
     @Override
     public String toModelFilename(String name) {
         // model name cannot use reserved keyword, e.g. return
-        if (reservedWords.contains(name)) {
+        if (isReservedWord(name)) {
             throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
         }
 
@@ -198,7 +205,7 @@ public class SinatraServerCodegen extends DefaultCodegen implements CodegenConfi
     @Override
     public String toApiFilename(String name) {
         // replace - with _ e.g. created-at => created_at
-        name = name.replaceAll("-", "_");
+        name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
         // e.g. PhoneNumberApi.rb => phone_number_api.rb
         return underscore(name) + "_api";
@@ -216,7 +223,7 @@ public class SinatraServerCodegen extends DefaultCodegen implements CodegenConfi
     @Override
     public String toOperationId(String operationId) {
         // method name cannot use reserved keyword, e.g. return
-        if (reservedWords.contains(operationId)) {
+        if (isReservedWord(operationId)) {
             throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
         }
 
@@ -230,7 +237,7 @@ public class SinatraServerCodegen extends DefaultCodegen implements CodegenConfi
             try {
                 objs.put("swagger-yaml", Yaml.mapper().writeValueAsString(swagger));
             } catch (JsonProcessingException e) {
-                e.printStackTrace();
+                LOGGER.error(e.getMessage(), e);
             }
         }
         return super.postProcessSupportingFileData(objs);
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SlimFrameworkServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SlimFrameworkServerCodegen.java
index ae28493fe7c..26184738ca5 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SlimFrameworkServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SlimFrameworkServerCodegen.java
@@ -39,7 +39,7 @@ public class SlimFrameworkServerCodegen extends DefaultCodegen implements Codege
 
         embeddedTemplateDir = templateDir = "slim";
 
-        reservedWords = new HashSet<String>(
+        setReservedWordsLowerCase(
                 Arrays.asList(
                         "__halt_compiler", "abstract", "and", "array", "as", "break", "callable", "case", "catch", "class", "clone", "const", "continue", "declare", "default", "die", "do", "echo", "else", "elseif", "empty", "enddeclare", "endfor", "endforeach", "endif", "endswitch", "endwhile", "eval", "exit", "extends", "final", "for", "foreach", "function", "global", "goto", "if", "implements", "include", "include_once", "instanceof", "insteadof", "interface", "isset", "list", "namespace", "new", "or", "print", "private", "protected", "public", "require", "require_once", "return", "static", "switch", "throw", "trait", "try", "unset", "use", "var", "while", "xor")
         );
@@ -83,6 +83,9 @@ public class SlimFrameworkServerCodegen extends DefaultCodegen implements Codege
         typeMapping.put("array", "array");
         typeMapping.put("list", "array");
         typeMapping.put("object", "object");
+        //TODO binary should be mapped to byte array
+        // mapped to String as a workaround
+        typeMapping.put("binary", "string");
 
         supportingFiles.add(new SupportingFile("README.mustache", packagePath.replace('/', File.separatorChar), "README.md"));
         supportingFiles.add(new SupportingFile("composer.json", packagePath.replace('/', File.separatorChar), "composer.json"));
@@ -177,8 +180,7 @@ public class SlimFrameworkServerCodegen extends DefaultCodegen implements Codege
 
     @Override
     public String toVarName(String name) {
-        // sanitize name
-        name = sanitizeName(name);
+        name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
         if ("camelCase".equals(variableNamingConvention)) {
             // return the name in camelCase style
@@ -208,7 +210,7 @@ public class SlimFrameworkServerCodegen extends DefaultCodegen implements Codege
     @Override
     public String toModelName(String name) {
         // model name cannot use reserved keyword
-        if (reservedWords.contains(name)) {
+        if (isReservedWord(name)) {
             escapeReservedWord(name); // e.g. return => _return
         }
 
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java
index 256f78b02b6..848b6f4caea 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java
@@ -6,7 +6,7 @@ import io.swagger.models.Operation;
 import java.io.File;
 import java.util.*;
 
-public class SpringMVCServerCodegen extends JavaClientCodegen implements CodegenConfig {
+public class SpringMVCServerCodegen extends JavaClientCodegen {
     public static final String CONFIG_PACKAGE = "configPackage";
     protected String title = "Petstore Server";
     protected String configPackage = "";
@@ -34,6 +34,7 @@ public class SpringMVCServerCodegen extends JavaClientCodegen implements Codegen
 
         languageSpecificPrimitives = new HashSet<String>(
                 Arrays.asList(
+                        "byte[]",
                         "String",
                         "boolean",
                         "Boolean",
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticDocCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticDocCodegen.java
index 99ba292915a..3ff35f170fd 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticDocCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticDocCodegen.java
@@ -1,5 +1,6 @@
 package io.swagger.codegen.languages;
 
+import io.swagger.codegen.CliOption;
 import io.swagger.codegen.CodegenConfig;
 import io.swagger.codegen.CodegenConstants;
 import io.swagger.codegen.CodegenType;
@@ -22,6 +23,11 @@ public class StaticDocCodegen extends DefaultCodegen implements CodegenConfig {
         apiTemplateFiles.put("operation.mustache", ".html");
         embeddedTemplateDir = templateDir = "swagger-static";
 
+        cliOptions.add(new CliOption(CodegenConstants.INVOKER_PACKAGE, CodegenConstants.INVOKER_PACKAGE_DESC));
+        cliOptions.add(new CliOption(CodegenConstants.GROUP_ID, CodegenConstants.GROUP_ID_DESC));
+        cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_ID, CodegenConstants.ARTIFACT_ID_DESC));
+        cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_VERSION, CodegenConstants.ARTIFACT_VERSION_DESC));
+
         additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
         additionalProperties.put(CodegenConstants.GROUP_ID, groupId);
         additionalProperties.put(CodegenConstants.ARTIFACT_ID, artifactId);
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtmlGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtmlGenerator.java
index cb598f8fbd8..65ec8529930 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtmlGenerator.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtmlGenerator.java
@@ -1,5 +1,6 @@
 package io.swagger.codegen.languages;
 
+import io.swagger.codegen.CliOption;
 import io.swagger.codegen.CodegenConfig;
 import io.swagger.codegen.CodegenConstants;
 import io.swagger.codegen.CodegenOperation;
@@ -32,6 +33,17 @@ public class StaticHtmlGenerator extends DefaultCodegen implements CodegenConfig
 
         defaultIncludes = new HashSet<String>();
 
+        cliOptions.add(new CliOption("appName", "short name of the application"));
+        cliOptions.add(new CliOption("appDescription", "description of the application"));
+        cliOptions.add(new CliOption("infoUrl", "a URL where users can get more information about the application"));
+        cliOptions.add(new CliOption("infoEmail", "an email address to contact for inquiries about the application"));
+        cliOptions.add(new CliOption("licenseInfo", "a short description of the license"));
+        cliOptions.add(new CliOption("licenseUrl", "a URL pointing to the full license"));
+        cliOptions.add(new CliOption(CodegenConstants.INVOKER_PACKAGE, CodegenConstants.INVOKER_PACKAGE_DESC));
+        cliOptions.add(new CliOption(CodegenConstants.GROUP_ID, CodegenConstants.GROUP_ID_DESC));
+        cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_ID, CodegenConstants.ARTIFACT_ID_DESC));
+        cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_VERSION, CodegenConstants.ARTIFACT_VERSION_DESC));
+        
         additionalProperties.put("appName", "Swagger Sample");
         additionalProperties.put("appDescription", "A sample swagger server");
         additionalProperties.put("infoUrl", "https://helloreverb.com");
@@ -89,20 +101,4 @@ public class StaticHtmlGenerator extends DefaultCodegen implements CodegenConfig
         }
         return objs;
     }
-
-    @Override
-    public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map<String, List<CodegenOperation>> operations) {
-        List<CodegenOperation> opList = operations.get(ALL_OPERATIONS);
-        if (opList == null) {
-            opList = new ArrayList<CodegenOperation>();
-            operations.put(ALL_OPERATIONS, opList);
-        }
-        for (CodegenOperation addedOperation : opList) {
-            if (addedOperation.operationId.equals(co.operationId) && addedOperation.path.equals(co.path) && addedOperation.httpMethod.equals(co.httpMethod)) {
-                addedOperation.tags.addAll(co.tags);
-                return;
-            }
-        }
-        opList.add(co);
-    }
 }
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerGenerator.java
index a98d5fc5b13..b34e6bba5ab 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerGenerator.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerGenerator.java
@@ -1,16 +1,22 @@
 package io.swagger.codegen.languages;
 
+import java.io.File;
+
+import org.apache.commons.io.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import io.swagger.codegen.CodegenConfig;
 import io.swagger.codegen.CodegenType;
 import io.swagger.codegen.DefaultCodegen;
 import io.swagger.codegen.SupportingFile;
 import io.swagger.models.Swagger;
 import io.swagger.util.Json;
-import org.apache.commons.io.FileUtils;
-
-import java.io.File;
 
 public class SwaggerGenerator extends DefaultCodegen implements CodegenConfig {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(SwaggerGenerator.class);
+
     public SwaggerGenerator() {
         super();
         embeddedTemplateDir = templateDir = "swagger";
@@ -41,9 +47,9 @@ public class SwaggerGenerator extends DefaultCodegen implements CodegenConfig {
         try {
             String outputFile = outputFolder + File.separator + "swagger.json";
             FileUtils.writeStringToFile(new File(outputFile), swaggerString);
-            System.out.println("wrote file to " + outputFile);
+            LOGGER.debug("wrote file to " + outputFile);
         } catch (Exception e) {
-            e.printStackTrace();
+            LOGGER.error(e.getMessage(), e);
         }
     }
 }
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java
index 9c4680112e9..5442000280f 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java
@@ -1,16 +1,22 @@
 package io.swagger.codegen.languages;
 
+import java.io.File;
+
+import org.apache.commons.io.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import io.swagger.codegen.CodegenConfig;
 import io.swagger.codegen.CodegenType;
 import io.swagger.codegen.DefaultCodegen;
 import io.swagger.codegen.SupportingFile;
 import io.swagger.models.Swagger;
 import io.swagger.util.Yaml;
-import org.apache.commons.io.FileUtils;
-
-import java.io.File;
 
 public class SwaggerYamlGenerator extends DefaultCodegen implements CodegenConfig {
+	
+    private static final Logger LOGGER = LoggerFactory.getLogger(SwaggerYamlGenerator.class);
+
     public SwaggerYamlGenerator() {
         super();
         embeddedTemplateDir = templateDir = "swagger";
@@ -40,9 +46,9 @@ public class SwaggerYamlGenerator extends DefaultCodegen implements CodegenConfi
             String swaggerString = Yaml.mapper().writeValueAsString(swagger);
             String outputFile = outputFolder + File.separator + "swagger.yaml";
             FileUtils.writeStringToFile(new File(outputFile), swaggerString);
-            System.out.println("wrote file to " + outputFile);
+            LOGGER.debug("wrote file to " + outputFile);
         } catch (Exception e) {
-            e.printStackTrace();
+            LOGGER.error(e.getMessage(), e);
         }
     }
 }
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java
index ddd72e4230b..003dbba2b79 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java
@@ -24,249 +24,322 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class SwiftCodegen extends DefaultCodegen implements CodegenConfig {
-  public static final String PROJECT_NAME = "projectName";
-  public static final String RESPONSE_AS = "responseAs";
-  public static final String UNWRAP_REQUIRED = "unwrapRequired";
-  public static final String POD_SOURCE = "podSource";
-  public static final String POD_AUTHORS = "podAuthors";
-  public static final String POD_SOCIAL_MEDIA_URL = "podSocialMediaURL";
-  public static final String POD_DOCSET_URL = "podDocsetURL";
-  public static final String POD_LICENSE = "podLicense";
-  public static final String POD_HOMEPAGE = "podHomepage";
-  public static final String POD_SUMMARY = "podSummary";
-  public static final String POD_DESCRIPTION = "podDescription";
-  public static final String POD_SCREENSHOTS = "podScreenshots";
-  public static final String POD_DOCUMENTATION_URL = "podDocumentationURL";
-  protected static final String LIBRARY_PROMISE_KIT = "PromiseKit";
-  protected static final String[] RESPONSE_LIBRARIES = { LIBRARY_PROMISE_KIT };
-  protected String projectName = "SwaggerClient";
-  protected boolean unwrapRequired;
-  protected String[] responseAs = new String[0];
-  protected String sourceFolder = "Classes" + File.separator + "Swaggers";
-  private static final Pattern PATH_PARAM_PATTERN = Pattern.compile("\\{[a-zA-Z_]+\\}");
+    public static final String PROJECT_NAME = "projectName";
+    public static final String RESPONSE_AS = "responseAs";
+    public static final String UNWRAP_REQUIRED = "unwrapRequired";
+    public static final String POD_SOURCE = "podSource";
+    public static final String POD_AUTHORS = "podAuthors";
+    public static final String POD_SOCIAL_MEDIA_URL = "podSocialMediaURL";
+    public static final String POD_DOCSET_URL = "podDocsetURL";
+    public static final String POD_LICENSE = "podLicense";
+    public static final String POD_HOMEPAGE = "podHomepage";
+    public static final String POD_SUMMARY = "podSummary";
+    public static final String POD_DESCRIPTION = "podDescription";
+    public static final String POD_SCREENSHOTS = "podScreenshots";
+    public static final String POD_DOCUMENTATION_URL = "podDocumentationURL";
+    public static final String SWIFT_USE_API_NAMESPACE = "swiftUseApiNamespace";
+    protected static final String LIBRARY_PROMISE_KIT = "PromiseKit";
+    protected static final String[] RESPONSE_LIBRARIES = { LIBRARY_PROMISE_KIT };
+    protected String projectName = "SwaggerClient";
+    protected boolean unwrapRequired;
+    protected boolean swiftUseApiNamespace;
+    protected String[] responseAs = new String[0];
+    protected String sourceFolder = "Classes" + File.separator + "Swaggers";
+    private static final Pattern PATH_PARAM_PATTERN = Pattern.compile("\\{[a-zA-Z_]+\\}");
 
-  @Override
-  public CodegenType getTag() {
-    return CodegenType.CLIENT;
-  }
-
-  @Override
-  public String getName() {
-    return "swift";
-  }
-
-  @Override
-  public String getHelp() {
-    return "Generates a swift client library.";
-  }
-
-  public SwiftCodegen() {
-    super();
-    outputFolder = "generated-code" + File.separator + "swift";
-    modelTemplateFiles.put("model.mustache", ".swift");
-    apiTemplateFiles.put("api.mustache", ".swift");
-    embeddedTemplateDir = templateDir = "swift";
-    apiPackage = File.separator + "APIs";
-    modelPackage = File.separator + "Models";
-
-    languageSpecificPrimitives = new HashSet<String>(
-      Arrays.asList(
-        "Int",
-        "Float",
-        "Double",
-        "Bool",
-        "Void",
-        "String",
-        "Character")
-    );
-    defaultIncludes = new HashSet<String>(
-      Arrays.asList(
-        "NSDate",
-        "Array",
-        "Dictionary",
-        "Set",
-        "Any",
-        "Empty",
-        "AnyObject")
-    );
-    reservedWords = new HashSet<String>(
-      Arrays.asList(
-        "class", "break", "as", "associativity", "deinit", "case", "dynamicType", "convenience", "enum", "continue",
-        "false", "dynamic", "extension", "default", "is", "didSet", "func", "do", "nil", "final", "import", "else",
-        "self", "get", "init", "fallthrough", "Self", "infix", "internal", "for", "super", "inout", "let", "if",
-        "true", "lazy", "operator", "in", "COLUMN", "left", "private", "return", "FILE", "mutating", "protocol",
-        "switch", "FUNCTION", "none", "public", "where", "LINE", "nonmutating", "static", "while", "optional",
-        "struct", "override", "subscript", "postfix", "typealias", "precedence", "var", "prefix", "Protocol",
-        "required", "right", "set", "Type", "unowned", "weak")
-    );
-
-    typeMapping = new HashMap<String, String>();
-    typeMapping.put("array", "Array");
-    typeMapping.put("List", "Array");
-    typeMapping.put("map", "Dictionary");
-    typeMapping.put("date", "NSDate");
-    typeMapping.put("Date", "NSDate");
-    typeMapping.put("DateTime", "NSDate");
-    typeMapping.put("boolean", "Bool");
-    typeMapping.put("string", "String");
-    typeMapping.put("char", "Character");
-    typeMapping.put("short", "Int");
-    typeMapping.put("int", "Int");
-    typeMapping.put("long", "Int");
-    typeMapping.put("integer", "Int");
-    typeMapping.put("Integer", "Int");
-    typeMapping.put("float", "Float");
-    typeMapping.put("number", "Double");
-    typeMapping.put("double", "Double");
-    typeMapping.put("object", "String");
-    typeMapping.put("file", "NSURL");
-
-    importMapping = new HashMap<String, String>();
-
-    cliOptions.add(new CliOption(PROJECT_NAME, "Project name in Xcode"));
-    cliOptions.add(new CliOption(RESPONSE_AS, "Optionally use libraries to manage response.  Currently " +
-            StringUtils.join(RESPONSE_LIBRARIES, ", ") + " are available."));
-    cliOptions.add(new CliOption(UNWRAP_REQUIRED, "Treat 'required' properties in response as non-optional " +
-            "(which would crash the app if api returns null as opposed to required option specified in json schema"));
-    cliOptions.add(new CliOption(POD_SOURCE, "Source information used for Podspec"));
-    cliOptions.add(new CliOption(CodegenConstants.POD_VERSION, "Version used for Podspec"));
-    cliOptions.add(new CliOption(POD_AUTHORS, "Authors used for Podspec"));
-    cliOptions.add(new CliOption(POD_SOCIAL_MEDIA_URL, "Social Media URL used for Podspec"));
-    cliOptions.add(new CliOption(POD_DOCSET_URL, "Docset URL used for Podspec"));
-    cliOptions.add(new CliOption(POD_LICENSE, "License used for Podspec"));
-    cliOptions.add(new CliOption(POD_HOMEPAGE, "Homepage used for Podspec"));
-    cliOptions.add(new CliOption(POD_SUMMARY, "Summary used for Podspec"));
-    cliOptions.add(new CliOption(POD_DESCRIPTION, "Description used for Podspec"));
-    cliOptions.add(new CliOption(POD_SCREENSHOTS, "Screenshots used for Podspec"));
-    cliOptions.add(new CliOption(POD_DOCUMENTATION_URL, "Documentation URL used for Podspec"));
-  }
-
-  @Override
-  public void processOpts() {
-    super.processOpts();
-
-    // Setup project name
-    if (additionalProperties.containsKey(PROJECT_NAME)) {
-      setProjectName((String) additionalProperties.get(PROJECT_NAME));
-    } else {
-      additionalProperties.put(PROJECT_NAME, projectName);
-    }
-    sourceFolder = projectName + File.separator + sourceFolder;
-
-    // Setup unwrapRequired option, which makes all the properties with "required" non-optional
-    if (additionalProperties.containsKey(UNWRAP_REQUIRED)) {
-      setUnwrapRequired(Boolean.parseBoolean(String.valueOf(additionalProperties.get(UNWRAP_REQUIRED))));
-    }
-    additionalProperties.put(UNWRAP_REQUIRED, unwrapRequired);
-
-    // Setup unwrapRequired option, which makes all the properties with "required" non-optional
-    if (additionalProperties.containsKey(RESPONSE_AS)) {
-      Object responseAsObject = additionalProperties.get(RESPONSE_AS);
-      if (responseAsObject instanceof String) {
-        setResponseAs(((String)responseAsObject).split(","));
-      } else {
-        setResponseAs((String[]) responseAsObject);
-      }
-    }
-    additionalProperties.put(RESPONSE_AS, responseAs);
-    if (ArrayUtils.contains(responseAs, LIBRARY_PROMISE_KIT)) {
-      additionalProperties.put("usePromiseKit", true);
+    @Override
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
     }
 
-    supportingFiles.add(new SupportingFile("Podspec.mustache", "", projectName + ".podspec"));
-    supportingFiles.add(new SupportingFile("Cartfile.mustache", "", "Cartfile"));
-    supportingFiles.add(new SupportingFile("APIHelper.mustache", sourceFolder, "APIHelper.swift"));
-    supportingFiles.add(new SupportingFile("AlamofireImplementations.mustache", sourceFolder,
-            "AlamofireImplementations.swift"));
-    supportingFiles.add(new SupportingFile("Extensions.mustache", sourceFolder, "Extensions.swift"));
-    supportingFiles.add(new SupportingFile("Models.mustache", sourceFolder, "Models.swift"));
-    supportingFiles.add(new SupportingFile("APIs.mustache", sourceFolder, "APIs.swift"));
-  }
-
-  @Override
-  public String escapeReservedWord(String name) {
-    return "Swagger" + name;  // add an underscore to the name
-  }
-
-  @Override
-  public String modelFileFolder() {
-    return outputFolder + File.separator + sourceFolder + modelPackage().replace('.', File.separatorChar);
-  }
-
-  @Override
-  public String apiFileFolder() {
-    return outputFolder + File.separator + sourceFolder + apiPackage().replace('.', File.separatorChar);
-  }
-
-  @Override
-  public String getTypeDeclaration(Property p) {
-    if (p instanceof ArrayProperty) {
-      ArrayProperty ap = (ArrayProperty) p;
-      Property inner = ap.getItems();
-      return "[" + getTypeDeclaration(inner) + "]";
-    } else if (p instanceof MapProperty) {
-      MapProperty mp = (MapProperty) p;
-      Property inner = mp.getAdditionalProperties();
-      return "[String:" + getTypeDeclaration(inner) + "]";
+    @Override
+    public String getName() {
+        return "swift";
     }
-    return super.getTypeDeclaration(p);
-  }
 
-  @Override
-  public String getSwaggerType(Property p) {
-    String swaggerType = super.getSwaggerType(p);
-    String type = null;
-    if (typeMapping.containsKey(swaggerType)) {
-      type = typeMapping.get(swaggerType);
-      if (languageSpecificPrimitives.contains(type))
+    @Override
+    public String getHelp() {
+        return "Generates a swift client library.";
+    }
+
+    public SwiftCodegen() {
+        super();
+        outputFolder = "generated-code" + File.separator + "swift";
+        modelTemplateFiles.put("model.mustache", ".swift");
+        apiTemplateFiles.put("api.mustache", ".swift");
+        embeddedTemplateDir = templateDir = "swift";
+        apiPackage = File.separator + "APIs";
+        modelPackage = File.separator + "Models";
+
+        languageSpecificPrimitives = new HashSet<String>(
+                Arrays.asList(
+                    "Int",
+                    "Float",
+                    "Double",
+                    "Bool",
+                    "Void",
+                    "String",
+                    "Character",
+                    "AnyObject")
+                );
+        defaultIncludes = new HashSet<String>(
+                Arrays.asList(
+                    "NSDate",
+                    "NSURL", // for file
+                    "Array",
+                    "Dictionary",
+                    "Set",
+                    "Any",
+                    "Empty",
+                    "AnyObject")
+                );
+        setReservedWordsLowerCase(
+                Arrays.asList(
+                    "class", "break", "as", "associativity", "deinit", "case", "dynamicType", "convenience", "enum", "continue",
+                    "false", "dynamic", "extension", "default", "is", "didSet", "func", "do", "nil", "final", "import", "else",
+                    "self", "get", "init", "fallthrough", "Self", "infix", "internal", "for", "super", "inout", "let", "if",
+                    "true", "lazy", "operator", "in", "COLUMN", "left", "private", "return", "FILE", "mutating", "protocol",
+                    "switch", "FUNCTION", "none", "public", "where", "LINE", "nonmutating", "static", "while", "optional",
+                    "struct", "override", "subscript", "postfix", "typealias", "precedence", "var", "prefix", "Protocol",
+                    "required", "right", "set", "Type", "unowned", "weak")
+                );
+
+        typeMapping = new HashMap<String, String>();
+        typeMapping.put("array", "Array");
+        typeMapping.put("List", "Array");
+        typeMapping.put("map", "Dictionary");
+        typeMapping.put("date", "NSDate");
+        typeMapping.put("Date", "NSDate");
+        typeMapping.put("DateTime", "NSDate");
+        typeMapping.put("boolean", "Bool");
+        typeMapping.put("string", "String");
+        typeMapping.put("char", "Character");
+        typeMapping.put("short", "Int");
+        typeMapping.put("int", "Int");
+        typeMapping.put("long", "Int");
+        typeMapping.put("integer", "Int");
+        typeMapping.put("Integer", "Int");
+        typeMapping.put("float", "Float");
+        typeMapping.put("number", "Double");
+        typeMapping.put("double", "Double");
+        typeMapping.put("object", "AnyObject");
+        typeMapping.put("file", "NSURL");
+        //TODO binary should be mapped to byte array
+        // mapped to String as a workaround
+        typeMapping.put("binary", "String");
+
+        importMapping = new HashMap<String, String>();
+
+        cliOptions.add(new CliOption(PROJECT_NAME, "Project name in Xcode"));
+        cliOptions.add(new CliOption(RESPONSE_AS, "Optionally use libraries to manage response.  Currently " +
+                    StringUtils.join(RESPONSE_LIBRARIES, ", ") + " are available."));
+        cliOptions.add(new CliOption(UNWRAP_REQUIRED, "Treat 'required' properties in response as non-optional " +
+                    "(which would crash the app if api returns null as opposed to required option specified in json schema"));
+        cliOptions.add(new CliOption(POD_SOURCE, "Source information used for Podspec"));
+        cliOptions.add(new CliOption(CodegenConstants.POD_VERSION, "Version used for Podspec"));
+        cliOptions.add(new CliOption(POD_AUTHORS, "Authors used for Podspec"));
+        cliOptions.add(new CliOption(POD_SOCIAL_MEDIA_URL, "Social Media URL used for Podspec"));
+        cliOptions.add(new CliOption(POD_DOCSET_URL, "Docset URL used for Podspec"));
+        cliOptions.add(new CliOption(POD_LICENSE, "License used for Podspec"));
+        cliOptions.add(new CliOption(POD_HOMEPAGE, "Homepage used for Podspec"));
+        cliOptions.add(new CliOption(POD_SUMMARY, "Summary used for Podspec"));
+        cliOptions.add(new CliOption(POD_DESCRIPTION, "Description used for Podspec"));
+        cliOptions.add(new CliOption(POD_SCREENSHOTS, "Screenshots used for Podspec"));
+        cliOptions.add(new CliOption(POD_DOCUMENTATION_URL, "Documentation URL used for Podspec"));
+        cliOptions.add(new CliOption(SWIFT_USE_API_NAMESPACE, "Flag to make all the API classes inner-class of {{projectName}}API"));
+    }
+
+    @Override
+    public void processOpts() {
+        super.processOpts();
+
+        // Setup project name
+        if (additionalProperties.containsKey(PROJECT_NAME)) {
+            setProjectName((String) additionalProperties.get(PROJECT_NAME));
+        } else {
+            additionalProperties.put(PROJECT_NAME, projectName);
+        }
+        sourceFolder = projectName + File.separator + sourceFolder;
+
+        // Setup unwrapRequired option, which makes all the properties with "required" non-optional
+        if (additionalProperties.containsKey(UNWRAP_REQUIRED)) {
+            setUnwrapRequired(Boolean.parseBoolean(String.valueOf(additionalProperties.get(UNWRAP_REQUIRED))));
+        }
+        additionalProperties.put(UNWRAP_REQUIRED, unwrapRequired);
+
+        // Setup unwrapRequired option, which makes all the properties with "required" non-optional
+        if (additionalProperties.containsKey(RESPONSE_AS)) {
+            Object responseAsObject = additionalProperties.get(RESPONSE_AS);
+            if (responseAsObject instanceof String) {
+                setResponseAs(((String)responseAsObject).split(","));
+            } else {
+                setResponseAs((String[]) responseAsObject);
+            }
+        }
+        additionalProperties.put(RESPONSE_AS, responseAs);
+        if (ArrayUtils.contains(responseAs, LIBRARY_PROMISE_KIT)) {
+            additionalProperties.put("usePromiseKit", true);
+        }
+
+        // Setup swiftUseApiNamespace option, which makes all the API classes inner-class of {{projectName}}API
+        if (additionalProperties.containsKey(SWIFT_USE_API_NAMESPACE)) {
+            swiftUseApiNamespace = Boolean.parseBoolean(String.valueOf(additionalProperties.get(SWIFT_USE_API_NAMESPACE)));
+        }
+        additionalProperties.put(SWIFT_USE_API_NAMESPACE, swiftUseApiNamespace);
+
+        supportingFiles.add(new SupportingFile("Podspec.mustache", "", projectName + ".podspec"));
+        supportingFiles.add(new SupportingFile("Cartfile.mustache", "", "Cartfile"));
+        supportingFiles.add(new SupportingFile("APIHelper.mustache", sourceFolder, "APIHelper.swift"));
+        supportingFiles.add(new SupportingFile("AlamofireImplementations.mustache", sourceFolder,
+                    "AlamofireImplementations.swift"));
+        supportingFiles.add(new SupportingFile("Extensions.mustache", sourceFolder, "Extensions.swift"));
+        supportingFiles.add(new SupportingFile("Models.mustache", sourceFolder, "Models.swift"));
+        supportingFiles.add(new SupportingFile("APIs.mustache", sourceFolder, "APIs.swift"));
+        supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
+        supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
+
+    }
+
+    @Override
+    public String escapeReservedWord(String name) {
+        return "_" + name;  // add an underscore to the name
+    }
+
+    @Override
+    public String modelFileFolder() {
+        return outputFolder + File.separator + sourceFolder + modelPackage().replace('.', File.separatorChar);
+    }
+
+    @Override
+    public String apiFileFolder() {
+        return outputFolder + File.separator + sourceFolder + apiPackage().replace('.', File.separatorChar);
+    }
+
+    @Override
+    public String getTypeDeclaration(Property p) {
+        if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            Property inner = ap.getItems();
+            return "[" + getTypeDeclaration(inner) + "]";
+        } else if (p instanceof MapProperty) {
+            MapProperty mp = (MapProperty) p;
+            Property inner = mp.getAdditionalProperties();
+            return "[String:" + getTypeDeclaration(inner) + "]";
+        }
+        return super.getTypeDeclaration(p);
+    }
+
+    @Override
+    public String getSwaggerType(Property p) {
+        String swaggerType = super.getSwaggerType(p);
+        String type = null;
+        if (typeMapping.containsKey(swaggerType)) {
+            type = typeMapping.get(swaggerType);
+            if (languageSpecificPrimitives.contains(type) || defaultIncludes.contains(type))
+                return type;
+        } else
+            type = swaggerType;
         return toModelName(type);
-    } else
-      type = swaggerType;
-    return toModelName(type);
-  }
-
-  @Override
-  public String toDefaultValue(Property p) {
-    // nil
-    return null;
-  }
-
-  @Override
-  public String toInstantiationType(Property p) {
-    if (p instanceof MapProperty) {
-      MapProperty ap = (MapProperty) p;
-      String inner = getSwaggerType(ap.getAdditionalProperties());
-      return "[String:" + inner + "]";
-    } else if (p instanceof ArrayProperty) {
-      ArrayProperty ap = (ArrayProperty) p;
-      String inner = getSwaggerType(ap.getItems());
-      return "[" + inner + "]";
     }
-    return null;
-  }
 
-  @Override
-  public CodegenProperty fromProperty(String name, Property p) {
-    CodegenProperty codegenProperty = super.fromProperty(name, p);
-    if (codegenProperty.isEnum) {
-      List<Map<String, String>> swiftEnums = new ArrayList<Map<String, String>>();
-      List<String> values = (List<String>) codegenProperty.allowableValues.get("values");
-      for (String value : values) {
-        Map<String, String> map = new HashMap<String, String>();
-        map.put("enum", toSwiftyEnumName(value));
-        map.put("raw", value);
-        swiftEnums.add(map);
-      }
-      codegenProperty.allowableValues.put("values", swiftEnums);
-      codegenProperty.datatypeWithEnum =
-              StringUtils.left(codegenProperty.datatypeWithEnum, codegenProperty.datatypeWithEnum.length() - "Enum".length());
-      if (reservedWords.contains(codegenProperty.datatypeWithEnum)) {
-        codegenProperty.datatypeWithEnum = escapeReservedWord(codegenProperty.datatypeWithEnum);
-      }
+    /**
+     * Output the proper model name (capitalized)
+     *
+     * @param name the name of the model
+     * @return capitalized model name
+     */
+    @Override
+    public String toModelName(String name) {
+        name = sanitizeName(name);  // FIXME parameter should not be assigned. Also declare it as "final"
+
+        if (!StringUtils.isEmpty(modelNameSuffix)) { // set model suffix
+            name = name + "_" + modelNameSuffix;
+        }
+
+        if (!StringUtils.isEmpty(modelNamePrefix)) { // set model prefix
+            name = modelNamePrefix + "_" + name;
+        }
+
+        // camelize the model name
+        // phone_number => PhoneNumber
+        name = camelize(name);
+
+        // model name cannot use reserved keyword, e.g. return
+        if (isReservedWord(name)) {
+            String modelName = "Model" + name;
+            LOGGER.warn(name + " (reserved word) cannot be used as model name. Renamed to " + modelName);
+            return modelName;
+        }
+
+        // model name starts with number
+        if (name.matches("^\\d.*")) {
+            String modelName = "Model" + name; // e.g. 200Response => Model200Response (after camelize)
+            LOGGER.warn(name + " (model name starts with number) cannot be used as model name. Renamed to " + modelName);
+            return modelName;
+        }
+
+        return name;
     }
-    return codegenProperty;
-  }
 
+    /**
+     * Return the capitalized file name of the model
+     *
+     * @param name the model name
+     * @return the file name of the model
+     */
+    @Override
+    public String toModelFilename(String name) {
+        // should be the same as the model name
+        return toModelName(name);
+    }
+
+    @Override
+    public String toDefaultValue(Property p) {
+        // nil
+        return null;
+    }
+
+    @Override
+    public String toInstantiationType(Property p) {
+        if (p instanceof MapProperty) {
+            MapProperty ap = (MapProperty) p;
+            String inner = getSwaggerType(ap.getAdditionalProperties());
+            return "[String:" + inner + "]";
+        } else if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            String inner = getSwaggerType(ap.getItems());
+            return "[" + inner + "]";
+        }
+        return null;
+    }
+
+    @Override
+    public CodegenProperty fromProperty(String name, Property p) {
+        CodegenProperty codegenProperty = super.fromProperty(name, p);
+        if (codegenProperty.isEnum) {
+            List<Map<String, String>> swiftEnums = new ArrayList<Map<String, String>>();
+            List<String> values = (List<String>) codegenProperty.allowableValues.get("values");
+            for (String value : values) {
+                Map<String, String> map = new HashMap<String, String>();
+                map.put("enum", toSwiftyEnumName(value));
+                map.put("raw", value);
+                swiftEnums.add(map);
+            }
+            codegenProperty.allowableValues.put("values", swiftEnums);
+            codegenProperty.datatypeWithEnum =
+                StringUtils.left(codegenProperty.datatypeWithEnum, codegenProperty.datatypeWithEnum.length() - "Enum".length());
+            // Ensure that the enum type doesn't match a reserved word or
+            // the variable name doesn't match the generated enum type or the
+            // Swift compiler will generate an error
+            if (isReservedWord(codegenProperty.datatypeWithEnum) ||
+                    name.equals(codegenProperty.datatypeWithEnum)) {
+                codegenProperty.datatypeWithEnum = escapeReservedWord(codegenProperty.datatypeWithEnum);
+                    }
+        }
+        return codegenProperty;
+    }
+
+    @SuppressWarnings("static-method")
     public String toSwiftyEnumName(String value) {
         // Prevent from breaking properly cased identifier
         if (value.matches("[A-Z][a-z0-9]+[a-zA-Z0-9]*")) {
@@ -277,63 +350,129 @@ public class SwiftCodegen extends DefaultCodegen implements CodegenConfig {
     }
 
 
-  @Override
-  public String toApiName(String name) {
-    if(name.length() == 0)
-      return "DefaultAPI";
-    return initialCaps(name) + "API";
-  }
-
-  @Override
-  public CodegenOperation fromOperation(String path, String httpMethod, Operation operation, Map<String, Model> definitions, Swagger swagger) {
-    path = normalizePath(path);
-    List<Parameter> parameters = operation.getParameters();
-    parameters = Lists.newArrayList(Iterators.filter(parameters.iterator(), new Predicate<Parameter>() {
-      @Override
-      public boolean apply(@Nullable Parameter parameter) {
-        return !(parameter instanceof HeaderParameter);
-      }
-    }));
-    operation.setParameters(parameters);
-    return super.fromOperation(path, httpMethod, operation, definitions, swagger);
-  }
-
-  private static String normalizePath(String path) {
-    StringBuilder builder = new StringBuilder();
-
-    int cursor = 0;
-    Matcher matcher = PATH_PARAM_PATTERN.matcher(path);
-    boolean found = matcher.find();
-    while (found) {
-      String stringBeforeMatch = path.substring(cursor, matcher.start());
-      builder.append(stringBeforeMatch);
-
-      String group = matcher.group().substring(1, matcher.group().length() - 1);
-      group = camelize(group, true);
-      builder
-              .append("{")
-              .append(group)
-              .append("}");
-
-      cursor = matcher.end();
-      found = matcher.find();
+    @Override
+    public String toApiName(String name) {
+        if(name.length() == 0)
+            return "DefaultAPI";
+        return initialCaps(name) + "API";
     }
 
-    String stringAfterMatch = path.substring(cursor);
-    builder.append(stringAfterMatch);
+    @Override
+    public String toOperationId(String operationId) {
+        operationId = camelize(sanitizeName(operationId), true); 
 
-    return builder.toString();
-  }
+        // throw exception if method name is empty. This should not happen but keep the check just in case
+        if (StringUtils.isEmpty(operationId)) {
+            throw new RuntimeException("Empty method name (operationId) not allowed");
+        }
 
-  public void setProjectName(String projectName) {
-    this.projectName = projectName;
-  }
+        // method name cannot use reserved keyword, e.g. return
+        if (isReservedWord(operationId)) {
+            String newOperationId = camelize(("call_" + operationId), true);
+            LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to " + newOperationId);
+            return newOperationId;
+        }
 
-  public void setUnwrapRequired(boolean unwrapRequired) {
-    this.unwrapRequired = unwrapRequired;
-  }
+        return operationId;
+    }
 
-  public void setResponseAs(String[] responseAs) {
-    this.responseAs = responseAs;
-  }
+    @Override
+    public String toVarName(String name) {
+        // sanitize name
+        name = sanitizeName(name);
+
+        // if it's all uppper case, do nothing
+        if (name.matches("^[A-Z_]*$")) {
+            return name;
+        }
+
+        // camelize the variable name
+        // pet_id => petId
+        name = camelize(name, true);
+
+        // for reserved word or word starting with number, append _
+        if (isReservedWord(name) || name.matches("^\\d.*")) {
+            name = escapeReservedWord(name);
+        }
+
+        return name;
+    }
+
+    @Override
+    public String toParamName(String name) {
+        // sanitize name
+        name = sanitizeName(name);
+
+        // replace - with _ e.g. created-at => created_at
+        name = name.replaceAll("-", "_");
+
+        // if it's all uppper case, do nothing
+        if (name.matches("^[A-Z_]*$")) {
+            return name;
+        }
+
+        // camelize(lower) the variable name
+        // pet_id => petId
+        name = camelize(name, true);
+
+        // for reserved word or word starting with number, append _
+        if (isReservedWord(name) || name.matches("^\\d.*")) {
+            name = escapeReservedWord(name);
+        }
+
+        return name;
+    }
+
+    @Override
+    public CodegenOperation fromOperation(String path, String httpMethod, Operation operation, Map<String, Model> definitions, Swagger swagger) {
+        path = normalizePath(path); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
+        List<Parameter> parameters = operation.getParameters();
+        parameters = Lists.newArrayList(Iterators.filter(parameters.iterator(), new Predicate<Parameter>() {
+            @Override
+            public boolean apply(@Nullable Parameter parameter) {
+                return !(parameter instanceof HeaderParameter);
+            }
+        }));
+        operation.setParameters(parameters);
+        return super.fromOperation(path, httpMethod, operation, definitions, swagger);
+    }
+
+    private static String normalizePath(String path) {
+        StringBuilder builder = new StringBuilder();
+
+        int cursor = 0;
+        Matcher matcher = PATH_PARAM_PATTERN.matcher(path);
+        boolean found = matcher.find();
+        while (found) {
+            String stringBeforeMatch = path.substring(cursor, matcher.start());
+            builder.append(stringBeforeMatch);
+
+            String group = matcher.group().substring(1, matcher.group().length() - 1);
+            group = camelize(group, true);
+            builder
+                .append("{")
+                .append(group)
+                .append("}");
+
+            cursor = matcher.end();
+            found = matcher.find();
+        }
+
+        String stringAfterMatch = path.substring(cursor);
+        builder.append(stringAfterMatch);
+
+        return builder.toString();
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public void setUnwrapRequired(boolean unwrapRequired) {
+        this.unwrapRequired = unwrapRequired;
+    }
+
+    public void setResponseAs(String[] responseAs) {
+        this.responseAs = responseAs;
+    }
 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TizenClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TizenClientCodegen.java
index 83241ddc5e7..c3f6d7ab99a 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TizenClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TizenClientCodegen.java
@@ -53,7 +53,7 @@ public class TizenClientCodegen extends DefaultCodegen implements CodegenConfig
 
         additionalProperties().put("prefix", PREFIX);
 
-        reservedWords = new HashSet<String>(
+        setReservedWordsLowerCase(
                 // VERIFY
                 Arrays.asList(
                         "void", "char", "short", "int", "void", "char", "short", "int",
@@ -76,6 +76,9 @@ public class TizenClientCodegen extends DefaultCodegen implements CodegenConfig
         typeMapping.put("map", "HashMap");
         typeMapping.put("number", "Long");
         typeMapping.put("object", PREFIX + "Object");
+        //TODO binary should be mapped to byte array
+        // mapped to String as a workaround
+        typeMapping.put("binary", "String");
 
         importMapping = new HashMap<String, String>();
 
@@ -128,12 +131,8 @@ public class TizenClientCodegen extends DefaultCodegen implements CodegenConfig
     @Override
     public String toInstantiationType(Property p) {
         if (p instanceof MapProperty) {
-            MapProperty ap = (MapProperty) p;
-            String inner = getSwaggerType(ap.getAdditionalProperties());
             return instantiationTypes.get("map");
         } else if (p instanceof ArrayProperty) {
-            ArrayProperty ap = (ArrayProperty) p;
-            String inner = getSwaggerType(ap.getItems());
             return instantiationTypes.get("array");
         } else {
             return null;
@@ -217,12 +216,8 @@ public class TizenClientCodegen extends DefaultCodegen implements CodegenConfig
         } else if (p instanceof DecimalProperty) {
             return "new Long()";
         } else if (p instanceof MapProperty) {
-            MapProperty ap = (MapProperty) p;
-            String inner = getSwaggerType(ap.getAdditionalProperties());
             return "new HashMap()";
         } else if (p instanceof ArrayProperty) {
-            ArrayProperty ap = (ArrayProperty) p;
-            String inner = getSwaggerType(ap.getItems());
             return "new ArrayList()";
         }
         // else
@@ -278,7 +273,7 @@ public class TizenClientCodegen extends DefaultCodegen implements CodegenConfig
         }
 
         // method name cannot use reserved keyword, e.g. return$
-        if (reservedWords.contains(operationId)) {
+        if (isReservedWord(operationId)) {
             throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
         }
 
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java
index 60b6f2b34c6..6237331cf80 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java
@@ -14,7 +14,17 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode
 	public String getHelp() {
 		return "Generates a TypeScript AngularJS client library.";
 	}
+	
+	@Override
+    public void processOpts() {
+        super.processOpts();
+	    supportingFiles.add(new SupportingFile("api.d.mustache", apiPackage().replace('.', File.separatorChar), "api.d.ts"));
+        supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
+        //supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
 
+
+	}
+	
 	public TypeScriptAngularClientCodegen() {
 	    super();
 	    outputFolder = "generated-code/typescript-angular";
@@ -23,6 +33,5 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode
 	    embeddedTemplateDir = templateDir = "TypeScript-Angular";
 	    apiPackage = "API.Client";
 	    modelPackage = "API.Client";
-	    supportingFiles.add(new SupportingFile("api.d.mustache", apiPackage().replace('.', File.separatorChar), "api.d.ts"));
 	}
 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptNodeClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptNodeClientCodegen.java
index b4de0f7ed0c..e590a60b323 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptNodeClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptNodeClientCodegen.java
@@ -14,11 +14,18 @@ public class TypeScriptNodeClientCodegen extends AbstractTypeScriptClientCodegen
         return "Generates a TypeScript nodejs client library.";
     }
 
+	@Override
+    public void processOpts() {
+        super.processOpts();
+        supportingFiles.add(new SupportingFile("api.mustache", null, "api.ts"));
+        supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
+        //supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
+    }
+    
     public TypeScriptNodeClientCodegen() {
         super();
         outputFolder = "generated-code/typescript-node";
         embeddedTemplateDir = templateDir = "TypeScript-node";
-        supportingFiles.add(new SupportingFile("api.mustache", null, "api.ts"));
     }
 
 }
diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/utils/OptionUtils.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/utils/OptionUtils.java
similarity index 96%
rename from modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/utils/OptionUtils.java
rename to modules/swagger-codegen/src/main/java/io/swagger/codegen/utils/OptionUtils.java
index 34d56727412..52afb51c89c 100644
--- a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/utils/OptionUtils.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/utils/OptionUtils.java
@@ -1,4 +1,4 @@
-package io.swagger.codegen.cmd.utils;
+package io.swagger.codegen.utils;
 
 import org.apache.commons.lang3.tuple.Pair;
 
diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/ApiClient.mustache
index a428cdc3630..ea92989daa4 100644
--- a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/ApiClient.mustache
@@ -159,6 +159,7 @@ namespace {{packageName}}.Client
         /// </summary>
         /// <param name="content">HTTP body (e.g. string, JSON).</param>
         /// <param name="type">Object type.</param>
+        /// <param name="headers">HTTP headers.</param>
         /// <returns>Object representation of the JSON string.</returns>
         public object Deserialize(string content, Type type, IList<Parameter> headers=null)
         {
diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/ApiException.mustache b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/ApiException.mustache
index 71d0243d729..dd618e0a99c 100644
--- a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/ApiException.mustache
+++ b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/ApiException.mustache
@@ -20,7 +20,6 @@ namespace {{packageName}}.Client {
       /// <summary>
       /// Initializes a new instance of the <see cref="ApiException"/> class.
       /// </summary>
-      /// <param name="basePath">The base path.</param>
       public ApiException() {}
 
       /// <summary>
diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/api.mustache b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/api.mustache
index 2e51c913c30..c3fb85acb4f 100644
--- a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/api.mustache
@@ -9,6 +9,9 @@ using {{packageName}}.Client;
 namespace {{packageName}}.Api
 {
     {{#operations}}
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
     public interface I{{classname}}
     {
         {{#operation}}
@@ -16,7 +19,7 @@ namespace {{packageName}}.Api
         /// {{summary}} {{notes}}
         /// </summary>
         {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
-        {{/allParams}}/// <returns>{{#returnType}}{{{returnType}}}{{/returnType}}</returns>
+        {{/allParams}}/// <returns>{{#returnType}}{{returnType}}{{/returnType}}</returns>
         {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
         {{/operation}}
     }
@@ -71,7 +74,7 @@ namespace {{packageName}}.Api
         /// <summary>
         /// Gets or sets the API client.
         /// </summary>
-        /// <value>An instance of the ApiClient</param>
+        /// <value>An instance of the ApiClient</value>
         public ApiClient ApiClient {get; set;}
     
         {{#operation}}
@@ -79,7 +82,7 @@ namespace {{packageName}}.Api
         /// {{summary}} {{notes}}
         /// </summary>
         {{#allParams}}/// <param name="{{paramName}}">{{description}}</param> 
-        {{/allParams}}/// <returns>{{#returnType}}{{{returnType}}}{{/returnType}}</returns>            
+        {{/allParams}}/// <returns>{{#returnType}}{{returnType}}{{/returnType}}</returns>            
         public {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
         {
             {{#allParams}}{{#required}}
diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/compile-mono.sh.mustache b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/compile-mono.sh.mustache
index 73add75a69a..1e4e12b4aee 100644
--- a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/compile-mono.sh.mustache
+++ b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/compile-mono.sh.mustache
@@ -7,6 +7,6 @@ vendor/RestSharp.Net2.1.1.11/lib/net20/RestSharp.Net2.dll,\
 System.Runtime.Serialization.dll \
 -target:library \
 -out:bin/{{packageName}}.dll \
--recurse:src/*.cs \
+-recurse:'src/*.cs' \
 -doc:bin/{{packageName}}.xml \
--platform:anycpu
\ No newline at end of file
+-platform:anycpu
diff --git a/modules/swagger-codegen/src/main/resources/Groovy/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Groovy/build.gradle.mustache
index 342094c90ec..49edec87133 100644
--- a/modules/swagger-codegen/src/main/resources/Groovy/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Groovy/build.gradle.mustache
@@ -1,5 +1,7 @@
 apply plugin: 'groovy'
 apply plugin: 'idea'
+apply plugin: 'eclipse'
+
 def artifactory = 'buildserver.supportspace.com'
 group = 'com.supportspace'
 archivesBaseName = 'swagger-gen-groovy'
diff --git a/modules/swagger-codegen/src/main/resources/JMeter/api.mustache b/modules/swagger-codegen/src/main/resources/JMeter/api.mustache
index 1af63c2d66d..b52f7f3b97c 100644
--- a/modules/swagger-codegen/src/main/resources/JMeter/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/JMeter/api.mustache
@@ -103,7 +103,7 @@
           <stringProp name="HTTPSampler.response_timeout"></stringProp>
           <stringProp name="HTTPSampler.protocol"></stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
-          <stringProp name="HTTPSampler.path">{{vendorExtensions.x-path}}</stringProp>
+          <stringProp name="HTTPSampler.path">{{basePathWithoutHost}}{{vendorExtensions.x-path}}</stringProp>
           <stringProp name="HTTPSampler.method">{{httpMethod}}</stringProp>
           <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
diff --git a/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache
index ef31058d561..4c79216bc55 100644
--- a/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache
@@ -43,11 +43,13 @@ import {{invokerPackage}}.auth.OAuth;
 
 {{>generatedAnnotation}}
 public class ApiClient {
-  private Map<String, Client> hostMap = new HashMap<String, Client>();
   private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
-  private boolean debugging = false;
   private String basePath = "{{basePath}}";
-  private ObjectMapper mapper;
+  private boolean debugging = false;
+  private int connectionTimeout = 0;
+
+  private Client httpClient;
+  private ObjectMapper objectMapper;
 
   private Map<String, Authentication> authentications;
 
@@ -57,25 +59,19 @@ public class ApiClient {
   private DateFormat dateFormat;
 
   public ApiClient() {
-    mapper = new ObjectMapper();
-    mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-    mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-    mapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
-    mapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
-    mapper.registerModule(new JodaModule());
-  
-    // Use RFC3339 format for date and datetime.
-    // See http://xml2rfc.ietf.org/public/rfc/html/rfc3339.html#anchor14
-    this.dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
+    objectMapper = new ObjectMapper();
+    objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+    objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+    objectMapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
+    objectMapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
+    objectMapper.registerModule(new JodaModule());
+    objectMapper.setDateFormat(ApiClient.buildDefaultDateFormat());
 
-    // Use UTC as the default time zone.
-    this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
-
-    this.mapper.setDateFormat((DateFormat) dateFormat.clone());
+    dateFormat = ApiClient.buildDefaultDateFormat();
 
     // Set default User-Agent.
-    setUserAgent("Java-Swagger");
+    setUserAgent("{{#httpUserAgent}}{{{.}}}{{/httpUserAgent}}{{^httpUserAgent}}Swagger-Codegen/{{{artifactVersion}}}/java{{/httpUserAgent}}");
 
     // Setup authentications (key: authentication name, value: authentication).
     authentications = new HashMap<String, Authentication>();{{#authMethods}}{{#isBasic}}
@@ -84,6 +80,62 @@ public class ApiClient {
     authentications.put("{{name}}", new OAuth());{{/isOAuth}}{{/authMethods}}
     // Prevent the authentications from being modified.
     authentications = Collections.unmodifiableMap(authentications);
+
+    rebuildHttpClient();
+  }
+
+  public static DateFormat buildDefaultDateFormat() {
+    // Use RFC3339 format for date and datetime.
+    // See http://xml2rfc.ietf.org/public/rfc/html/rfc3339.html#anchor14
+    DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
+    // Use UTC as the default time zone.
+    dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+    return dateFormat;
+  }
+
+  /**
+   * Build the Client used to make HTTP requests with the latest settings,
+   * i.e. objectMapper and debugging.
+   * TODO: better to use the Builder Pattern?
+   */
+  public ApiClient rebuildHttpClient() {
+    // Add the JSON serialization support to Jersey
+    JacksonJsonProvider jsonProvider = new JacksonJsonProvider(objectMapper);
+    DefaultClientConfig conf = new DefaultClientConfig();
+    conf.getSingletons().add(jsonProvider);
+    Client client = Client.create(conf);
+    if (debugging) {
+      client.addFilter(new LoggingFilter());
+    }
+    this.httpClient = client;
+    return this;
+  }
+
+  /**
+   * Returns the current object mapper used for JSON serialization/deserialization.
+   * <p>
+   * Note: If you make changes to the object mapper, remember to set it back via
+   * <code>setObjectMapper</code> in order to trigger HTTP client rebuilding.
+   * </p>
+   */
+  public ObjectMapper getObjectMapper() {
+    return objectMapper;
+  }
+
+  public ApiClient setObjectMapper(ObjectMapper objectMapper) {
+    this.objectMapper = objectMapper;
+    // Need to rebuild the Client as it depends on object mapper.
+    rebuildHttpClient();
+    return this;
+  }
+
+  public Client getHttpClient() {
+    return httpClient;
+  }
+
+  public ApiClient setHttpClient(Client httpClient) {
+    this.httpClient = httpClient;
+    return this;
   }
 
   public String getBasePath() {
@@ -224,9 +276,29 @@ public class ApiClient {
    */
   public ApiClient setDebugging(boolean debugging) {
     this.debugging = debugging;
+    // Need to rebuild the Client as it depends on the value of debugging.
+    rebuildHttpClient();
     return this;
   }
 
+  /**
+   * Connect timeout (in milliseconds).
+   */
+  public int getConnectTimeout() {
+    return connectionTimeout;
+  }
+
+  /**
+   * Set the connect timeout (in milliseconds).
+   * A value of 0 means no timeout, otherwise values must be between 1 and
+   * {@link Integer#MAX_VALUE}.
+   */
+   public ApiClient setConnectTimeout(int connectionTimeout) {
+     this.connectionTimeout = connectionTimeout;
+     httpClient.setConnectTimeout(connectionTimeout);
+     return this;
+   }
+
   /**
    * Get the date format used to parse/format date parameters.
    */
@@ -239,8 +311,10 @@ public class ApiClient {
    */
   public ApiClient setDateFormat(DateFormat dateFormat) {
     this.dateFormat = dateFormat;
-    // also set the date format for model (de)serialization with Date properties
-    this.mapper.setDateFormat((DateFormat) dateFormat.clone());
+    // Also set the date format for model (de)serialization with Date properties.
+    this.objectMapper.setDateFormat((DateFormat) dateFormat.clone());
+    // Need to rebuild the Client as objectMapper changes.
+    rebuildHttpClient();
     return this;
   }
 
@@ -428,36 +502,51 @@ public class ApiClient {
     }
   }
 
-  private ClientResponse getAPIResponse(String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, Object> formParams, String accept, String contentType, String[] authNames) throws ApiException {
+  /**
+   * Build full URL by concatenating base path, the given sub path and query parameters.
+   *
+   * @param path The sub path
+   * @param queryParams The query parameters
+   * @return The full URL
+   */
+  private String buildUrl(String path, List<Pair> queryParams) {
+    final StringBuilder url = new StringBuilder();
+    url.append(basePath).append(path);
 
-    if (body != null && !formParams.isEmpty()){
+    if (queryParams != null && !queryParams.isEmpty()) {
+      // support (constant) query string in `path`, e.g. "/posts?draft=1"
+      String prefix = path.contains("?") ? "&" : "?";
+      for (Pair param : queryParams) {
+        if (param.getValue() != null) {
+          if (prefix != null) {
+            url.append(prefix);
+            prefix = null;
+          } else {
+            url.append("&");
+          }
+          String value = parameterToString(param.getValue());
+          url.append(escapeString(param.getName())).append("=").append(escapeString(value));
+        }
+      }
+    }
+
+    return url.toString();
+  }
+
+  private ClientResponse getAPIResponse(String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, Object> formParams, String accept, String contentType, String[] authNames) throws ApiException {
+    if (body != null && !formParams.isEmpty()) {
       throw new ApiException(500, "Cannot have body and form params");
     }
 
     updateParamsForAuth(authNames, queryParams, headerParams);
 
-    Client client = getClient();
-
-    StringBuilder b = new StringBuilder();
-    b.append("?");
-    if (queryParams != null){
-      for (Pair queryParam : queryParams){
-        if (!queryParam.getName().isEmpty()) {
-          b.append(escapeString(queryParam.getName()));
-          b.append("=");
-          b.append(escapeString(queryParam.getValue()));
-          b.append("&");
-        }
-      }
-    }
-
-    String querystring = b.substring(0, b.length() - 1);
-
+    final String url = buildUrl(path, queryParams);
     Builder builder;
-    if (accept == null)
-      builder = client.resource(basePath + path + querystring).getRequestBuilder();
-    else
-      builder = client.resource(basePath + path + querystring).accept(accept);
+    if (accept == null) {
+      builder = httpClient.resource(url).getRequestBuilder();
+    } else {
+      builder = httpClient.resource(url).accept(accept);
+    }
 
     for (String key : headerParams.keySet()) {
       builder = builder.header(key, headerParams.get(key));
@@ -478,7 +567,10 @@ public class ApiClient {
       response = builder.type(contentType).put(ClientResponse.class, serialize(body, contentType, formParams));
     } else if ("DELETE".equals(method)) {
       response = builder.type(contentType).delete(ClientResponse.class, serialize(body, contentType, formParams));
-    } else {
+    } else if ("PATCH".equals(method)) {
+      response = builder.type(contentType).header("X-HTTP-Method-Override", "PATCH").post(ClientResponse.class, serialize(body, contentType, formParams));
+    }
+    else {
       throw new ApiException(500, "unknown method type " + method);
     }
     return response;
@@ -569,21 +661,4 @@ public class ApiClient {
 
     return encodedFormParams;
   }
-
-  /**
-   * Get an existing client or create a new client to handle HTTP request.
-   */
-  private Client getClient() {
-    if(!hostMap.containsKey(basePath)) {
-      // Add the JSON serialization support to Jersey
-      JacksonJsonProvider jsonProvider = new JacksonJsonProvider(mapper);
-      DefaultClientConfig conf = new DefaultClientConfig();
-      conf.getSingletons().add(jsonProvider);
-      Client client = Client.create(conf);
-      if (debugging)
-        client.addFilter(new LoggingFilter());
-      hostMap.put(basePath, client);
-    }
-    return hostMap.get(basePath);
-  }
 }
diff --git a/modules/swagger-codegen/src/main/resources/Java/README.mustache b/modules/swagger-codegen/src/main/resources/Java/README.mustache
index 7ce9bac3ca0..50e2cf3fbe9 100644
--- a/modules/swagger-codegen/src/main/resources/Java/README.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/README.mustache
@@ -20,7 +20,7 @@ mvn deploy
 
 Refer to the [official documentation](https://maven.apache.org/plugins/maven-deploy-plugin/usage.html) for more information.
 
-After the client libarary is installed/deployed, you can use it in your Maven project by adding the following to your *pom.xml*:
+After the client library is installed/deployed, you can use it in your Maven project by adding the following to your *pom.xml*:
 
 ```xml
 <dependency>
diff --git a/modules/swagger-codegen/src/main/resources/Java/api.mustache b/modules/swagger-codegen/src/main/resources/Java/api.mustache
index fc441df954a..0487cd8ef98 100644
--- a/modules/swagger-codegen/src/main/resources/Java/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/api.mustache
@@ -11,7 +11,10 @@ import {{invokerPackage}}.Pair;
 {{/imports}}
 
 {{^fullJavaUtil}}
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 {{/fullJavaUtil}}
 
 {{>generatedAnnotation}}
@@ -38,56 +41,57 @@ public class {{classname}} {
   {{#operation}}
   /**
    * {{summary}}
-   * {{notes}}
-{{#allParams}}   * @param {{paramName}} {{description}}
-{{/allParams}}   * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
+   * {{notes}}{{#allParams}}
+   * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{/allParams}}{{#returnType}}
+   * @return {{{returnType}}}{{/returnType}}
+   * @throws ApiException if fails to make API call
    */
   public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
-    Object {{localVariablePrefix}}postBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
+    Object {{localVariablePrefix}}localVarPostBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
     {{#allParams}}{{#required}}
-     // verify the required parameter '{{paramName}}' is set
-     if ({{paramName}} == null) {
-        throw new ApiException(400, "Missing the required parameter '{{paramName}}' when calling {{operationId}}");
-     }
-     {{/required}}{{/allParams}}
+    // verify the required parameter '{{paramName}}' is set
+    if ({{paramName}} == null) {
+      throw new ApiException(400, "Missing the required parameter '{{paramName}}' when calling {{operationId}}");
+    }
+    {{/required}}{{/allParams}}
     // create path and map variables
-    String {{localVariablePrefix}}path = "{{{path}}}".replaceAll("\\{format\\}","json"){{#pathParams}}
+    String {{localVariablePrefix}}localVarPath = "{{{path}}}".replaceAll("\\{format\\}","json"){{#pathParams}}
       .replaceAll("\\{" + "{{baseName}}" + "\\}", {{localVariablePrefix}}apiClient.escapeString({{{paramName}}}.toString())){{/pathParams}};
 
     // query params
-    {{javaUtilPrefix}}List<Pair> {{localVariablePrefix}}queryParams = new {{javaUtilPrefix}}ArrayList<Pair>();
-    {{javaUtilPrefix}}Map<String, String> {{localVariablePrefix}}headerParams = new {{javaUtilPrefix}}HashMap<String, String>();
-    {{javaUtilPrefix}}Map<String, Object> {{localVariablePrefix}}formParams = new {{javaUtilPrefix}}HashMap<String, Object>();
+    {{javaUtilPrefix}}List<Pair> {{localVariablePrefix}}localVarQueryParams = new {{javaUtilPrefix}}ArrayList<Pair>();
+    {{javaUtilPrefix}}Map<String, String> {{localVariablePrefix}}localVarHeaderParams = new {{javaUtilPrefix}}HashMap<String, String>();
+    {{javaUtilPrefix}}Map<String, Object> {{localVariablePrefix}}localVarFormParams = new {{javaUtilPrefix}}HashMap<String, Object>();
 
     {{#queryParams}}
-    {{localVariablePrefix}}queryParams.addAll({{localVariablePrefix}}apiClient.parameterToPairs("{{#collectionFormat}}{{{collectionFormat}}}{{/collectionFormat}}", "{{baseName}}", {{paramName}}));
+    {{localVariablePrefix}}localVarQueryParams.addAll({{localVariablePrefix}}apiClient.parameterToPairs("{{#collectionFormat}}{{{collectionFormat}}}{{/collectionFormat}}", "{{baseName}}", {{paramName}}));
     {{/queryParams}}
 
     {{#headerParams}}if ({{paramName}} != null)
-      {{localVariablePrefix}}headerParams.put("{{baseName}}", {{localVariablePrefix}}apiClient.parameterToString({{paramName}}));
+      {{localVariablePrefix}}localVarHeaderParams.put("{{baseName}}", {{localVariablePrefix}}apiClient.parameterToString({{paramName}}));
     {{/headerParams}}
 
     {{#formParams}}if ({{paramName}} != null)
-      {{localVariablePrefix}}formParams.put("{{baseName}}", {{paramName}});
+      {{localVariablePrefix}}localVarFormParams.put("{{baseName}}", {{paramName}});
     {{/formParams}}
 
-    final String[] {{localVariablePrefix}}accepts = {
+    final String[] {{localVariablePrefix}}localVarAccepts = {
       {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}}
     };
-    final String {{localVariablePrefix}}accept = {{localVariablePrefix}}apiClient.selectHeaderAccept({{localVariablePrefix}}accepts);
+    final String {{localVariablePrefix}}localVarAccept = {{localVariablePrefix}}apiClient.selectHeaderAccept({{localVariablePrefix}}localVarAccepts);
 
-    final String[] {{localVariablePrefix}}contentTypes = {
+    final String[] {{localVariablePrefix}}localVarContentTypes = {
       {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}}
     };
-    final String {{localVariablePrefix}}contentType = {{localVariablePrefix}}apiClient.selectHeaderContentType({{localVariablePrefix}}contentTypes);
+    final String {{localVariablePrefix}}localVarContentType = {{localVariablePrefix}}apiClient.selectHeaderContentType({{localVariablePrefix}}localVarContentTypes);
 
-    String[] {{localVariablePrefix}}authNames = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
+    String[] {{localVariablePrefix}}localVarAuthNames = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
 
     {{#returnType}}
-    GenericType<{{{returnType}}}> {{localVariablePrefix}}returnType = new GenericType<{{{returnType}}}>() {};
-    return {{localVariablePrefix}}apiClient.invokeAPI({{localVariablePrefix}}path, "{{httpMethod}}", {{localVariablePrefix}}queryParams, {{localVariablePrefix}}postBody, {{localVariablePrefix}}headerParams, {{localVariablePrefix}}formParams, {{localVariablePrefix}}accept, {{localVariablePrefix}}contentType, {{localVariablePrefix}}authNames, {{localVariablePrefix}}returnType);
+    GenericType<{{{returnType}}}> {{localVariablePrefix}}localVarReturnType = new GenericType<{{{returnType}}}>() {};
+    return {{localVariablePrefix}}apiClient.invokeAPI({{localVariablePrefix}}localVarPath, "{{httpMethod}}", {{localVariablePrefix}}localVarQueryParams, {{localVariablePrefix}}localVarPostBody, {{localVariablePrefix}}localVarHeaderParams, {{localVariablePrefix}}localVarFormParams, {{localVariablePrefix}}localVarAccept, {{localVariablePrefix}}localVarContentType, {{localVariablePrefix}}localVarAuthNames, {{localVariablePrefix}}localVarReturnType);
     {{/returnType}}{{^returnType}}
-    {{localVariablePrefix}}apiClient.invokeAPI({{localVariablePrefix}}path, "{{httpMethod}}", {{localVariablePrefix}}queryParams, {{localVariablePrefix}}postBody, {{localVariablePrefix}}headerParams, {{localVariablePrefix}}formParams, {{localVariablePrefix}}accept, {{localVariablePrefix}}contentType, {{localVariablePrefix}}authNames, null);
+    {{localVariablePrefix}}apiClient.invokeAPI({{localVariablePrefix}}localVarPath, "{{httpMethod}}", {{localVariablePrefix}}localVarQueryParams, {{localVariablePrefix}}localVarPostBody, {{localVariablePrefix}}localVarHeaderParams, {{localVariablePrefix}}localVarFormParams, {{localVariablePrefix}}localVarAccept, {{localVariablePrefix}}localVarContentType, {{localVariablePrefix}}localVarAuthNames, null);
     {{/returnType}}
   }
   {{/operation}}
diff --git a/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache
index 2725cbe1f86..605472d67b3 100644
--- a/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache
@@ -1,3 +1,6 @@
+apply plugin: 'idea'
+apply plugin: 'eclipse'
+
 group = '{{groupId}}'
 version = '{{artifactVersion}}'
 
@@ -105,7 +108,9 @@ dependencies {
     compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
+    compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
     compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.1.5"
     compile "joda-time:joda-time:$jodatime_version"
+    compile "com.brsanthu:migbase64:2.2"
     testCompile "junit:junit:$junit_version"
 }
diff --git a/modules/swagger-codegen/src/main/resources/Java/generatedAnnotation.mustache b/modules/swagger-codegen/src/main/resources/Java/generatedAnnotation.mustache
index 49110fc1ad9..a47b6faa85b 100644
--- a/modules/swagger-codegen/src/main/resources/Java/generatedAnnotation.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/generatedAnnotation.mustache
@@ -1 +1 @@
-@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}")
\ No newline at end of file
+{{^hideGenerationTimestamp}}@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}"){{/hideGenerationTimestamp}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/Java/git_push.sh.mustache b/modules/swagger-codegen/src/main/resources/Java/git_push.sh.mustache
new file mode 100755
index 00000000000..e153ce23ecf
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Java/git_push.sh.mustache
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="{{{gitUserId}}}"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="{{{gitRepoId}}}"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="{{{releaseNote}}}"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/modules/swagger-codegen/src/main/resources/Java/gitignore.mustache b/modules/swagger-codegen/src/main/resources/Java/gitignore.mustache
new file mode 100644
index 00000000000..32858aad3c3
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Java/gitignore.mustache
@@ -0,0 +1,12 @@
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/ApiClient.mustache
index 3f2bfcebd5b..2d9fa23cf04 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/ApiClient.mustache
@@ -1,12 +1,22 @@
 package {{invokerPackage}};
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder;
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder;
+
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+
 import feign.Feign;
+import feign.RequestInterceptor;
 import feign.jackson.JacksonDecoder;
 import feign.jackson.JacksonEncoder;
 import feign.slf4j.Slf4jLogger;
+import {{invokerPackage}}.auth.*;
+import {{invokerPackage}}.auth.OAuth.AccessTokenListener;
 
 {{>generatedAnnotation}}
 public class ApiClient {
@@ -14,11 +24,80 @@ public class ApiClient {
 
   private ObjectMapper objectMapper;
   private String basePath = "{{basePath}}";
+  private Map<String, RequestInterceptor> apiAuthorizations;
+  private Feign.Builder feignBuilder;
 
   public ApiClient() {
     objectMapper = createObjectMapper();
+    apiAuthorizations = new LinkedHashMap<String, RequestInterceptor>();
+    feignBuilder = Feign.builder()
+                .encoder(new FormAwareEncoder(new JacksonEncoder(objectMapper)))
+                .decoder(new JacksonDecoder(objectMapper))
+                .logger(new Slf4jLogger());
   }
 
+  public ApiClient(String[] authNames) {
+    this();
+    for(String authName : authNames) { {{#hasAuthMethods}}
+      RequestInterceptor auth;
+      {{#authMethods}}if (authName == "{{name}}") { {{#isBasic}}
+        auth = new HttpBasicAuth();{{/isBasic}}{{#isApiKey}}
+        auth = new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{keyParamName}}");{{/isApiKey}}{{#isOAuth}}
+        auth = new OAuth(OAuthFlow.{{flow}}, "{{authorizationUrl}}", "{{tokenUrl}}", "{{#scopes}}{{scope}}{{#hasMore}}, {{/hasMore}}{{/scopes}}");{{/isOAuth}}
+      } else {{/authMethods}}{
+        throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");
+      }
+      addAuthorization(authName, auth);{{/hasAuthMethods}}{{^hasAuthMethods}}
+      throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");{{/hasAuthMethods}}
+    }
+  }
+
+  /**
+   * Basic constructor for single auth name
+   * @param authName
+   */
+  public ApiClient(String authName) {
+    this(new String[]{authName});
+  }
+
+  /**
+   * Helper constructor for single api key
+   * @param authName
+   * @param apiKey
+   */
+  public ApiClient(String authName, String apiKey) {
+    this(authName);
+    this.setApiKey(apiKey);
+  }
+
+  /**
+   * Helper constructor for single basic auth or password oauth2
+   * @param authName
+   * @param username
+   * @param password
+   */
+  public ApiClient(String authName, String username, String password) {
+    this(authName);
+    this.setCredentials(username,  password);
+  }
+
+  /**
+   * Helper constructor for single password oauth2
+   * @param authName
+   * @param clientId
+   * @param secret
+   * @param username
+   * @param password
+   */
+   public ApiClient(String authName, String clientId, String secret, String username, String password) {
+     this(authName);
+     this.getTokenEndPoint()
+            .setClientId(clientId)
+            .setClientSecret(secret)
+            .setUsername(username)
+            .setPassword(password);
+   }
+
   public String getBasePath() {
     return basePath;
   }
@@ -28,6 +107,23 @@ public class ApiClient {
     return this;
   }
 
+  public Map<String, RequestInterceptor> getApiAuthorizations() {
+    return apiAuthorizations;
+  }
+
+  public void setApiAuthorizations(Map<String, RequestInterceptor> apiAuthorizations) {
+    this.apiAuthorizations = apiAuthorizations;
+  }
+
+  public Feign.Builder getFeignBuilder() {
+    return feignBuilder;
+  }
+
+  public ApiClient setFeignBuilder(Feign.Builder feignBuilder) {
+    this.feignBuilder = feignBuilder;
+    return this;
+  }
+
   private ObjectMapper createObjectMapper() {
     ObjectMapper objectMapper = new ObjectMapper();
     objectMapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
@@ -45,13 +141,7 @@ public class ApiClient {
    *    XYZResponse response = api.someMethod(...);
    */
   public <T extends Api> T buildClient(Class<T> clientClass) {
-        return Feign.builder()
-                .encoder(new FormAwareEncoder(new JacksonEncoder(objectMapper)))
-                .decoder(new JacksonDecoder(objectMapper))
-// enable for basic auth:
-//                .requestInterceptor(new feign.auth.BasicAuthRequestInterceptor(username, password))
-                .logger(new Slf4jLogger())
-                .target(clientClass, basePath);
+    return feignBuilder.target(clientClass, basePath);
   }
 
   /**
@@ -83,4 +173,137 @@ public class ApiClient {
     if (StringUtil.containsIgnoreCase(contentTypes, "application/json")) return "application/json";
     return contentTypes[0];
   }
+
+  /**
+   * Helper method to configure the first api key found
+   * @param apiKey
+   */
+  public void setApiKey(String apiKey) {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof ApiKeyAuth) {
+        ApiKeyAuth keyAuth = (ApiKeyAuth) apiAuthorization;
+        keyAuth.setApiKey(apiKey);
+        return ;
+      }
+    }
+    throw new RuntimeException("No API key authentication configured!");
+  }
+
+  /**
+   * Helper method to configure the username/password for basic auth or password OAuth
+   * @param username
+   * @param password
+   */
+  public void setCredentials(String username, String password) {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof HttpBasicAuth) {
+        HttpBasicAuth basicAuth = (HttpBasicAuth) apiAuthorization;
+        basicAuth.setCredentials(username, password);
+        return;
+      }
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        oauth.getTokenRequestBuilder().setUsername(username).setPassword(password);
+        return;
+      }
+    }
+    throw new RuntimeException("No Basic authentication or OAuth configured!");
+  }
+
+  /**
+   * Helper method to configure the token endpoint of the first oauth found in the apiAuthorizations (there should be only one)
+   * @return
+   */
+  public TokenRequestBuilder getTokenEndPoint() {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        return oauth.getTokenRequestBuilder();
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Helper method to configure authorization endpoint of the first oauth found in the apiAuthorizations (there should be only one)
+   * @return
+   */
+  public AuthenticationRequestBuilder getAuthorizationEndPoint() {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        return oauth.getAuthenticationRequestBuilder();
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Helper method to pre-set the oauth access token of the first oauth found in the apiAuthorizations (there should be only one)
+   * @param accessToken
+   * @param expiresIn : validity period in seconds
+   */
+  public void setAccessToken(String accessToken, Long expiresIn) {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        oauth.setAccessToken(accessToken, expiresIn);
+        return;
+      }
+    }
+  }
+
+  /**
+   * Helper method to configure the oauth accessCode/implicit flow parameters
+   * @param clientId
+   * @param clientSecret
+   * @param redirectURI
+   */
+  public void configureAuthorizationFlow(String clientId, String clientSecret, String redirectURI) {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        oauth.getTokenRequestBuilder()
+                .setClientId(clientId)
+                .setClientSecret(clientSecret)
+                .setRedirectURI(redirectURI);
+        oauth.getAuthenticationRequestBuilder()
+                .setClientId(clientId)
+                .setRedirectURI(redirectURI);
+        return;
+      }
+    }
+  }
+
+  /**
+   * Configures a listener which is notified when a new access token is received.
+   * @param accessTokenListener
+   */
+  public void registerAccessTokenListener(AccessTokenListener accessTokenListener) {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        oauth.registerAccessTokenListener(accessTokenListener);
+        return;
+      }
+    }
+  }
+
+  public RequestInterceptor getAuthorization(String authName) {
+    return apiAuthorizations.get(authName);
+  }
+
+  /**
+   * Adds an authorization to be used by the client
+   * @param authName
+   * @param authorization
+   */
+  public void addAuthorization(String authName, RequestInterceptor authorization) {
+    if (apiAuthorizations.containsKey(authName)) {
+      throw new RuntimeException("auth name \"" + authName + "\" already in api authorizations");
+    }
+    apiAuthorizations.put(authName, authorization);
+    feignBuilder.requestInterceptor(authorization);
+  }
+
 }
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/api.mustache
index 729320bd2e5..fae7a93303d 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/api.mustache
@@ -5,7 +5,11 @@ import {{invokerPackage}}.ApiClient;
 {{#imports}}import {{import}};
 {{/imports}}
 
-{{^fullJavaUtil}}import java.util.*;
+{{^fullJavaUtil}}
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 {{/fullJavaUtil}}
 import feign.*;
 
@@ -16,10 +20,10 @@ public interface {{classname}} extends ApiClient.Api {
   /**
    * {{summary}}
    * {{notes}}
-{{#allParams}}   * @param {{paramName}} {{description}}
+{{#allParams}}   * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
 {{/allParams}}   * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
    */
-  @RequestLine("{{httpMethod}} {{{path}}}{{#hasQueryParams}}?{{/hasQueryParams}}{{#queryParams}}{{paramName}}={{=<% %>=}}{<%paramName%>}<%={{ }}=%>{{#hasMore}}&{{/hasMore}}{{/queryParams}}")
+  @RequestLine("{{httpMethod}} {{{path}}}{{#hasQueryParams}}?{{/hasQueryParams}}{{#queryParams}}{{baseName}}={{=<% %>=}}{<%paramName%>}<%={{ }}=%>{{#hasMore}}&{{/hasMore}}{{/queryParams}}")
   @Headers({
     "Content-type: {{vendorExtensions.x-contentType}}",
     "Accepts: {{vendorExtensions.x-accepts}}",{{#headerParams}}
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/auth/ApiKeyAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/auth/ApiKeyAuth.mustache
new file mode 100644
index 00000000000..371b24dbe55
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/auth/ApiKeyAuth.mustache
@@ -0,0 +1,41 @@
+package {{invokerPackage}}.auth;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+
+public class ApiKeyAuth implements RequestInterceptor {
+    private final String location;
+    private final String paramName;
+
+    private String apiKey;
+
+    public ApiKeyAuth(String location, String paramName) {
+        this.location = location;
+        this.paramName = paramName;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public String getParamName() {
+        return paramName;
+    }
+
+    public String getApiKey() {
+        return apiKey;
+    }
+
+    public void setApiKey(String apiKey) {
+        this.apiKey = apiKey;
+    }
+
+    @Override
+    public void apply(RequestTemplate template) {
+        if (location == "query") {
+            template.query(paramName, apiKey);
+        } else if (location == "header") {
+            template.header(paramName, apiKey);
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/auth/HttpBasicAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/auth/HttpBasicAuth.mustache
new file mode 100644
index 00000000000..2b1acb8ff74
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/auth/HttpBasicAuth.mustache
@@ -0,0 +1,41 @@
+package {{invokerPackage}}.auth;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import feign.auth.BasicAuthRequestInterceptor;
+
+/**
+ * An interceptor that adds the request header needed to use HTTP basic authentication.
+ */
+public class HttpBasicAuth implements RequestInterceptor {
+
+    private String username;
+    private String password;
+    
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public void setCredentials(String username, String password) {
+        this.username = username;
+        this.password = password;
+    }
+
+  @Override
+  public void apply(RequestTemplate template) {
+      RequestInterceptor requestInterceptor = new BasicAuthRequestInterceptor(username, password);
+      requestInterceptor.apply(template);
+  }
+}
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/auth/OAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/auth/OAuth.mustache
new file mode 100644
index 00000000000..74ff86ebd1b
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/auth/OAuth.mustache
@@ -0,0 +1,203 @@
+package {{invokerPackage}}.auth;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.apache.oltu.oauth2.client.HttpClient;
+import org.apache.oltu.oauth2.client.OAuthClient;
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest;
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder;
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder;
+import org.apache.oltu.oauth2.client.response.OAuthClientResponse;
+import org.apache.oltu.oauth2.client.response.OAuthClientResponseFactory;
+import org.apache.oltu.oauth2.client.response.OAuthJSONAccessTokenResponse;
+import org.apache.oltu.oauth2.common.exception.OAuthProblemException;
+import org.apache.oltu.oauth2.common.exception.OAuthSystemException;
+import org.apache.oltu.oauth2.common.message.types.GrantType;
+import org.apache.oltu.oauth2.common.token.BasicOAuthToken;
+
+import feign.Client;
+import feign.Request.Options;
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import feign.Response;
+import feign.Util;
+import {{invokerPackage}}.StringUtil;
+
+
+public class OAuth implements RequestInterceptor {
+
+    public interface AccessTokenListener {
+        public void notify(BasicOAuthToken token);
+    }
+
+    private volatile String accessToken;
+    private Long expirationTimeMillis;
+    private OAuthClient oauthClient;
+    private TokenRequestBuilder tokenRequestBuilder;
+    private AuthenticationRequestBuilder authenticationRequestBuilder;
+    private AccessTokenListener accessTokenListener;
+
+    public OAuth(Client client, TokenRequestBuilder requestBuilder) {
+        setOauthClient(client);
+        this.tokenRequestBuilder = requestBuilder;
+    }
+
+    public OAuth(Client client, OAuthFlow flow, String authorizationUrl, String tokenUrl, String scopes) {
+        this(client, OAuthClientRequest.tokenLocation(tokenUrl).setScope(scopes));
+        setFlow(flow);
+        authenticationRequestBuilder = OAuthClientRequest.authorizationLocation(authorizationUrl);
+    }
+
+    public OAuth(OAuthFlow flow, String authorizationUrl, String tokenUrl, String scopes) {
+        this(new Client.Default(null, null), flow, authorizationUrl, tokenUrl, scopes);
+    }
+
+    public void setFlow(OAuthFlow flow) {
+        switch(flow) {
+        case accessCode:
+        case implicit:
+            tokenRequestBuilder.setGrantType(GrantType.AUTHORIZATION_CODE);
+            break;
+        case password:
+            tokenRequestBuilder.setGrantType(GrantType.PASSWORD);
+            break;
+        case application:
+            tokenRequestBuilder.setGrantType(GrantType.CLIENT_CREDENTIALS);
+            break;
+        default:
+            break;
+        }
+    }
+
+    @Override
+    public void apply(RequestTemplate template) {
+        // If the request already have an authorization (eg. Basic auth), do nothing
+        if (template.headers().containsKey("Authorization")) {
+            return;
+        }
+        // If first time, get the token
+        if (expirationTimeMillis == null || System.currentTimeMillis() >= expirationTimeMillis) {
+            try {
+                updateAccessToken();
+            } catch (OAuthSystemException e) {
+                e.printStackTrace();
+                return;
+            } catch (OAuthProblemException e) {
+                e.printStackTrace();
+                return;
+            }
+        }
+        if (getAccessToken() != null) {
+            template.header("Authorization", "Bearer " + getAccessToken());
+        }
+    }
+
+    public synchronized void updateAccessToken() throws OAuthSystemException, OAuthProblemException {
+        if (getAccessToken() == null) {
+            OAuthJSONAccessTokenResponse accessTokenResponse = oauthClient.accessToken(tokenRequestBuilder.buildBodyMessage());
+            if (accessTokenResponse != null && accessTokenResponse.getAccessToken() != null) {
+                setAccessToken(accessTokenResponse.getAccessToken(), accessTokenResponse.getExpiresIn());
+                if (accessTokenListener != null) {
+                    accessTokenListener.notify((BasicOAuthToken) accessTokenResponse.getOAuthToken());
+                }
+            }
+        }
+    }
+
+    public void registerAccessTokenListener(AccessTokenListener accessTokenListener) {
+        this.accessTokenListener = accessTokenListener;
+    }
+
+    public synchronized String getAccessToken() {
+        return accessToken;
+    }
+
+    public synchronized void setAccessToken(String accessToken, Long expiresIn) {
+        this.accessToken = accessToken;
+        this.expirationTimeMillis = System.currentTimeMillis() + expiresIn * 1000;
+    }
+
+    public TokenRequestBuilder getTokenRequestBuilder() {
+        return tokenRequestBuilder;
+    }
+
+    public void setTokenRequestBuilder(TokenRequestBuilder tokenRequestBuilder) {
+        this.tokenRequestBuilder = tokenRequestBuilder;
+    }
+
+    public AuthenticationRequestBuilder getAuthenticationRequestBuilder() {
+        return authenticationRequestBuilder;
+    }
+
+    public void setAuthenticationRequestBuilder(AuthenticationRequestBuilder authenticationRequestBuilder) {
+        this.authenticationRequestBuilder = authenticationRequestBuilder;
+    }
+
+    public OAuthClient getOauthClient() {
+        return oauthClient;
+    }
+
+    public void setOauthClient(OAuthClient oauthClient) {
+        this.oauthClient = oauthClient;
+    }
+
+    public void setOauthClient(Client client) {
+        this.oauthClient = new OAuthClient( new OAuthFeignClient(client));
+    }
+
+    public class OAuthFeignClient implements HttpClient {
+
+        private Client client;
+
+        public OAuthFeignClient() {
+            this.client = new Client.Default(null, null);
+        }
+
+        public OAuthFeignClient(Client client) {
+            this.client = client;
+        }
+
+        public <T extends OAuthClientResponse> T execute(OAuthClientRequest request, Map<String, String> headers,
+                String requestMethod, Class<T> responseClass)
+                        throws OAuthSystemException, OAuthProblemException {
+
+            RequestTemplate req = new RequestTemplate()
+                    .append(request.getLocationUri())
+                    .method(requestMethod)
+                    .body(request.getBody());
+
+            for (Entry<String, String> entry : headers.entrySet()) {
+                req.header(entry.getKey(), entry.getValue());
+            }
+            Response feignResponse;
+            String body = "";
+            try {
+                feignResponse = client.execute(req.request(), new Options());
+                body = Util.toString(feignResponse.body().asReader());
+            } catch (IOException e) {
+                throw new OAuthSystemException(e);
+            }
+
+            String contentType = null;
+            Collection<String> contentTypeHeader =  feignResponse.headers().get("Content-Type");
+            if(contentTypeHeader != null) {
+                contentType = StringUtil.join(contentTypeHeader.toArray(new String[0]), ";");
+            }
+
+            return OAuthClientResponseFactory.createCustomResponse(
+                    body,
+                    contentType,
+                    feignResponse.status(),
+                    responseClass
+            );
+        }
+
+        public void shutdown() {
+            // Nothing to do here
+        }
+
+    }
+}
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.mustache
index a528180df28..0a678861061 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.mustache
@@ -1,3 +1,6 @@
+apply plugin: 'idea'
+apply plugin: 'eclipse'
+
 group = '{{groupId}}'
 version = '{{artifactVersion}}'
 
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache
index e8069b82931..5ff827ff40c 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache
@@ -110,7 +110,7 @@
     <dependency>
       <groupId>io.swagger</groupId>
       <artifactId>swagger-annotations</artifactId>
-      <version>${swagger-annotations-version}</version>
+      <version>${swagger-core-version}</version>
     </dependency>
 
     <!-- HTTP client: Netflix Feign -->
@@ -164,6 +164,12 @@
       <version>2.2</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.oltu.oauth2</groupId>
+      <artifactId>org.apache.oltu.oauth2.client</artifactId>
+      <version>${oltu-version}</version>
+    </dependency>
+
     <!-- test dependencies -->
     <dependency>
       <groupId>junit</groupId>
@@ -173,11 +179,12 @@
     </dependency>
   </dependencies>
   <properties>
-    <swagger-annotations-version>1.5.0</swagger-annotations-version>
+    <swagger-core-version>1.5.8</swagger-core-version>
     <feign-version>8.1.1</feign-version>
     <jackson-version>2.6.3</jackson-version>
     <jodatime-version>2.5</jodatime-version>
     <junit-version>4.12</junit-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
+    <oltu-version>1.0.0</oltu-version>
   </properties>
 </project>
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
index f482b8c34d4..58bab66e13d 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
@@ -12,12 +12,17 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 
 import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.filter.LoggingFilter;
+import org.glassfish.jersey.jackson.JacksonFeature;
 import org.glassfish.jersey.media.multipart.FormDataBodyPart;
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import org.glassfish.jersey.media.multipart.MultiPart;
 import org.glassfish.jersey.media.multipart.MultiPartFeature;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
@@ -35,6 +40,8 @@ import java.io.UnsupportedEncodingException;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import {{invokerPackage}}.auth.Authentication;
 import {{invokerPackage}}.auth.HttpBasicAuth;
@@ -43,12 +50,14 @@ import {{invokerPackage}}.auth.OAuth;
 
 {{>generatedAnnotation}}
 public class ApiClient {
-  private Client client;
-  private Map<String, Client> hostMap = new HashMap<String, Client>();
   private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
-  private boolean debugging = false;
   private String basePath = "{{basePath}}";
-  private JSON json = new JSON();
+  private boolean debugging = false;
+  private int connectionTimeout = 0;
+
+  private Client httpClient;
+  private JSON json;
+  private String tempFolderPath = null;
 
   private Map<String, Authentication> authentications;
 
@@ -58,6 +67,9 @@ public class ApiClient {
   private DateFormat dateFormat;
 
   public ApiClient() {
+    json = new JSON();
+    httpClient = buildHttpClient(debugging);
+
     // Use RFC3339 format for date and datetime.
     // See http://xml2rfc.ietf.org/public/rfc/html/rfc3339.html#anchor14
     this.dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
@@ -68,9 +80,7 @@ public class ApiClient {
     this.json.setDateFormat((DateFormat) dateFormat.clone());
 
     // Set default User-Agent.
-    setUserAgent("Java-Swagger");
-
-    buildClient();
+    setUserAgent("{{#httpUserAgent}}{{{.}}}{{/httpUserAgent}}{{^httpUserAgent}}Swagger-Codegen/{{{artifactVersion}}}/java{{/httpUserAgent}}");
 
     // Setup authentications (key: authentication name, value: authentication).
     authentications = new HashMap<String, Authentication>();{{#authMethods}}{{#isBasic}}
@@ -226,7 +236,42 @@ public class ApiClient {
    */
   public ApiClient setDebugging(boolean debugging) {
     this.debugging = debugging;
-    buildClient();
+    // Rebuild HTTP Client according to the new "debugging" value.
+    this.httpClient = buildHttpClient(debugging);
+    return this;
+  }
+
+  /**
+   * The path of temporary folder used to store downloaded files from endpoints
+   * with file response. The default value is <code>null</code>, i.e. using
+   * the system's default tempopary folder.
+   *
+   * @see https://docs.oracle.com/javase/7/docs/api/java/io/File.html#createTempFile(java.lang.String,%20java.lang.String,%20java.io.File)
+   */
+  public String getTempFolderPath() {
+    return tempFolderPath;
+  }
+
+  public ApiClient setTempFolderPath(String tempFolderPath) {
+    this.tempFolderPath = tempFolderPath;
+    return this;
+  }
+
+  /**
+   * Connect timeout (in milliseconds).
+   */
+  public int getConnectTimeout() {
+    return connectionTimeout;
+  }
+
+  /**
+   * Set the connect timeout (in milliseconds).
+   * A value of 0 means no timeout, otherwise values must be between 1 and
+   * {@link Integer#MAX_VALUE}.
+   */
+  public ApiClient setConnectTimeout(int connectionTimeout) {
+    this.connectionTimeout = connectionTimeout;
+    httpClient.property(ClientProperties.CONNECT_TIMEOUT, connectionTimeout);
     return this;
   }
 
@@ -444,6 +489,13 @@ public class ApiClient {
    * Deserialize response body to Java object according to the Content-Type.
    */
   public <T> T deserialize(Response response, GenericType<T> returnType) throws ApiException {
+    // Handle file downloading.
+    if (returnType.equals(File.class)) {
+      @SuppressWarnings("unchecked")
+      T file = (T) downloadFileFromResponse(response);
+      return file;
+    }
+
     String contentType = null;
     List<Object> contentTypes = response.getHeaders().get("Content-Type");
     if (contentTypes != null && !contentTypes.isEmpty())
@@ -454,6 +506,55 @@ public class ApiClient {
     return response.readEntity(returnType);
   }
 
+  /**
+   * Download file from the given response.
+   * @throws ApiException If fail to read file content from response and write to disk
+   */
+  public File downloadFileFromResponse(Response response) throws ApiException {
+    try {
+      File file = prepareDownloadFile(response);
+      Files.copy(response.readEntity(InputStream.class), file.toPath());
+      return file;
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+  }
+
+  public File prepareDownloadFile(Response response) throws IOException {
+    String filename = null;
+    String contentDisposition = (String) response.getHeaders().getFirst("Content-Disposition");
+    if (contentDisposition != null && !"".equals(contentDisposition)) {
+      // Get filename from the Content-Disposition header.
+      Pattern pattern = Pattern.compile("filename=['\"]?([^'\"\\s]+)['\"]?");
+      Matcher matcher = pattern.matcher(contentDisposition);
+      if (matcher.find())
+        filename = matcher.group(1);
+    }
+
+    String prefix = null;
+    String suffix = null;
+    if (filename == null) {
+      prefix = "download-";
+      suffix = "";
+    } else {
+      int pos = filename.lastIndexOf(".");
+      if (pos == -1) {
+        prefix = filename + "-";
+      } else {
+        prefix = filename.substring(0, pos) + "-";
+        suffix = filename.substring(pos);
+      }
+      // File.createTempFile requires the prefix to be at least three characters long
+      if (prefix.length() < 3)
+        prefix = "download-";
+    }
+
+    if (tempFolderPath == null)
+      return File.createTempFile(prefix, suffix);
+    else
+      return File.createTempFile(prefix, suffix, new File(tempFolderPath));
+  }
+
   /**
    * Invoke API by sending HTTP request with the given options.
    *
@@ -472,7 +573,9 @@ public class ApiClient {
   public <T> T invokeAPI(String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, Object> formParams, String accept, String contentType, String[] authNames, GenericType<T> returnType) throws ApiException {
     updateParamsForAuth(authNames, queryParams, headerParams);
 
-    WebTarget target = client.target(this.basePath).path(path);
+    // Not using `.target(this.basePath).path(path)` below,
+    // to support (constant) query string in `path`, e.g. "/posts?draft=1"
+    WebTarget target = httpClient.target(this.basePath + path);
 
     if (queryParams != null) {
       for (Pair queryParam : queryParams) {
@@ -545,15 +648,18 @@ public class ApiClient {
     }
   }
 
-  private void buildClient() {
+  /**
+   * Build the Client used to make HTTP requests.
+   */
+  private Client buildHttpClient(boolean debugging) {
     final ClientConfig clientConfig = new ClientConfig();
     clientConfig.register(MultiPartFeature.class);
     clientConfig.register(json);
-    clientConfig.register(org.glassfish.jersey.jackson.JacksonFeature.class);
+    clientConfig.register(JacksonFeature.class);
     if (debugging) {
       clientConfig.register(LoggingFilter.class);
     }
-    this.client = ClientBuilder.newClient(clientConfig);
+    return ClientBuilder.newClient(clientConfig);
   }
 
   private Map<String, List<String>> buildResponseHeaders(Response response) {
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/api.mustache
index f9572359ded..6c980b727fa 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/api.mustache
@@ -11,7 +11,10 @@ import javax.ws.rs.core.GenericType;
 {{/imports}}
 
 {{^fullJavaUtil}}
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 {{/fullJavaUtil}}
 
 {{>generatedAnnotation}}
@@ -38,12 +41,13 @@ public class {{classname}} {
   {{#operation}}
   /**
    * {{summary}}
-   * {{notes}}
-{{#allParams}}   * @param {{paramName}} {{description}}
-{{/allParams}}   * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
+   * {{notes}}{{#allParams}}
+   * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{/allParams}}{{#returnType}}
+   * @return {{{returnType}}}{{/returnType}}
+   * @throws ApiException if fails to make API call
    */
   public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
-    Object {{localVariablePrefix}}postBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
+    Object {{localVariablePrefix}}localVarPostBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
     {{#allParams}}{{#required}}
     // verify the required parameter '{{paramName}}' is set
     if ({{paramName}} == null) {
@@ -51,43 +55,43 @@ public class {{classname}} {
     }
     {{/required}}{{/allParams}}
     // create path and map variables
-    String {{localVariablePrefix}}path = "{{{path}}}".replaceAll("\\{format\\}","json"){{#pathParams}}
+    String {{localVariablePrefix}}localVarPath = "{{{path}}}".replaceAll("\\{format\\}","json"){{#pathParams}}
       .replaceAll("\\{" + "{{baseName}}" + "\\}", {{localVariablePrefix}}apiClient.escapeString({{{paramName}}}.toString())){{/pathParams}};
 
     // query params
-    {{javaUtilPrefix}}List<Pair> {{localVariablePrefix}}queryParams = new {{javaUtilPrefix}}ArrayList<Pair>();
-    {{javaUtilPrefix}}Map<String, String> {{localVariablePrefix}}headerParams = new {{javaUtilPrefix}}HashMap<String, String>();
-    {{javaUtilPrefix}}Map<String, Object> {{localVariablePrefix}}formParams = new {{javaUtilPrefix}}HashMap<String, Object>();
+    {{javaUtilPrefix}}List<Pair> {{localVariablePrefix}}localVarQueryParams = new {{javaUtilPrefix}}ArrayList<Pair>();
+    {{javaUtilPrefix}}Map<String, String> {{localVariablePrefix}}localVarHeaderParams = new {{javaUtilPrefix}}HashMap<String, String>();
+    {{javaUtilPrefix}}Map<String, Object> {{localVariablePrefix}}localVarFormParams = new {{javaUtilPrefix}}HashMap<String, Object>();
 
     {{#queryParams}}
-    {{localVariablePrefix}}queryParams.addAll({{localVariablePrefix}}apiClient.parameterToPairs("{{#collectionFormat}}{{{collectionFormat}}}{{/collectionFormat}}", "{{baseName}}", {{paramName}}));
+    {{localVariablePrefix}}localVarQueryParams.addAll({{localVariablePrefix}}apiClient.parameterToPairs("{{#collectionFormat}}{{{collectionFormat}}}{{/collectionFormat}}", "{{baseName}}", {{paramName}}));
     {{/queryParams}}
 
     {{#headerParams}}if ({{paramName}} != null)
-    {{localVariablePrefix}}headerParams.put("{{baseName}}", {{localVariablePrefix}}apiClient.parameterToString({{paramName}}));
+      {{localVariablePrefix}}localVarHeaderParams.put("{{baseName}}", {{localVariablePrefix}}apiClient.parameterToString({{paramName}}));
     {{/headerParams}}
 
     {{#formParams}}if ({{paramName}} != null)
-      {{localVariablePrefix}}formParams.put("{{baseName}}", {{paramName}});
+      {{localVariablePrefix}}localVarFormParams.put("{{baseName}}", {{paramName}});
     {{/formParams}}
 
-    final String[] {{localVariablePrefix}}accepts = {
+    final String[] {{localVariablePrefix}}localVarAccepts = {
       {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}}
     };
-    final String {{localVariablePrefix}}accept = {{localVariablePrefix}}apiClient.selectHeaderAccept({{localVariablePrefix}}accepts);
+    final String {{localVariablePrefix}}localVarAccept = {{localVariablePrefix}}apiClient.selectHeaderAccept({{localVariablePrefix}}localVarAccepts);
 
-    final String[] {{localVariablePrefix}}contentTypes = {
+    final String[] {{localVariablePrefix}}localVarContentTypes = {
       {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}}
     };
-    final String {{localVariablePrefix}}contentType = {{localVariablePrefix}}apiClient.selectHeaderContentType({{localVariablePrefix}}contentTypes);
+    final String {{localVariablePrefix}}localVarContentType = {{localVariablePrefix}}apiClient.selectHeaderContentType({{localVariablePrefix}}localVarContentTypes);
 
-    String[] {{localVariablePrefix}}authNames = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
+    String[] {{localVariablePrefix}}localVarAuthNames = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
 
     {{#returnType}}
-    GenericType<{{{returnType}}}> {{localVariablePrefix}}returnType = new GenericType<{{{returnType}}}>() {};
-    return {{localVariablePrefix}}apiClient.invokeAPI({{localVariablePrefix}}path, "{{httpMethod}}", {{localVariablePrefix}}queryParams, {{localVariablePrefix}}postBody, {{localVariablePrefix}}headerParams, {{localVariablePrefix}}formParams, {{localVariablePrefix}}accept, {{localVariablePrefix}}contentType, {{localVariablePrefix}}authNames, {{localVariablePrefix}}returnType);
+    GenericType<{{{returnType}}}> {{localVariablePrefix}}localVarReturnType = new GenericType<{{{returnType}}}>() {};
+    return {{localVariablePrefix}}apiClient.invokeAPI({{localVariablePrefix}}localVarPath, "{{httpMethod}}", {{localVariablePrefix}}localVarQueryParams, {{localVariablePrefix}}localVarPostBody, {{localVariablePrefix}}localVarHeaderParams, {{localVariablePrefix}}localVarFormParams, {{localVariablePrefix}}localVarAccept, {{localVariablePrefix}}localVarContentType, {{localVariablePrefix}}localVarAuthNames, {{localVariablePrefix}}localVarReturnType);
     {{/returnType}}{{^returnType}}
-    {{localVariablePrefix}}apiClient.invokeAPI({{localVariablePrefix}}path, "{{httpMethod}}", {{localVariablePrefix}}queryParams, {{localVariablePrefix}}postBody, {{localVariablePrefix}}headerParams, {{localVariablePrefix}}formParams, {{localVariablePrefix}}accept, {{localVariablePrefix}}contentType, {{localVariablePrefix}}authNames, null);
+    {{localVariablePrefix}}apiClient.invokeAPI({{localVariablePrefix}}localVarPath, "{{httpMethod}}", {{localVariablePrefix}}localVarQueryParams, {{localVariablePrefix}}localVarPostBody, {{localVariablePrefix}}localVarHeaderParams, {{localVariablePrefix}}localVarFormParams, {{localVariablePrefix}}localVarAccept, {{localVariablePrefix}}localVarContentType, {{localVariablePrefix}}localVarAuthNames, null);
     {{/returnType}}
   }
   {{/operation}}
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
index 09262af0d63..4ba5115aaf4 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
@@ -1,3 +1,6 @@
+apply plugin: 'idea'
+apply plugin: 'eclipse'
+
 group = '{{groupId}}'
 version = '{{artifactVersion}}'
 
@@ -20,7 +23,7 @@ if(hasProperty('target') && target == 'android') {
 
     apply plugin: 'com.android.library'
     apply plugin: 'com.github.dcendents.android-maven'
-    
+
     android {
         compileSdkVersion 22
         buildToolsVersion '22.0.0'
@@ -32,7 +35,7 @@ if(hasProperty('target') && target == 'android') {
             sourceCompatibility JavaVersion.VERSION_1_7
             targetCompatibility JavaVersion.VERSION_1_7
         }
-    
+
         // Rename the aar correctly
         libraryVariants.all { variant ->
             variant.outputs.each { output ->
@@ -48,7 +51,7 @@ if(hasProperty('target') && target == 'android') {
             provided 'javax.annotation:jsr250-api:1.0'
         }
     }
-    
+
     afterEvaluate {
         android.libraryVariants.all { variant ->
             def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
@@ -60,12 +63,12 @@ if(hasProperty('target') && target == 'android') {
             artifacts.add('archives', task);
         }
     }
-    
+
     task sourcesJar(type: Jar) {
         from android.sourceSets.main.java.srcDirs
         classifier = 'sources'
     }
-    
+
     artifacts {
         archives sourcesJar
     }
@@ -74,16 +77,16 @@ if(hasProperty('target') && target == 'android') {
 
     apply plugin: 'java'
     apply plugin: 'maven'
-    
+
     sourceCompatibility = JavaVersion.VERSION_1_7
     targetCompatibility = JavaVersion.VERSION_1_7
-    
+
     install {
         repositories.mavenInstaller {
             pom.artifactId = '{{artifactId}}'
         }
     }
-    
+
     task execute(type:JavaExec) {
        main = System.getProperty('mainClass')
        classpath = sourceSets.main.runtimeClasspath
@@ -93,19 +96,21 @@ if(hasProperty('target') && target == 'android') {
 ext {
     swagger_annotations_version = "1.5.0"
     jackson_version = "2.4.2"
-    jersey_version = "2.6"
+    jersey_version = "2.22"
     jodatime_version = "2.3"
-    junit_version = "4.8.1"
+    junit_version = "4.12"
 }
 
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "org.glassfish.jersey.core:jersey-client:$jersey_version"
     compile "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version"
+    compile "org.glassfish.jersey.media:jersey-media-json-jackson:2.22.1"
     compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
     compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.1.5"
     compile "joda-time:joda-time:$jodatime_version"
+    compile "com.brsanthu:migbase64:2.2"
     testCompile "junit:junit:$junit_version"
 }
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache
index 76f2164a1ad..13fab8b0ed2 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache
@@ -104,13 +104,34 @@
           <target>1.6</target>
         </configuration>
       </plugin>
+      <!-- For testing build.gradle -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.2.1</version>
+        <executions>
+          <execution>
+            <id>gradle-test</id>
+            <phase>integration-test</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>gradle</executable>
+              <arguments>
+                <argument>check</argument>
+              </arguments>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <dependencies>
     <dependency>
       <groupId>io.swagger</groupId>
       <artifactId>swagger-annotations</artifactId>
-      <version>${swagger-annotations-version}</version>
+      <version>${swagger-core-version}</version>
     </dependency>
 
     <!-- HTTP client: jersey-client -->
@@ -129,7 +150,7 @@
       <artifactId>jersey-media-json-jackson</artifactId>
       <version>2.22.1</version>
     </dependency>
-    
+
     <!-- JSON processing: jackson -->
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
@@ -173,11 +194,11 @@
     </dependency>
   </dependencies>
   <properties>
-    <swagger-annotations-version>1.5.0</swagger-annotations-version>
-    <jersey-version>2.12</jersey-version>
+    <swagger-core-version>1.5.8</swagger-core-version>
+    <jersey-version>2.22</jersey-version>
     <jackson-version>2.4.2</jackson-version>
     <jodatime-version>2.3</jodatime-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
-    <junit-version>4.8.1</junit-version>
+    <junit-version>4.12</junit-version>
   </properties>
 </project>
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache
index 8c0880bf217..4c8e304ed97 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache
@@ -11,6 +11,8 @@ import com.squareup.okhttp.MultipartBuilder;
 import com.squareup.okhttp.MediaType;
 import com.squareup.okhttp.Headers;
 import com.squareup.okhttp.internal.http.HttpMethod;
+import com.squareup.okhttp.logging.HttpLoggingInterceptor;
+import com.squareup.okhttp.logging.HttpLoggingInterceptor.Level;
 
 import java.lang.reflect.Type;
 
@@ -116,6 +118,8 @@ public class ApiClient {
   private OkHttpClient httpClient;
   private JSON json;
 
+  private HttpLoggingInterceptor loggingInterceptor;
+
   public ApiClient() {
     httpClient = new OkHttpClient();
 
@@ -137,7 +141,7 @@ public class ApiClient {
     this.lenientDatetimeFormat = true;
 
     // Set default User-Agent.
-    setUserAgent("Java-Swagger");
+    setUserAgent("{{#httpUserAgent}}{{{.}}}{{/httpUserAgent}}{{^httpUserAgent}}Swagger-Codegen/{{{artifactVersion}}}/java{{/httpUserAgent}}");
 
     // Setup authentications (key: authentication name, value: authentication).
     authentications = new HashMap<String, Authentication>();{{#authMethods}}{{#isBasic}}
@@ -452,6 +456,16 @@ public class ApiClient {
    * @param debugging To enable (true) or disable (false) debugging
    */
   public ApiClient setDebugging(boolean debugging) {
+    if (debugging != this.debugging) {
+      if (debugging) {
+        loggingInterceptor = new HttpLoggingInterceptor();
+        loggingInterceptor.setLevel(Level.BODY);
+        httpClient.interceptors().add(loggingInterceptor);
+      } else {
+        httpClient.interceptors().remove(loggingInterceptor);
+        loggingInterceptor = null;
+      }
+    }
     this.debugging = debugging;
     return this;
   }
@@ -567,6 +581,17 @@ public class ApiClient {
     return params;
   }
 
+  /**
+   * Sanitize filename by removing path.
+   * e.g. ../../sun.gif becomes sun.gif
+   *
+   * @param filename The filename to be sanitized
+   * @return The sanitized filename
+   */
+  public String sanitizeFilename(String filename) {
+    return filename.replaceAll(".*[/\\\\]", "");
+  }
+
   /**
    * Check if the given MIME is a JSON MIME.
    * JSON MIME examples:
@@ -632,8 +657,8 @@ public class ApiClient {
   }
 
   /**
-   * Deserialize response body to Java object, according to the Content-Type
-   * response header.
+   * Deserialize response body to Java object, according to the return type and
+   * the Content-Type response header.
    *
    * @param response HTTP response
    * @param returnType The type of the Java object
@@ -642,12 +667,21 @@ public class ApiClient {
    *   or the Content-Type of the response is not supported.
    */
   public <T> T deserialize(Response response, Type returnType) throws ApiException {
-    if (response == null || returnType == null)
+    if (response == null || returnType == null) {
       return null;
+    }
 
-    // Handle file downloading.
-    if (returnType.equals(File.class))
+    if ("byte[]".equals(returnType.toString())) {
+      // Handle binary response (byte array).
+      try {
+        return (T) response.body().bytes();
+      } catch (IOException e) {
+        throw new ApiException(e);
+      }
+    } else if (returnType.equals(File.class)) {
+      // Handle file downloading.
       return (T) downloadFileFromResponse(response);
+    }
 
     String respBody;
     try {
@@ -659,8 +693,9 @@ public class ApiClient {
       throw new ApiException(e);
     }
 
-    if (respBody == null || "".equals(respBody))
+    if (respBody == null || "".equals(respBody)) {
       return null;
+    }
 
     String contentType = response.headers().get("Content-Type");
     if (contentType == null) {
@@ -682,20 +717,29 @@ public class ApiClient {
   }
 
   /**
-   * Serialize the given Java object into request body string, according to the
-   * request Content-Type.
+   * Serialize the given Java object into request body according to the object's
+   * class and the request Content-Type.
    *
    * @param obj The Java object
    * @param contentType The request Content-Type
-   * @return The serialized string
+   * @return The serialized request body
    * @throws ApiException If fail to serialize the given object
    */
-  public String serialize(Object obj, String contentType) throws ApiException {
-    if (isJsonMime(contentType)) {
-      if (obj != null)
-        return json.serialize(obj);
-      else
-        return null;
+  public RequestBody serialize(Object obj, String contentType) throws ApiException {
+    if (obj instanceof byte[]) {
+      // Binary (byte array) body parameter support.
+      return RequestBody.create(MediaType.parse(contentType), (byte[]) obj);
+    } else if (obj instanceof File) {
+      // File body parameter support.
+      return RequestBody.create(MediaType.parse(contentType), (File) obj);
+    } else if (isJsonMime(contentType)) {
+      String content;
+      if (obj != null) {
+        content = json.serialize(obj);
+      } else {
+        content = null;
+      }
+      return RequestBody.create(MediaType.parse(contentType), content);
     } else {
       throw new ApiException("Content type \"" + contentType + "\" is not supported");
     }
@@ -724,8 +768,9 @@ public class ApiClient {
       // Get filename from the Content-Disposition header.
       Pattern pattern = Pattern.compile("filename=['\"]?([^'\"\\s]+)['\"]?");
       Matcher matcher = pattern.matcher(contentDisposition);
-      if (matcher.find())
-        filename = matcher.group(1);
+      if (matcher.find()) {
+        filename = sanitizeFilename(matcher.group(1));
+      }
     }
 
     String prefix = null;
@@ -883,7 +928,7 @@ public class ApiClient {
         reqBody = RequestBody.create(MediaType.parse(contentType), "");
       }
     } else {
-      reqBody = RequestBody.create(MediaType.parse(contentType), serialize(body, contentType));
+      reqBody = serialize(body, contentType);
     }
 
     Request request = null;
@@ -906,20 +951,27 @@ public class ApiClient {
    * @return The full URL
    */
   public String buildUrl(String path, List<Pair> queryParams) {
-    StringBuilder query = new StringBuilder();
-    if (queryParams != null) {
+    final StringBuilder url = new StringBuilder();
+    url.append(basePath).append(path);
+
+    if (queryParams != null && !queryParams.isEmpty()) {
+      // support (constant) query string in `path`, e.g. "/posts?draft=1"
+      String prefix = path.contains("?") ? "&" : "?";
       for (Pair param : queryParams) {
         if (param.getValue() != null) {
-          if (query.toString().length() == 0)
-            query.append("?");
-          else
-            query.append("&");
+          if (prefix != null) {
+            url.append(prefix);
+            prefix = null;
+          } else {
+            url.append("&");
+          }
           String value = parameterToString(param.getValue());
-          query.append(escapeString(param.getName())).append("=").append(escapeString(value));
+          url.append(escapeString(param.getName())).append("=").append(escapeString(value));
         }
       }
     }
-    return basePath + path + query.toString();
+
+    return url.toString();
   }
 
   /**
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache
index e760f4a370e..6c46a9aed9a 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache
@@ -22,7 +22,10 @@ import java.io.IOException;
 
 import java.lang.reflect.Type;
 {{^fullJavaUtil}}
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 {{/fullJavaUtil}}
 
 {{#operations}}
@@ -48,7 +51,7 @@ public class {{classname}} {
   {{#operation}}
   /* Build call for {{operationId}} */
   private Call {{operationId}}Call({{#allParams}}{{{dataType}}} {{paramName}}, {{/allParams}}final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object {{localVariablePrefix}}postBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
+    Object {{localVariablePrefix}}localVarPostBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
     {{#allParams}}{{#required}}
     // verify the required parameter '{{paramName}}' is set
     if ({{paramName}} == null) {
@@ -57,32 +60,32 @@ public class {{classname}} {
     {{/required}}{{/allParams}}
 
     // create path and map variables
-    String {{localVariablePrefix}}path = "{{path}}".replaceAll("\\{format\\}","json"){{#pathParams}}
+    String {{localVariablePrefix}}localVarPath = "{{path}}".replaceAll("\\{format\\}","json"){{#pathParams}}
       .replaceAll("\\{" + "{{baseName}}" + "\\}", {{localVariablePrefix}}apiClient.escapeString({{{paramName}}}.toString())){{/pathParams}};
 
-    {{javaUtilPrefix}}List<Pair> {{localVariablePrefix}}queryParams = new {{javaUtilPrefix}}ArrayList<Pair>();{{#queryParams}}
+    {{javaUtilPrefix}}List<Pair> {{localVariablePrefix}}localVarQueryParams = new {{javaUtilPrefix}}ArrayList<Pair>();{{#queryParams}}
     if ({{paramName}} != null)
-      {{localVariablePrefix}}queryParams.addAll({{localVariablePrefix}}apiClient.parameterToPairs("{{#collectionFormat}}{{{collectionFormat}}}{{/collectionFormat}}", "{{baseName}}", {{paramName}}));{{/queryParams}}
+      {{localVariablePrefix}}localVarQueryParams.addAll({{localVariablePrefix}}apiClient.parameterToPairs("{{#collectionFormat}}{{{collectionFormat}}}{{/collectionFormat}}", "{{baseName}}", {{paramName}}));{{/queryParams}}
 
-    {{javaUtilPrefix}}Map<String, String> {{localVariablePrefix}}headerParams = new {{javaUtilPrefix}}HashMap<String, String>();{{#headerParams}}
+    {{javaUtilPrefix}}Map<String, String> {{localVariablePrefix}}localVarHeaderParams = new {{javaUtilPrefix}}HashMap<String, String>();{{#headerParams}}
     if ({{paramName}} != null)
-      {{localVariablePrefix}}headerParams.put("{{baseName}}", {{localVariablePrefix}}apiClient.parameterToString({{paramName}}));{{/headerParams}}
+      {{localVariablePrefix}}localVarHeaderParams.put("{{baseName}}", {{localVariablePrefix}}apiClient.parameterToString({{paramName}}));{{/headerParams}}
 
-    {{javaUtilPrefix}}Map<String, Object> {{localVariablePrefix}}formParams = new {{javaUtilPrefix}}HashMap<String, Object>();{{#formParams}}
+    {{javaUtilPrefix}}Map<String, Object> {{localVariablePrefix}}localVarFormParams = new {{javaUtilPrefix}}HashMap<String, Object>();{{#formParams}}
     if ({{paramName}} != null)
-      {{localVariablePrefix}}formParams.put("{{baseName}}", {{paramName}});{{/formParams}}
+      {{localVariablePrefix}}localVarFormParams.put("{{baseName}}", {{paramName}});{{/formParams}}
 
-    final String[] {{localVariablePrefix}}accepts = {
+    final String[] {{localVariablePrefix}}localVarAccepts = {
       {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}}
     };
-    final String {{localVariablePrefix}}accept = {{localVariablePrefix}}apiClient.selectHeaderAccept({{localVariablePrefix}}accepts);
-    if ({{localVariablePrefix}}accept != null) {{localVariablePrefix}}headerParams.put("Accept", {{localVariablePrefix}}accept);
+    final String {{localVariablePrefix}}localVarAccept = {{localVariablePrefix}}apiClient.selectHeaderAccept({{localVariablePrefix}}localVarAccepts);
+    if ({{localVariablePrefix}}localVarAccept != null) {{localVariablePrefix}}localVarHeaderParams.put("Accept", {{localVariablePrefix}}localVarAccept);
 
-    final String[] {{localVariablePrefix}}contentTypes = {
+    final String[] {{localVariablePrefix}}localVarContentTypes = {
       {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}}
     };
-    final String {{localVariablePrefix}}contentType = {{localVariablePrefix}}apiClient.selectHeaderContentType({{localVariablePrefix}}contentTypes);
-    {{localVariablePrefix}}headerParams.put("Content-Type", {{localVariablePrefix}}contentType);
+    final String {{localVariablePrefix}}localVarContentType = {{localVariablePrefix}}apiClient.selectHeaderContentType({{localVariablePrefix}}localVarContentTypes);
+    {{localVariablePrefix}}localVarHeaderParams.put("Content-Type", {{localVariablePrefix}}localVarContentType);
 
     if(progressListener != null) {
       apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
@@ -96,14 +99,14 @@ public class {{classname}} {
       });
     }
 
-    String[] {{localVariablePrefix}}authNames = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
-    return {{localVariablePrefix}}apiClient.buildCall({{localVariablePrefix}}path, "{{httpMethod}}", {{localVariablePrefix}}queryParams, {{localVariablePrefix}}postBody, {{localVariablePrefix}}headerParams, {{localVariablePrefix}}formParams, {{localVariablePrefix}}authNames, progressRequestListener);
+    String[] {{localVariablePrefix}}localVarAuthNames = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
+    return {{localVariablePrefix}}apiClient.buildCall({{localVariablePrefix}}localVarPath, "{{httpMethod}}", {{localVariablePrefix}}localVarQueryParams, {{localVariablePrefix}}localVarPostBody, {{localVariablePrefix}}localVarHeaderParams, {{localVariablePrefix}}localVarFormParams, {{localVariablePrefix}}localVarAuthNames, progressRequestListener);
   }
 
   /**
    * {{summary}}
    * {{notes}}{{#allParams}}
-   * @param {{paramName}} {{description}}{{/allParams}}{{#returnType}}
+   * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{/allParams}}{{#returnType}}
    * @return {{{returnType}}}{{/returnType}}
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
@@ -115,20 +118,20 @@ public class {{classname}} {
   /**
    * {{summary}}
    * {{notes}}{{#allParams}}
-   * @param {{paramName}} {{description}}{{/allParams}}
+   * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{/allParams}}
    * @return ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}>
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
   public ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{operationId}}WithHttpInfo({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
     Call {{localVariablePrefix}}call = {{operationId}}Call({{#allParams}}{{paramName}}, {{/allParams}}null, null);
-    {{#returnType}}Type {{localVariablePrefix}}returnType = new TypeToken<{{{returnType}}}>(){}.getType();
-    return {{localVariablePrefix}}apiClient.execute({{localVariablePrefix}}call, {{localVariablePrefix}}returnType);{{/returnType}}{{^returnType}}return {{localVariablePrefix}}apiClient.execute({{localVariablePrefix}}call);{{/returnType}}
+    {{#returnType}}Type {{localVariablePrefix}}localVarReturnType = new TypeToken<{{{returnType}}}>(){}.getType();
+    return {{localVariablePrefix}}apiClient.execute({{localVariablePrefix}}call, {{localVariablePrefix}}localVarReturnType);{{/returnType}}{{^returnType}}return {{localVariablePrefix}}apiClient.execute({{localVariablePrefix}}call);{{/returnType}}
   }
 
   /**
    * {{summary}} (asynchronously)
    * {{notes}}{{#allParams}}
-   * @param {{paramName}} {{description}}{{/allParams}}
+   * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{/allParams}}
    * @param callback The callback to be executed when the API call finishes
    * @return The request call
    * @throws ApiException If fail to process the API call, e.g. serializing the request body object
@@ -143,7 +146,7 @@ public class {{classname}} {
         @Override
         public void update(long bytesRead, long contentLength, boolean done) {
           callback.onDownloadProgress(bytesRead, contentLength, done);
-        } 
+        }
       };
 
       progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
@@ -155,8 +158,8 @@ public class {{classname}} {
     }
 
     Call {{localVariablePrefix}}call = {{operationId}}Call({{#allParams}}{{paramName}}, {{/allParams}}progressListener, progressRequestListener);
-    {{#returnType}}Type {{localVariablePrefix}}returnType = new TypeToken<{{{returnType}}}>(){}.getType();
-    {{localVariablePrefix}}apiClient.executeAsync({{localVariablePrefix}}call, {{localVariablePrefix}}returnType, {{localVariablePrefix}}callback);{{/returnType}}{{^returnType}}{{localVariablePrefix}}apiClient.executeAsync({{localVariablePrefix}}call, {{localVariablePrefix}}callback);{{/returnType}}
+    {{#returnType}}Type {{localVariablePrefix}}localVarReturnType = new TypeToken<{{{returnType}}}>(){}.getType();
+    {{localVariablePrefix}}apiClient.executeAsync({{localVariablePrefix}}call, {{localVariablePrefix}}localVarReturnType, {{localVariablePrefix}}callback);{{/returnType}}{{^returnType}}{{localVariablePrefix}}apiClient.executeAsync({{localVariablePrefix}}call, {{localVariablePrefix}}callback);{{/returnType}}
     return {{localVariablePrefix}}call;
   }
   {{/operation}}
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
index 9741cb13d10..ad415b54579 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
@@ -1,3 +1,6 @@
+apply plugin: 'idea'
+apply plugin: 'eclipse'
+
 group = '{{groupId}}'
 version = '{{artifactVersion}}'
 
@@ -20,7 +23,7 @@ if(hasProperty('target') && target == 'android') {
 
     apply plugin: 'com.android.library'
     apply plugin: 'com.github.dcendents.android-maven'
-    
+
     android {
         compileSdkVersion 22
         buildToolsVersion '22.0.0'
@@ -32,7 +35,7 @@ if(hasProperty('target') && target == 'android') {
             sourceCompatibility JavaVersion.VERSION_1_7
             targetCompatibility JavaVersion.VERSION_1_7
         }
-    
+
         // Rename the aar correctly
         libraryVariants.all { variant ->
             variant.outputs.each { output ->
@@ -48,7 +51,7 @@ if(hasProperty('target') && target == 'android') {
             provided 'javax.annotation:jsr250-api:1.0'
         }
     }
-    
+
     afterEvaluate {
         android.libraryVariants.all { variant ->
             def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
@@ -60,12 +63,12 @@ if(hasProperty('target') && target == 'android') {
             artifacts.add('archives', task);
         }
     }
-    
+
     task sourcesJar(type: Jar) {
         from android.sourceSets.main.java.srcDirs
         classifier = 'sources'
     }
-    
+
     artifacts {
         archives sourcesJar
     }
@@ -74,16 +77,16 @@ if(hasProperty('target') && target == 'android') {
 
     apply plugin: 'java'
     apply plugin: 'maven'
-    
+
     sourceCompatibility = JavaVersion.VERSION_1_7
     targetCompatibility = JavaVersion.VERSION_1_7
-    
+
     install {
         repositories.mavenInstaller {
             pom.artifactId = '{{artifactId}}'
         }
     }
-    
+
     task execute(type:JavaExec) {
        main = System.getProperty('mainClass')
        classpath = sourceSets.main.runtimeClasspath
@@ -92,8 +95,8 @@ if(hasProperty('target') && target == 'android') {
 
 dependencies {
     compile 'io.swagger:swagger-annotations:1.5.0'
-    compile 'com.squareup.okhttp:okhttp:2.4.0'
+    compile 'com.squareup.okhttp:okhttp:2.7.2'
+    compile 'com.squareup.okhttp:logging-interceptor:2.7.2'
     compile 'com.google.code.gson:gson:2.3.1'
-    compile 'com.brsanthu:migbase64:2.2'
     testCompile 'junit:junit:4.8.1'
 }
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache
index b748f53e48d..50e843248fb 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache
@@ -10,9 +10,9 @@ lazy val root = (project in file(".")).
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       "io.swagger" % "swagger-annotations" % "1.5.0",
-      "com.squareup.okhttp" % "okhttp" % "2.4.0",
+      "com.squareup.okhttp" % "okhttp" % "2.7.2",
+      "com.squareup.okhttp" % "logging-interceptor" % "2.7.2",
       "com.google.code.gson" % "gson" % "2.3.1",
-      "com.brsanthu" % "migbase64" % "2.2",
       "junit" % "junit" % "4.8.1" % "test"
     )
   )
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/model.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/model.mustache
index ef4a001dd05..0b544b9e06c 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/model.mustache
@@ -13,7 +13,7 @@ import com.google.gson.annotations.SerializedName;
 /**
  * {{description}}
  **/{{/description}}
-@ApiModel(description = "{{{description}}}")
+{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
   {{#vars}}{{#isEnum}}
 
@@ -33,10 +33,10 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   @ApiModelProperty({{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
   public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
-  }
+  }{{^isReadOnly}}
   public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {
     this.{{name}} = {{name}};
-  }
+  }{{/isReadOnly}}
 
   {{/vars}}
 
@@ -47,16 +47,17 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
     }
     if (o == null || getClass() != o.getClass()) {
       return false;
-    }
-    {{classname}} {{classVarName}} = ({{classname}}) o;{{#hasVars}}
-    return {{#vars}}Objects.equals({{name}}, {{classVarName}}.{{name}}){{#hasMore}} &&
-        {{/hasMore}}{{^hasMore}};{{/hasMore}}{{/vars}}{{/hasVars}}{{^hasVars}}
+    }{{#hasVars}}
+    {{classname}} {{classVarName}} = ({{classname}}) o;
+    return {{#vars}}Objects.equals(this.{{name}}, {{classVarName}}.{{name}}){{#hasMore}} &&
+        {{/hasMore}}{{/vars}}{{#parent}} &&
+        super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}
     return true;{{/hasVars}}
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash({{#vars}}{{name}}{{#hasMore}}, {{/hasMore}}{{/vars}});
+    return Objects.hash({{#vars}}{{name}}{{#hasMore}}, {{/hasMore}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}});
   }
 
   @Override
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
index 0d7e9015101..d457749d19a 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
@@ -104,19 +104,46 @@
           <target>1.6</target>
         </configuration>
       </plugin>
+      <!-- For testing build.gradle -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.2.1</version>
+        <executions>
+          <execution>
+            <id>gradle-test</id>
+            <phase>integration-test</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>gradle</executable>
+              <arguments>
+                <argument>check</argument>
+              </arguments>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
     </plugins>
   </build>
   <dependencies>
     <dependency>
       <groupId>io.swagger</groupId>
       <artifactId>swagger-annotations</artifactId>
-      <version>${swagger-annotations-version}</version>
+      <version>${swagger-core-version}</version>
     </dependency>
     <dependency>
       <groupId>com.squareup.okhttp</groupId>
       <artifactId>okhttp</artifactId>
       <version>${okhttp-version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp</groupId>
+      <artifactId>logging-interceptor</artifactId>
+      <version>${okhttp-version}</version>
+    </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
@@ -132,8 +159,8 @@
     </dependency>
   </dependencies>
   <properties>
-    <swagger-annotations-version>1.5.0</swagger-annotations-version>
-    <okhttp-version>2.4.0</okhttp-version>
+    <swagger-core-version>1.5.8</swagger-core-version>
+    <okhttp-version>2.7.2</okhttp-version>
     <gson-version>2.3.1</gson-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <junit-version>4.8.1</junit-version>
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/api.mustache
index 9d758bddd21..aa84768b47a 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/api.mustache
@@ -10,7 +10,10 @@ import retrofit.mime.*;
 {{/imports}}
 
 {{^fullJavaUtil}}
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 {{/fullJavaUtil}}
 
 {{#operations}}
@@ -20,7 +23,7 @@ public interface {{classname}} {
    * {{summary}}
    * Sync method
    * {{notes}}
-{{#allParams}}   * @param {{paramName}} {{description}}
+{{#allParams}}   * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
 {{/allParams}}   * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
    */
   {{#formParams}}{{#-first}}
@@ -33,7 +36,7 @@ public interface {{classname}} {
   /**
    * {{summary}}
    * Async method
-{{#allParams}}   * @param {{paramName}} {{description}}
+{{#allParams}}   * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
 {{/allParams}}   * @param cb callback method
    * @return void
    */
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/build.gradle.mustache
index 7072c8752f5..ca26e739496 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/build.gradle.mustache
@@ -1,3 +1,6 @@
+apply plugin: 'idea'
+apply plugin: 'eclipse'
+
 group = '{{groupId}}'
 version = '{{artifactVersion}}'
 
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/model.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/model.mustache
index ef4a001dd05..779a56fedb7 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/model.mustache
@@ -13,7 +13,7 @@ import com.google.gson.annotations.SerializedName;
 /**
  * {{description}}
  **/{{/description}}
-@ApiModel(description = "{{{description}}}")
+{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
   {{#vars}}{{#isEnum}}
 
@@ -33,10 +33,10 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   @ApiModelProperty({{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
   public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
-  }
+  }{{^isReadOnly}}
   public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {
     this.{{name}} = {{name}};
-  }
+  }{{/isReadOnly}}
 
   {{/vars}}
 
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/pom.mustache
index 651c9bd6a64..2370cf4a211 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/pom.mustache
@@ -110,7 +110,7 @@
     <dependency>
       <groupId>io.swagger</groupId>
       <artifactId>swagger-annotations</artifactId>
-      <version>${swagger-annotations-version}</version>
+      <version>${swagger-core-version}</version>
     </dependency>
     <dependency>
       <groupId>com.squareup.retrofit</groupId>
@@ -137,7 +137,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <swagger-annotations-version>1.5.0</swagger-annotations-version>
+    <swagger-core-version>1.5.8</swagger-core-version>
     <retrofit-version>1.9.0</retrofit-version>
     <okhttp-version>2.4.0</okhttp-version>
     <oltu-version>1.0.0</oltu-version>
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache
index 56e83f7d915..ad5f02c49e4 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache
@@ -10,17 +10,20 @@ import java.util.Map;
 import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder;
 import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder;
 
-import retrofit.Converter;
-import retrofit.Retrofit;
-import retrofit.GsonConverterFactory;
+import retrofit2.Converter;
+import retrofit2.Retrofit;
+{{#useRxJava}}import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;{{/useRxJava}}
+import retrofit2.converter.gson.GsonConverterFactory;
+import retrofit2.converter.scalars.ScalarsConverterFactory;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonParseException;
-import com.squareup.okhttp.Interceptor;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.RequestBody;
-import com.squareup.okhttp.ResponseBody;
+import okhttp3.Interceptor;
+import okhttp3.OkHttpClient;
+import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+
 
 import {{invokerPackage}}.auth.HttpBasicAuth;
 import {{invokerPackage}}.auth.ApiKeyAuth;
@@ -101,14 +104,14 @@ public class ApiClient {
                 .setUsername(username)
                 .setPassword(password);
     }
-    
+
    public void createDefaultAdapter() {
         Gson gson = new GsonBuilder()
                 .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
                 .create();
 
         okClient = new OkHttpClient();
-        
+
         String baseUrl = "{{basePath}}";
         if(!baseUrl.endsWith("/"))
         	baseUrl = baseUrl + "/";
@@ -117,12 +120,14 @@ public class ApiClient {
                 .Builder()
                 .baseUrl(baseUrl)
                 .client(okClient)
+                {{#useRxJava}}.addCallAdapterFactory(RxJavaCallAdapterFactory.create()){{/useRxJava}}
+                .addConverterFactory(ScalarsConverterFactory.create())
                 .addConverterFactory(GsonCustomConverterFactory.create(gson));
     }
 
     public <S> S createService(Class<S> serviceClass) {
         return adapterBuilder.build().create(serviceClass);
-        
+
     }
 
     /**
@@ -200,7 +205,7 @@ public class ApiClient {
             }
         }
     }
-    
+
     /**
      * Helper method to configure the oauth accessCode/implicit flow parameters
      * @param clientId
@@ -222,7 +227,7 @@ public class ApiClient {
             }
         }
     }
-    
+
     /**
      * Configures a listener which is notified when a new access token is received.
      * @param accessTokenListener
@@ -269,7 +274,7 @@ public class ApiClient {
     public OkHttpClient getOkClient() {
         return okClient;
     }
-    
+
     public void addAuthsToOkClient(OkHttpClient okClient) {
         for(Interceptor apiAuthorization : apiAuthorizations.values()) {
             okClient.interceptors().add(apiAuthorization);
@@ -281,7 +286,7 @@ public class ApiClient {
      * @param okClient
      */
     public void configureFromOkclient(OkHttpClient okClient) {
-        OkHttpClient clone = okClient.clone();
+        OkHttpClient clone = okClient.newBuilder().build();
         addAuthsToOkClient(clone);
         adapterBuilder.client(clone);
     }
@@ -305,14 +310,14 @@ class GsonResponseBodyConverterToString<T> implements Converter<ResponseBody, T>
 	    String returned = value.string();
 	    try {
 	      return gson.fromJson(returned, type);
-	    } 
+	    }
 	    catch (JsonParseException e) {
                 return (T) returned;
-        } 
+        }
 	 }
 }
 
-class GsonCustomConverterFactory extends Converter.Factory 
+class GsonCustomConverterFactory extends Converter.Factory
 {
 	public static GsonCustomConverterFactory create(Gson gson) {
 	    return new GsonCustomConverterFactory(gson);
@@ -327,17 +332,17 @@ class GsonCustomConverterFactory extends Converter.Factory
 	    this.gsonConverterFactory = GsonConverterFactory.create(gson);
 	  }
 
-	  @Override
-	  public Converter<ResponseBody, ?> fromResponseBody(Type type, Annotation[] annotations) {
-		  if(type.equals(String.class))
-			  return new GsonResponseBodyConverterToString<Object>(gson, type);
-		  else
-			  return gsonConverterFactory.fromResponseBody(type, annotations);
-	  }
+    @Override
+    public Converter<ResponseBody, ?> responseBodyConverter(Type type, Annotation[] annotations, Retrofit retrofit) {
+        if(type.equals(String.class))
+            return new GsonResponseBodyConverterToString<Object>(gson, type);
+        else
+            return gsonConverterFactory.responseBodyConverter(type, annotations, retrofit);
+    }
 
-	  @Override
-	  public Converter<?, RequestBody> toRequestBody(Type type, Annotation[] annotations) {
-	    return gsonConverterFactory.toRequestBody(type, annotations);
-	  }
+    @Override
+    public Converter<?, RequestBody> requestBodyConverter(Type type, Annotation[] parameterAnnotations, Annotation[] methodAnnotations, Retrofit retrofit) {
+            return gsonConverterFactory.requestBodyConverter(type, parameterAnnotations, methodAnnotations, retrofit);
+    }
 }
 
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/CollectionFormats.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/CollectionFormats.mustache
index a549ea59d1c..8c91c335dfc 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/CollectionFormats.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/CollectionFormats.mustache
@@ -4,18 +4,18 @@ import java.util.Arrays;
 import java.util.List;
 
 public class CollectionFormats {
-    
+
     public static class CSVParams {
 
         protected List<String> params;
-        
+
         public CSVParams() {
         }
-        
+
         public CSVParams(List<String> params) {
             this.params = params;
         }
-        
+
         public CSVParams(String... params) {
             this.params = Arrays.asList(params);
         }
@@ -27,19 +27,19 @@ public class CollectionFormats {
         public void setParams(List<String> params) {
             this.params = params;
         }
-        
+
         @Override
         public String toString() {
             return StringUtil.join(params.toArray(new String[0]), ",");
         }
-        
+
     }
-    
+
     public static class SSVParams extends CSVParams {
-        
+
         public SSVParams() {
         }
-        
+
         public SSVParams(List<String> params) {
             super(params);
         }
@@ -53,16 +53,16 @@ public class CollectionFormats {
             return StringUtil.join(params.toArray(new String[0]), " ");
         }
     }
-    
+
     public static class TSVParams extends CSVParams {
-        
+
         public TSVParams() {
         }
-        
+
         public TSVParams(List<String> params) {
             super(params);
         }
-        
+
         public TSVParams(String... params) {
             super(params);
         }
@@ -72,16 +72,16 @@ public class CollectionFormats {
             return StringUtil.join( params.toArray(new String[0]), "\t");
         }
     }
-    
+
     public static class PIPESParams extends CSVParams {
-        
+
         public PIPESParams() {
         }
-        
+
         public PIPESParams(List<String> params) {
             super(params);
         }
-        
+
         public PIPESParams(String... params) {
             super(params);
         }
@@ -91,5 +91,5 @@ public class CollectionFormats {
             return StringUtil.join(params.toArray(new String[0]), "|");
         }
     }
-    
+
 }
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/api.mustache
index a066a625cff..9bd835a4a36 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/api.mustache
@@ -2,15 +2,20 @@ package {{package}};
 
 import {{invokerPackage}}.CollectionFormats.*;
 
-import retrofit.Call;
-import retrofit.http.*;
-import com.squareup.okhttp.RequestBody;
+{{#useRxJava}}import rx.Observable;{{/useRxJava}}
+{{^useRxJava}}import retrofit2.Call;{{/useRxJava}}
+import retrofit2.http.*;
+
+import okhttp3.RequestBody;
 
 {{#imports}}import {{import}};
 {{/imports}}
 
 {{^fullJavaUtil}}
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 {{/fullJavaUtil}}
 
 {{#operations}}
@@ -19,13 +24,13 @@ public interface {{classname}} {
   /**
    * {{summary}}
    * {{notes}}
-{{#allParams}}   * @param {{paramName}} {{description}}
+{{#allParams}}   * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
 {{/allParams}}   * @return Call<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}}>
    */
   {{#formParams}}{{#-first}}
   {{#isMultipart}}@Multipart{{/isMultipart}}{{^isMultipart}}@FormUrlEncoded{{/isMultipart}}{{/-first}}{{/formParams}}
   @{{httpMethod}}("{{path}}")
-  Call<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}}> {{operationId}}({{^allParams}});{{/allParams}}
+  {{#useRxJava}}Observable{{/useRxJava}}{{^useRxJava}}Call{{/useRxJava}}<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}}> {{operationId}}({{^allParams}});{{/allParams}}
     {{#allParams}}{{>libraries/retrofit2/queryParams}}{{>libraries/retrofit2/pathParams}}{{>libraries/retrofit2/headerParams}}{{>libraries/retrofit2/bodyParams}}{{>libraries/retrofit2/formParams}}{{#hasMore}}, {{/hasMore}}{{^hasMore}}
   );{{/hasMore}}{{/allParams}}
 
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/ApiKeyAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/ApiKeyAuth.mustache
index fec45262e93..92c0df0ddea 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/ApiKeyAuth.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/ApiKeyAuth.mustache
@@ -4,9 +4,9 @@ import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 
-import com.squareup.okhttp.Interceptor;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.Response;
+import okhttp3.Interceptor;
+import okhttp3.Request;
+import okhttp3.Response;
 
 public class ApiKeyAuth implements Interceptor {
     private final String location;
@@ -41,18 +41,18 @@ public class ApiKeyAuth implements Interceptor {
         Request request = chain.request();
 
         if (location == "query") {
-            String newQuery = request.uri().getQuery();
+            String newQuery = request.url().uri().getQuery();
             paramValue = paramName + "=" + apiKey;
             if (newQuery == null) {
                 newQuery = paramValue;
             } else {
-                newQuery += "&" + paramValue;  
+                newQuery += "&" + paramValue;
             }
 
             URI newUri;
             try {
-                newUri = new URI(request.uri().getScheme(), request.uri().getAuthority(),
-                        request.uri().getPath(), newQuery, request.uri().getFragment());
+                newUri = new URI(request.url().uri().getScheme(), request.url().uri().getAuthority(),
+                    request.url().uri().getPath(), newQuery, request.url().uri().getFragment());
             } catch (URISyntaxException e) {
                 throw new IOException(e);
             }
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/HttpBasicAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/HttpBasicAuth.mustache
index 394592f64d9..d4588426662 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/HttpBasicAuth.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/HttpBasicAuth.mustache
@@ -2,10 +2,11 @@ package {{invokerPackage}}.auth;
 
 import java.io.IOException;
 
-import com.squareup.okhttp.Credentials;
-import com.squareup.okhttp.Interceptor;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.Response;
+import okhttp3.Interceptor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.Credentials;
 
 public class HttpBasicAuth implements Interceptor {
 
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/OAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/OAuth.mustache
index 68ee918601e..0997418a210 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/OAuth.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/OAuth.mustache
@@ -16,11 +16,11 @@ import org.apache.oltu.oauth2.common.exception.OAuthSystemException;
 import org.apache.oltu.oauth2.common.message.types.GrantType;
 import org.apache.oltu.oauth2.common.token.BasicOAuthToken;
 
-import com.squareup.okhttp.Interceptor;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.Request.Builder;
-import com.squareup.okhttp.Response;
+import okhttp3.Interceptor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Request.Builder;
+import okhttp3.Response;
 
 public class OAuth implements Interceptor {
 
@@ -90,9 +90,9 @@ public class OAuth implements Interceptor {
 
         String requestAccessToken = new String(getAccessToken());
         try {
-            oAuthRequest = new OAuthBearerClientRequest(request.urlString())
-            .setAccessToken(requestAccessToken)
-            .buildHeaderMessage();
+            oAuthRequest = new OAuthBearerClientRequest(request.url().toString())
+                .setAccessToken(requestAccessToken)
+                .buildHeaderMessage();
         } catch (OAuthSystemException e) {
             throw new IOException(e);
         }
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/OAuthOkHttpClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/OAuthOkHttpClient.mustache
index ea195f7df04..423fa1ba0e5 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/OAuthOkHttpClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/OAuthOkHttpClient.mustache
@@ -11,11 +11,14 @@ import org.apache.oltu.oauth2.client.response.OAuthClientResponseFactory;
 import org.apache.oltu.oauth2.common.exception.OAuthProblemException;
 import org.apache.oltu.oauth2.common.exception.OAuthSystemException;
 
-import com.squareup.okhttp.MediaType;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.RequestBody;
-import com.squareup.okhttp.Response;
+
+import okhttp3.Interceptor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Request.Builder;
+import okhttp3.Response;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
 
 
 public class OAuthOkHttpClient implements HttpClient {
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
index cf0047cf283..a5cfd0ebef2 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
@@ -1,3 +1,6 @@
+apply plugin: 'idea'
+apply plugin: 'eclipse'
+
 group = '{{groupId}}'
 version = '{{artifactVersion}}'
 
@@ -20,7 +23,7 @@ if(hasProperty('target') && target == 'android') {
 
 	apply plugin: 'com.android.library'
 	apply plugin: 'com.github.dcendents.android-maven'
-	
+
 	android {
 	    compileSdkVersion 22
 	    buildToolsVersion '22.0.0'
@@ -32,7 +35,7 @@ if(hasProperty('target') && target == 'android') {
 	        sourceCompatibility JavaVersion.VERSION_1_7
 	        targetCompatibility JavaVersion.VERSION_1_7
 	    }
-	
+
 	    // Rename the aar correctly
 	    libraryVariants.all { variant ->
 	        variant.outputs.each { output ->
@@ -44,7 +47,7 @@ if(hasProperty('target') && target == 'android') {
 	        }
 	    }
 	}
-	
+
 	afterEvaluate {
 	    android.libraryVariants.all { variant ->
 	        def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
@@ -56,12 +59,12 @@ if(hasProperty('target') && target == 'android') {
 	        artifacts.add('archives', task);
 	    }
 	}
-	
+
 	task sourcesJar(type: Jar) {
 	    from android.sourceSets.main.java.srcDirs
 	    classifier = 'sources'
 	}
-	
+
 	artifacts {
 	    archives sourcesJar
 	}
@@ -70,16 +73,16 @@ if(hasProperty('target') && target == 'android') {
 
 	apply plugin: 'java'
 	apply plugin: 'maven'
-	
-	sourceCompatibility = JavaVersion.VERSION_1_7
-	targetCompatibility = JavaVersion.VERSION_1_7
-	
+
+    sourceCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_1_7
+
 	install {
 	    repositories.mavenInstaller {
 	        pom.artifactId = '{{artifactId}}'
 	    }
 	}
-	
+
 	task execute(type:JavaExec) {
 	   main = System.getProperty('mainClass')
 	   classpath = sourceSets.main.runtimeClasspath
@@ -87,20 +90,29 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    okhttp_version = "2.5.0"
     oltu_version = "1.0.0"
-    retrofit_version = "2.0.0-beta2"
+    retrofit_version = "2.0.0-beta4"
     gson_version = "2.4"
     swagger_annotations_version = "1.5.0"
     junit_version = "4.12"
+{{#useRxJava}}
+    rx_java_version = "1.0.16"
+{{/useRxJava}}
+{{^useRxJava}}{{/useRxJava}}
 }
 
 dependencies {
-    compile "com.squareup.okhttp:okhttp:$okhttp_version"
-    compile "com.squareup.retrofit:retrofit:$retrofit_version"
-    compile "com.google.code.gson:gson:$gson_version"
-    compile "com.squareup.retrofit:converter-gson:$retrofit_version"
+    compile "com.squareup.retrofit2:retrofit:$retrofit_version"
+    compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
+    compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
+{{#useRxJava}}
+    compile "com.squareup.retrofit2:adapter-rxjava:$retrofit_version"
+    compile "io.reactivex:rxjava:$rx_java_version"
+{{/useRxJava}}
+{{^useRxJava}}{{/useRxJava}}
+
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
+
     testCompile "junit:junit:$junit_version"
 }
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/model.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/model.mustache
index ef4a001dd05..779a56fedb7 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/model.mustache
@@ -13,7 +13,7 @@ import com.google.gson.annotations.SerializedName;
 /**
  * {{description}}
  **/{{/description}}
-@ApiModel(description = "{{{description}}}")
+{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
   {{#vars}}{{#isEnum}}
 
@@ -33,10 +33,10 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   @ApiModelProperty({{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
   public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
-  }
+  }{{^isReadOnly}}
   public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {
     this.{{name}} = {{name}};
-  }
+  }{{/isReadOnly}}
 
   {{/vars}}
 
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache
index a155d04ef88..a76fb3b9547 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache
@@ -100,8 +100,9 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.3.2</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+            <source>
+            1.7</source>
+            <target>1.7</target>
         </configuration>
       </plugin>
     </plugins>
@@ -110,33 +111,38 @@
     <dependency>
       <groupId>io.swagger</groupId>
       <artifactId>swagger-annotations</artifactId>
-      <version>${swagger-annotations-version}</version>
+      <version>${swagger-core-version}</version>
     </dependency>
     <dependency>
-      <groupId>com.squareup.retrofit</groupId>
+      <groupId>com.squareup.retrofit2</groupId>
       <artifactId>retrofit</artifactId>
       <version>${retrofit-version}</version>
     </dependency>
     <dependency>
-      <groupId>com.squareup.retrofit</groupId>
+      <groupId>com.squareup.retrofit2</groupId>
+      <artifactId>converter-scalars</artifactId>
+      <version>${retrofit-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.retrofit2</groupId>
       <artifactId>converter-gson</artifactId>
       <version>${retrofit-version}</version>
     </dependency>
-    <dependency>
-	  <groupId>com.google.code.gson</groupId>
-	  <artifactId>gson</artifactId>
-	  <version>${gson-version}</version>
-	</dependency>
     <dependency>
       <groupId>org.apache.oltu.oauth2</groupId>
       <artifactId>org.apache.oltu.oauth2.client</artifactId>
       <version>${oltu-version}</version>
+    </dependency>{{#useRxJava}}
+    <dependency>
+      <groupId>io.reactivex</groupId>
+      <artifactId>rxjava</artifactId>
+      <version>${rxjava-version}</version>
     </dependency>
-      <dependency>
-      <groupId>com.squareup.okhttp</groupId>
-      <artifactId>okhttp</artifactId>
-      <version>${okhttp-version}</version>
-    </dependency>
+    <dependency>
+      <groupId>com.squareup.retrofit2</groupId>
+      <artifactId>adapter-rxjava</artifactId>
+      <version>${retrofit-version}</version>
+    </dependency>{{/useRxJava}}
 
     <!-- test dependencies -->
     <dependency>
@@ -147,10 +153,9 @@
     </dependency>
   </dependencies>
   <properties>
-    <swagger-annotations-version>1.5.0</swagger-annotations-version>
-    <retrofit-version>2.0.0-beta2</retrofit-version>
-    <okhttp-version>2.5.0</okhttp-version>
-    <gson-version>2.4</gson-version>
+    <swagger-core-version>1.5.8</swagger-core-version>
+    <retrofit-version>2.0.0-beta4</retrofit-version>{{#useRxJava}}
+    <rxjava-version>1.0.16</rxjava-version>{{/useRxJava}}
     <oltu-version>1.0.0</oltu-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <junit-version>4.12</junit-version>
diff --git a/modules/swagger-codegen/src/main/resources/Java/pojo.mustache b/modules/swagger-codegen/src/main/resources/Java/pojo.mustache
index eea33d346d4..1a1f455ed31 100644
--- a/modules/swagger-codegen/src/main/resources/Java/pojo.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/pojo.mustache
@@ -8,41 +8,47 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
 {{>enumClass}}{{/items}}{{/items.isEnum}}
   private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/vars}}
 
-  {{#vars}}
+  {{#vars}}{{^isReadOnly}}
   /**{{#description}}
    * {{{description}}}{{/description}}{{#minimum}}
    * minimum: {{minimum}}{{/minimum}}{{#maximum}}
    * maximum: {{maximum}}{{/maximum}}
    **/
-  {{#vendorExtensions.extraAnnotation}}{{vendorExtensions.extraAnnotation}}{{/vendorExtensions.extraAnnotation}}
-  @ApiModelProperty({{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
+  public {{classname}} {{name}}({{{datatypeWithEnum}}} {{name}}) {
+    this.{{name}} = {{name}};
+    return this;
+  }
+  {{/isReadOnly}}{{#vendorExtensions.extraAnnotation}}
+  {{vendorExtensions.extraAnnotation}}{{/vendorExtensions.extraAnnotation}}
+  @ApiModelProperty({{#example}}example = "{{example}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
   @JsonProperty("{{baseName}}")
   public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
-  }
+  }{{^isReadOnly}}
   public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {
     this.{{name}} = {{name}};
-  }
+  }{{/isReadOnly}}
 
   {{/vars}}
 
   @Override
-  public boolean equals(Object o) {
+  public boolean equals(java.lang.Object o) {
     if (this == o) {
       return true;
     }
     if (o == null || getClass() != o.getClass()) {
       return false;
-    }
-    {{classname}} {{classVarName}} = ({{classname}}) o;{{#hasVars}}
-    return {{#vars}}Objects.equals({{name}}, {{classVarName}}.{{name}}){{#hasMore}} &&
-        {{/hasMore}}{{^hasMore}};{{/hasMore}}{{/vars}}{{/hasVars}}{{^hasVars}}
+    }{{#hasVars}}
+    {{classname}} {{classVarName}} = ({{classname}}) o;
+    return {{#vars}}Objects.equals(this.{{name}}, {{classVarName}}.{{name}}){{#hasMore}} &&
+        {{/hasMore}}{{/vars}}{{#parent}} &&
+        super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}
     return true;{{/hasVars}}
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash({{#vars}}{{name}}{{#hasMore}}, {{/hasMore}}{{/vars}});
+    return Objects.hash({{#vars}}{{name}}{{#hasMore}}, {{/hasMore}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}});
   }
 
   @Override
@@ -59,7 +65,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(Object o) {
+  private String toIndentedString(java.lang.Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/modules/swagger-codegen/src/main/resources/Java/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/pom.mustache
index f2c20a96740..f0dd8c213b0 100644
--- a/modules/swagger-codegen/src/main/resources/Java/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/pom.mustache
@@ -64,6 +64,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.10</version>
         <executions>
           <execution>
             <id>add_sources</id>
@@ -141,7 +142,7 @@
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-json-provider</artifactId>
       <version>${jackson-version}</version>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-joda</artifactId>
@@ -169,7 +170,8 @@
     </dependency>
   </dependencies>
   <properties>
-    <swagger-annotations-version>1.5.4</swagger-annotations-version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <swagger-annotations-version>1.5.8</swagger-annotations-version>
     <jersey-version>1.18</jersey-version>
     <jackson-version>2.4.2</jackson-version>
     <jodatime-version>2.3</jodatime-version>
diff --git a/modules/swagger-codegen/src/main/resources/JavaInflector/inflector.mustache b/modules/swagger-codegen/src/main/resources/JavaInflector/inflector.mustache
index c61fa2054b8..87fc5581316 100644
--- a/modules/swagger-codegen/src/main/resources/JavaInflector/inflector.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaInflector/inflector.mustache
@@ -2,8 +2,11 @@ controllerPackage: {{invokerPackage}}
 modelPackage:  {{modelPackage}}
 swaggerUrl: ./src/main/swagger/swagger.yaml
 modelMappings:
+  # to enable explicit mappings, use this syntax:
+  DefinitionFromSwaggerSpecification: fully.qualified.path.to.Model
   {{#models}}{{#model}}{{classname}} : {{modelPackage}}.{{classname}}{{/model}}
   {{/models}}
+
 entityProcessors:
   - json
   - xml
diff --git a/modules/swagger-codegen/src/main/resources/JavaInflector/pojo.mustache b/modules/swagger-codegen/src/main/resources/JavaInflector/pojo.mustache
index eea33d346d4..58bfed16381 100644
--- a/modules/swagger-codegen/src/main/resources/JavaInflector/pojo.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaInflector/pojo.mustache
@@ -14,8 +14,13 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
    * minimum: {{minimum}}{{/minimum}}{{#maximum}}
    * maximum: {{maximum}}{{/maximum}}
    **/
+  public {{classname}} {{name}}({{{datatypeWithEnum}}} {{name}}) {
+    this.{{name}} = {{name}};
+    return this;
+  }
+
   {{#vendorExtensions.extraAnnotation}}{{vendorExtensions.extraAnnotation}}{{/vendorExtensions.extraAnnotation}}
-  @ApiModelProperty({{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
+  @ApiModelProperty({{#example}}example = "{{example}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
   @JsonProperty("{{baseName}}")
   public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
diff --git a/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache
index c4b5fdf4922..a46b1960a67 100644
--- a/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache
@@ -19,6 +19,25 @@
         <directory>target</directory>
         <finalName>${project.artifactId}-${project.version}</finalName>
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.10</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/gen/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
@@ -78,12 +97,21 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-inflector</artifactId>
-            <version>1.0.0</version>
+            <version>${swagger-inflector-version}</version>
         </dependency>
     </dependencies>
+    <repositories>
+        <repository>
+            <id>sonatype-snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
     <properties>
         <maven-plugin-version>1.0.0</maven-plugin-version>
-        <swagger-core-version>1.5.4</swagger-core-version>
+        <swagger-inflector-version>1.0.4</swagger-inflector-version>
         <jetty-version>9.2.9.v20150224</jetty-version>
         <logback-version>1.0.1</logback-version>
         <junit-version>4.8.2</junit-version>
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/CXF2InterfaceComparator.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/CXF2InterfaceComparator.mustache
new file mode 100644
index 00000000000..d1fd0bf82c8
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/CXF2InterfaceComparator.mustache
@@ -0,0 +1,120 @@
+package {{package}};
+
+
+import java.lang.reflect.Method;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.ws.rs.HttpMethod;
+import javax.ws.rs.Path;
+
+import org.apache.cxf.jaxrs.ext.ResourceComparator;
+import org.apache.cxf.jaxrs.model.ClassResourceInfo;
+import org.apache.cxf.jaxrs.model.OperationResourceInfo;
+import org.apache.cxf.message.Message;
+
+/**
+ * This class only help CXF to decide which resource interface is more suitable. It used Java reflexion to iterate over Java methods but it *DO NOT* select the target method.
+ */
+public class CXFInterfaceComparator implements ResourceComparator {
+
+   private static final Logger LOGGER = LoggerFactory.getLogger(CXFInterfaceComparator.class);
+
+   @Override
+   public int compare(ClassResourceInfo cri1, ClassResourceInfo cri2, Message message) {
+      String requestVerb = (String) message.get(Message.HTTP_REQUEST_METHOD);
+      String requestURI = (String) message.get(Message.REQUEST_URI);
+      String requestPath = requestURI.replace((String) message.get(Message.BASE_PATH), "");
+
+      // remove "/"at the end of requestPath if present
+      if (requestPath.endsWith("/")){
+         requestPath = requestPath.substring(0, requestPath.length()-1);
+      }
+
+      if (analyseInterface(cri1, requestPath, requestVerb)) {
+         return -1; // Indicate that 'cri1' interface should be preferred
+      } else if (analyseInterface(cri2, requestPath, requestVerb)) {
+         return 1; // Indicate that 'cri2' interface should be preferred
+      } else {
+         return 0; // Nothing match, leave CXF decision
+      }
+   }
+
+   /**
+    * Analyse each methods provided to check if there is a match with the
+    * message request path and request HTTP verb.
+    *
+    * @param cri
+    *            the interface to be analysed
+    * @param requestPath
+    *            the path of the request. Do not contains the host and base
+    *            path
+    * @return true if a method match the request, false otherwise
+    */
+   private static boolean analyseInterface(ClassResourceInfo cri, String requestPath, String requestVerb) {
+      assert cri.getServiceClass() != null;
+      assert cri.getServiceClass().getInterfaces() != null;
+      assert cri.getServiceClass().getInterfaces()[0] != null;
+      assert cri.getServiceClass().getInterfaces()[0].getMethods().length > 0;
+
+      Method[] methods = cri.getServiceClass().getInterfaces()[0].getMethods();
+      // Java reflexion. Check all the methods of an interface.
+      for (Method method : methods) {
+         Path pathAnnotation = method.getAnnotation(javax.ws.rs.Path.class);
+         if (pathAnnotation != null && pathAnnotation.value() != null) {
+            String pathValue = pathAnnotation.value();
+            String methodHttpVerb = getMethodHttpVerb(method);
+
+            // Always authorize OPTIONS request if the path is matching a method declaration
+            if (requestVerb.equals(HttpMethod.OPTIONS) && match(pathValue,requestPath)) {
+               return true;
+            }
+            // Also check the HTTP verb since a single path can be match do multiple request, depending of the HTTP request verb.
+            if (requestVerb.equals(methodHttpVerb) && match(pathValue, requestPath)) {
+               return true;
+            }
+         }
+      }
+      return false;
+   }
+
+   private static String getMethodHttpVerb(Method method) {
+      if (method.getAnnotation(javax.ws.rs.POST.class) != null) {
+         return HttpMethod.POST;
+      } else if (method.getAnnotation(javax.ws.rs.GET.class) != null) {
+         return HttpMethod.GET;
+      } else if (method.getAnnotation(javax.ws.rs.PUT.class) != null) {
+         return HttpMethod.PUT;
+      } else if (method.getAnnotation(javax.ws.rs.OPTIONS.class) != null) {
+         return HttpMethod.OPTIONS;
+      } else if (method.getAnnotation(javax.ws.rs.DELETE.class) != null) {
+         return HttpMethod.DELETE;
+      } else if (method.getAnnotation(javax.ws.rs.HEAD.class) != null) {
+         return HttpMethod.HEAD;
+      }
+      assert false;
+      return null;
+   }
+
+   /**
+    * Check whether if the pathValue match with the requestPath parameter.
+    * Every path params are considered to be declared as '{param}'. The tokens to start and close path params declaration are '{' and '}'.
+    *
+    * @param valueFromAnnotation
+    * @param valueFromRequest
+    * @return true if there is a match, false otherwise
+    */
+   private static boolean match(String valueFromAnnotation, String valueFromRequest) {
+      String patternFinal = valueFromAnnotation.replaceAll("\\{(.*?)\\}", "([^/]*)").replace("/", "\\/");
+      Matcher matcher = Pattern.compile(patternFinal).matcher(valueFromRequest);
+      if (matcher.matches()) {
+         return true;
+      }
+      return false;
+   }
+
+   @Override
+   public int compare(OperationResourceInfo ori1, OperationResourceInfo ori2, Message message) {
+      return 0; // Leave CXF decision
+   }
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/allowableValues.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/allowableValues.mustache
new file mode 100644
index 00000000000..a48256d027a
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/allowableValues.mustache
@@ -0,0 +1 @@
+{{#allowableValues}}allowableValues="{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{/values}}{{^values}}range=[{{#min}}{{.}}{{/min}}{{^min}}-infinity{{/min}}, {{#max}}{{.}}{{/max}}{{^max}}infinity{{/max}}]{{/values}}"{{/allowableValues}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/api.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/api.mustache
new file mode 100644
index 00000000000..346a7a7d0a1
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/api.mustache
@@ -0,0 +1,23 @@
+package {{package}};
+
+{{#imports}}import {{import}};
+{{/imports}}
+
+import javax.ws.rs.*;
+import javax.ws.rs.core.Response;
+
+import org.apache.cxf.jaxrs.ext.multipart.*;
+
+@Path("/")
+public interface {{classname}}  {
+{{#operations}}
+{{#operation}}
+    @{{httpMethod}}
+    {{#subresourceOperation}}@Path("{{path}}"){{/subresourceOperation}}
+    {{#hasConsumes}}@Consumes({ {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}
+    {{#hasProduces}}@Produces({ {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
+    public Response {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}});
+{{/operation}}
+}
+{{/operations}}
+
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/bodyParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/bodyParams.mustache
new file mode 100644
index 00000000000..c7d1abfe527
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/bodyParams.mustache
@@ -0,0 +1 @@
+{{#isBodyParam}}{{{dataType}}} {{paramName}}{{/isBodyParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/enumClass.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/enumClass.mustache
new file mode 100644
index 00000000000..1ef4a61efbe
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/enumClass.mustache
@@ -0,0 +1,16 @@
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlType(name="{{classname}}")
+@XmlEnum
+public enum {{classname}} {
+    {{#allowableValues}}{{.}}{{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/allowableValues}}
+    
+    public String value() {
+        return name();
+    }
+
+    public static {{classname}} fromValue(String v) {
+        return valueOf(v);
+    }
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/formParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/formParams.mustache
new file mode 100644
index 00000000000..c129a925e94
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/formParams.mustache
@@ -0,0 +1,2 @@
+{{#isFormParam}}{{#notFile}}@Multipart(value = "{{paramName}}"{{^required}}, required = false{{/required}})  {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}} @Multipart(value = "{{paramName}}"{{^required}}, required = false{{/required}}) InputStream {{paramName}}InputStream,
+   @Multipart(value = "{{paramName}}" {{^required}}, required = false{{/required}}) Attachment {{paramName}}Detail{{/isFile}}{{/isFormParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/generatedAnnotation.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/generatedAnnotation.mustache
new file mode 100644
index 00000000000..49110fc1ad9
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/generatedAnnotation.mustache
@@ -0,0 +1 @@
+@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}")
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/headerParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/headerParams.mustache
new file mode 100644
index 00000000000..25d690c90ed
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/headerParams.mustache
@@ -0,0 +1 @@
+{{#isHeaderParam}}@HeaderParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isHeaderParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/model.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/model.mustache
new file mode 100644
index 00000000000..2c383a41a28
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/model.mustache
@@ -0,0 +1,14 @@
+package {{package}};
+
+{{#imports}}import {{import}};
+{{/imports}}
+
+{{#models}}
+{{#model}}{{#description}}
+/**
+ * {{description}}
+ **/{{/description}}
+{{#isEnum}}{{>enumClass}}{{/isEnum}}
+{{^isEnum}}{{>pojo}}{{/isEnum}}
+{{/model}}
+{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pathParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pathParams.mustache
new file mode 100644
index 00000000000..ba153467a65
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pathParams.mustache
@@ -0,0 +1 @@
+{{#isPathParam}}@PathParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isPathParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache
new file mode 100644
index 00000000000..b42a6d3b3eb
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache
@@ -0,0 +1,57 @@
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+{{#hasVars}} @XmlType(name = "{{classn,ame}}", propOrder =
+	{ {{#vars}}"{{name}}"{{^-last}}, {{/-last}}{{/vars}}
+}){{/hasVars}}
+{{^hasVars}}@XmlType(name = "{{classname}}"){{/hasVars}}
+{{^parent}}@XmlRootElement(name="{{classname}}"){{/parent}}
+public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {
+  {{#vars}}{{#isEnum}}
+
+{{>enumClass}}{{/isEnum}}{{#items.isEnum}}{{#items}}
+
+{{>enumClass}}{{/items}}{{/items.isEnum}}
+
+  private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/vars}}
+
+  {{#vars}}
+  /**{{#description}}
+   * {{{description}}}{{/description}}{{#minimum}}
+   * minimum: {{minimum}}{{/minimum}}{{#maximum}}
+   * maximum: {{maximum}}{{/maximum}}
+   **/
+  {{#vendorExtensions.extraAnnotation}}{{vendorExtensions.extraAnnotation}}{{/vendorExtensions.extraAnnotation}}
+  public {{{datatypeWithEnum}}} {{getter}}() {
+    return {{name}};
+  }
+  public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {
+    this.{{name}} = {{name}};
+  }
+  {{/vars}}
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class {{classname}} {\n");
+    {{#parent}}sb.append("    ").append(toIndentedString(super.toString())).append("\n");{{/parent}}
+    {{#vars}}sb.append("    {{name}}: ").append(toIndentedString({{name}})).append("\n");
+    {{/vars}}sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private static String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/queryParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/queryParams.mustache
new file mode 100644
index 00000000000..be8cee8dfe1
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/queryParams.mustache
@@ -0,0 +1 @@
+{{#isQueryParam}}@QueryParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/api.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/api.mustache
index c8fd2b80800..16f46ce0534 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/api.mustache
@@ -46,12 +46,12 @@ public class {{classname}}  {
         {{/hasMore}}{{/authMethods}}
     }{{/hasAuthMethods}}, tags={ {{#vendorExtensions.x-tags}}"{{tag}}"{{#hasMore}}, {{/hasMore}}{{/vendorExtensions.x-tags}} })
     @io.swagger.annotations.ApiResponses(value = { {{#responses}}
-        @io.swagger.annotations.ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{returnType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}){{#hasMore}},
-        {{/hasMore}}{{/responses}} })
-
-    public Response {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}},{{/allParams}}@Context SecurityContext securityContext)
+        @io.swagger.annotations.ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{returnType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}){{#hasMore}},{{/hasMore}}{{/responses}} })
+    public Response {{nickname}}(
+        {{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}},
+        {{/allParams}}@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.{{nickname}}({{#allParams}}{{#isFile}}fileDetail{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}},{{/allParams}}securityContext);
+        return delegate.{{nickname}}({{#allParams}}{{#isFile}}inputStream, fileDetail{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}},{{/allParams}}securityContext);
     }
 {{/operation}}
 }
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/apiServiceImpl.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/apiServiceImpl.mustache
index 09741c1e03e..f4c558e7b11 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/apiServiceImpl.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/apiServiceImpl.mustache
@@ -22,13 +22,13 @@ import javax.ws.rs.core.SecurityContext;
 {{>generatedAnnotation}}
 {{#operations}}
 public class {{classname}}ServiceImpl extends {{classname}}Service {
-  {{#operation}}
-      @Override
-      public Response {{nickname}}({{#allParams}}{{>serviceQueryParams}}{{>servicePathParams}}{{>serviceHeaderParams}}{{>serviceBodyParams}}{{>serviceFormParams}},{{/allParams}}SecurityContext securityContext)
-      throws NotFoundException {
-      // do some magic!
-      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-  }
-  {{/operation}}
+    {{#operation}}
+    @Override
+    public Response {{nickname}}({{#allParams}}{{>serviceQueryParams}}{{>servicePathParams}}{{>serviceHeaderParams}}{{>serviceBodyParams}}{{>serviceFormParams}}, {{/allParams}}SecurityContext securityContext)
+    throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    {{/operation}}
 }
 {{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/bootstrap.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/bootstrap.mustache
new file mode 100644
index 00000000000..f7e8efff419
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/bootstrap.mustache
@@ -0,0 +1,31 @@
+package {{apiPackage}};
+
+import io.swagger.jaxrs.config.SwaggerContextService;
+import io.swagger.models.*;
+
+import io.swagger.models.auth.*;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+
+public class Bootstrap extends HttpServlet {
+  @Override
+  public void init(ServletConfig config) throws ServletException {
+    Info info = new Info()
+      .title("{{title}}")
+      .description("{{{appDescription}}}")
+      .termsOfService("{{termsOfService}}")
+      .contact(new Contact()
+        .email("{{infoEmail}}"))
+      .license(new License()
+        .name("{{licenseInfo}}")
+        .url("{{licenseUrl}}"));
+
+    ServletContext context = config.getServletContext();
+    Swagger swagger = new Swagger().info(info);
+
+    new SwaggerContextService().withServletConfig(config).updateSwagger(swagger);
+  }
+}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/formParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/formParams.mustache
index 632d39cf23e..3fe8f19d3de 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/formParams.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/formParams.mustache
@@ -1,2 +1,2 @@
-{{#isFormParam}}{{#notFile}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}})@FormParam("{{paramName}}")  {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}  @FormDataParam("file") InputStream inputStream,
-      @FormDataParam("file") FormDataContentDisposition fileDetail{{/isFile}}{{/isFormParam}}
\ No newline at end of file
+{{#isFormParam}}{{#notFile}}{{^vendorExtensions.x-multipart}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}){{/vendorExtensions.x-multipart}}{{#vendorExtensions.x-multipart}}@FormDataParam("{{paramName}}")  {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{^vendorExtensions.x-multipart}}@FormParam("{{paramName}}")  {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{/notFile}}{{#isFile}}@FormDataParam("file") InputStream inputStream,
+        @FormDataParam("file") FormDataContentDisposition fileDetail{{/isFile}}{{/isFormParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/generatedAnnotation.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/generatedAnnotation.mustache
index 49110fc1ad9..a47b6faa85b 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/generatedAnnotation.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/generatedAnnotation.mustache
@@ -1 +1 @@
-@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}")
\ No newline at end of file
+{{^hideGenerationTimestamp}}@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}"){{/hideGenerationTimestamp}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/jacksonJsonProvider.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/jacksonJsonProvider.mustache
new file mode 100644
index 00000000000..5efcb449bb5
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/jacksonJsonProvider.mustache
@@ -0,0 +1,19 @@
+package {{apiPackage}};
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
+import io.swagger.util.Json;
+
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@Produces({MediaType.APPLICATION_JSON})
+public class JacksonJsonProvider extends JacksonJaxbJsonProvider {
+    private static ObjectMapper commonMapper = Json.mapper();
+
+    public JacksonJsonProvider() {
+        super.setMapper(commonMapper);
+    }
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/pojo.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/pojo.mustache
index eea33d346d4..58bfed16381 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/pojo.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/pojo.mustache
@@ -14,8 +14,13 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
    * minimum: {{minimum}}{{/minimum}}{{#maximum}}
    * maximum: {{maximum}}{{/maximum}}
    **/
+  public {{classname}} {{name}}({{{datatypeWithEnum}}} {{name}}) {
+    this.{{name}} = {{name}};
+    return this;
+  }
+
   {{#vendorExtensions.extraAnnotation}}{{vendorExtensions.extraAnnotation}}{{/vendorExtensions.extraAnnotation}}
-  @ApiModelProperty({{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
+  @ApiModelProperty({{#example}}example = "{{example}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
   @JsonProperty("{{baseName}}")
   public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/pom.mustache
index 0d1b06de43a..180450ce73f 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/pom.mustache
@@ -168,7 +168,7 @@
     </repository>
   </repositories>
   <properties>
-    <swagger-core-version>1.5.4</swagger-core-version>
+    <swagger-core-version>1.5.8</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey-version>1.18.1</jersey-version>
     <slf4j-version>1.6.3</slf4j-version>
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/queryParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/queryParams.mustache
index 342da154a87..9055e6f16dc 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/queryParams.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/queryParams.mustache
@@ -1 +1 @@
-{{#isQueryParam}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @QueryParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
+{{#isQueryParam}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}){{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} @QueryParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/serviceFormParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/serviceFormParams.mustache
index e44ab167e8f..759335ba9ce 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/serviceFormParams.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/serviceFormParams.mustache
@@ -1 +1 @@
-{{#isFormParam}}{{#notFile}}{{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}FormDataContentDisposition fileDetail{{/isFile}}{{/isFormParam}}
\ No newline at end of file
+{{#isFormParam}}{{#notFile}}{{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}InputStream inputStream, FormDataContentDisposition fileDetail{{/isFile}}{{/isFormParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/ApiException.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/ApiException.mustache
new file mode 100644
index 00000000000..f6161147700
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/ApiException.mustache
@@ -0,0 +1,10 @@
+package {{apiPackage}};
+
+{{>generatedAnnotation}}
+public class ApiException extends Exception{
+    private int code;
+    public ApiException (int code, String msg) {
+        super(msg);
+        this.code = code;
+    }
+}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/ApiOriginFilter.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/ApiOriginFilter.mustache
new file mode 100644
index 00000000000..b8af270a05a
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/ApiOriginFilter.mustache
@@ -0,0 +1,22 @@
+package {{apiPackage}};
+
+import java.io.IOException;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletResponse;
+
+{{>generatedAnnotation}}
+public class ApiOriginFilter implements javax.servlet.Filter {
+    public void doFilter(ServletRequest request, ServletResponse response,
+            FilterChain chain) throws IOException, ServletException {
+        HttpServletResponse res = (HttpServletResponse) response;
+        res.addHeader("Access-Control-Allow-Origin", "*");
+        res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT");
+        res.addHeader("Access-Control-Allow-Headers", "Content-Type");
+        chain.doFilter(request, response);
+    }
+
+    public void destroy() {}
+
+    public void init(FilterConfig filterConfig) throws ServletException {}
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/ApiResponseMessage.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/ApiResponseMessage.mustache
new file mode 100644
index 00000000000..c883e16b5e6
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/ApiResponseMessage.mustache
@@ -0,0 +1,69 @@
+package {{apiPackage}};
+
+import javax.xml.bind.annotation.XmlTransient;
+
+@javax.xml.bind.annotation.XmlRootElement
+{{>generatedAnnotation}}
+public class ApiResponseMessage {
+    public static final int ERROR = 1;
+    public static final int WARNING = 2;
+    public static final int INFO = 3;
+    public static final int OK = 4;
+    public static final int TOO_BUSY = 5;
+
+    int code;
+    String type;
+    String message;
+
+    public ApiResponseMessage(){}
+
+    public ApiResponseMessage(int code, String message){
+        this.code = code;
+        switch(code){
+        case ERROR:
+            setType("error");
+            break;
+        case WARNING:
+            setType("warning");
+            break;
+        case INFO:
+            setType("info");
+            break;
+        case OK:
+            setType("ok");
+            break;
+        case TOO_BUSY:
+            setType("too busy");
+            break;
+        default:
+            setType("unknown");
+            break;
+        }
+        this.message = message;
+    }
+
+    @XmlTransient
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/JodaDateTimeProvider.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/JodaDateTimeProvider.mustache
new file mode 100644
index 00000000000..f9421790983
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/JodaDateTimeProvider.mustache
@@ -0,0 +1,44 @@
+package {{apiPackage}};
+
+import com.sun.jersey.core.spi.component.ComponentContext;
+import com.sun.jersey.spi.inject.Injectable;
+import com.sun.jersey.spi.inject.PerRequestTypeInjectableProvider;
+
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+import javax.ws.rs.core.UriInfo;
+import javax.ws.rs.ext.Provider;
+import org.joda.time.DateTime;
+import java.util.List;
+
+@Provider
+public class JodaDateTimeProvider extends PerRequestTypeInjectableProvider<QueryParam, DateTime> {
+    private final UriInfo uriInfo;
+
+    public JodaDateTimeProvider(@Context UriInfo uriInfo) {
+        super(DateTime.class);
+        this.uriInfo = uriInfo;
+    }
+
+    @Override
+    public Injectable<DateTime> getInjectable(final ComponentContext cc, final QueryParam a) {
+        return new Injectable<DateTime>() {
+            @Override
+            public DateTime getValue() {
+                final List<String> values = uriInfo.getQueryParameters().get(a.value());
+
+                if (values == null || values.isEmpty())
+                    return null;
+                if (values.size() > 1) {
+                    throw new WebApplicationException(Response.status(Status.BAD_REQUEST).
+                            entity(a.value() + " cannot contain multiple values").build());
+                }
+
+                return DateTime.parse(values.get(0));
+            }
+        };
+    }
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/JodaLocalDateProvider.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/JodaLocalDateProvider.mustache
new file mode 100644
index 00000000000..7bd4027e63d
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/JodaLocalDateProvider.mustache
@@ -0,0 +1,44 @@
+package {{apiPackage}};
+
+import com.sun.jersey.core.spi.component.ComponentContext;
+import com.sun.jersey.spi.inject.Injectable;
+import com.sun.jersey.spi.inject.PerRequestTypeInjectableProvider;
+
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+import javax.ws.rs.core.UriInfo;
+import javax.ws.rs.ext.Provider;
+import org.joda.time.LocalDate;
+import java.util.List;
+
+@Provider
+public class JodaLocalDateProvider extends PerRequestTypeInjectableProvider<QueryParam, LocalDate> {
+    private final UriInfo uriInfo;
+
+    public JodaLocalDateProvider(@Context UriInfo uriInfo) {
+        super(LocalDate.class);
+        this.uriInfo = uriInfo;
+    }
+
+    @Override
+    public Injectable<LocalDate> getInjectable(final ComponentContext cc, final QueryParam a) {
+        return new Injectable<LocalDate>() {
+            @Override
+            public LocalDate getValue() {
+                final List<String> values = uriInfo.getQueryParameters().get(a.value());
+
+                if (values == null || values.isEmpty())
+                    return null;
+                if (values.size() > 1) {
+                    throw new WebApplicationException(Response.status(Status.BAD_REQUEST).
+                            entity(a.value() + " cannot contain multiple values").build());
+                }
+
+                return LocalDate.parse(values.get(0));
+            }
+        };
+    }
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/LocalDateProvider.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/LocalDateProvider.mustache
new file mode 100644
index 00000000000..8c4cd4cbd15
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/LocalDateProvider.mustache
@@ -0,0 +1,44 @@
+package {{apiPackage}};
+
+import com.sun.jersey.core.spi.component.ComponentContext;
+import com.sun.jersey.spi.inject.Injectable;
+import com.sun.jersey.spi.inject.PerRequestTypeInjectableProvider;
+
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+import javax.ws.rs.core.UriInfo;
+import javax.ws.rs.ext.Provider;
+import java.time.LocalDate;
+import java.util.List;
+
+@Provider
+public class LocalDateProvider extends PerRequestTypeInjectableProvider<QueryParam, LocalDate> {
+    private final UriInfo uriInfo;
+
+    public LocalDateProvider(@Context UriInfo uriInfo) {
+        super(LocalDate.class);
+        this.uriInfo = uriInfo;
+    }
+
+    @Override
+    public Injectable<LocalDate> getInjectable(final ComponentContext cc, final QueryParam a) {
+        return new Injectable<LocalDate>() {
+            @Override
+            public LocalDate getValue() {
+                final List<String> values = uriInfo.getQueryParameters().get(a.value());
+
+                if (values == null || values.isEmpty())
+                    return null;
+                if (values.size() > 1) {
+                    throw new WebApplicationException(Response.status(Status.BAD_REQUEST).
+                            entity(a.value() + " cannot contain multiple values").build());
+                }
+
+                return LocalDate.parse(values.get(0));
+            }
+        };
+    }
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/LocalDateTimeProvider.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/LocalDateTimeProvider.mustache
new file mode 100644
index 00000000000..93bb6f19d50
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/LocalDateTimeProvider.mustache
@@ -0,0 +1,44 @@
+package {{apiPackage}};
+
+import com.sun.jersey.core.spi.component.ComponentContext;
+import com.sun.jersey.spi.inject.Injectable;
+import com.sun.jersey.spi.inject.PerRequestTypeInjectableProvider;
+
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+import javax.ws.rs.core.UriInfo;
+import javax.ws.rs.ext.Provider;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Provider
+public class LocalDateTimeProvider extends PerRequestTypeInjectableProvider<QueryParam, LocalDateTime> {
+    private final UriInfo uriInfo;
+
+    public LocalDateTimeProvider(@Context UriInfo uriInfo) {
+        super(LocalDateTime.class);
+        this.uriInfo = uriInfo;
+    }
+
+    @Override
+    public Injectable<LocalDateTime> getInjectable(final ComponentContext cc, final QueryParam a) {
+        return new Injectable<LocalDateTime>() {
+            @Override
+            public LocalDateTime getValue() {
+                final List<String> values = uriInfo.getQueryParameters().get(a.value());
+
+                if (values == null || values.isEmpty())
+                    return null;
+                if (values.size() > 1) {
+                    throw new WebApplicationException(Response.status(Status.BAD_REQUEST).
+                            entity(a.value() + " cannot contain multiple values").build());
+                }
+
+                return LocalDateTime.parse(values.get(0));
+            }
+        };
+    }
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/NotFoundException.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/NotFoundException.mustache
new file mode 100644
index 00000000000..40c25c5ea5c
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/NotFoundException.mustache
@@ -0,0 +1,10 @@
+package {{apiPackage}};
+
+{{>generatedAnnotation}}
+public class NotFoundException extends ApiException {
+    private int code;
+    public NotFoundException (int code, String msg) {
+        super(code, msg);
+        this.code = code;
+    }
+}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/README.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/README.mustache
new file mode 100644
index 00000000000..808f690a496
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/README.mustache
@@ -0,0 +1,23 @@
+# Swagger Jersey 2 generated server
+
+## Overview
+This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project. By using the 
+[OpenAPI-Spec](https://github.com/swagger-api/swagger-core/wiki) from a remote server, you can easily generate a server stub.  This
+is an example of building a swagger-enabled JAX-RS server.
+
+This example uses the [JAX-RS](https://jax-rs-spec.java.net/) framework.
+
+To run the server, please execute the following:
+
+```
+mvn clean package jetty:run
+```
+
+You can then view the swagger listing here:
+
+```
+http://localhost:{{serverPort}}{{contextPath}}/swagger.json
+```
+
+Note that if you have configured the `host` to be something other than localhost, the calls through
+swagger-ui will be directed to that host and not localhost!
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/StringUtil.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/StringUtil.mustache
new file mode 100644
index 00000000000..073966b0c21
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/StringUtil.mustache
@@ -0,0 +1,42 @@
+package {{invokerPackage}};
+
+{{>generatedAnnotation}}
+public class StringUtil {
+  /**
+   * Check if the given array contains the given value (with case-insensitive comparison).
+   *
+   * @param array The array
+   * @param value The value to search
+   * @return true if the array contains the value
+   */
+  public static boolean containsIgnoreCase(String[] array, String value) {
+    for (String str : array) {
+      if (value == null && str == null) return true;
+      if (value != null && value.equalsIgnoreCase(str)) return true;
+    }
+    return false;
+  }
+
+  /**
+   * Join an array of strings with the given separator.
+   * <p>
+   * Note: This might be replaced by utility method from commons-lang or guava someday
+   * if one of those libraries is added as dependency.
+   * </p>
+   *
+   * @param array     The array of strings
+   * @param separator The separator
+   * @return the resulting string
+   */
+  public static String join(String[] array, String separator) {
+    int len = array.length;
+    if (len == 0) return "";
+
+    StringBuilder out = new StringBuilder();
+    out.append(array[0]);
+    for (int i = 1; i < len; i++) {
+      out.append(separator).append(array[i]);
+    }
+    return out.toString();
+  }
+}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/allowableValues.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/allowableValues.mustache
new file mode 100644
index 00000000000..a48256d027a
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/allowableValues.mustache
@@ -0,0 +1 @@
+{{#allowableValues}}allowableValues="{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{/values}}{{^values}}range=[{{#min}}{{.}}{{/min}}{{^min}}-infinity{{/min}}, {{#max}}{{.}}{{/max}}{{^max}}infinity{{/max}}]{{/values}}"{{/allowableValues}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/api.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/api.mustache
new file mode 100644
index 00000000000..4200f4aca6e
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/api.mustache
@@ -0,0 +1,55 @@
+package {{package}};
+
+import {{modelPackage}}.*;
+import {{package}}.{{classname}}Service;
+import {{package}}.factories.{{classname}}ServiceFactory;
+
+import io.swagger.annotations.ApiParam;
+
+{{#imports}}import {{import}};
+{{/imports}}
+
+import java.util.List;
+import {{package}}.NotFoundException;
+
+import java.io.InputStream;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataParam;
+
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.*;
+
+@Path("/{{baseName}}")
+{{#hasConsumes}}@Consumes({ {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}
+{{#hasProduces}}@Produces({ {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
+@io.swagger.annotations.Api(description = "the {{baseName}} API")
+{{>generatedAnnotation}}
+{{#operations}}
+public class {{classname}}  {
+   private final {{classname}}Service delegate = {{classname}}ServiceFactory.get{{classname}}();
+
+{{#operation}}
+    @{{httpMethod}}
+    {{#subresourceOperation}}@Path("{{path}}"){{/subresourceOperation}}
+    {{#hasConsumes}}@Consumes({ {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}
+    {{#hasProduces}}@Produces({ {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
+    @io.swagger.annotations.ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", response = {{{returnType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}{{#hasAuthMethods}}, authorizations = {
+        {{#authMethods}}@io.swagger.annotations.Authorization(value = "{{name}}"{{#isOAuth}}, scopes = {
+            {{#scopes}}@io.swagger.annotations.AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}},
+            {{/hasMore}}{{/scopes}}
+        }{{/isOAuth}}){{#hasMore}},
+        {{/hasMore}}{{/authMethods}}
+    }{{/hasAuthMethods}}, tags={ {{#vendorExtensions.x-tags}}"{{tag}}",{{/vendorExtensions.x-tags}} })
+    @io.swagger.annotations.ApiResponses(value = { {{#responses}}
+        @io.swagger.annotations.ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{returnType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}){{#hasMore}},
+        {{/hasMore}}{{/responses}} })
+    public Response {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}},{{/allParams}}@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.{{nickname}}({{#allParams}}{{#isFile}}inputStream, fileDetail{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}},{{/allParams}}securityContext);
+    }
+{{/operation}}
+}
+{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/apiService.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/apiService.mustache
new file mode 100644
index 00000000000..50e00e24497
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/apiService.mustache
@@ -0,0 +1,26 @@
+package {{package}};
+
+import {{package}}.*;
+import {{modelPackage}}.*;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+
+{{#imports}}import {{import}};
+{{/imports}}
+
+import java.util.List;
+import {{package}}.NotFoundException;
+
+import java.io.InputStream;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+
+{{>generatedAnnotation}}
+{{#operations}}
+public abstract class {{classname}}Service {
+    {{#operation}}
+    public abstract Response {{nickname}}({{#allParams}}{{>serviceQueryParams}}{{>servicePathParams}}{{>serviceHeaderParams}}{{>serviceBodyParams}}{{>serviceFormParams}},{{/allParams}}SecurityContext securityContext) throws NotFoundException;
+    {{/operation}}
+}
+{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/apiServiceFactory.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/apiServiceFactory.mustache
new file mode 100644
index 00000000000..0f321034999
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/apiServiceFactory.mustache
@@ -0,0 +1,13 @@
+package {{package}}.factories;
+
+import {{package}}.{{classname}}Service;
+import {{package}}.impl.{{classname}}ServiceImpl;
+
+{{>generatedAnnotation}}
+public class {{classname}}ServiceFactory {
+    private final static {{classname}}Service service = new {{classname}}ServiceImpl();
+
+    public static {{classname}}Service get{{classname}}() {
+        return service;
+    }
+}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/apiServiceImpl.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/apiServiceImpl.mustache
new file mode 100644
index 00000000000..3d3f4c6cbf7
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/apiServiceImpl.mustache
@@ -0,0 +1,30 @@
+package {{package}}.impl;
+
+import {{package}}.*;
+import {{modelPackage}}.*;
+
+{{#imports}}import {{import}};
+{{/imports}}
+
+import java.util.List;
+import {{package}}.NotFoundException;
+
+import java.io.InputStream;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+
+{{>generatedAnnotation}}
+{{#operations}}
+public class {{classname}}ServiceImpl extends {{classname}}Service {
+    {{#operation}}
+    @Override
+    public Response {{nickname}}({{#allParams}}{{>serviceQueryParams}}{{>servicePathParams}}{{>serviceHeaderParams}}{{>serviceBodyParams}}{{>serviceFormParams}}, {{/allParams}}SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    {{/operation}}
+}
+{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/bodyParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/bodyParams.mustache
new file mode 100644
index 00000000000..2b28441d3d0
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/bodyParams.mustache
@@ -0,0 +1 @@
+{{#isBodyParam}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) {{{dataType}}} {{paramName}}{{/isBodyParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/bootstrap.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/bootstrap.mustache
new file mode 100644
index 00000000000..f7e8efff419
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/bootstrap.mustache
@@ -0,0 +1,31 @@
+package {{apiPackage}};
+
+import io.swagger.jaxrs.config.SwaggerContextService;
+import io.swagger.models.*;
+
+import io.swagger.models.auth.*;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+
+public class Bootstrap extends HttpServlet {
+  @Override
+  public void init(ServletConfig config) throws ServletException {
+    Info info = new Info()
+      .title("{{title}}")
+      .description("{{{appDescription}}}")
+      .termsOfService("{{termsOfService}}")
+      .contact(new Contact()
+        .email("{{infoEmail}}"))
+      .license(new License()
+        .name("{{licenseInfo}}")
+        .url("{{licenseUrl}}"));
+
+    ServletContext context = config.getServletContext();
+    Swagger swagger = new Swagger().info(info);
+
+    new SwaggerContextService().withServletConfig(config).updateSwagger(swagger);
+  }
+}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/enumClass.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/enumClass.mustache
new file mode 100644
index 00000000000..6010e26704f
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/enumClass.mustache
@@ -0,0 +1,17 @@
+
+  public enum {{{datatypeWithEnum}}} {
+    {{#allowableValues}}{{#enumVars}}{{{name}}}("{{{value}}}"){{^-last}},
+    {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}}
+
+    private String value;
+
+    {{{datatypeWithEnum}}}(String value) {
+      this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+      return value;
+    }
+  }
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/enumOuterClass.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/enumOuterClass.mustache
new file mode 100644
index 00000000000..7aea7b92f22
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/enumOuterClass.mustache
@@ -0,0 +1,3 @@
+public enum {{classname}} {
+    {{#allowableValues}}{{.}}{{^-last}}, {{/-last}}{{/allowableValues}}
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/formParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/formParams.mustache
new file mode 100644
index 00000000000..993d47bb562
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/formParams.mustache
@@ -0,0 +1,3 @@
+{{#isFormParam}}{{#notFile}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}){{#vendorExtensions.x-multipart}}@FormDataParam("{{paramName}}")  {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{^vendorExtensions.x-multipart}}@FormParam("{{paramName}}")  {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{/notFile}}{{#isFile}}
+            @FormDataParam("file") InputStream inputStream,
+            @FormDataParam("file") FormDataContentDisposition fileDetail{{/isFile}}{{/isFormParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/generatedAnnotation.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/generatedAnnotation.mustache
new file mode 100644
index 00000000000..a47b6faa85b
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/generatedAnnotation.mustache
@@ -0,0 +1 @@
+{{^hideGenerationTimestamp}}@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}"){{/hideGenerationTimestamp}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/headerParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/headerParams.mustache
new file mode 100644
index 00000000000..1360d796826
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/headerParams.mustache
@@ -0,0 +1 @@
+{{#isHeaderParam}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}})@HeaderParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isHeaderParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/jacksonJsonProvider.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/jacksonJsonProvider.mustache
new file mode 100644
index 00000000000..5efcb449bb5
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/jacksonJsonProvider.mustache
@@ -0,0 +1,19 @@
+package {{apiPackage}};
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
+import io.swagger.util.Json;
+
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@Produces({MediaType.APPLICATION_JSON})
+public class JacksonJsonProvider extends JacksonJaxbJsonProvider {
+    private static ObjectMapper commonMapper = Json.mapper();
+
+    public JacksonJsonProvider() {
+        super.setMapper(commonMapper);
+    }
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/model.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/model.mustache
new file mode 100644
index 00000000000..b9512d2b83c
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/model.mustache
@@ -0,0 +1,16 @@
+package {{package}};
+
+import java.util.Objects;
+{{#imports}}import {{import}};
+{{/imports}}
+
+{{#serializableModel}}import java.io.Serializable;{{/serializableModel}}
+{{#models}}
+{{#model}}{{#description}}
+/**
+ * {{description}}
+ **/{{/description}}
+{{#isEnum}}{{>enumOuterClass}}{{/isEnum}}
+{{^isEnum}}{{>pojo}}{{/isEnum}}
+{{/model}}
+{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/pathParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/pathParams.mustache
new file mode 100644
index 00000000000..8d80210b4b4
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/pathParams.mustache
@@ -0,0 +1 @@
+{{#isPathParam}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @PathParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isPathParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/pojo.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/pojo.mustache
new file mode 100644
index 00000000000..58bfed16381
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/pojo.mustache
@@ -0,0 +1,73 @@
+{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}
+{{>generatedAnnotation}}
+public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
+  {{#vars}}{{#isEnum}}
+
+{{>enumClass}}{{/isEnum}}{{#items.isEnum}}{{#items}}
+
+{{>enumClass}}{{/items}}{{/items.isEnum}}
+  private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/vars}}
+
+  {{#vars}}
+  /**{{#description}}
+   * {{{description}}}{{/description}}{{#minimum}}
+   * minimum: {{minimum}}{{/minimum}}{{#maximum}}
+   * maximum: {{maximum}}{{/maximum}}
+   **/
+  public {{classname}} {{name}}({{{datatypeWithEnum}}} {{name}}) {
+    this.{{name}} = {{name}};
+    return this;
+  }
+
+  {{#vendorExtensions.extraAnnotation}}{{vendorExtensions.extraAnnotation}}{{/vendorExtensions.extraAnnotation}}
+  @ApiModelProperty({{#example}}example = "{{example}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
+  @JsonProperty("{{baseName}}")
+  public {{{datatypeWithEnum}}} {{getter}}() {
+    return {{name}};
+  }
+  public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {
+    this.{{name}} = {{name}};
+  }
+
+  {{/vars}}
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    {{classname}} {{classVarName}} = ({{classname}}) o;{{#hasVars}}
+    return {{#vars}}Objects.equals({{name}}, {{classVarName}}.{{name}}){{#hasMore}} &&
+        {{/hasMore}}{{^hasMore}};{{/hasMore}}{{/vars}}{{/hasVars}}{{^hasVars}}
+    return true;{{/hasVars}}
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash({{#vars}}{{name}}{{#hasMore}}, {{/hasMore}}{{/vars}});
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class {{classname}} {\n");
+    {{#parent}}sb.append("    ").append(toIndentedString(super.toString())).append("\n");{{/parent}}
+    {{#vars}}sb.append("    {{name}}: ").append(toIndentedString({{name}})).append("\n");
+    {{/vars}}sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/pom.mustache
new file mode 100644
index 00000000000..a2f59b53fe7
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/pom.mustache
@@ -0,0 +1,145 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>{{groupId}}</groupId>
+  <artifactId>{{artifactId}}</artifactId>
+  <packaging>jar</packaging>
+  <name>{{artifactId}}</name>
+  <version>{{artifactVersion}}</version>
+  <build>
+    <sourceDirectory>src/main/java</sourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.1.1</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <version>2.6</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-maven-plugin</artifactId>
+        <version>${jetty-version}</version>
+        <configuration>
+          <webApp>
+            <contextPath>/</contextPath>
+          </webApp>
+          <webAppSourceDirectory>target/${project.artifactId}-${project.version}</webAppSourceDirectory>
+          <stopPort>8079</stopPort>
+          <stopKey>stopit</stopKey>
+          <httpConnector>
+            <port>{{serverPort}}</port>
+            <idleTimeout>60000</idleTimeout>
+          </httpConnector>
+        </configuration>
+        <executions>
+          <execution>
+            <id>start-jetty</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>start</goal>
+            </goals>
+            <configuration>
+              <scanIntervalSeconds>0</scanIntervalSeconds>
+              <daemon>true</daemon>
+            </configuration>
+          </execution>
+          <execution>
+            <id>stop-jetty</id>
+            <phase>post-integration-test</phase>
+            <goals>
+              <goal>stop</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.9.1</version>
+        <executions>
+          <execution>
+            <id>add-source</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>src/gen/java</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>io.swagger</groupId>
+      <artifactId>swagger-jersey2-jaxrs</artifactId>
+      <scope>compile</scope>
+      <version>${swagger-core-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>${logback-version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+      <version>${logback-version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit-version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>${servlet-api-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.containers</groupId>
+      <artifactId>jersey-container-servlet-core</artifactId>
+      <version>${jersey2-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.media</groupId>
+      <artifactId>jersey-media-multipart</artifactId>
+      <version>${jersey2-version}</version>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <id>sonatype-snapshots</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+  <properties>
+    <swagger-core-version>1.5.8</swagger-core-version>
+    <jetty-version>9.2.9.v20150224</jetty-version>
+    <jersey2-version>2.6</jersey2-version>
+    <slf4j-version>1.6.3</slf4j-version>
+    <junit-version>4.8.1</junit-version>
+    <logback-version>1.0.1</logback-version>
+    <servlet-api-version>2.5</servlet-api-version>
+  </properties>
+</project>
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/project/build.properties b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/project/build.properties
new file mode 100644
index 00000000000..a8c2f849be3
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/project/build.properties
@@ -0,0 +1 @@
+sbt.version=0.12.0
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/project/plugins.sbt b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/project/plugins.sbt
new file mode 100644
index 00000000000..713b7f3e993
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/project/plugins.sbt
@@ -0,0 +1,9 @@
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.8.4")
+
+libraryDependencies <+= sbtVersion(v => v match {
+  case "0.11.0" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.0-0.2.8"
+  case "0.11.1" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.1-0.2.10"
+  case "0.11.2" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.2-0.2.11"
+  case "0.11.3" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.3-0.2.11.1"
+  case x if (x.startsWith("0.12")) => "com.github.siasia" %% "xsbt-web-plugin" % "0.12.0-0.2.11.1"
+})
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/queryParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/queryParams.mustache
new file mode 100644
index 00000000000..9055e6f16dc
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/queryParams.mustache
@@ -0,0 +1 @@
+{{#isQueryParam}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}){{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} @QueryParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/returnTypes.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/returnTypes.mustache
new file mode 100644
index 00000000000..c8f7a56938a
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/returnTypes.mustache
@@ -0,0 +1 @@
+{{#returnContainer}}{{#isMapContainer}}Map<String, {{{returnType}}}>{{/isMapContainer}}{{#isListContainer}}List<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/serviceBodyParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/serviceBodyParams.mustache
new file mode 100644
index 00000000000..c7d1abfe527
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/serviceBodyParams.mustache
@@ -0,0 +1 @@
+{{#isBodyParam}}{{{dataType}}} {{paramName}}{{/isBodyParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/serviceFormParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/serviceFormParams.mustache
new file mode 100644
index 00000000000..759335ba9ce
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/serviceFormParams.mustache
@@ -0,0 +1 @@
+{{#isFormParam}}{{#notFile}}{{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}InputStream inputStream, FormDataContentDisposition fileDetail{{/isFile}}{{/isFormParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/serviceHeaderParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/serviceHeaderParams.mustache
new file mode 100644
index 00000000000..bd03573d196
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/serviceHeaderParams.mustache
@@ -0,0 +1 @@
+{{#isHeaderParam}}{{{dataType}}} {{paramName}}{{/isHeaderParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/servicePathParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/servicePathParams.mustache
new file mode 100644
index 00000000000..6829cf8c7a6
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/servicePathParams.mustache
@@ -0,0 +1 @@
+{{#isPathParam}}{{{dataType}}} {{paramName}}{{/isPathParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/serviceQueryParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/serviceQueryParams.mustache
new file mode 100644
index 00000000000..ff79730471d
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/serviceQueryParams.mustache
@@ -0,0 +1 @@
+{{#isQueryParam}}{{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/web.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/web.mustache
new file mode 100644
index 00000000000..520456fb128
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/web.mustache
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+  xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee    http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+    <servlet>
+        <servlet-name>jersey</servlet-name>
+        <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
+        <init-param>
+            <param-name>jersey.config.server.provider.packages</param-name>
+            <param-value>
+                io.swagger.jaxrs.listing,
+                io.swagger.sample.resource,
+                {{apiPackage}}
+            </param-value>
+        </init-param>
+        <init-param>
+            <param-name>jersey.config.server.provider.classnames</param-name>
+            <param-value>org.glassfish.jersey.media.multipart.MultiPartFeature</param-value>
+        </init-param>
+        <init-param>
+            <param-name>jersey.config.server.wadl.disableWadl</param-name>
+            <param-value>true</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>Jersey2Config</servlet-name>
+        <servlet-class>io.swagger.jersey.config.JerseyJaxrsConfig</servlet-class>
+        <init-param>
+            <param-name>api.version</param-name>
+            <param-value>1.0.0</param-value>
+        </init-param>
+        <init-param>
+            <param-name>swagger.api.title</param-name>
+            <param-value>{{{title}}}</param-value>
+        </init-param>
+        <init-param>
+            <param-name>swagger.api.basepath</param-name>
+            <param-value>{{basePath}}</param-value>
+        </init-param>
+
+        <load-on-startup>2</load-on-startup>
+    </servlet>
+    <servlet>
+        <servlet-name>Bootstrap</servlet-name>
+        <servlet-class>{{apiPackage}}.Bootstrap</servlet-class>
+        <load-on-startup>2</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>jersey</servlet-name>
+        <url-pattern>{{contextPath}}/*</url-pattern>
+    </servlet-mapping>
+    <filter>
+        <filter-name>ApiOriginFilter</filter-name>
+        <filter-class>{{apiPackage}}.ApiOriginFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>ApiOriginFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+</web-app>
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/ApiException.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/ApiException.mustache
new file mode 100644
index 00000000000..11b4036b832
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/ApiException.mustache
@@ -0,0 +1,10 @@
+package {{apiPackage}};
+
+{{>generatedAnnotation}}
+public class ApiException extends Exception{
+	private int code;
+	public ApiException (int code, String msg) {
+		super(msg);
+		this.code = code;
+	}
+}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/ApiOriginFilter.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/ApiOriginFilter.mustache
new file mode 100644
index 00000000000..a1e5a678fe1
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/ApiOriginFilter.mustache
@@ -0,0 +1,22 @@
+package {{apiPackage}};
+
+import java.io.IOException;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletResponse;
+
+{{>generatedAnnotation}}
+public class ApiOriginFilter implements javax.servlet.Filter {
+	public void doFilter(ServletRequest request, ServletResponse response,
+			FilterChain chain) throws IOException, ServletException {
+		HttpServletResponse res = (HttpServletResponse) response;
+		res.addHeader("Access-Control-Allow-Origin", "*");
+		res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT");
+		res.addHeader("Access-Control-Allow-Headers", "Content-Type");
+		chain.doFilter(request, response);
+	}
+
+	public void destroy() {}
+
+	public void init(FilterConfig filterConfig) throws ServletException {}
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/ApiResponseMessage.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/ApiResponseMessage.mustache
new file mode 100644
index 00000000000..2b9a2b1f8c5
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/ApiResponseMessage.mustache
@@ -0,0 +1,69 @@
+package {{apiPackage}};
+
+import javax.xml.bind.annotation.XmlTransient;
+
+@javax.xml.bind.annotation.XmlRootElement
+{{>generatedAnnotation}}
+public class ApiResponseMessage {
+	public static final int ERROR = 1;
+	public static final int WARNING = 2;
+	public static final int INFO = 3;
+	public static final int OK = 4;
+	public static final int TOO_BUSY = 5;
+
+	int code;
+	String type;
+	String message;
+	
+	public ApiResponseMessage(){}
+	
+	public ApiResponseMessage(int code, String message){
+		this.code = code;
+		switch(code){
+		case ERROR:
+			setType("error");
+			break;
+		case WARNING:
+			setType("warning");
+			break;
+		case INFO:
+			setType("info");
+			break;
+		case OK:
+			setType("ok");
+			break;
+		case TOO_BUSY:
+			setType("too busy");
+			break;
+		default:
+			setType("unknown");
+			break;
+		}
+		this.message = message;
+	}
+
+	@XmlTransient
+	public int getCode() {
+		return code;
+	}
+
+	public void setCode(int code) {
+		this.code = code;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/JacksonConfig.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/JacksonConfig.mustache
new file mode 100644
index 00000000000..f2caa6c8331
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/JacksonConfig.mustache
@@ -0,0 +1,47 @@
+package {{invokerPackage}};
+
+import com.fasterxml.jackson.core.JsonGenerationException;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import com.fasterxml.jackson.datatype.joda.JodaModule;
+import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
+import org.joda.time.format.ISODateTimeFormat;
+
+import javax.ws.rs.ext.ContextResolver;
+import javax.ws.rs.ext.Provider;
+import java.io.IOException;
+
+@Provider
+public class JacksonConfig implements ContextResolver<ObjectMapper> {
+    private final ObjectMapper objectMapper;
+
+    public JacksonConfig() throws Exception {
+
+        objectMapper = new ObjectMapper();
+        objectMapper.registerModule(new JodaModule() {
+            {
+                addSerializer(DateTime.class, new StdSerializer<DateTime>(DateTime.class) {
+                    @Override
+                    public void serialize(DateTime value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonGenerationException {
+                        jgen.writeString(ISODateTimeFormat.dateTimeNoMillis().print(value));
+                    }
+                });
+                addSerializer(LocalDate.class, new StdSerializer<LocalDate>(LocalDate.class) {
+                    @Override
+                    public void serialize(LocalDate value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonGenerationException {
+                        jgen.writeString(ISODateTimeFormat.date().print(value));
+                    }
+                });
+
+            }
+        });
+    }
+
+    @Override
+    public ObjectMapper getContext(Class<?> arg0) {
+        return objectMapper;
+    }
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/JodaDateTimeProvider.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/JodaDateTimeProvider.mustache
new file mode 100644
index 00000000000..8010eb85f93
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/JodaDateTimeProvider.mustache
@@ -0,0 +1,42 @@
+package {{apiPackage}};
+
+import org.joda.time.DateTime;
+import javax.ws.rs.ext.ParamConverter;
+import javax.ws.rs.ext.ParamConverterProvider;
+import javax.ws.rs.ext.Provider;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Response;
+
+
+@Provider
+public class JodaDateTimeProvider implements ParamConverterProvider {
+
+    public static class JodaDateTimeConverter implements ParamConverter<DateTime> {
+
+        @Override
+        public DateTime fromString(String string) {
+            try {
+                DateTime dateTime = DateTime.parse(string);
+                return dateTime;
+            } catch (Exception e) {
+                throw new WebApplicationException(Response.status(Response.Status.BAD_REQUEST).
+                entity(string + " must be valid DateTime").build());
+            }
+        }
+
+        @Override
+        public String toString(DateTime t) {
+            return t.toString();
+        }
+    }
+
+    @Override
+    public <T> ParamConverter<T> getConverter(Class<T> type, Type type1, Annotation[] antns) {
+        if (DateTime.class.equals(type)) {
+            return (ParamConverter<T>) new JodaDateTimeConverter();
+        }
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/JodaLocalDateProvider.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/JodaLocalDateProvider.mustache
new file mode 100644
index 00000000000..6227bf6df27
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/JodaLocalDateProvider.mustache
@@ -0,0 +1,42 @@
+package {{apiPackage}};
+
+import org.joda.time.LocalDate;
+import javax.ws.rs.ext.ParamConverter;
+import javax.ws.rs.ext.ParamConverterProvider;
+import javax.ws.rs.ext.Provider;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Response;
+
+
+@Provider
+public class JodaLocalDateProvider implements ParamConverterProvider {
+
+    public static class JodaLocalDateConverter implements ParamConverter<LocalDate> {
+
+        @Override
+        public LocalDate fromString(String string) {
+            try {
+                LocalDate localDate = LocalDate.parse(string);
+                return localDate;
+            } catch (Exception e) {
+                throw new WebApplicationException(Response.status(Response.Status.BAD_REQUEST).
+                entity(string + " must be valid LocalDate").build());
+            }
+    }
+
+        @Override
+        public String toString(LocalDate t) {
+            return t.toString();
+        }
+    }
+
+    @Override
+    public <T> ParamConverter<T> getConverter(Class<T> type, Type type1, Annotation[] antns) {
+        if (LocalDate.class.equals(type)) {
+            return (ParamConverter<T>) new JodaLocalDateConverter();
+        }
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/LocalDateProvider.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/LocalDateProvider.mustache
new file mode 100644
index 00000000000..cf52264a1f4
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/LocalDateProvider.mustache
@@ -0,0 +1,34 @@
+package {{apiPackage}};
+
+import java.time.LocalDate;
+import javax.ws.rs.ext.ParamConverter;
+import javax.ws.rs.ext.ParamConverterProvider;
+import javax.ws.rs.ext.Provider;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
+@Provider
+public class LocalDateProvider implements ParamConverterProvider {
+
+    public static class LocalDateConverter implements ParamConverter<LocalDate> {
+
+        @Override
+        public LocalDate fromString(String string) {
+            LocalDate localDate = LocalDate.parse(string);
+            return localDate;
+        }
+
+        @Override
+        public String toString(LocalDate t) {
+            return t.toString();
+        }
+    }
+
+    @Override
+    public <T> ParamConverter<T> getConverter(Class<T> type, Type type1, Annotation[] antns) {
+        if (LocalDate.class.equals(type)) {
+            return (ParamConverter<T>) new LocalDateConverter();
+        }
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/LocalDateTimeProvider.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/LocalDateTimeProvider.mustache
new file mode 100644
index 00000000000..5ee7f06bf8e
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/LocalDateTimeProvider.mustache
@@ -0,0 +1,34 @@
+package {{apiPackage}};
+
+import java.time.LocalDateTime;
+import javax.ws.rs.ext.ParamConverter;
+import javax.ws.rs.ext.ParamConverterProvider;
+import javax.ws.rs.ext.Provider;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
+@Provider
+public class LocalDateTimeProvider implements ParamConverterProvider {
+
+    public static class LocalDateTimeConverter implements ParamConverter<LocalDateTime> {
+
+        @Override
+        public LocalDateTime fromString(String string) {
+            LocalDateTime localDateTime = LocalDateTime.parse(string);
+            return localDateTime;
+        }
+
+        @Override
+        public String toString(LocalDateTime t) {
+            return t.toString();
+        }
+    }
+
+    @Override
+    public <T> ParamConverter<T> getConverter(Class<T> type, Type type1, Annotation[] antns) {
+        if (LocalDateTime.class.equals(type)) {
+            return (ParamConverter<T>) new LocalDateTimeConverter();
+        }
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/NotFoundException.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/NotFoundException.mustache
new file mode 100644
index 00000000000..1bd5e207d7b
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/NotFoundException.mustache
@@ -0,0 +1,10 @@
+package {{apiPackage}};
+
+{{>generatedAnnotation}}
+public class NotFoundException extends ApiException {
+	private int code;
+	public NotFoundException (int code, String msg) {
+		super(code, msg);
+		this.code = code;
+	}
+}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/README.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/README.mustache
new file mode 100644
index 00000000000..3551b9e9914
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/README.mustache
@@ -0,0 +1,23 @@
+# Swagger generated server
+
+## Overview
+This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project. By using the 
+[OpenAPI-Spec](https://github.com/swagger-api/swagger-core/wiki) from a remote server, you can easily generate a server stub.  This
+is an example of building a swagger-enabled JAX-RS server.
+
+This example uses the [JAX-RS](https://jax-rs-spec.java.net/) framework.
+
+To run the server, please execute the following:
+
+```
+mvn clean package jetty:run
+```
+
+You can then view the swagger listing here:
+
+```
+http://localhost:{{serverPort}}{{contextPath}}/swagger.json
+```
+
+Note that if you have configured the `host` to be something other than localhost, the calls through
+swagger-ui will be directed to that host and not localhost!
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/RestApplication.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/RestApplication.mustache
new file mode 100644
index 00000000000..df9a31434b6
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/RestApplication.mustache
@@ -0,0 +1,9 @@
+package {{invokerPackage}};
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+@ApplicationPath("/")
+public class RestApplication extends Application {
+
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/StringUtil.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/StringUtil.mustache
new file mode 100644
index 00000000000..073966b0c21
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/StringUtil.mustache
@@ -0,0 +1,42 @@
+package {{invokerPackage}};
+
+{{>generatedAnnotation}}
+public class StringUtil {
+  /**
+   * Check if the given array contains the given value (with case-insensitive comparison).
+   *
+   * @param array The array
+   * @param value The value to search
+   * @return true if the array contains the value
+   */
+  public static boolean containsIgnoreCase(String[] array, String value) {
+    for (String str : array) {
+      if (value == null && str == null) return true;
+      if (value != null && value.equalsIgnoreCase(str)) return true;
+    }
+    return false;
+  }
+
+  /**
+   * Join an array of strings with the given separator.
+   * <p>
+   * Note: This might be replaced by utility method from commons-lang or guava someday
+   * if one of those libraries is added as dependency.
+   * </p>
+   *
+   * @param array     The array of strings
+   * @param separator The separator
+   * @return the resulting string
+   */
+  public static String join(String[] array, String separator) {
+    int len = array.length;
+    if (len == 0) return "";
+
+    StringBuilder out = new StringBuilder();
+    out.append(array[0]);
+    for (int i = 1; i < len; i++) {
+      out.append(separator).append(array[i]);
+    }
+    return out.toString();
+  }
+}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/allowableValues.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/allowableValues.mustache
new file mode 100644
index 00000000000..a48256d027a
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/allowableValues.mustache
@@ -0,0 +1 @@
+{{#allowableValues}}allowableValues="{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{/values}}{{^values}}range=[{{#min}}{{.}}{{/min}}{{^min}}-infinity{{/min}}, {{#max}}{{.}}{{/max}}{{^max}}infinity{{/max}}]{{/values}}"{{/allowableValues}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/api.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/api.mustache
new file mode 100644
index 00000000000..d83facaf646
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/api.mustache
@@ -0,0 +1,40 @@
+package {{package}};
+
+import {{modelPackage}}.*;
+import {{package}}.{{classname}}Service;
+import {{package}}.factories.{{classname}}ServiceFactory;
+
+{{#imports}}import {{import}};
+{{/imports}}
+
+import java.util.List;
+import {{package}}.NotFoundException;
+
+import java.io.InputStream;
+
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.*;
+{{#operations}}{{#operation}}{{#isMultipart}}import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput;
+{{/isMultipart}}{{/operation}}{{/operations}}
+@Path("/{{baseName}}")
+{{#hasConsumes}}@Consumes({ {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}
+{{#hasProduces}}@Produces({ {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
+{{>generatedAnnotation}}
+{{#operations}}
+public class {{classname}}  {
+   private final {{classname}}Service delegate = {{classname}}ServiceFactory.get{{classname}}();
+
+{{#operation}}
+    @{{httpMethod}}
+    {{#subresourceOperation}}@Path("{{path}}"){{/subresourceOperation}}
+    {{#hasConsumes}}@Consumes({ {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}
+    {{#hasProduces}}@Produces({ {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
+    public Response {{nickname}}({{#isMultipart}}MultipartFormDataInput input,{{/isMultipart}}{{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{^isMultipart}}{{>formParams}},{{/isMultipart}}{{#isMultipart}}{{^isFormParam}},{{/isFormParam}}{{/isMultipart}}{{/allParams}}@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.{{nickname}}({{#isMultipart}}input,{{/isMultipart}}{{#allParams}}{{^isMultipart}}{{paramName}},{{/isMultipart}}{{#isMultipart}}{{^isFormParam}}{{paramName}},{{/isFormParam}}{{/isMultipart}}{{/allParams}}securityContext);
+    }
+{{/operation}}
+}
+{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/apiService.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/apiService.mustache
new file mode 100644
index 00000000000..21915e68ebc
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/apiService.mustache
@@ -0,0 +1,27 @@
+package {{package}};
+
+import {{package}}.*;
+import {{modelPackage}}.*;
+{{#operations}}{{#operation}}{{#isMultipart}}import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput;
+{{/isMultipart}}{{/operation}}{{/operations}}
+
+{{#imports}}import {{import}};
+{{/imports}}
+
+import java.util.List;
+import {{package}}.NotFoundException;
+
+import java.io.InputStream;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+
+{{>generatedAnnotation}}
+{{#operations}}
+public abstract class {{classname}}Service {
+  {{#operation}}
+      public abstract Response {{nickname}}({{#isMultipart}}MultipartFormDataInput input,{{/isMultipart}}{{#allParams}}{{>serviceQueryParams}}{{>servicePathParams}}{{>serviceHeaderParams}}{{>serviceBodyParams}}{{^isMultipart}}{{>serviceFormParams}},{{/isMultipart}}{{#isMultipart}}{{^isFormParam}},{{/isFormParam}}{{/isMultipart}}{{/allParams}}SecurityContext securityContext)
+      throws NotFoundException;
+  {{/operation}}
+}
+{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/apiServiceFactory.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/apiServiceFactory.mustache
new file mode 100644
index 00000000000..1bb63bc0775
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/apiServiceFactory.mustache
@@ -0,0 +1,15 @@
+package {{package}}.factories;
+
+import {{package}}.{{classname}}Service;
+import {{package}}.impl.{{classname}}ServiceImpl;
+
+{{>generatedAnnotation}}
+public class {{classname}}ServiceFactory {
+
+   private final static {{classname}}Service service = new {{classname}}ServiceImpl();
+
+   public static {{classname}}Service get{{classname}}()
+   {
+      return service;
+   }
+}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/apiServiceImpl.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/apiServiceImpl.mustache
new file mode 100644
index 00000000000..bc7e896e4b0
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/apiServiceImpl.mustache
@@ -0,0 +1,31 @@
+package {{package}}.impl;
+
+import {{package}}.*;
+import {{modelPackage}}.*;
+{{#operations}}{{#operation}}{{#isMultipart}}import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput;
+{{/isMultipart}}{{/operation}}{{/operations}}
+
+{{#imports}}import {{import}};
+{{/imports}}
+
+import java.util.List;
+import {{package}}.NotFoundException;
+
+import java.io.InputStream;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+
+{{>generatedAnnotation}}
+{{#operations}}
+public class {{classname}}ServiceImpl extends {{classname}}Service {
+  {{#operation}}
+      @Override
+      public Response {{nickname}}({{#isMultipart}}MultipartFormDataInput input,{{/isMultipart}}{{#allParams}}{{>serviceQueryParams}}{{>servicePathParams}}{{>serviceHeaderParams}}{{>serviceBodyParams}}{{^isMultipart}}{{>serviceFormParams}},{{/isMultipart}}{{#isMultipart}}{{^isFormParam}},{{/isFormParam}}{{/isMultipart}}{{/allParams}}SecurityContext securityContext)
+      throws NotFoundException {
+      // do some magic!
+      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+  }
+  {{/operation}}
+}
+{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/bodyParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/bodyParams.mustache
new file mode 100644
index 00000000000..bb1d6ff4ef0
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/bodyParams.mustache
@@ -0,0 +1 @@
+{{#isBodyParam}} {{{dataType}}} {{paramName}}{{/isBodyParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/enumClass.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/enumClass.mustache
new file mode 100644
index 00000000000..6010e26704f
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/enumClass.mustache
@@ -0,0 +1,17 @@
+
+  public enum {{{datatypeWithEnum}}} {
+    {{#allowableValues}}{{#enumVars}}{{{name}}}("{{{value}}}"){{^-last}},
+    {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}}
+
+    private String value;
+
+    {{{datatypeWithEnum}}}(String value) {
+      this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+      return value;
+    }
+  }
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/enumOuterClass.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/enumOuterClass.mustache
new file mode 100644
index 00000000000..7aea7b92f22
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/enumOuterClass.mustache
@@ -0,0 +1,3 @@
+public enum {{classname}} {
+    {{#allowableValues}}{{.}}{{^-last}}, {{/-last}}{{/allowableValues}}
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/formParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/formParams.mustache
new file mode 100644
index 00000000000..7494e6a00ad
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/formParams.mustache
@@ -0,0 +1 @@
+{{#isFormParam}}{{#notFile}}@FormParam("{{paramName}}")  {{{dataType}}} {{paramName}}{{/notFile}}{{/isFormParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/generatedAnnotation.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/generatedAnnotation.mustache
new file mode 100644
index 00000000000..49110fc1ad9
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/generatedAnnotation.mustache
@@ -0,0 +1 @@
+@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}")
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/gradle.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/gradle.mustache
new file mode 100644
index 00000000000..b5d7e2378ef
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/gradle.mustache
@@ -0,0 +1,32 @@
+apply plugin: 'war'
+
+project.version = "{{artifactVersion}}"
+project.group = "{{groupId}}"
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    providedCompile 'org.jboss.resteasy:resteasy-jaxrs:3.0.11.Final'
+    providedCompile 'org.jboss.resteasy:jaxrs-api:3.0.11.Final'
+    providedCompile 'org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final'
+    providedCompile 'org.jboss.resteasy:resteasy-multipart-provider:3.0.11.Final'
+    providedCompile 'javax.annotation:javax.annotation-api:1.2'
+    providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final'
+    compile         'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final'
+
+//    compile         'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.4.1'
+//    compile         'joda-time:joda-time:2.7'
+
+    testCompile     'junit:junit:4.12',
+                    'org.hamcrest:hamcrest-core:1.3'
+}
+
+sourceSets {
+    main {
+        java {
+            srcDir 'src/gen/java'
+        }
+    }
+}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/headerParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/headerParams.mustache
new file mode 100644
index 00000000000..25d690c90ed
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/headerParams.mustache
@@ -0,0 +1 @@
+{{#isHeaderParam}}@HeaderParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isHeaderParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/jboss-web.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/jboss-web.mustache
new file mode 100644
index 00000000000..788fc867d92
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/jboss-web.mustache
@@ -0,0 +1,3 @@
+<jboss-web>
+    <context-root>{{contextPath}}</context-root>
+</jboss-web>
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/model.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/model.mustache
new file mode 100644
index 00000000000..85d815a79c6
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/model.mustache
@@ -0,0 +1,17 @@
+package {{package}};
+
+import java.util.Objects;
+import java.util.ArrayList;
+{{#imports}}import {{import}};
+{{/imports}}
+
+{{#serializableModel}}import java.io.Serializable;{{/serializableModel}}
+{{#models}}
+{{#model}}{{#description}}
+/**
+ * {{description}}
+ **/{{/description}}
+{{#isEnum}}{{>enumOuterClass}}{{/isEnum}}
+{{^isEnum}}{{>pojo}}{{/isEnum}}
+{{/model}}
+{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pathParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pathParams.mustache
new file mode 100644
index 00000000000..39116c805cb
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pathParams.mustache
@@ -0,0 +1 @@
+{{#isPathParam}} @PathParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isPathParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pojo.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pojo.mustache
new file mode 100644
index 00000000000..63578d8bc73
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pojo.mustache
@@ -0,0 +1,66 @@
+{{>generatedAnnotation}}
+public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
+  {{#vars}}{{#isEnum}}
+
+{{>enumClass}}{{/isEnum}}{{#items.isEnum}}{{#items}}
+
+{{>enumClass}}{{/items}}{{/items.isEnum}}
+  private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/vars}}
+
+  {{#vars}}
+  /**{{#description}}
+   * {{{description}}}{{/description}}{{#minimum}}
+   * minimum: {{minimum}}{{/minimum}}{{#maximum}}
+   * maximum: {{maximum}}{{/maximum}}
+   **/
+  {{#vendorExtensions.extraAnnotation}}{{vendorExtensions.extraAnnotation}}{{/vendorExtensions.extraAnnotation}}
+  @JsonProperty("{{baseName}}")
+  public {{{datatypeWithEnum}}} {{getter}}() {
+    return {{name}};
+  }
+  public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {
+    this.{{name}} = {{name}};
+  }
+
+  {{/vars}}
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    {{classname}} {{classVarName}} = ({{classname}}) o;{{#hasVars}}
+    return {{#vars}}Objects.equals({{name}}, {{classVarName}}.{{name}}){{#hasMore}} &&
+        {{/hasMore}}{{^hasMore}};{{/hasMore}}{{/vars}}{{/hasVars}}{{^hasVars}}
+    return true;{{/hasVars}}
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash({{#vars}}{{name}}{{#hasMore}}, {{/hasMore}}{{/vars}});
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class {{classname}} {\n");
+    {{#parent}}sb.append("    ").append(toIndentedString(super.toString())).append("\n");{{/parent}}
+    {{#vars}}sb.append("    {{name}}: ").append(toIndentedString({{name}})).append("\n");
+    {{/vars}}sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache
new file mode 100644
index 00000000000..3373c53b2ce
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache
@@ -0,0 +1,155 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>{{groupId}}</groupId>
+    <artifactId>{{artifactId}}</artifactId>
+    <packaging>war</packaging>
+    <name>{{artifactId}}</name>
+    <version>{{artifactVersion}}</version>
+    <build>
+        <sourceDirectory>src/main/java</sourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.1.1</version>
+            </plugin>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.9.1</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>
+                                src/gen/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>${slf4j-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>${servlet-api-version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jaxrs</artifactId>
+            <version>${resteasy-version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>jaxrs-api</artifactId>
+            <version>${resteasy-version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-validator-provider-11</artifactId>
+            <version>${resteasy-version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-multipart-provider</artifactId>
+            <version>${resteasy-version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jackson2-provider</artifactId>
+            <version>${resteasy-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.2</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-joda</artifactId>
+            <version>2.4.1</version>
+        </dependency>
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>2.7</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>6.8.8</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>junit</artifactId>
+                    <groupId>junit</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>snakeyaml</artifactId>
+                    <groupId>org.yaml</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>bsh</artifactId>
+                    <groupId>org.beanshell</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+    <repositories>
+        <repository>
+            <id>sonatype-snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+    <properties>
+        <swagger-core-version>1.5.8</swagger-core-version>
+        <jetty-version>9.2.9.v20150224</jetty-version>
+        <resteasy-version>3.0.11.Final</resteasy-version>
+        <slf4j-version>1.6.3</slf4j-version>
+        <junit-version>4.8.1</junit-version>
+        <servlet-api-version>2.5</servlet-api-version>
+    </properties>
+</project>
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/queryParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/queryParams.mustache
new file mode 100644
index 00000000000..458b8de7c3b
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/queryParams.mustache
@@ -0,0 +1 @@
+{{#isQueryParam}} @QueryParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/returnTypes.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/returnTypes.mustache
new file mode 100644
index 00000000000..c8f7a56938a
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/returnTypes.mustache
@@ -0,0 +1 @@
+{{#returnContainer}}{{#isMapContainer}}Map<String, {{{returnType}}}>{{/isMapContainer}}{{#isListContainer}}List<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/serviceBodyParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/serviceBodyParams.mustache
new file mode 100644
index 00000000000..c7d1abfe527
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/serviceBodyParams.mustache
@@ -0,0 +1 @@
+{{#isBodyParam}}{{{dataType}}} {{paramName}}{{/isBodyParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/serviceFormParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/serviceFormParams.mustache
new file mode 100644
index 00000000000..e44ab167e8f
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/serviceFormParams.mustache
@@ -0,0 +1 @@
+{{#isFormParam}}{{#notFile}}{{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}FormDataContentDisposition fileDetail{{/isFile}}{{/isFormParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/serviceHeaderParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/serviceHeaderParams.mustache
new file mode 100644
index 00000000000..bd03573d196
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/serviceHeaderParams.mustache
@@ -0,0 +1 @@
+{{#isHeaderParam}}{{{dataType}}} {{paramName}}{{/isHeaderParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/servicePathParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/servicePathParams.mustache
new file mode 100644
index 00000000000..6829cf8c7a6
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/servicePathParams.mustache
@@ -0,0 +1 @@
+{{#isPathParam}}{{{dataType}}} {{paramName}}{{/isPathParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/serviceQueryParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/serviceQueryParams.mustache
new file mode 100644
index 00000000000..ff79730471d
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/serviceQueryParams.mustache
@@ -0,0 +1 @@
+{{#isQueryParam}}{{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/settingsGradle.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/settingsGradle.mustache
new file mode 100644
index 00000000000..b8fd6c4c41f
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/settingsGradle.mustache
@@ -0,0 +1 @@
+rootProject.name = "{{artifactId}}"
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/web.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/web.mustache
new file mode 100644
index 00000000000..6453a110a34
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/web.mustache
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+  xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee    http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+  <filter>
+    <filter-name>ApiOriginFilter</filter-name>
+    <filter-class>{{apiPackage}}.ApiOriginFilter</filter-class>
+  </filter>
+  <filter-mapping>
+    <filter-name>ApiOriginFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+</web-app>
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/api.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/api.mustache
index a882c006975..7560d5c0830 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/api.mustache
@@ -8,7 +8,6 @@ import {{modelPackage}}.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import io.swagger.annotations.Authorization;
 import io.swagger.annotations.AuthorizationScope;
@@ -44,8 +43,8 @@ public class {{classname}} {
       }{{/isOAuth}}){{#hasMore}},
     {{/hasMore}}{{/authMethods}}
   }{{/hasAuthMethods}})
-  @ApiResponses(value = { {{#responses}}
-    @ApiResponse(code = {{{code}}}, message = "{{{message}}}"){{#hasMore}},{{/hasMore}}{{/responses}} })
+  @io.swagger.annotations.ApiResponses(value = { {{#responses}}
+    @io.swagger.annotations.ApiResponse(code = {{{code}}}, message = "{{{message}}}"){{#hasMore}},{{/hasMore}}{{/responses}} })
   @RequestMapping(value = "{{path}}", 
     {{#hasProduces}}produces = { {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }, {{/hasProduces}}
     {{#hasConsumes}}consumes = { {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} },{{/hasConsumes}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/model.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/model.mustache
index d1a5e396e13..b39a599ae71 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/model.mustache
@@ -20,8 +20,12 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {
   public enum {{datatypeWithEnum}} {
     {{#allowableValues}}{{#values}} {{.}}, {{/values}}{{/allowableValues}}
   };
-  private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{^isEnum}}
-  private {{{datatype}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{/vars}}
+  {{/isEnum}}{{#items}}{{#isEnum}}
+  public enum {{datatypeWithEnum}} {
+    {{#allowableValues}}{{#values}} {{.}}, {{/values}}{{/allowableValues}}
+  };
+  {{/isEnum}}{{/items}}
+  private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/vars}}
 
   {{#vars}}
   /**{{#description}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom-j8-async.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom-j8-async.mustache
index 566a4c83d8d..257a4611db5 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom-j8-async.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom-j8-async.mustache
@@ -159,7 +159,7 @@
     </repository>
   </repositories>
   <properties>
-    <swagger-core-version>1.5.4</swagger-core-version>
+    <swagger-core-version>1.5.8</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey-version>1.13</jersey-version>
     <slf4j-version>1.6.3</slf4j-version>
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom.mustache
index c4a71c199ce..8cb969102e1 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom.mustache
@@ -75,31 +75,6 @@
       <artifactId>slf4j-log4j12</artifactId>
       <version>${slf4j-version}</version>
     </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-core</artifactId>
-      <version>${jersey-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-json</artifactId>
-      <version>${jersey-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-servlet</artifactId>
-      <version>${jersey-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey.contribs</groupId>
-      <artifactId>jersey-multipart</artifactId>
-      <version>${jersey-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-server</artifactId>
-      <version>${jersey-version}</version>
-    </dependency>
 
     <!--Spring dependencies -->
     <dependency>
@@ -142,22 +117,14 @@
       <version>${servlet-api-version}</version>
     </dependency>
   </dependencies>
-  <repositories>
-    <repository>
-      <id>jcenter-snapshots</id>
-      <name>jcenter</name>
-      <url>http://oss.jfrog.org/artifactory/oss-snapshot-local/</url>
-    </repository>
-  </repositories>
   <properties>
-    <swagger-core-version>1.5.4</swagger-core-version>
+    <swagger-core-version>1.5.8</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey-version>1.13</jersey-version>
     <slf4j-version>1.6.3</slf4j-version>
-    <scala-test-version>1.6.1</scala-test-version>
     <junit-version>4.8.1</junit-version>
     <servlet-api-version>2.5</servlet-api-version>
-    <springfox-version>2.0.4-SNAPSHOT</springfox-version>
-    <spring-version>4.0.9.RELEASE</spring-version>
+    <springfox-version>2.3.1</springfox-version>
+    <spring-version>4.1.8.RELEASE</spring-version>
   </properties>
 </project>
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/Javascript-Closure-Angular/api.mustache b/modules/swagger-codegen/src/main/resources/Javascript-Closure-Angular/api.mustache
new file mode 100644
index 00000000000..957add6753e
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Javascript-Closure-Angular/api.mustache
@@ -0,0 +1,124 @@
+/**
+ * @fileoverview AUTOMATICALLY GENERATED service for {{package}}.{{classname}}.
+ * Do not edit this file by hand or your changes will be lost next time it is
+ * generated.{{#appDescription}}
+ *
+ * {{ appDescription }}{{/appDescription}}{{#version}}
+ * Version: {{version}}{{/version}}{{#appContact}}
+ * Contact: {{appContact}}{{/appContact}}
+ * Generated at: {{generatedDate}}
+ * Generated by: {{generatorClass}}
+ */{{#licenseInfo}}
+/**
+ * @license {{licenseInfo}}{{#licenseUrl}}
+ * {{licenseUrl}}{{/licenseUrl}}
+ */
+{{/licenseInfo}}
+
+goog.provide('{{package}}.{{classname}}');
+
+{{#imports}}
+goog.require('{{import}}');
+{{/imports}}
+{{#operations}}
+
+/**
+{{#description}}
+ * {{&description}}
+{{/description}}
+ * @constructor
+ * @param {!angular.$http} $http
+ * @param {!Object} $httpParamSerializer
+ * @param {!angular.$injector} $injector
+ * @struct
+ */
+{{package}}.{{classname}} = function($http, $httpParamSerializer, $injector) {
+  /** @private {!string} */
+  this.basePath_ = $injector.has('{{classname}}BasePath') ?
+                   /** @type {!string} */ ($injector.get('{{classname}}BasePath')) :
+                   '{{basePath}}';
+
+  /** @private {!Object<string, string>} */
+  this.defaultHeaders_ = $injector.has('{{classname}}DefaultHeaders') ?
+                   /** @type {!Object<string, string>} */ (
+                       $injector.get('{{classname}}DefaultHeaders')) :
+                   {};
+
+  /** @private {!angular.$http} */
+  this.http_ = $http;
+
+  /** @private {!Object} */
+  this.httpParamSerializer_ = $injector.get('$httpParamSerializer');
+}
+{{package}}.{{classname}}.$inject = ['$http', '$httpParamSerializer', '$injector'];
+{{#operation}}
+
+/**
+ * {{summary}}
+ * {{notes}}{{#allParams}}
+ * @param {!{{{dataType}}}{{^required}}={{/required}}} {{^required}}opt_{{/required}}{{paramName}} {{description}}{{/allParams}}
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise{{#returnType}}<!{{{returnType}}}>{{/returnType}}}
+ */
+{{package}}.{{classname}}.prototype.{{nickname}} = function({{#allParams}}{{^required}}opt_{{/required}}{{paramName}}, {{/allParams}}opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '{{path}}'{{#pathParams}}
+      .replace('{' + '{{baseName}}' + '}', String({{^required}}opt_{{/required}}{{paramName}})){{/pathParams}};
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+{{#hasFormParams}}
+  /** @type {!Object} */
+  var formParams = {};
+
+{{/hasFormParams}}
+{{#allParams}}
+{{#required}}
+  // verify required parameter '{{^required}}opt_{{/required}}{{paramName}}' is set
+  if (!{{^required}}opt_{{/required}}{{paramName}}) {
+    throw new Error('Missing required parameter {{^required}}opt_{{/required}}{{paramName}} when calling {{nickname}}');
+  }
+{{/required}}
+{{/allParams}}
+{{#queryParams}}
+  if ({{^required}}opt_{{/required}}{{paramName}} !== undefined) {
+    queryParameters['{{baseName}}'] = {{^required}}opt_{{/required}}{{paramName}};
+  }
+
+{{/queryParams}}
+{{#headerParams}}
+  headerParams['{{baseName}}'] = {{^required}}opt_{{/required}}{{paramName}};
+
+{{/headerParams}}
+{{#hasFormParams}}
+  headerParams['Content-Type'] = 'application/x-www-form-urlencoded';
+
+{{/hasFormParams}}
+{{#formParams}}
+  formParams['{{baseName}}'] = {{^required}}opt_{{/required}}{{paramName}};
+
+{{/formParams}}
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: '{{httpMethod}}',
+    url: path,
+    json: {{#hasFormParams}}false{{/hasFormParams}}{{^hasFormParams}}true{{/hasFormParams}},
+    {{#bodyParam}}data: {{^required}}opt_{{/required}}{{paramName}},
+    {{/bodyParam}}
+    {{#hasFormParams}}data: this.httpParamSerializer_(formParams),
+    {{/hasFormParams}}
+    params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+{{/operation}}
+{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/Javascript-Closure-Angular/model.mustache b/modules/swagger-codegen/src/main/resources/Javascript-Closure-Angular/model.mustache
new file mode 100644
index 00000000000..81ec7591c87
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Javascript-Closure-Angular/model.mustache
@@ -0,0 +1,40 @@
+{{#models}}
+{{#model}}
+goog.provide('{{package}}.{{name}}');
+{{/model}}
+{{/models}}
+
+{{#models}}
+{{#model}}
+/**
+{{#description}}
+ * {{{description}}}
+{{/description}}
+ * @record
+ */
+{{package}}.{{classname}} = function() {}
+{{#vars}}
+
+/**
+{{#description}}
+ * {{{description}}}
+{{/description}}
+{{! Explicitly force types to be non-nullable using !. This is redundant but valid }}
+ * @type {!{{{datatype}}}}
+ * @export
+ */
+{{package}}.{{classname}}.prototype.{{name}};
+{{/vars}}
+
+{{#hasEnums}}
+{{#vars}}
+{{#isEnum}}
+/** @enum {string} */
+{{package}}.{{classname}}.{{datatypeWithEnum}} = { {{#allowableValues}}{{#values}}
+  {{.}}: '{{.}}',{{/values}}{{/allowableValues}}
+}
+{{/isEnum}}
+{{/vars}}
+{{/hasEnums}}
+{{/model}}
+{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/Javascript/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Javascript/ApiClient.mustache
new file mode 100644
index 00000000000..25f5474523f
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Javascript/ApiClient.mustache
@@ -0,0 +1,484 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['superagent'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('superagent'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.{{moduleName}}) {
+      root.{{moduleName}} = {};
+    }
+    root.{{moduleName}}.ApiClient = factory(root.superagent);
+  }
+}(this, function(superagent) {
+  'use strict';
+
+{{#emitJSDoc}}  /**
+   * @module ApiClient
+   * @version {{projectVersion}}
+   */
+
+  /**
+   * Manages low level client-server communications, parameter marshalling, etc. There should not be any need for an
+   * application to use this class directly - the *Api and model classes provide the public API for the service. The
+   * contents of this file should be regarded as internal but are documented for completeness.
+   * @alias module:ApiClient
+   * @class
+   */
+{{/emitJSDoc}}  var exports = function() {
+{{#emitJSDoc}}    /**
+     * The base URL against which to resolve every API call's (relative) path.
+     * @type {String}
+     * @default {{basePath}}
+     */
+{{/emitJSDoc}}    this.basePath = '{{basePath}}'.replace(/\/+$/, '');
+
+{{#emitJSDoc}}    /**
+     * The authentication methods to be included for all API calls.
+     * @type {Array.<String>}
+     */
+{{/emitJSDoc}}{{=< >=}}    this.authentications = {<#authMethods><#isBasic>
+      '<name>': {type: 'basic'}</isBasic><#isApiKey>
+      '<name>': {type: 'apiKey', 'in': <#isKeyInHeader>'header'</isKeyInHeader><^isKeyInHeader>'query'</isKeyInHeader>, name: '<keyParamName>'}</isApiKey><#isOAuth>
+      '<name>': {type: 'oauth2'}</isOAuth><#hasMore>,</hasMore></authMethods>
+    };
+<={{ }}=>
+{{#emitJSDoc}}    /**
+     * The default HTTP headers to be included for all API calls.
+     * @type {Array.<String>}
+     * @default {}
+     */
+{{/emitJSDoc}}    this.defaultHeaders = {};
+
+    /**
+     * The default HTTP timeout for all API calls.
+     * @type {Number}
+     * @default 60000
+     */
+    this.timeout = 60000;
+  };
+
+{{#emitJSDoc}}  /**
+   * Returns a string representation for an actual parameter.
+   * @param param The actual parameter.
+   * @returns {String} The string representation of <code>param</code>.
+   */
+{{/emitJSDoc}}  exports.prototype.paramToString = function(param) {
+    if (param == undefined || param == null) {
+      return '';
+    }
+    if (param instanceof Date) {
+      return param.toJSON();
+    }
+    return param.toString();
+  };
+
+{{#emitJSDoc}}  /**
+   * Builds full URL by appending the given path to the base URL and replacing path parameter place-holders with parameter values.
+   * NOTE: query parameters are not handled here.
+   * @param {String} path The path to append to the base URL.
+   * @param {Object} pathParams The parameter values to append.
+   * @returns {String} The encoded path with parameter values substituted.
+   */
+{{/emitJSDoc}}  exports.prototype.buildUrl = function(path, pathParams) {
+    if (!path.match(/^\//)) {
+      path = '/' + path;
+    }
+    var url = this.basePath + path;
+    var _this = this;
+    url = url.replace(/\{([\w-]+)\}/g, function(fullMatch, key) {
+      var value;
+      if (pathParams.hasOwnProperty(key)) {
+        value = _this.paramToString(pathParams[key]);
+      } else {
+        value = fullMatch;
+      }
+      return encodeURIComponent(value);
+    });
+    return url;
+  };
+
+{{#emitJSDoc}}  /**
+   * Checks whether the given content type represents JSON.<br>
+   * JSON content type examples:<br>
+   * <ul>
+   * <li>application/json</li>
+   * <li>application/json; charset=UTF8</li>
+   * <li>APPLICATION/JSON</li>
+   * </ul>
+   * @param {String} contentType The MIME content type to check.
+   * @returns {Boolean} <code>true</code> if <code>contentType</code> represents JSON, otherwise <code>false</code>.
+   */
+{{/emitJSDoc}}  exports.prototype.isJsonMime = function(contentType) {
+    return Boolean(contentType != null && contentType.match(/^application\/json(;.*)?$/i));
+  };
+
+{{#emitJSDoc}}  /**
+   * Chooses a content type from the given array, with JSON preferred; i.e. return JSON if included, otherwise return the first.
+   * @param {Array.<String>} contentTypes
+   * @returns {String} The chosen content type, preferring JSON.
+   */
+{{/emitJSDoc}}  exports.prototype.jsonPreferredMime = function(contentTypes) {
+    for (var i = 0; i < contentTypes.length; i++) {
+      if (this.isJsonMime(contentTypes[i])) {
+        return contentTypes[i];
+      }
+    }
+    return contentTypes[0];
+  };
+
+{{#emitJSDoc}}  /**
+   * Checks whether the given parameter value represents file-like content.
+   * @param param The parameter to check.
+   * @returns {Boolean} <code>true</code> if <code>param</code> represents a file. 
+   */
+{{/emitJSDoc}}  exports.prototype.isFileParam = function(param) {
+    // fs.ReadStream in Node.js (but not in runtime like browserify)
+    if (typeof window === 'undefined' &&
+        typeof require === 'function' &&
+        require('fs') &&
+        param instanceof require('fs').ReadStream) {
+      return true;
+    }
+    // Buffer in Node.js
+    if (typeof Buffer === 'function' && param instanceof Buffer) {
+      return true;
+    }
+    // Blob in browser
+    if (typeof Blob === 'function' && param instanceof Blob) {
+      return true;
+    }
+    // File in browser (it seems File object is also instance of Blob, but keep this for safe)
+    if (typeof File === 'function' && param instanceof File) {
+      return true;
+    }
+    return false;
+  };
+
+{{#emitJSDoc}}  /**
+   * Normalizes parameter values:
+   * <ul>
+   * <li>remove nils</li>
+   * <li>keep files and arrays</li>
+   * <li>format to string with `paramToString` for other cases</li>
+   * </ul>
+   * @param {Object.<String, Object>} params The parameters as object properties.
+   * @returns {Object.<String, Object>} normalized parameters.
+   */
+{{/emitJSDoc}}  exports.prototype.normalizeParams = function(params) {
+    var newParams = {};
+    for (var key in params) {
+      if (params.hasOwnProperty(key) && params[key] != undefined && params[key] != null) {
+        var value = params[key];
+        if (this.isFileParam(value) || Array.isArray(value)) {
+          newParams[key] = value;
+        } else {
+          newParams[key] = this.paramToString(value);
+        }
+      }
+    }
+    return newParams;
+  };
+
+{{#emitJSDoc}}  /**
+   * Enumeration of collection format separator strategies.
+   * @enum {String} 
+   * @readonly
+   */
+  exports.CollectionFormatEnum = {
+    /**
+     * Comma-separated values. Value: <code>csv</code>
+     * @const
+     */
+    CSV: ',',
+    /**
+     * Space-separated values. Value: <code>ssv</code>
+     * @const
+     */
+    SSV: ' ',
+    /**
+     * Tab-separated values. Value: <code>tsv</code>
+     * @const
+     */
+    TSV: '\t',
+    /**
+     * Pipe(|)-separated values. Value: <code>pipes</code>
+     * @const
+     */
+    PIPES: '|',
+    /**
+     * Native array. Value: <code>multi</code>
+     * @const
+     */
+    MULTI: 'multi'
+  };
+
+  /**
+   * Builds a string representation of an array-type actual parameter, according to the given collection format.
+   * @param {Array} param An array parameter.
+   * @param {module:ApiClient.CollectionFormatEnum} collectionFormat The array element separator strategy.
+   * @returns {String|Array} A string representation of the supplied collection, using the specified delimiter. Returns
+   * <code>param</code> as is if <code>collectionFormat</code> is <code>multi</code>.
+   */
+{{/emitJSDoc}}  exports.prototype.buildCollectionParam = function buildCollectionParam(param, collectionFormat) {
+    if (param == null) {
+      return null;
+    }
+    switch (collectionFormat) {
+      case 'csv':
+        return param.map(this.paramToString).join(',');
+      case 'ssv':
+        return param.map(this.paramToString).join(' ');
+      case 'tsv':
+        return param.map(this.paramToString).join('\t');
+      case 'pipes':
+        return param.map(this.paramToString).join('|');
+      case 'multi':
+        // return the array directly as SuperAgent will handle it as expected
+        return param.map(this.paramToString);
+      default:
+        throw new Error('Unknown collection format: ' + collectionFormat);
+    }
+  };
+
+{{#emitJSDoc}}  /**
+   * Applies authentication headers to the request.
+   * @param {Object} request The request object created by a <code>superagent()</code> call.
+   * @param {Array.<String>} authNames An array of authentication method names.
+   */
+{{/emitJSDoc}}  exports.prototype.applyAuthToRequest = function(request, authNames) {
+    var _this = this;
+    authNames.forEach(function(authName) {
+      var auth = _this.authentications[authName];
+      switch (auth.type) {
+        case 'basic':
+          if (auth.username || auth.password) {
+            request.auth(auth.username || '', auth.password || '');
+          }
+          break;
+        case 'apiKey':
+          if (auth.apiKey) {
+            var data = {};
+            if (auth.apiKeyPrefix) {
+              data[auth.name] = auth.apiKeyPrefix + ' ' + auth.apiKey;
+            } else {
+              data[auth.name] = auth.apiKey;
+            }
+            if (auth['in'] === 'header') {
+              request.set(data);
+            } else {
+              request.query(data);
+            }
+          }
+          break;
+        case 'oauth2':
+          if (auth.accessToken) {
+            request.set({'Authorization': 'Bearer ' + auth.accessToken});
+          }
+          break;
+        default:
+          throw new Error('Unknown authentication type: ' + auth.type);
+      }
+    });
+  };
+
+{{#emitJSDoc}}  /**
+   * Deserializes an HTTP response body into a value of the specified type.
+   * @param {Object} response A SuperAgent response object.
+   * @param {(String|Array.<String>|Object.<String, Object>|Function)} returnType The type to return. Pass a string for simple types
+   * or the constructor function for a complex type. Pass an array containing the type name to return an array of that type. To
+   * return an object, pass an object with one property whose name is the key type and whose value is the corresponding value type:
+   * all properties on <code>data<code> will be converted to this type.
+   * @returns A value of the specified type.
+   */
+{{/emitJSDoc}}  exports.prototype.deserialize = function deserialize(response, returnType) {
+    if (response == null || returnType == null) {
+      return null;
+    }
+    // Rely on SuperAgent for parsing response body.
+    // See http://visionmedia.github.io/superagent/#parsing-response-bodies
+    var data = response.body;
+    if (data == null) {
+      // SuperAgent does not always produce a body; use the unparsed response as a fallback
+      data = response.text;
+    }
+    return exports.convertToType(data, returnType);
+  };
+
+{{#emitJSDoc}}{{^usePromises}}  /**
+   * Callback function to receive the result of the operation.
+   * @callback module:ApiClient~callApiCallback
+   * @param {String} error Error message, if any.
+   * @param data The data returned by the service call.
+   * @param {String} response The complete HTTP response.
+   */
+
+{{/usePromises}}  /**
+   * Invokes the REST service using the supplied settings and parameters.
+   * @param {String} path The base URL to invoke.
+   * @param {String} httpMethod The HTTP method to use.
+   * @param {Object.<String, String>} pathParams A map of path parameters and their values.
+   * @param {Object.<String, Object>} queryParams A map of query parameters and their values.
+   * @param {Object.<String, Object>} headerParams A map of header parameters and their values.
+   * @param {Object.<String, Object>} formParams A map of form parameters and their values.
+   * @param {Object} bodyParam The value to pass as the request body.
+   * @param {Array.<String>} authNames An array of authentication type names.
+   * @param {Array.<String>} contentTypes An array of request MIME types.
+   * @param {Array.<String>} accepts An array of acceptable response MIME types.
+   * @param {(String|Array|ObjectFunction)} returnType The required type to return; can be a string for simple types or the
+   * constructor for a complex type.{{^usePromises}}
+   * @param {module:ApiClient~callApiCallback} callback The callback function.
+{{/usePromises}}   * @returns {{#usePromises}}{Promise} A Promise object{{/usePromises}}{{^usePromises}}{Object} The SuperAgent request object{{/usePromises}}.
+   */
+{{/emitJSDoc}}  exports.prototype.callApi = function callApi(path, httpMethod, pathParams,
+      queryParams, headerParams, formParams, bodyParam, authNames, contentTypes, accepts,
+      returnType{{^usePromises}}, callback{{/usePromises}}) {
+
+    var _this = this;
+    var url = this.buildUrl(path, pathParams);
+    var request = superagent(httpMethod, url);
+
+    // apply authentications
+    this.applyAuthToRequest(request, authNames);
+
+    // set query parameters
+    request.query(this.normalizeParams(queryParams));
+
+    // set header parameters
+    request.set(this.defaultHeaders).set(this.normalizeParams(headerParams));
+
+    // set request timeout
+    request.timeout(this.timeout);
+
+    var contentType = this.jsonPreferredMime(contentTypes);
+    if (contentType) {
+      request.type(contentType);
+    } else if (!request.header['Content-Type']) {
+      request.type('application/json');
+    }
+
+    if (contentType === 'application/x-www-form-urlencoded') {
+      request.send(this.normalizeParams(formParams));
+    } else if (contentType == 'multipart/form-data') {
+      var _formParams = this.normalizeParams(formParams);
+      for (var key in _formParams) {
+        if (_formParams.hasOwnProperty(key)) {
+          if (this.isFileParam(_formParams[key])) {
+            // file field
+            request.attach(key, _formParams[key]);
+          } else {
+            request.field(key, _formParams[key]);
+          }
+        }
+      }
+    } else if (bodyParam) {
+      request.send(bodyParam);
+    }
+
+    var accept = this.jsonPreferredMime(accepts);
+    if (accept) {
+      request.accept(accept);
+    }
+
+{{#usePromises}}    return new Promise(function(resolve, reject) {
+      request.end(function(error, response) {
+        if (error) {
+          reject(error);
+        } else {
+          var data = _this.deserialize(response, returnType);
+          resolve(data);
+        }
+      });
+    });{{/usePromises}}
+{{^usePromises}}    request.end(function(error, response) {
+      if (callback) {
+        var data = null;
+        if (!error) {
+          data = _this.deserialize(response, returnType);
+        }
+        callback(error, data, response);
+      }
+    });
+
+    return request;
+{{/usePromises}}  };
+
+{{#emitJSDoc}}  /**
+   * Parses an ISO-8601 string representation of a date value.
+   * @param {String} str The date value as a string.
+   * @returns {Date} The parsed date object.
+   */
+{{/emitJSDoc}}  exports.parseDate = function(str) {
+    return new Date(str.replace(/T/i, ' '));
+  };
+
+{{#emitJSDoc}}  /**
+   * Converts a value to the specified type.
+   * @param {(String|Object)} data The data to convert, as a string or object.
+   * @param {(String|Array.<String>|Object.<String, Object>|Function)} type The type to return. Pass a string for simple types
+   * or the constructor function for a complex type. Pass an array containing the type name to return an array of that type. To
+   * return an object, pass an object with one property whose name is the key type and whose value is the corresponding value type:
+   * all properties on <code>data<code> will be converted to this type.
+   * @returns An instance of the specified type.
+   */
+{{/emitJSDoc}}  exports.convertToType = function(data, type) {
+    switch (type) {
+      case 'Boolean':
+        return Boolean(data);
+      case 'Integer':
+        return parseInt(data, 10);
+      case 'Number':
+        return parseFloat(data);
+      case 'String':
+        return String(data);
+      case 'Date':
+        return this.parseDate(String(data));
+      default:
+        if (type === Object) {
+          // generic object, return directly
+          return data;
+        } else if (typeof type === 'function') {
+          // for model type like: User
+          return type.constructFromObject(data);
+        } else if (Array.isArray(type)) {
+          // for array type like: ['String']
+          var itemType = type[0];
+          return data.map(function(item) {
+            return exports.convertToType(item, itemType);
+          });
+        } else if (typeof type === 'object') {
+          // for plain object type like: {'String': 'Integer'}
+          var keyType, valueType;
+          for (var k in type) {
+            if (type.hasOwnProperty(k)) {
+              keyType = k;
+              valueType = type[k];
+              break;
+            }
+          }
+          var result = {};
+          for (var k in data) {
+            if (data.hasOwnProperty(k)) {
+              var key = exports.convertToType(k, keyType);
+              var value = exports.convertToType(data[k], valueType);
+              result[key] = value;
+            }
+          }
+          return result;
+        } else {
+          // for unknown type, return the data directly
+          return data;
+        }
+    }
+  };
+
+{{#emitJSDoc}}  /**
+   * The default API client implementation.
+   * @type {module:ApiClient}
+   */
+{{/emitJSDoc}}  exports.instance = new exports();
+
+  return exports;
+}));
diff --git a/modules/swagger-codegen/src/main/resources/Javascript/README.mustache b/modules/swagger-codegen/src/main/resources/Javascript/README.mustache
new file mode 100644
index 00000000000..633f2f0aebb
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Javascript/README.mustache
@@ -0,0 +1,138 @@
+# {{projectName}}
+
+{{moduleName}} - JavaScript client for {{projectName}}
+{{#appDescription}}
+{{{appDescription}}}
+{{/appDescription}}
+This SDK is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
+
+- API version: {{appVersion}}
+- Package version: {{projectVersion}}
+- Build date: {{generatedDate}}
+- Build package: {{generatorClass}}
+{{#infoUrl}}
+For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
+{{/infoUrl}}
+
+## Installation
+
+### For [Node.js](https://nodejs.org/)
+
+#### npm
+
+To publish the library as a [npm](https://www.npmjs.com/),
+please follow the procedure in ["Publishing npm packages"](https://docs.npmjs.com/getting-started/publishing-npm-packages).
+
+Then install it via:
+
+```shell
+npm install {{{projectName}}} --save
+```
+
+#### git
+#
+If the library is hosted at a git repository, e.g.
+https://github.com/{{#gitUserName}}{{.}}{{/gitUserName}}{{^gitUserName}}YOUR_USERNAME{{/gitUserName}}/{{#gitRepoId}}{{.}}{{/gitRepoId}}{{^gitRepoId}}{{projectName}}{{/gitRepoId}}
+then install it via:
+
+```shell
+npm install {{#gitUserName}}{{.}}{{/gitUserName}}{{^gitUserName}}YOUR_USERNAME{{/gitUserName}}/{{#gitRepoId}}{{.}}{{/gitRepoId}}{{^gitRepoId}}{{projectName}}{{/gitRepoId}} --save
+```
+
+### For browser
+
+The library also works in the browser environment via npm and [browserify](http://browserify.org/). After following
+the above steps with Node.js and installing browserify with `npm install -g browserify`,
+perform the following (assuming *main.js* is your entry file):
+
+```shell
+browserify main.js > bundle.js
+```
+
+Then include *bundle.js* in the HTML pages.
+
+## Getting Started
+
+Please follow the [installation](#installation) instruction and execute the following JS code:
+
+```javascript
+var {{{moduleName}}} = require('{{{projectName}}}');
+{{#apiInfo}}{{#apis}}{{#-first}}{{#operations}}{{#operation}}{{#-first}}{{#hasAuthMethods}}
+var defaultClient = {{{moduleName}}}.ApiClient.default;
+{{#authMethods}}{{#isBasic}}
+// Configure HTTP basic authorization: {{{name}}}
+var {{{name}}} = defaultClient.authentications['{{{name}}}'];
+{{{name}}}.username = 'YOUR USERNAME'
+{{{name}}}.password = 'YOUR PASSWORD'{{/isBasic}}{{#isApiKey}}
+// Configure API key authorization: {{{name}}}
+var {{{name}}} = defaultClient.authentications['{{{name}}}'];
+{{{name}}}.apiKey = "YOUR API KEY"
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//{{{name}}}.apiKeyPrefix['{{{keyParamName}}}'] = "Token"{{/isApiKey}}{{#isOAuth}}
+// Configure OAuth2 access token for authorization: {{{name}}}
+var {{{name}}} = defaultClient.authentications['{{{name}}}'];
+{{{name}}}.accessToken = "YOUR ACCESS TOKEN"{{/isOAuth}}
+{{/authMethods}}
+{{/hasAuthMethods}}
+
+var api = new {{{moduleName}}}.{{{classname}}}(){{#hasParams}}
+{{#vendorExtensions.x-codegen-hasRequiredParams}}{{#allParams}}{{#required}}
+var {{{paramName}}} = {{{example}}}; // {{=< >=}}{<&dataType>}<={{ }}=> {{{description}}}
+{{/required}}{{/allParams}}{{/vendorExtensions.x-codegen-hasRequiredParams}}{{#hasOptionalParams}}
+var opts = { {{#allParams}}{{^required}}
+  '{{{paramName}}}': {{{example}}}{{#vendorExtensions.x-codegen-hasMoreOptional}},{{/vendorExtensions.x-codegen-hasMoreOptional}} // {{=< >=}}{<&dataType>}<={{ }}=> {{{description}}}{{/required}}{{/allParams}}
+};{{/hasOptionalParams}}{{/hasParams}}
+{{#usePromises}}
+api.{{{operationId}}}({{#allParams}}{{#required}}{{{paramName}}}{{#vendorExtensions.x-codegen-hasMoreRequired}}, {{/vendorExtensions.x-codegen-hasMoreRequired}}{{/required}}{{/allParams}}{{#hasOptionalParams}}{{#vendorExtensions.x-codegen-hasRequiredParams}}, {{/vendorExtensions.x-codegen-hasRequiredParams}}opts{{/hasOptionalParams}}).then(function({{#returnType}}data{{/returnType}}) {
+  {{#returnType}}console.log('API called successfully. Returned data: ' + data);{{/returnType}}{{^returnType}}console.log('API called successfully.');{{/returnType}}
+}, function(error) {
+  console.error(error);
+});
+
+{{/usePromises}}{{^usePromises}}
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    {{#returnType}}console.log('API called successfully. Returned data: ' + data);{{/returnType}}{{^returnType}}console.log('API called successfully.');{{/returnType}}
+  }
+};
+api.{{{operationId}}}({{#allParams}}{{#required}}{{{paramName}}}{{#vendorExtensions.x-codegen-hasMoreRequired}}, {{/vendorExtensions.x-codegen-hasMoreRequired}}{{/required}}{{/allParams}}{{#hasOptionalParams}}{{#vendorExtensions.x-codegen-hasRequiredParams}}, {{/vendorExtensions.x-codegen-hasRequiredParams}}opts{{/hasOptionalParams}}{{#hasParams}}, {{/hasParams}}callback);
+{{/usePromises}}{{/-first}}{{/operation}}{{/operations}}{{/-first}}{{/apis}}{{/apiInfo}}
+```
+
+## Documentation for API Endpoints
+
+All URIs are relative to *{{basePath}}*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+{{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}*{{moduleName}}.{{classname}}* | [**{{operationId}}**]({{apiDocPath}}{{classname}}.md#{{operationId}}) | **{{httpMethod}}** {{path}} | {{#summary}}{{summary}}{{/summary}}
+{{/operation}}{{/operations}}{{/apis}}{{/apiInfo}}
+
+## Documentation for Models
+
+{{#models}}{{#model}} - [{{moduleName}}.{{classname}}]({{modelDocPath}}{{classname}}.md)
+{{/model}}{{/models}}
+
+## Documentation for Authorization
+
+{{^authMethods}} All endpoints do not require authorization.
+{{/authMethods}}{{#authMethods}}{{#last}} Authentication schemes defined for the API:{{/last}}{{/authMethods}}
+{{#authMethods}}### {{name}}
+
+{{#isApiKey}}- **Type**: API key
+- **API key parameter name**: {{keyParamName}}
+- **Location**: {{#isKeyInQuery}}URL query string{{/isKeyInQuery}}{{#isKeyInHeader}}HTTP header{{/isKeyInHeader}}
+{{/isApiKey}}
+{{#isBasic}}- **Type**: HTTP basic authentication
+{{/isBasic}}
+{{#isOAuth}}- **Type**: OAuth
+- **Flow**: {{flow}}
+- **Authorizatoin URL**: {{authorizationUrl}}
+- **Scopes**: {{^scopes}}N/A{{/scopes}}
+{{#scopes}}  - {{scope}}: {{description}}
+{{/scopes}}
+{{/isOAuth}}
+
+{{/authMethods}}
diff --git a/modules/swagger-codegen/src/main/resources/Javascript/api.mustache b/modules/swagger-codegen/src/main/resources/Javascript/api.mustache
index 9957fc4e2c5..8cc6cee18b9 100644
--- a/modules/swagger-codegen/src/main/resources/Javascript/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/Javascript/api.mustache
@@ -1,125 +1,90 @@
-// require files in Node.js environment
-var ${{#imports}}, {{import}}{{/imports}};
-if (typeof module === 'object' && module.exports) {
-  $ = require('jquery');{{#imports}}
-  {{import}} = require('../model/{{import}}.js');{{/imports}}
-}
-
-// export module for AMD
-if ( typeof define === "function" && define.amd ) {     
-	define(['jquery'{{#imports}}, '{{import}}'{{/imports}}], function(${{#imports}}, {{import}}{{/imports}}) {
-        return {{classname}};
-	 });
-}
-
-var {{classname}} = function {{classname}}() {
-	var self = this;
-  {{#operations}}
-  {{#operation}}
-  /**
-   * {{summary}}
-   * {{notes}}
-{{#allParams}}   * @param {{=<% %>=}}{<% dataType %>} <%={{ }}=%> {{paramName}} {{description}}
-{{/allParams}}   * @param {function} callback the callback function
-   * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
-   */
-  self.{{nickname}} = function({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{#hasParams}}, {{/hasParams}}callback) {
-    var {{localVariablePrefix}}postBody = {{#bodyParam}}{{^isBinary}}JSON.stringify({{paramName}}){{/isBinary}}{{#isBinary}}null{{/isBinary}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
-    var {{localVariablePrefix}}postBinaryBody = {{#bodyParam}}{{#isBinary}}{{paramName}}{{/isBinary}}{{^isBinary}}null{{/isBinary}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
-    {{#allParams}}{{#required}}
-     // verify the required parameter '{{paramName}}' is set
-     if ({{paramName}} == null) {
-        //throw new ApiException(400, "Missing the required parameter '{{paramName}}' when calling {{nickname}}");
-        var errorRequiredMsg = "Missing the required parameter '{{paramName}}' when calling {{nickname}}";
-        throw errorRequiredMsg;
-     }
-     {{/required}}{{/allParams}}
-    // create path and map variables
-    var basePath = '{{basePath}}';
-    // if basePath ends with a /, remove it as path starts with a leading /
-    if (basePath.substring(basePath.length-1, basePath.length)=='/') {
-    	basePath = basePath.substring(0, basePath.length-1);
+{{=< >=}}(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient'<#imports>, '../<#modelPackage><modelPackage>/</modelPackage><import>'</imports>], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient')<#imports>, require('../<#modelPackage><modelPackage>/</modelPackage><import>')</imports>);
+  } else {
+    // Browser globals (root is window)
+    if (!root.<moduleName>) {
+      root.<moduleName> = {};
     }
-    
-    var {{localVariablePrefix}}path = basePath + replaceAll(replaceAll("{{{path}}}", "\\{format\\}","json"){{#pathParams}}
-, "\\{" + "{{baseName}}" + "\\}", encodeURIComponent({{{paramName}}}.toString()){{/pathParams}});
-
-    var queryParams = {};
-    var headerParams =  {};
-    var formParams =  {};
-
-    {{#queryParams}}
-    queryParams.{{baseName}} = {{paramName}};
-    {{/queryParams}}
-    {{#headerParams}}if ({{paramName}} != null)
-    {{localVariablePrefix}}headerParams.put("{{baseName}}", {{paramName}});
-    {{/headerParams}}
-    {{#formParams}}if ({{paramName}} != null)
-      {{localVariablePrefix}}formParams.put("{{baseName}}", {{paramName}});
-    {{/formParams}}
-
-    path += createQueryString(queryParams);
-
-    var options = {type: "{{httpMethod}}", async: true, contentType: "application/json", dataType: "json", data: postBody};
-    var request = $.ajax(path, options);
-
-    request.fail(function(jqXHR, textStatus, errorThrown){
-      if (callback) {
-        var error = errorThrown || textStatus || jqXHR.statusText || 'error';
-        callback(null, textStatus, jqXHR, error);
-      }
-    });
-		
-    request.done(function(response, textStatus, jqXHR){
-      {{#returnType}}
-      /**
-        * @returns {{{returnType}}}
-        */
-      {{#returnTypeIsPrimitive}}var myResponse = response;{{/returnTypeIsPrimitive}}
-      {{^returnTypeIsPrimitive}}var myResponse = new {{{returnType}}}();
-      myResponse.constructFromObject(response);{{/returnTypeIsPrimitive}}
-      if (callback) {
-        callback(myResponse, textStatus, jqXHR);
-      }
-      {{/returnType}}{{^returnType}}
-      if (callback) {
-        callback(response, textStatus, jqXHR);
-      }
-      {{/returnType}}
-    });
- 
-    return request;
+    root.<moduleName>.<classname> = factory(root.<moduleName>.ApiClient<#imports>, root.<moduleName>.<import></imports>);
   }
-  {{/operation}}
-  {{/operations}}
+}(this, function(ApiClient<#imports>, <import></imports>) {
+  'use strict';
 
- 	function replaceAll (haystack, needle, replace) {
-		var result= haystack;
-		if (needle !=null && replace!=null) {
-			result= haystack.replace(new RegExp(needle, 'g'), replace);
-		}
-		return result;
-	}
+<#emitJSDoc>  /**
+   * <baseName> service.
+   * @module <#apiPackage><apiPackage>/</apiPackage><classname>
+   * @version <projectVersion>
+   */
 
- 	function createQueryString (queryParams) {
-		var queryString ='';
-		var i = 0;
-		for (var queryParamName in queryParams) {
-			if (i==0) {
-				queryString += '?' ;
-			} else {
-				queryString += '&' ;
-			}
-			
-			queryString +=  queryParamName + '=' + encodeURIComponent(queryParams[queryParamName]);
-			i++;
-		}
-		
-		return queryString;
-	}
-}
+  /**
+   * Constructs a new <classname>. <#description>
+   * <description></description>
+   * @alias module:<#apiPackage><apiPackage>/</apiPackage><classname>
+   * @class
+   * @param {module:ApiClient} apiClient Optional API client implementation to use, default to {@link module:ApiClient#instance}
+   * if unspecified.
+   */
+</emitJSDoc>  var exports = function(apiClient) {
+    this.apiClient = apiClient || ApiClient.instance;
 
-// export module for Node.js
-if (typeof module === 'object' && module.exports) {
-  module.exports = {{classname}};
-}
+<#operations><#operation><#emitJSDoc><^usePromises>
+    /**
+     * Callback function to receive the result of the <nickname> operation.
+     * @callback module:<#apiPackage><apiPackage>/</apiPackage><classname>~<nickname>Callback
+     * @param {String} error Error message, if any.
+     * @param <#vendorExtensions.x-jsdoc-type><&vendorExtensions.x-jsdoc-type> data The data returned by the service call.</vendorExtensions.x-jsdoc-type><^vendorExtensions.x-jsdoc-type>data This operation does not return a value.</vendorExtensions.x-jsdoc-type>
+     * @param {String} response The complete HTTP response.
+     */</usePromises>
+
+    /**<#summary>
+     * <summary></summary><#notes>
+     * <notes></notes><#allParams><#required>
+     * @param <&vendorExtensions.x-jsdoc-type> <paramName> <description></required></allParams><#hasOptionalParams>
+     * @param {Object} opts Optional parameters<#allParams><^required>
+     * @param <&vendorExtensions.x-jsdoc-type> opts.<paramName> <description><#defaultValue> (default to <.>)</defaultValue></required></allParams></hasOptionalParams><^usePromises>
+     * @param {module:<#apiPackage><apiPackage>/</apiPackage><classname>~<nickname>Callback} callback The callback function, accepting three arguments: error, data, response</usePromises><#returnType>
+     * data is of type: <&vendorExtensions.x-jsdoc-type></returnType>
+     */
+</emitJSDoc>    this.<nickname> = function(<vendorExtensions.x-codegen-argList>) {<#hasOptionalParams>
+      opts = opts || {};</hasOptionalParams>
+      var postBody = <#bodyParam><#required><paramName></required><^required>opts['<paramName>']</required></bodyParam><^bodyParam>null</bodyParam>;
+<#allParams><#required>
+      // verify the required parameter '<paramName>' is set
+      if (<paramName> == undefined || <paramName> == null) {
+        throw "Missing the required parameter '<paramName>' when calling <nickname>";
+      }
+</required></allParams>
+
+      var pathParams = {<#pathParams>
+        '<baseName>': <#required><paramName></required><^required>opts['<paramName>']</required><#hasMore>,</hasMore></pathParams>
+      };
+      var queryParams = {<#queryParams>
+        '<baseName>': <#collectionFormat>this.apiClient.buildCollectionParam(<#required><paramName></required><^required>opts['<paramName>']</required>, '<collectionFormat>')</collectionFormat><^collectionFormat><#required><paramName></required><^required>opts['<paramName>']</required></collectionFormat><#hasMore>,</hasMore></queryParams>
+      };
+      var headerParams = {<#headerParams>
+        '<baseName>': <#required><paramName></required><^required>opts['<paramName>']</required><#hasMore>,</hasMore></headerParams>
+      };
+      var formParams = {<#formParams>
+        '<baseName>': <#collectionFormat>this.apiClient.buildCollectionParam(<#required><paramName></required><^required>opts['<paramName>']</required>, '<collectionFormat>')</collectionFormat><^collectionFormat><#required><paramName></required><^required>opts['<paramName>']</required></collectionFormat><#hasMore>,</hasMore></formParams>
+      };
+
+      var authNames = [<#authMethods>'<name>'<#hasMore>, </hasMore></authMethods>];
+      var contentTypes = [<#consumes>'<mediaType>'<#hasMore>, </hasMore></consumes>];
+      var accepts = [<#produces>'<mediaType>'<#hasMore>, </hasMore></produces>];
+      var returnType = <#returnType><&returnType></returnType><^returnType>null</returnType>;
+
+      return this.apiClient.callApi(
+        '<&path>', '<httpMethod>',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType<^usePromises>, callback</usePromises>
+      );
+    }
+</operation></operations>  };
+
+  return exports;
+}));<={{ }}=>
diff --git a/modules/swagger-codegen/src/main/resources/Javascript/api_doc.mustache b/modules/swagger-codegen/src/main/resources/Javascript/api_doc.mustache
new file mode 100644
index 00000000000..698b42dfe11
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Javascript/api_doc.mustache
@@ -0,0 +1,89 @@
+# {{moduleName}}.{{classname}}{{#description}}
+{{description}}{{/description}}
+
+All URIs are relative to *{{basePath}}*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+{{#operations}}{{#operation}}[**{{operationId}}**]({{classname}}.md#{{operationId}}) | **{{httpMethod}}** {{path}} | {{#summary}}{{summary}}{{/summary}}
+{{/operation}}{{/operations}}
+
+{{#operations}}
+{{#operation}}
+<a name="{{operationId}}"></a>
+# **{{operationId}}**
+> {{#returnType}}{{returnType}} {{/returnType}}{{operationId}}{{#hasParams}}({{#allParams}}{{#required}}{{{paramName}}}{{#vendorExtensions.x-codegen-hasMoreRequired}}, {{/vendorExtensions.x-codegen-hasMoreRequired}}{{/required}}{{/allParams}}{{#hasOptionalParams}}{{#vendorExtensions.x-codegen-hasRequiredParams}}, {{/vendorExtensions.x-codegen-hasRequiredParams}}opts{{/hasOptionalParams}}){{/hasParams}}
+
+{{summary}}{{#notes}}
+
+{{notes}}{{/notes}}
+
+### Example
+```javascript
+var {{{moduleName}}} = require('{{{projectName}}}');
+{{#hasAuthMethods}}
+var defaultClient = {{{moduleName}}}.ApiClient.default;
+{{#authMethods}}{{#isBasic}}
+// Configure HTTP basic authorization: {{{name}}}
+var {{{name}}} = defaultClient.authentications['{{{name}}}'];
+{{{name}}}.username = 'YOUR USERNAME'
+{{{name}}}.password = 'YOUR PASSWORD'{{/isBasic}}{{#isApiKey}}
+// Configure API key authorization: {{{name}}}
+var {{{name}}} = defaultClient.authentications['{{{name}}}'];
+{{{name}}}.apiKey = "YOUR API KEY"
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//{{{name}}}.apiKeyPrefix['{{{keyParamName}}}'] = "Token"{{/isApiKey}}{{#isOAuth}}
+// Configure OAuth2 access token for authorization: {{{name}}}
+var {{{name}}} = defaultClient.authentications['{{{name}}}'];
+{{{name}}}.accessToken = "YOUR ACCESS TOKEN"{{/isOAuth}}
+{{/authMethods}}
+{{/hasAuthMethods}}
+
+var apiInstance = new {{{moduleName}}}.{{{classname}}}(){{#hasParams}}
+{{#vendorExtensions.x-codegen-hasRequiredParams}}{{#allParams}}{{#required}}
+var {{{paramName}}} = {{{example}}}; // {{=< >=}}{<&dataType>}<={{ }}=> {{{description}}}
+{{/required}}{{/allParams}}{{/vendorExtensions.x-codegen-hasRequiredParams}}{{#hasOptionalParams}}
+var opts = { {{#allParams}}{{^required}}
+  '{{{paramName}}}': {{{example}}}{{#vendorExtensions.x-codegen-hasMoreOptional}},{{/vendorExtensions.x-codegen-hasMoreOptional}} // {{=< >=}}{<&dataType>}<={{ }}=> {{{description}}}{{/required}}{{/allParams}}
+};{{/hasOptionalParams}}{{/hasParams}}
+{{#usePromises}}
+apiInstance.{{{operationId}}}({{#allParams}}{{#required}}{{{paramName}}}{{#vendorExtensions.x-codegen-hasMoreRequired}}, {{/vendorExtensions.x-codegen-hasMoreRequired}}{{/required}}{{/allParams}}{{#hasOptionalParams}}{{#vendorExtensions.x-codegen-hasRequiredParams}}, {{/vendorExtensions.x-codegen-hasRequiredParams}}opts{{/hasOptionalParams}}).then(function({{#returnType}}data{{/returnType}}) {
+  {{#returnType}}console.log('API called successfully. Returned data: ' + data);{{/returnType}}{{^returnType}}console.log('API called successfully.');{{/returnType}}
+}, function(error) {
+  console.error(error);
+});
+
+{{/usePromises}}{{^usePromises}}
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    {{#returnType}}console.log('API called successfully. Returned data: ' + data);{{/returnType}}{{^returnType}}console.log('API called successfully.');{{/returnType}}
+  }
+};
+api.{{{operationId}}}({{#allParams}}{{#required}}{{{paramName}}}{{#vendorExtensions.x-codegen-hasMoreRequired}}, {{/vendorExtensions.x-codegen-hasMoreRequired}}{{/required}}{{/allParams}}{{#hasOptionalParams}}{{#vendorExtensions.x-codegen-hasRequiredParams}}, {{/vendorExtensions.x-codegen-hasRequiredParams}}opts{{/hasOptionalParams}}{{#hasParams}}, {{/hasParams}}callback);
+{{/usePromises}}
+```
+
+### Parameters
+{{^allParams}}This endpoint does not need any parameter.{{/allParams}}{{#allParams}}{{#-last}}
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------{{/-last}}{{/allParams}}
+{{#allParams}} **{{paramName}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isFile}}**{{dataType}}**{{/isFile}}{{^isFile}}[**{{dataType}}**]({{baseType}}.md){{/isFile}}{{/isPrimitiveType}}| {{description}} | {{^required}}[optional] {{/required}}{{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}
+{{/allParams}}
+
+### Return type
+
+{{#returnType}}{{#returnTypeIsPrimitive}}**{{returnType}}**{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}[**{{returnType}}**]({{returnBaseType}}.md){{/returnTypeIsPrimitive}}{{/returnType}}{{^returnType}}null (empty response body){{/returnType}}
+
+### Authorization
+
+{{^authMethods}}No authorization required{{/authMethods}}{{#authMethods}}[{{name}}](../README.md#{{name}}){{^-last}}, {{/-last}}{{/authMethods}}
+
+### HTTP reuqest headers
+
+ - **Content-Type**: {{#consumes}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/consumes}}{{^consumes}}Not defined{{/consumes}}
+ - **Accept**: {{#produces}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/produces}}{{^produces}}Not defined{{/produces}}
+
+{{/operation}}
+{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/Javascript/enumClass.mustache b/modules/swagger-codegen/src/main/resources/Javascript/enumClass.mustache
index 648708c2d7e..d245084042a 100644
--- a/modules/swagger-codegen/src/main/resources/Javascript/enumClass.mustache
+++ b/modules/swagger-codegen/src/main/resources/Javascript/enumClass.mustache
@@ -1,19 +1,13 @@
-
-//export module
-if ( typeof define === "function" && define.amd ) {     
-	define('{{datatypeWithEnum}}', ['jquery'], function($) {
-        return {{datatypeWithEnum}};
-	 });
-}
-
-var {{datatypeWithEnum}} = function {{datatypeWithEnum}}() {
-	var self = this;
-	
-{{#allowableValues}}{{#enumVars}}
-	/**
-	 * @const 
-	 */ 
-	self.{{name}} = "{{value}}"{{^-last}},
-	{{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}}
-
-}
+{{#emitJSDoc}}  /**
+   * Allowed values for the <code>{{baseName}}</code> property.
+   * @enum {{=<% %>=}}{<%datatype%>}<%={{ }}=%>
+   * @readonly
+   */{{/emitJSDoc}}
+  exports.{{datatypeWithEnum}} = { {{#allowableValues}}{{#enumVars}}
+{{#emitJSDoc}}    /**
+     * value: {{value}}
+     * @const
+     */
+{{/emitJSDoc}}    {{name}}: "{{value}}"{{^-last}},
+    {{/-last}}{{/enumVars}}{{/allowableValues}}
+  };
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/Javascript/git_push.sh.mustache b/modules/swagger-codegen/src/main/resources/Javascript/git_push.sh.mustache
new file mode 100755
index 00000000000..e153ce23ecf
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Javascript/git_push.sh.mustache
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="{{{gitUserId}}}"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="{{{gitRepoId}}}"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="{{{releaseNote}}}"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/modules/swagger-codegen/src/main/resources/Javascript/gitignore.mustache b/modules/swagger-codegen/src/main/resources/Javascript/gitignore.mustache
new file mode 100644
index 00000000000..e920c16718d
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Javascript/gitignore.mustache
@@ -0,0 +1,33 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directory
+node_modules
+
+# Optional npm cache directory
+.npm
+
+# Optional REPL history
+.node_repl_history
diff --git a/modules/swagger-codegen/src/main/resources/Javascript/index.mustache b/modules/swagger-codegen/src/main/resources/Javascript/index.mustache
index a0207a6cc91..b48956afbb4 100644
--- a/modules/swagger-codegen/src/main/resources/Javascript/index.mustache
+++ b/modules/swagger-codegen/src/main/resources/Javascript/index.mustache
@@ -1,10 +1,62 @@
-if (typeof module === 'object' && module.exports) {
-  var {{moduleName}} = {};
-  {{#models}}
-  {{moduleName}}.{{importPath}} = require('./model/{{importPath}}.js');
-  {{/models}}
-  {{#apiInfo}}{{#apis}}
-  {{moduleName}}.{{importPath}} = require('./api/{{importPath}}.js');
-  {{/apis}}{{/apiInfo}}
-  module.exports = {{moduleName}};
-}
\ No newline at end of file
+(function(factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['./ApiClient'{{#models}}, './{{#modelPackage}}{{modelPackage}}/{{/modelPackage}}{{importPath}}'{{/models}}{{#apiInfo}}{{#apis}}, './{{#apiPackage}}{{apiPackage}}/{{/apiPackage}}{{importPath}}'{{/apis}}{{/apiInfo}}], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('./ApiClient'){{#models}}, require('./{{#modelPackage}}{{modelPackage}}/{{/modelPackage}}{{importPath}}'){{/models}}{{#apiInfo}}{{#apis}}, require('./{{#apiPackage}}{{apiPackage}}/{{/apiPackage}}{{importPath}}'){{/apis}}{{/apiInfo}});
+  }
+}(function(ApiClient{{#models}}{{#model}}, {{classFilename}}{{/model}}{{/models}}{{#apiInfo}}{{#apis}}, {{importPath}}{{/apis}}{{/apiInfo}}) {
+  'use strict';
+
+{{#emitJSDoc}}  /**{{#projectDescription}}
+   * {{projectDescription}}.<br>{{/projectDescription}}
+   * The <code>index</code> module provides access to constructors for all the classes which comprise the public API.
+   * <p>
+   * An AMD (recommended!) or CommonJS application will generally do something equivalent to the following:
+   * <pre>
+   * var {{moduleName}} = require('./index'); // See note below*.
+   * var xxxSvc = new {{moduleName}}.XxxApi(); // Allocate the API class we're going to use.
+   * var yyyModel = new {{moduleName}}.Yyy(); // Construct a model instance.
+   * yyyModel.someProperty = 'someValue';
+   * ...
+   * var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
+   * ...
+   * </pre>
+   * <em>*NOTE: For a top-level AMD script, use require(['./index'], function(){...}) and put the application logic within the
+   * callback function.</em>
+   * </p>
+   * <p>
+   * A non-AMD browser application (discouraged) might do something like this:
+   * <pre>
+   * var xxxSvc = new {{moduleName}}.XxxApi(); // Allocate the API class we're going to use.
+   * var yyy = new {{moduleName}}.Yyy(); // Construct a model instance.
+   * yyyModel.someProperty = 'someValue';
+   * ...
+   * var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
+   * ...
+   * </pre>
+   * </p>
+   * @module index
+   * @version {{projectVersion}}
+   */{{/emitJSDoc}}
+{{=< >=}}  var exports = {<#emitJSDoc>
+    /**
+     * The ApiClient constructor.
+     * @property {module:ApiClient}
+     */</emitJSDoc>
+    ApiClient: ApiClient<#models>,<#emitJSDoc>
+    /**
+     * The <importPath> model constructor.
+     * @property {module:<#modelPackage><modelPackage>/</modelPackage><importPath>}
+     */</emitJSDoc>
+    <importPath>: <importPath></models><#apiInfo><#apis>,<#emitJSDoc>
+    /**
+     * The <importPath> service constructor.
+     * @property {module:<#apiPackage><apiPackage>/</apiPackage><importPath>}
+     */</emitJSDoc>
+    <importPath>: <importPath></apis></apiInfo>
+  };
+
+  return exports;<={{ }}=>
+}));
diff --git a/modules/swagger-codegen/src/main/resources/Javascript/model.mustache b/modules/swagger-codegen/src/main/resources/Javascript/model.mustache
index 0588d03a8c1..c8849223fc4 100644
--- a/modules/swagger-codegen/src/main/resources/Javascript/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/Javascript/model.mustache
@@ -1,75 +1,100 @@
-// require files in Node.js environment
-{{#imports}}
-var {{import}};{{/imports}}
-if (typeof module === 'object' && module.exports) {
-  {{#imports}}
-  {{import}} = require('./{{import}}.js');{{/imports}}
-}
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient'{{#imports}}, './{{import}}'{{/imports}}], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'){{#imports}}, require('./{{import}}'){{/imports}});
+  } else {
+    // Browser globals (root is window)
+    if (!root.{{moduleName}}) {
+      root.{{moduleName}} = {};
+    }
+    root.{{moduleName}}.{{classname}} = factory(root.{{moduleName}}.ApiClient{{#imports}}, root.{{moduleName}}.{{import}}{{/imports}});
+  }
+}(this, function(ApiClient{{#imports}}, {{import}}{{/imports}}) {
+  'use strict';
 
-{{#models}}{{#model}}
+{{#models}}{{#model}}{{#emitJSDoc}}  /**
+   * The {{classname}} model module.
+   * @module {{#modelPackage}}{{modelPackage}}/{{/modelPackage}}{{classname}}
+   * @version {{projectVersion}}
+   */
+
+  /**
+   * Constructs a new <code>{{classname}}</code>.{{#description}}
+   * {{description}}{{/description}}
+   * @alias module:{{#modelPackage}}{{modelPackage}}/{{/modelPackage}}{{classname}}
+   * @class{{#useInheritance}}{{#parent}}
+   * @extends module:{{#modelPackage}}{{modelPackage}}/{{/modelPackage}}{{parent}}{{/parent}}{{#interfaces}}
+   * @implements module:{{#modelPackage}}{{modelPackage}}/{{/modelPackage}}{{.}}{{/interfaces}}{{/useInheritance}}{{#vendorExtensions.x-all-required}}
+   * @param {{.}}{{/vendorExtensions.x-all-required}}
+   */{{/emitJSDoc}}
+  var exports = function({{#vendorExtensions.x-all-required}}{{.}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-all-required}}) {
+{{#useInheritance}}{{#parentModel}}    {{classname}}.call(this{{#vendorExtensions.x-all-required}}, {{.}}{{/vendorExtensions.x-all-required}});{{/parentModel}}
+{{#interfaceModels}}    {{classname}}.call(this{{#vendorExtensions.x-all-required}}, {{.}}{{/vendorExtensions.x-all-required}});
+{{/interfaceModels}}{{/useInheritance}}{{#vars}}{{#required}}    this['{{baseName}}'] = {{name}};{{/required}}
+{{/vars}}  };
+
+{{#emitJSDoc}}  /**
+   * Constructs a <code>{{classname}}</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {{=< >=}}{module:<#modelPackage><modelPackage>/</modelPackage><classname>}<={{ }}=> obj Optional instance to populate.
+   * @return {{=< >=}}{module:<#modelPackage><modelPackage>/</modelPackage><classname>}<={{ }}=> The populated <code>{{classname}}</code> instance.
+   */
+{{/emitJSDoc}}  exports.constructFromObject = function(data, obj) {
+    if (data) { {{!// TODO: support polymorphism: discriminator property on data determines class to instantiate.}}
+      obj = obj || new exports();
+{{#useInheritance}}{{#parent}}      {{.}}.constructFromObject(data, obj);{{/parent}}
+{{#interfaces}}      {{.}}.constructFromObject(data, obj);
+{{/interfaces}}{{/useInheritance}}{{#vars}}      if (data.hasOwnProperty('{{baseName}}')) {
+        obj['{{baseName}}']{{{defaultValueWithParam}}}
+      }
+{{/vars}}    }
+    return obj;
+  }
+{{#useInheritance}}{{#parent}}
+  exports.prototype = Object.create({{parent}}.prototype);
+  exports.prototype.constructor = exports;
+{{/parent}}{{/useInheritance}}
+{{#vars}}{{#emitJSDoc}}
+  /**{{#description}}
+   * {{{description}}}{{/description}}
+   * @member {{{vendorExtensions.x-jsdoc-type}}} {{baseName}}{{#defaultValue}}
+   * @default {{{defaultValue}}}{{/defaultValue}}
+   */
+{{/emitJSDoc}}  exports.prototype['{{baseName}}'] = {{#defaultValue}}{{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}undefined{{/defaultValue}};
+{{/vars}}{{#useInheritance}}{{#interfaceModels}}
+  // Implement {{classname}} interface:{{#allVars}}{{#emitJSDoc}}
+  /**{{#description}}
+   * {{{description}}}{{/description}}
+   * @member {{{vendorExtensions.x-jsdoc-type}}} {{baseName}}{{#defaultValue}}
+   * @default {{{defaultValue}}}{{/defaultValue}}
+   */
+{{/emitJSDoc}}  exports.prototype['{{baseName}}'] = {{#defaultValue}}{{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}undefined{{/defaultValue}};
+{{/allVars}}{{/interfaceModels}}{{/useInheritance}}
+{{#emitModelMethods}}{{#vars}}{{#emitJSDoc}}  /**{{#description}}
+   * Returns {{{description}}}{{/description}}{{#minimum}}
+   * minimum: {{minimum}}{{/minimum}}{{#maximum}}
+   * maximum: {{maximum}}{{/maximum}}
+   * @return {{{vendorExtensions.x-jsdoc-type}}}
+   */
+{{/emitJSDoc}}  exports.prototype.{{getter}} = function() {
+    return this['{{baseName}}'];
+  }
+
+{{#emitJSDoc}}  /**{{#description}}
+   * Sets {{{description}}}{{/description}}
+   * @param {{{vendorExtensions.x-jsdoc-type}}} {{name}}{{#description}} {{{description}}}{{/description}}
+   */
+{{/emitJSDoc}}  exports.prototype.{{setter}} = function({{name}}) {
+    this['{{baseName}}'] = {{name}};
+  }
+
+{{/vars}}{{/emitModelMethods}}
 {{#vars}}{{#isEnum}}{{>enumClass}}{{/isEnum}}{{#items.isEnum}}{{#items}}
 {{>enumClass}}{{/items}}*/{{/items.isEnum}}{{/vars}}
 
-//export module
-if ( typeof define === "function" && define.amd ) {
-  define('{{classname}}', ['jquery'{{#vars}}{{^isPrimitiveType}}{{^-last}}, {{/-last}}'{{datatypeWithEnum}}'{{/isPrimitiveType}}{{/vars}}],
-    function(${{#vars}}{{^isPrimitiveType}}{{^-last}}, {{/-last}}{{datatypeWithEnum}}{{/isPrimitiveType}}{{/vars}}) {
-      return {{classname}};
-   });
-}
-
-{{#description}}/**
- * {{description}}
- **/{{/description}}
-var {{classname}} = function {{classname}}({{#mandatory}}{{this}}{{^-last}}, {{/-last}}{{/mandatory}}) { {{#parent}}/* extends {{{parent}}}*/{{/parent}}
-  var self = this;
-  {{#vars}}
-  /**{{#description}}
-   * {{{description}}}{{/description}}
-   * datatype: {{{datatypeWithEnum}}}{{#required}}
-   * required{{/required}}{{#minimum}}
-   * minimum: {{minimum}}{{/minimum}}{{#maximum}}
-   * maximum: {{maximum}}{{/maximum}}
-   **/
-  self.{{name}} = {{#required}}{{name}}{{/required}}{{^required}}{{{defaultValue}}}{{/required}};
-  {{/vars}}
-  
-  self.constructFromObject = function(data) {
-    if (!data) {
-      return;
-    }
-    {{#vars}}
-    self.{{name}}{{{defaultValueWithParam}}}
-    {{/vars}}
-  }
-
-  {{#vars}}
-  /**{{#description}}
-   * get {{{description}}}{{/description}}{{#minimum}}
-   * minimum: {{minimum}}{{/minimum}}{{#maximum}}
-   * maximum: {{maximum}}{{/maximum}}
-   * @return {{=<% %>=}}{<% datatypeWithEnum %>}<%={{ }}=%>
-   **/
-  self.{{getter}} = function() {
-    return self.{{name}};
-  }
-
-  /**{{#description}}
-   * set {{{description}}}{{/description}}
-   * @param {{=<% %>=}}{<% datatypeWithEnum %>}<%={{ }}=%> {{name}}
-   **/
-  self.{{setter}} = function ({{name}}) {
-    self.{{name}} = {{name}};
-  }
-  {{/vars}}
-
-  self.toJson = function () {
-    return JSON.stringify(self);
-  }
-}
-
-if (typeof module === 'object' && module.exports) {
-  module.exports = {{classname}};
-}
-{{/model}}
-{{/models}}
+  return exports;
+{{/model}}{{/models}}}));
diff --git a/modules/swagger-codegen/src/main/resources/Javascript/model_doc.mustache b/modules/swagger-codegen/src/main/resources/Javascript/model_doc.mustache
new file mode 100644
index 00000000000..306d8a2b3f7
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Javascript/model_doc.mustache
@@ -0,0 +1,9 @@
+{{#models}}{{#model}}# {{moduleName}}.{{classname}}
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{datatype}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{datatype}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}
+{{/vars}}
+
+{{/model}}{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/Javascript/package.mustache b/modules/swagger-codegen/src/main/resources/Javascript/package.mustache
index c77ee835709..55c33e3f280 100644
--- a/modules/swagger-codegen/src/main/resources/Javascript/package.mustache
+++ b/modules/swagger-codegen/src/main/resources/Javascript/package.mustache
@@ -8,13 +8,11 @@
     "test": "./node_modules/mocha/bin/mocha --recursive"
   },
   "dependencies": {
-    "jquery": "~2.1.4"
+    "superagent": "1.7.1"
   },
   "devDependencies": {
     "mocha": "~2.3.4",
-    "expect.js": "~0.3.1",
-    "mockrequire": "~0.0.5",
-    "domino": "~1.0.20",
-    "xmlhttprequest": "~1.8.0"
+    "sinon": "1.17.3",
+    "expect.js": "~0.3.1"
   }
 }
diff --git a/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig b/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig
index 5d8a4f0fc6b..5c86c501392 100644
--- a/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig
+++ b/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig
@@ -1,13 +1,18 @@
 io.swagger.codegen.languages.AndroidClientCodegen
+io.swagger.codegen.languages.AspNet5ServerCodegen
 io.swagger.codegen.languages.AsyncScalaClientCodegen
 io.swagger.codegen.languages.CSharpClientCodegen
 io.swagger.codegen.languages.DartClientCodegen
 io.swagger.codegen.languages.FlashClientCodegen
 io.swagger.codegen.languages.FlaskConnexionCodegen
+io.swagger.codegen.languages.GoClientCodegen
 io.swagger.codegen.languages.JavaClientCodegen
-io.swagger.codegen.languages.JavascriptClientCodegen
-io.swagger.codegen.languages.JaxRSServerCodegen
+io.swagger.codegen.languages.JavaJerseyServerCodegen
+io.swagger.codegen.languages.JavaCXFServerCodegen
+io.swagger.codegen.languages.JavaResteasyServerCodegen
 io.swagger.codegen.languages.JavaInflectorServerCodegen
+io.swagger.codegen.languages.JavascriptClientCodegen
+io.swagger.codegen.languages.JavascriptClosureAngularClientCodegen
 io.swagger.codegen.languages.JMeterCodegen
 io.swagger.codegen.languages.NodeJSServerCodegen
 io.swagger.codegen.languages.ObjcClientCodegen
@@ -33,3 +38,4 @@ io.swagger.codegen.languages.TypeScriptNodeClientCodegen
 io.swagger.codegen.languages.AkkaScalaClientCodegen
 io.swagger.codegen.languages.CsharpDotNet2ClientCodegen
 io.swagger.codegen.languages.ClojureClientCodegen
+io.swagger.codegen.languages.HaskellServantCodegen
diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache
index 9efea198f36..427479cf675 100644
--- a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache
@@ -39,7 +39,7 @@ namespace {{package}} {
          {{#allParams}}* @param {{paramName}} {{description}}
          {{/allParams}}*/
         public {{nickname}} ({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}extraHttpRequestParams?: any ) : ng.IHttpPromise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}{}{{/returnType}}> {
-            const path = this.basePath + '{{path}}'{{#pathParams}}
+            const localVarPath = this.basePath + '{{path}}'{{#pathParams}}
                 .replace('{' + '{{baseName}}' + '}', String({{paramName}})){{/pathParams}};
 
             let queryParameters: any = {};
@@ -76,7 +76,7 @@ namespace {{package}} {
 {{/formParams}}
             let httpRequestParams: any = {
                 method: '{{httpMethod}}',
-                url: path,
+                url: localVarPath,
                 json: {{#hasFormParams}}false{{/hasFormParams}}{{^hasFormParams}}true{{/hasFormParams}},
                 {{#bodyParam}}data: {{paramName}},
                 {{/bodyParam}}
diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/git_push.sh.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/git_push.sh.mustache
new file mode 100755
index 00000000000..e153ce23ecf
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/git_push.sh.mustache
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="{{{gitUserId}}}"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="{{{gitRepoId}}}"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="{{{releaseNote}}}"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/model.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/model.mustache
index f4cfe923baa..b7d92962157 100644
--- a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/model.mustache
@@ -18,7 +18,7 @@ namespace {{package}} {
          * {{{description}}}
          */
 {{/description}}
-        {{name}}{{^required}}?{{/required}}: {{#isEnum}}{{classname}}.{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
+        "{{name}}"{{^required}}?{{/required}}: {{#isEnum}}{{classname}}.{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
 {{/vars}}
     }
 
@@ -28,7 +28,7 @@ namespace {{package}} {
 {{#isEnum}}
 
         export enum {{datatypeWithEnum}} { {{#allowableValues}}{{#values}}
-            {{.}} = <any> '{{.}}',{{/values}}{{/allowableValues}}
+            {{.}} = <any> '{{.}}'{{^-last}},{{/-last}}{{/values}}{{/allowableValues}}
         }
 {{/isEnum}}
 {{/vars}}
diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache
index 62f6760a6ec..9e78174b956 100644
--- a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache
@@ -22,7 +22,7 @@ export class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{
     * {{{description}}}
     */
 {{/description}}
-    {{name}}: {{#isEnum}}{{classname}}.{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
+    "{{name}}": {{#isEnum}}{{classname}}.{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
 {{/vars}}
 }
 
@@ -31,7 +31,7 @@ export namespace {{classname}} {
 {{#vars}}
 {{#isEnum}}
     export enum {{datatypeWithEnum}} { {{#allowableValues}}{{#values}}
-        {{.}} = <any> '{{.}}',{{/values}}{{/allowableValues}}
+        {{.}} = <any> '{{.}}'{{^-last}},{{/-last}}{{/values}}{{/allowableValues}}
     }
 {{/isEnum}}
 {{/vars}}
@@ -179,7 +179,7 @@ export class {{classname}} {
      {{#allParams}}* @param {{paramName}} {{description}}
      {{/allParams}}*/
     public {{nickname}} ({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) : Promise<{ response: http.ClientResponse; {{#returnType}}body: {{{returnType}}}; {{/returnType}}{{^returnType}}body?: any; {{/returnType}} }> {
-        const path = this.basePath + '{{path}}'{{#pathParams}}
+        const localVarPath = this.basePath + '{{path}}'{{#pathParams}}
             .replace('{' + '{{baseName}}' + '}', String({{paramName}})){{/pathParams}};
         let queryParameters: any = {};
         let headerParams: any = this.extendObj({}, this.defaultHeaders);
@@ -212,13 +212,13 @@ export class {{classname}} {
 {{/isFile}}
 
 {{/formParams}}
-        let deferred = promise.defer<{ response: http.ClientResponse; {{#returnType}}body: {{{returnType}}}; {{/returnType}}{{^returnType}}body?: any; {{/returnType}} }>();
+        let localVarDeferred = promise.defer<{ response: http.ClientResponse; {{#returnType}}body: {{{returnType}}}; {{/returnType}}{{^returnType}}body?: any; {{/returnType}} }>();
 
         let requestOptions: request.Options = {
             method: '{{httpMethod}}',
             qs: queryParameters,
             headers: headerParams,
-            uri: path,
+            uri: localVarPath,
             json: true,
 {{#bodyParam}}
             body: {{paramName}},
@@ -241,17 +241,17 @@ export class {{classname}} {
 
         request(requestOptions, (error, response, body) => {
             if (error) {
-                deferred.reject(error);
+                localVarDeferred.reject(error);
             } else {
                 if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    deferred.resolve({ response: response, body: body });
+                    localVarDeferred.resolve({ response: response, body: body });
                 } else {
-                    deferred.reject({ response: response, body: body });
+                    localVarDeferred.reject({ response: response, body: body });
                 }
             }
         });
 
-        return deferred.promise;
+        return localVarDeferred.promise;
     }
 {{/operation}}
 }
diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-node/git_push.sh.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-node/git_push.sh.mustache
new file mode 100755
index 00000000000..e153ce23ecf
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/TypeScript-node/git_push.sh.mustache
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="{{{gitUserId}}}"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="{{{gitRepoId}}}"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="{{{releaseNote}}}"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache b/modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache
index b5c9997ce0f..b7bd04afffb 100644
--- a/modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache
@@ -217,7 +217,7 @@
         <akka-version>2.3.9</akka-version>
         <joda-version>1.2</joda-version>
         <joda-time-version>2.2</joda-time-version>
-        <swagger-core-version>1.5.4</swagger-core-version>
+        <swagger-core-version>1.5.8</swagger-core-version>
         <maven-plugin.version>1.0.0</maven-plugin.version>
 
         <junit-version>4.8.1</junit-version>
diff --git a/modules/swagger-codegen/src/main/resources/android/api.mustache b/modules/swagger-codegen/src/main/resources/android/api.mustache
index 30c686b688b..f3d0f7996de 100644
--- a/modules/swagger-codegen/src/main/resources/android/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/android/api.mustache
@@ -11,7 +11,6 @@ import java.util.*;
 {{#imports}}import {{import}};
 {{/imports}}
 
-import org.apache.http.HttpEntity;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
 
 import java.util.Map;
@@ -47,7 +46,7 @@ public class {{classname}} {
 {{/allParams}}   * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
    */
   public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
-    Object postBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
+    Object localVarPostBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
     {{#allParams}}{{#required}}
     // verify the required parameter '{{paramName}}' is set
     if ({{paramName}} == null) {
@@ -56,53 +55,52 @@ public class {{classname}} {
     {{/required}}{{/allParams}}
 
     // create path and map variables
-    String path = "{{path}}".replaceAll("\\{format\\}","json"){{#pathParams}}.replaceAll("\\{" + "{{baseName}}" + "\\}", apiInvoker.escapeString({{{paramName}}}.toString())){{/pathParams}};
+    String localVarPath = "{{path}}".replaceAll("\\{format\\}","json"){{#pathParams}}.replaceAll("\\{" + "{{baseName}}" + "\\}", apiInvoker.escapeString({{{paramName}}}.toString())){{/pathParams}};
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
     // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     // form params
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, String> localVarFormParams = new HashMap<String, String>();
 
     {{#queryParams}}
-    queryParams.addAll(ApiInvoker.parameterToPairs("{{#collectionFormat}}{{{collectionFormat}}}{{/collectionFormat}}", "{{baseName}}", {{paramName}}));
+    localVarQueryParams.addAll(ApiInvoker.parameterToPairs("{{#collectionFormat}}{{{collectionFormat}}}{{/collectionFormat}}", "{{baseName}}", {{paramName}}));
     {{/queryParams}}
 
     {{#headerParams}}
-    headerParams.put("{{baseName}}", ApiInvoker.parameterToString({{paramName}}));
+    localVarHeaderParams.put("{{baseName}}", ApiInvoker.parameterToString({{paramName}}));
     {{/headerParams}}
 
-    String[] contentTypes = {
+    String[] localVarContentTypes = {
       {{#consumes}}"{{mediaType}}"{{#hasMore}},{{/hasMore}}{{/consumes}}
     };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json";
 
-    if (contentType.startsWith("multipart/form-data")) {
+    if (localVarContentType.startsWith("multipart/form-data")) {
       // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
       {{#formParams}}{{#notFile}}
       if ({{paramName}} != null) {
-        builder.addTextBody("{{baseName}}", ApiInvoker.parameterToString({{paramName}}), ApiInvoker.TEXT_PLAIN_UTF8);
+        localVarBuilder.addTextBody("{{baseName}}", ApiInvoker.parameterToString({{paramName}}), ApiInvoker.TEXT_PLAIN_UTF8);
       }
       {{/notFile}}{{#isFile}}
       if ({{paramName}} != null) {
-        builder.addBinaryBody("{{baseName}}", {{paramName}});
+        localVarBuilder.addBinaryBody("{{baseName}}", {{paramName}});
       }
       {{/isFile}}{{/formParams}}
 
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
+      localVarPostBody = localVarBuilder.build();
     } else {
       // normal form params
-      {{#formParams}}{{#notFile}}formParams.put("{{baseName}}", ApiInvoker.parameterToString({{paramName}}));{{/notFile}}
+      {{#formParams}}{{#notFile}}localVarFormParams.put("{{baseName}}", ApiInvoker.parameterToString({{paramName}}));{{/notFile}}
       {{/formParams}}
     }
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "{{httpMethod}}", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
-        return {{#returnType}}({{{returnType}}}) ApiInvoker.deserialize(response, "{{returnContainer}}", {{returnBaseType}}.class){{/returnType}};
+      String localVarResponse = apiInvoker.invokeAPI(basePath, localVarPath, "{{httpMethod}}", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarContentType);
+      if(localVarResponse != null){
+        return {{#returnType}}({{{returnType}}}) ApiInvoker.deserialize(localVarResponse, "{{returnContainer}}", {{returnBaseType}}.class){{/returnType}};
       }
       else {
         return {{#returnType}}null{{/returnType}};
diff --git a/modules/swagger-codegen/src/main/resources/android/apiInvoker.mustache b/modules/swagger-codegen/src/main/resources/android/apiInvoker.mustache
index 1f6d77a071c..a2df0ea9b7c 100644
--- a/modules/swagger-codegen/src/main/resources/android/apiInvoker.mustache
+++ b/modules/swagger-codegen/src/main/resources/android/apiInvoker.mustache
@@ -83,7 +83,7 @@ public class ApiInvoker {
     DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
 
     // Set default User-Agent.
-    setUserAgent("Android-Java-Swagger");
+    setUserAgent("{{#httpUserAgent}}{{{.}}}{{/httpUserAgent}}{{^httpUserAgent}}Swagger-Codegen/{{{artifactVersion}}}/android{{/httpUserAgent}}");
   }
 
   public static void setUserAgent(String userAgent) {
diff --git a/modules/swagger-codegen/src/main/resources/android/build.mustache b/modules/swagger-codegen/src/main/resources/android/build.mustache
index dff18970462..41c9a2dfbb1 100644
--- a/modules/swagger-codegen/src/main/resources/android/build.mustache
+++ b/modules/swagger-codegen/src/main/resources/android/build.mustache
@@ -8,9 +8,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
         {{#useAndroidMavenGradlePlugin}}
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
         {{/useAndroidMavenGradlePlugin}}
     }
 }
@@ -28,11 +28,12 @@ apply plugin: 'com.github.dcendents.android-maven'
 {{/useAndroidMavenGradlePlugin}}
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion '22.0.0'
+    compileSdkVersion 23
+    buildToolsVersion '23.0.2'
+    useLibrary  'org.apache.http.legacy'
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 22
+        targetSdkVersion 23
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
@@ -55,16 +56,17 @@ android {
 ext {
     swagger_annotations_version = "1.5.0"
     gson_version = "2.3.1"
-    httpclient_version = "4.3.3"
-    junit_version = "4.8.1"
+    httpclient_version = "4.5.2"
+    httpcore_version = "4.4.4"
+    junit_version = "4.12"
 }
 
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "com.google.code.gson:gson:$gson_version"
-    compile "org.apache.httpcomponents:httpcore:$httpclient_version"
+    compile "org.apache.httpcomponents:httpcore:$httpcore_version"
     compile "org.apache.httpcomponents:httpclient:$httpclient_version"
-    compile ("org.apache.httpcomponents:httpcore:$httpclient_version") {
+    compile ("org.apache.httpcomponents:httpcore:$httpcore_version") {
         exclude(group: 'org.apache.httpcomponents', module: 'httpclient')
     }
     compile ("org.apache.httpcomponents:httpmime:$httpclient_version") {
diff --git a/modules/swagger-codegen/src/main/resources/android/git_push.sh.mustache b/modules/swagger-codegen/src/main/resources/android/git_push.sh.mustache
new file mode 100755
index 00000000000..e153ce23ecf
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/android/git_push.sh.mustache
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="{{{gitUserId}}}"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="{{{gitRepoId}}}"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="{{{releaseNote}}}"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/modules/swagger-codegen/src/main/resources/android/gitignore.mustache b/modules/swagger-codegen/src/main/resources/android/gitignore.mustache
new file mode 100644
index 00000000000..a8363b06f95
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/android/gitignore.mustache
@@ -0,0 +1,39 @@
+# Built application files
+*.apk
+*.ap_
+
+# Files for the Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# Intellij
+*.iml
+
+#Keystore files
+*.jks
diff --git a/modules/swagger-codegen/src/main/resources/android/libraries/volley/api.mustache b/modules/swagger-codegen/src/main/resources/android/libraries/volley/api.mustache
index ccd12fd67c5..af6f859c73d 100644
--- a/modules/swagger-codegen/src/main/resources/android/libraries/volley/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/android/libraries/volley/api.mustache
@@ -1,6 +1,5 @@
 package {{package}};
 
-import {{invokerPackage}}.Responses;
 import {{invokerPackage}}.ApiInvoker;
 import {{invokerPackage}}.ApiException;
 import {{invokerPackage}}.Pair;
@@ -18,9 +17,12 @@ import com.android.volley.VolleyError;
 import org.apache.http.HttpEntity;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
 
-import java.util.Map;
+import java.util.ArrayList;
 import java.util.HashMap;
-import java.io.File;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
 
 {{#operations}}
 public class {{classname}} {
@@ -45,12 +47,94 @@ public class {{classname}} {
 
   {{#operation}}
   /**
-   * {{summary}}
-   * {{notes}}
+  * {{summary}}
+  * {{notes}}
 {{#allParams}}   * @param {{paramName}} {{description}}
 {{/allParams}}   * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
-   */
-  public void {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{^hasMore}}, {{/hasMore}}{{/allParams}}final {{#returnBaseType}}Responses.{{returnBaseType}}{{#isListContainer}}List{{/isListContainer}}Response{{/returnBaseType}}{{^returnBaseType}}Responses.StringResponse{{/returnBaseType}} responseListener, final Response.ErrorListener errorListener) {
+  */
+  public {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws TimeoutException, ExecutionException, InterruptedException, ApiException {
+     Object postBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
+  {{#allParams}}{{#required}}
+      // verify the required parameter '{{paramName}}' is set
+      if ({{paramName}} == null) {
+      VolleyError error = new VolleyError("Missing the required parameter '{{paramName}}' when calling {{nickname}}",
+      new ApiException(400, "Missing the required parameter '{{paramName}}' when calling {{nickname}}"));
+      }
+  {{/required}}{{/allParams}}
+
+  // create path and map variables
+  String path = "{{path}}".replaceAll("\\{format\\}","json"){{#pathParams}}.replaceAll("\\{" + "{{baseName}}" + "\\}", apiInvoker.escapeString({{{paramName}}}.toString())){{/pathParams}};
+
+  // query params
+  List<Pair> queryParams = new ArrayList<Pair>();
+      // header params
+      Map<String, String> headerParams = new HashMap<String, String>();
+      // form params
+      Map<String, String> formParams = new HashMap<String, String>();
+
+  {{#queryParams}}
+          queryParams.addAll(ApiInvoker.parameterToPairs("{{#collectionFormat}}{{{collectionFormat}}}{{/collectionFormat}}", "{{baseName}}", {{paramName}}));
+  {{/queryParams}}
+
+  {{#headerParams}}
+          headerParams.put("{{baseName}}", ApiInvoker.parameterToString({{paramName}}));
+  {{/headerParams}}
+
+      String[] contentTypes = {
+  {{#consumes}}"{{mediaType}}"{{#hasMore}},{{/hasMore}}{{/consumes}}
+      };
+      String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+      if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+  {{#formParams}}{{#notFile}}
+          if ({{paramName}} != null) {
+          localVarBuilder.addTextBody("{{baseName}}", ApiInvoker.parameterToString({{paramName}}), ApiInvoker.TEXT_PLAIN_UTF8);
+          }
+  {{/notFile}}{{#isFile}}
+          if ({{paramName}} != null) {
+          localVarBuilder.addBinaryBody("{{baseName}}", {{paramName}});
+          }
+  {{/isFile}}{{/formParams}}
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+      } else {
+      // normal form params
+  {{#formParams}}{{#notFile}}formParams.put("{{baseName}}", ApiInvoker.parameterToString({{paramName}}));{{/notFile}}
+  {{/formParams}}
+      }
+
+      String[] authNames = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
+
+      try {
+        String localVarResponse = apiInvoker.invokeAPI (basePath, path, "{{httpMethod}}", queryParams, postBody, headerParams, formParams, contentType, authNames);
+        if(localVarResponse != null){
+           return {{#returnType}}({{{returnType}}}) ApiInvoker.deserialize(localVarResponse, "{{returnContainer}}", {{returnBaseType}}.class){{/returnType}};
+        } else {
+           return {{#returnType}}null{{/returnType}};
+        }
+      } catch (ApiException ex) {
+         throw ex;
+      } catch (InterruptedException ex) {
+         throw ex;
+      } catch (ExecutionException ex) {
+         if(ex.getCause() instanceof VolleyError) {
+            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+         }
+         throw ex;
+      } catch (TimeoutException ex) {
+         throw ex;
+      }
+  }
+
+      /**
+   * {{summary}}
+   * {{notes}}
+{{#allParams}}   * @param {{paramName}} {{description}}{{/allParams}}
+  */
+  public void {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{^hasMore}}, {{/hasMore}}{{/allParams}}final Response.Listener<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}String{{/returnType}}> responseListener, final Response.ErrorListener errorListener) {
     Object postBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
 
   {{#allParams}}{{#required}}
@@ -86,18 +170,18 @@ public class {{classname}} {
 
     if (contentType.startsWith("multipart/form-data")) {
       // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
       {{#formParams}}{{#notFile}}
       if ({{paramName}} != null) {
-        builder.addTextBody("{{baseName}}", ApiInvoker.parameterToString({{paramName}}), ApiInvoker.TEXT_PLAIN_UTF8);
+        localVarBuilder.addTextBody("{{baseName}}", ApiInvoker.parameterToString({{paramName}}), ApiInvoker.TEXT_PLAIN_UTF8);
       }
       {{/notFile}}{{#isFile}}
       if ({{paramName}} != null) {
-        builder.addBinaryBody("{{baseName}}", {{paramName}});
+        localVarBuilder.addBinaryBody("{{baseName}}", {{paramName}});
       }
       {{/isFile}}{{/formParams}}
 
-      HttpEntity httpEntity = builder.build();
+      HttpEntity httpEntity = localVarBuilder.build();
       postBody = httpEntity;
     } else {
       // normal form params
@@ -111,13 +195,13 @@ public class {{classname}} {
       apiInvoker.invokeAPI(basePath, path, "{{httpMethod}}", queryParams, postBody, headerParams, formParams, contentType, authNames,
         new Response.Listener<String>() {
           @Override
-          public void onResponse(String response) {
+          public void onResponse(String localVarResponse) {
             {{#returnType}}
             try {
-              responseListener.onResponse(({{{returnType}}}) ApiInvoker.deserialize(response,  "{{returnContainer}}", {{returnBaseType}}.class));
+              responseListener.onResponse(({{{returnType}}}) ApiInvoker.deserialize(localVarResponse,  "{{returnContainer}}", {{returnBaseType}}.class));
               {{/returnType}}
               {{^returnType}}
-              responseListener.onResponse(response);
+              responseListener.onResponse(localVarResponse);
               {{/returnType}}
             {{#returnType}}
             } catch (ApiException exception) {
diff --git a/modules/swagger-codegen/src/main/resources/android/libraries/volley/apiInvoker.mustache b/modules/swagger-codegen/src/main/resources/android/libraries/volley/apiInvoker.mustache
index 04e6fdbc05c..e76bf1357e1 100644
--- a/modules/swagger-codegen/src/main/resources/android/libraries/volley/apiInvoker.mustache
+++ b/modules/swagger-codegen/src/main/resources/android/libraries/volley/apiInvoker.mustache
@@ -1,10 +1,16 @@
 package {{invokerPackage}};
 
-import android.content.Context;
-
+import com.android.volley.Cache;
+import com.android.volley.Network;
+import com.android.volley.Request;
 import com.android.volley.RequestQueue;
 import com.android.volley.Response;
-import com.android.volley.toolbox.Volley;
+import com.android.volley.ResponseDelivery;
+import com.android.volley.toolbox.BasicNetwork;
+import com.android.volley.toolbox.HttpStack;
+import com.android.volley.toolbox.HurlStack;
+import com.android.volley.toolbox.NoCache;
+import com.android.volley.toolbox.RequestFuture;
 import com.google.gson.JsonParseException;
 
 import org.apache.http.Consts;
@@ -22,6 +28,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 import {{invokerPackage}}.auth.Authentication;
 import {{invokerPackage}}.auth.ApiKeyAuth;
@@ -36,11 +45,12 @@ public class ApiInvoker {
   private static ApiInvoker INSTANCE;
   private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
 
-  private Context context;
   private RequestQueue mRequestQueue;
 
   private Map<String, Authentication> authentications;
 
+  private int connectionTimeout;
+
   /** Content type "text/plain" with UTF-8 encoding. */
   public static final ContentType TEXT_PLAIN_UTF8 = ContentType.create("text/plain", Consts.UTF_8);
 
@@ -165,9 +175,17 @@ public class ApiInvoker {
     return params;
   }
 
-  public static void initializeInstance(Context context) {
-     INSTANCE = new ApiInvoker(context);
-     setUserAgent("Android-Volley-Swagger");
+  public static void initializeInstance() {
+     initializeInstance(null);
+  }
+
+  public static void initializeInstance(Cache cache) {
+     initializeInstance(cache, null, 0, null, 30);
+  }
+
+  public static void initializeInstance(Cache cache, Network network, int threadPoolSize, ResponseDelivery delivery, int connectionTimeout) {
+     INSTANCE = new ApiInvoker(cache, network, threadPoolSize, delivery, connectionTimeout);
+     setUserAgent("{{#httpUserAgent}}{{{.}}}{{/httpUserAgent}}{{^httpUserAgent}}Swagger-Codegen/{{{artifactVersion}}}/android{{/httpUserAgent}}");
 
      // Setup authentications (key: authentication name, value: authentication).
      INSTANCE.authentications = new HashMap<String, Authentication>();
@@ -178,17 +196,28 @@ public class ApiInvoker {
      {{#isBasic}}
      INSTANCE.authentications.put("{{name}}", new HttpBasicAuth());
      {{/isBasic}}
+     {{#isOAuth}}
+     // TODO: comment out below as OAuth does not exist
+     //INSTANCE.authentications.put("{{name}}", new OAuth());
+     {{/isOAuth}}
      {{/authMethods}}
      // Prevent the authentications from being modified.
      INSTANCE.authentications = Collections.unmodifiableMap(INSTANCE.authentications);
   }
-  private ApiInvoker(Context context) {
-     this.context = context;
-     initConnectionManager();
-  }
 
-  public ApiInvoker() {
-    initConnectionManager();
+  private ApiInvoker(Cache cache, Network network, int threadPoolSize, ResponseDelivery delivery, int connectionTimeout) {
+     if(cache == null) cache = new NoCache();
+     if(network == null) {
+        HttpStack stack = new HurlStack();
+        network = new BasicNetwork(stack);
+     }
+
+     if(delivery == null) {
+        initConnectionRequest(cache, network);
+     } else {
+        initConnectionRequest(cache, network, threadPoolSize, delivery);
+     }
+     this.connectionTimeout = connectionTimeout;
   }
 
   public static ApiInvoker getInstance() {
@@ -304,6 +333,14 @@ public class ApiInvoker {
     throw new RuntimeException("No API key authentication configured!");
   }
 
+  public void setConnectionTimeout(int connectionTimeout){
+     this.connectionTimeout = connectionTimeout;
+  }
+
+  public int getConnectionTimeout() {
+     return connectionTimeout;
+  }
+
   /**
   * Update query and header parameters based on authentication settings.
   *
@@ -317,7 +354,21 @@ public class ApiInvoker {
     }
   }
 
+  public String invokeAPI(String host, String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, String> formParams, String contentType, String[] authNames) throws ApiException, InterruptedException, ExecutionException, TimeoutException {
+     RequestFuture<String> future = RequestFuture.newFuture();
+     Request request = createRequest(host, path, method, queryParams, body, headerParams, formParams, contentType, authNames, future, future);
+     if(request != null) {
+        mRequestQueue.add(request);
+        return future.get(connectionTimeout, TimeUnit.SECONDS);
+     } else return "no data";
+  }
+
   public void invokeAPI(String host, String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, String> formParams, String contentType, String[] authNames, Response.Listener<String> stringRequest, Response.ErrorListener errorListener) throws ApiException {
+     Request request = createRequest(host, path, method, queryParams, body, headerParams, formParams, contentType, authNames, stringRequest, errorListener);
+     if (request != null) mRequestQueue.add(request);
+  }
+
+  public Request<String> createRequest(String host, String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, String> formParams, String contentType, String[] authNames, Response.Listener<String> stringRequest, Response.ErrorListener errorListener) throws ApiException {
     StringBuilder b = new StringBuilder();
     b.append("?");
 
@@ -374,13 +425,13 @@ public class ApiInvoker {
       }
       formParamStr = formParamBuilder.toString();
     }
+    Request request = null;
 
     if ("GET".equals(method)) {
-      GetRequest request = new GetRequest(url, headers, null, stringRequest, errorListener);
-      mRequestQueue.add(request);
+      request = new GetRequest(url, headers, null, stringRequest, errorListener);
     }
     else if ("POST".equals(method)) {
-       PostRequest request = null;
+       request = null;
        if (formParamStr != null) {
           request = new PostRequest(url, headers, contentType, new StringEntity(formParamStr, "UTF-8"), stringRequest, errorListener);
        } else if (body != null) {
@@ -389,11 +440,12 @@ public class ApiInvoker {
           } else {
              request = new PostRequest(url, headers, contentType, new StringEntity(serialize(body), "UTF-8"), stringRequest, errorListener);
           }
+       } else {
+         request = new PostRequest(url, headers, null, null, stringRequest, errorListener);
        }
-       if(request != null) mRequestQueue.add(request);
     }
     else if ("PUT".equals(method)) {
-       PutRequest request = null;
+       request = null;
        if (formParamStr != null) {
           request = new PutRequest(url, headers, contentType, new StringEntity(formParamStr, "UTF-8"), stringRequest, errorListener);
        } else if (body != null) {
@@ -402,11 +454,12 @@ public class ApiInvoker {
           } else {
              request = new PutRequest(url, headers, contentType, new StringEntity(serialize(body), "UTF-8"), stringRequest, errorListener);
           }
+       } else {
+          request = new PutRequest(url, headers, null, null, stringRequest, errorListener);
        }
-       if(request != null) mRequestQueue.add(request);
     }
     else if ("DELETE".equals(method)) {
-       DeleteRequest request = null;
+       request = null;
           if (formParamStr != null) {
            request = new DeleteRequest(url, headers, contentType, new StringEntity(formParamStr, "UTF-8"), stringRequest, errorListener);
           } else if (body != null) {
@@ -415,11 +468,12 @@ public class ApiInvoker {
           } else {
              request = new DeleteRequest(url, headers, contentType, new StringEntity(serialize(body), "UTF-8"), stringRequest, errorListener);
           }
+       } else {
+          request = new DeleteRequest(url, headers, null, null, stringRequest, errorListener);
        }
-       if(request != null) mRequestQueue.add(request);
     }
     else if ("PATCH".equals(method)) {
-                PatchRequest request = null;
+       request = null;
           if (formParamStr != null) {
              request = new PatchRequest(url, headers, contentType, new StringEntity(formParamStr, "UTF-8"), stringRequest, errorListener);
           } else if (body != null) {
@@ -428,12 +482,24 @@ public class ApiInvoker {
              } else {
                 request = new PatchRequest(url, headers, contentType, new StringEntity(serialize(body), "UTF-8"), stringRequest, errorListener);
              }
-             }
-          if(request != null) mRequestQueue.add(request);
+          } else {
+             request = new PatchRequest(url, headers, null, null, stringRequest, errorListener);
+          }
        }
+    return request;
   }
 
-  private void initConnectionManager() {
-    mRequestQueue = Volley.newRequestQueue(context);
+  private void initConnectionRequest(Cache cache, Network network) {
+     mRequestQueue = new RequestQueue(cache, network);
+     mRequestQueue.start();
+  }
+
+  private void initConnectionRequest(Cache cache, Network network, int threadPoolSize, ResponseDelivery delivery) {
+     mRequestQueue = new RequestQueue(cache, network, threadPoolSize, delivery);
+     mRequestQueue.start();
+  }
+
+  public void stopQueue() {
+     mRequestQueue.stop();
   }
 }
diff --git a/modules/swagger-codegen/src/main/resources/android/libraries/volley/auth/apikeyauth.mustache b/modules/swagger-codegen/src/main/resources/android/libraries/volley/auth/apikeyauth.mustache
index a1824b551ca..44c5ed96eca 100644
--- a/modules/swagger-codegen/src/main/resources/android/libraries/volley/auth/apikeyauth.mustache
+++ b/modules/swagger-codegen/src/main/resources/android/libraries/volley/auth/apikeyauth.mustache
@@ -44,6 +44,9 @@ public class ApiKeyAuth implements Authentication {
   @Override
   public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {
     String value;
+    if (apiKey == null) {
+        return;
+    }
     if (apiKeyPrefix != null) {
       value = apiKeyPrefix + " " + apiKey;
     } else {
diff --git a/modules/swagger-codegen/src/main/resources/android/libraries/volley/auth/oauth.mustache b/modules/swagger-codegen/src/main/resources/android/libraries/volley/auth/oauth.mustache
new file mode 100644
index 00000000000..7eb4fe4aaba
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/android/libraries/volley/auth/oauth.mustache
@@ -0,0 +1,13 @@
+package {{invokerPackage}}.auth;
+
+import {{invokerPackage}}.Pair;
+
+import java.util.Map;
+import java.util.List;
+
+public class OAuth implements Authentication {
+   @Override
+   public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {
+        // TODO stub
+   }
+}
diff --git a/modules/swagger-codegen/src/main/resources/android/libraries/volley/build.mustache b/modules/swagger-codegen/src/main/resources/android/libraries/volley/build.mustache
index ec599632fd8..fabdd14a6d6 100644
--- a/modules/swagger-codegen/src/main/resources/android/libraries/volley/build.mustache
+++ b/modules/swagger-codegen/src/main/resources/android/libraries/volley/build.mustache
@@ -8,9 +8,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
         {{#useAndroidMavenGradlePlugin}}
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
         {{/useAndroidMavenGradlePlugin}}
     }
 }
@@ -28,11 +28,11 @@ apply plugin: 'com.github.dcendents.android-maven'
 {{/useAndroidMavenGradlePlugin}}
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion '22.0.0'
+    compileSdkVersion 23
+    buildToolsVersion '23.0.2'
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 22
+        targetSdkVersion 23
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
@@ -49,15 +49,22 @@ android {
             }
         }
     }
+
+    testOptions {
+        unitTests.returnDefaultValues = true
+    }
 }
 
 
 ext {
     swagger_annotations_version = "1.5.0"
     gson_version = "2.3.1"
-    httpclient_version = "4.3.3"
+    httpclient_version = "4.5.2"
+    httpcore_version = "4.4.4"
     volley_version = "1.0.19"
-    junit_version = "4.8.1"
+    junit_version = "4.12"
+    robolectric_version = "3.0"
+    concurrent_unit_version = "0.4.2"
 }
 
 dependencies {
@@ -67,6 +74,8 @@ dependencies {
     compile "org.apache.httpcomponents:httpmime:$httpclient_version"
     compile "com.mcxiaoke.volley:library:${volley_version}@aar"
     testCompile "junit:junit:$junit_version"
+    testCompile "org.robolectric:robolectric:${robolectric_version}"
+    testCompile "net.jodah:concurrentunit:${concurrent_unit_version}"
 }
 
 afterEvaluate {
diff --git a/modules/swagger-codegen/src/main/resources/android/libraries/volley/responses.mustache b/modules/swagger-codegen/src/main/resources/android/libraries/volley/responses.mustache
deleted file mode 100644
index 7cb955f7239..00000000000
--- a/modules/swagger-codegen/src/main/resources/android/libraries/volley/responses.mustache
+++ /dev/null
@@ -1,24 +0,0 @@
-package {{invokerPackage}};
-
-import java.util.List;
-import {{modelPackage}}.*;
-
-public class Responses {
-  {{#models}}
-  {{#model}}
-    public static interface {{classname}}Response {
-        public void onResponse({{classname}} {{classVarName}});
-    }
-    public static interface {{classname}}ListResponse {
-        public void onResponse(List<{{classname}}> {{classVarName}}List);
-    }
-    {{/model}}
-  {{/models}}
-    public static interface StringResponse {
-        public void onResponse(String response);
-    }
-
-    public static interface StringListResponse {
-        public void onResponse(List<String> stringList);
-    }
-}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/android/pom.mustache b/modules/swagger-codegen/src/main/resources/android/pom.mustache
index ad093828ecc..0c00c55de1f 100644
--- a/modules/swagger-codegen/src/main/resources/android/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/android/pom.mustache
@@ -110,7 +110,7 @@
     <dependency>
       <groupId>io.swagger</groupId>
       <artifactId>swagger-annotations</artifactId>
-      <version>${swagger-annotations-version}</version>
+      <version>${swagger-core-version}</version>
     </dependency>
     <dependency>
         <groupId>com.google.code.gson</groupId>
@@ -145,7 +145,7 @@
     </repository>
   </repositories>
   <properties>
-    <swagger-annotations-version>1.5.4</swagger-annotations-version>
+    <swagger-core-version>1.5.8</swagger-core-version>
     <gson-version>2.3.1</gson-version>
     <junit-version>4.8.1</junit-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/Dockerfile.mustache b/modules/swagger-codegen/src/main/resources/aspnet5/Dockerfile.mustache
new file mode 100644
index 00000000000..8ff1b8faeed
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/aspnet5/Dockerfile.mustache
@@ -0,0 +1,10 @@
+FROM microsoft/aspnet:1.0.0-rc1-final
+
+RUN mkdir -p /app/{{packageName}}
+COPY . /app/{{packageName}}
+WORKDIR /app/{{packageName}}
+RUN ["dnu", "restore"]
+RUN ["dnu", "pack", "--out", "artifacts"]
+
+EXPOSE 5000/tcp
+ENTRYPOINT ["dnx", "-p", "project.json", "web"]
diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/Properties/launchSettings.json b/modules/swagger-codegen/src/main/resources/aspnet5/Properties/launchSettings.json
new file mode 100644
index 00000000000..7d41a0f84b9
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/aspnet5/Properties/launchSettings.json
@@ -0,0 +1,12 @@
+{
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "swagger/ui",
+      "environmentVariables": {
+        "ASPNET_ENV": "Development"
+      }
+    }
+  }
+}
diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/Startup.mustache b/modules/swagger-codegen/src/main/resources/aspnet5/Startup.mustache
new file mode 100644
index 00000000000..c4e9d328cc7
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/aspnet5/Startup.mustache
@@ -0,0 +1,136 @@
+using System;
+using System.IO;
+using System.Linq;
+using Microsoft.AspNet.Builder;
+using Microsoft.AspNet.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.PlatformAbstractions;
+using Newtonsoft.Json.Serialization;
+using Swashbuckle.SwaggerGen;
+using Swashbuckle.SwaggerGen.XmlComments;
+
+namespace {{packageName}}
+{
+    public class Startup
+    {
+        private readonly IHostingEnvironment _hostingEnv;
+        private readonly IApplicationEnvironment _appEnv;
+
+        public Startup(IHostingEnvironment env, IApplicationEnvironment appEnv)
+        {
+            _hostingEnv = env;
+            _appEnv = appEnv;
+
+            // Set up configuration sources.
+            var builder = new ConfigurationBuilder()
+                .AddJsonFile("appsettings.json")
+                .AddEnvironmentVariables();
+            Configuration = builder.Build();
+        }
+
+        public IConfigurationRoot Configuration { get; set; }
+
+        // This method gets called by the runtime. Use this method to add services to the container.
+        public void ConfigureServices(IServiceCollection services)
+        {
+            string xmlComments = string.Format(@"{0}{4}artifacts{4}{1}{4}{2}{3}{4}{{packageName}}.xml",
+                   GetSolutionBasePath(),
+                   _appEnv.Configuration,
+                   _appEnv.RuntimeFramework.Identifier.ToLower(),
+                   _appEnv.RuntimeFramework.Version.ToString().Replace(".", string.Empty),
+                   Path.DirectorySeparatorChar);
+                   
+            // Add framework services.
+            services.AddMvc()
+                .AddJsonOptions(
+                    opts => { opts.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver(); });
+
+            // Uncomment the following line to add Web API services which makes it easier to port Web API 2 controllers.
+            // You will also need to add the Microsoft.AspNet.Mvc.WebApiCompatShim package to the 'dependencies' section of project.json.
+            // services.AddWebApiConventions();
+
+            services.AddSwaggerGen();
+            services.ConfigureSwaggerDocument(options =>
+            {
+                options.SingleApiVersion(new Info
+                {
+                    Version = "v1",
+                    Title = "{{packageName}}",
+                    Description = "{{packageName}} (ASP.NET 5 Web API 2.x)"
+                });
+                
+                options.OperationFilter(new ApplyXmlActionCommentsFixed(xmlComments));
+            });
+
+            services.ConfigureSwaggerSchema(options => { 
+                options.DescribeAllEnumsAsStrings = true; 
+                options.ModelFilter(new ApplyXmlTypeCommentsFixed(xmlComments));
+            });
+        }
+
+        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
+        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
+        {
+            loggerFactory.MinimumLevel = LogLevel.Information;
+            loggerFactory.AddConsole(Configuration.GetSection("Logging"));
+            loggerFactory.AddDebug();
+
+            app.UseIISPlatformHandler();
+
+            app.UseDefaultFiles();
+            app.UseStaticFiles();
+
+            app.UseMvc();
+
+            app.UseSwaggerGen();
+            app.UseSwaggerUi();
+        }
+
+        // Taken from https://github.com/domaindrivendev/Ahoy/blob/master/test/WebSites/Basic/Startup.cs
+        private string GetSolutionBasePath()
+        {
+            var dir = Directory.CreateDirectory(_appEnv.ApplicationBasePath);
+            while (dir.Parent != null)
+            {
+                if (dir.GetDirectories("artifacts").Any())
+                    return dir.FullName;
+
+                dir = dir.Parent;
+            }
+            throw new InvalidOperationException("Failed to detect solution base path - artifacts not found. Did you run dnu pack --out artifacts?");
+        }
+
+        // Entry point for the application.
+        public static void Main(string[] args) => WebApplication.Run<Startup>(args);
+    }
+    
+        
+    //  using Swashbuckle.SwaggerGen.XmlComments;
+    public class ApplyXmlTypeCommentsFixed : ApplyXmlTypeComments
+    {
+        public ApplyXmlTypeCommentsFixed() : base("")
+        {
+            throw new NotImplementedException();
+        }
+
+        public ApplyXmlTypeCommentsFixed(string filePath): base(filePath)
+        {
+
+        }
+    }
+
+    public class ApplyXmlActionCommentsFixed : ApplyXmlActionComments
+    {
+        public ApplyXmlActionCommentsFixed() : base("")
+        {
+            throw new NotImplementedException();
+        }
+
+        public ApplyXmlActionCommentsFixed(string filePath): base(filePath)
+        {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/appsettings.json b/modules/swagger-codegen/src/main/resources/aspnet5/appsettings.json
new file mode 100644
index 00000000000..e5472e562b7
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/aspnet5/appsettings.json
@@ -0,0 +1,10 @@
+{
+  "Logging": {
+    "IncludeScopes": false,
+    "LogLevel": {
+      "Default": "Verbose",
+      "System": "Information",
+      "Microsoft": "Information"
+    }
+  }
+}
diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/bodyParam.mustache b/modules/swagger-codegen/src/main/resources/aspnet5/bodyParam.mustache
new file mode 100644
index 00000000000..02b0fa1d2de
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/aspnet5/bodyParam.mustache
@@ -0,0 +1 @@
+{{#isBodyParam}}[FromBody]{{&dataType}} {{paramName}}{{/isBodyParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/build.mustache b/modules/swagger-codegen/src/main/resources/aspnet5/build.mustache
new file mode 100644
index 00000000000..0a63bfeaf3d
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/aspnet5/build.mustache
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+if ! type dnvm > /dev/null 2>&1; then
+    source /usr/local/lib/dnx/bin/dnvm.sh
+fi
+
+if ! type dnu > /dev/null 2>&1 || [ -z "$SKIP_DNX_INSTALL" ]; then
+    dnvm install latest -runtime coreclr -alias default
+    dnvm install default -runtime mono -alias default
+else
+    dnvm use default -runtime mono
+fi
+
+dnu restore src/{{packageName}}/ && \
+    dnu build src/{{packageName}}/ && \
+    dnu pack src/{{packageName}}/ --out artifacts && \
+    echo "Now, run the following to start the project: dnx --project src/{{packageName}}/project.json web"
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/controller.mustache b/modules/swagger-codegen/src/main/resources/aspnet5/controller.mustache
new file mode 100644
index 00000000000..e9c5c919898
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/aspnet5/controller.mustache
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc;
+using Newtonsoft.Json;
+using Swashbuckle.SwaggerGen.Annotations;
+using {{packageName}}.Models;
+
+namespace {{packageName}}.Controllers
+{ {{#operations}}
+    /// <summary>
+    /// {{description}}
+    /// </summary>{{#description}}{{#basePath}}
+    [Route("{{basePath}}")]
+    {{/basePath}}[Description("{{description}}")]{{/description}}
+    public class {{classname}}Controller : Controller
+    { {{#operation}}
+
+        /// <summary>
+        /// {{#summary}}{{summary}}{{/summary}}
+        /// </summary>
+        {{#notes}}/// <remarks>{{notes}}</remarks>{{/notes}}{{#allParams}}
+        /// <param name="{{paramName}}">{{description}}</param>{{/allParams}}{{#responses}}
+        /// <response code="{{code}}">{{message}}</response>{{/responses}}
+        [{{httpMethod}}]
+        [Route("{{path}}")]
+        [SwaggerOperation("{{operationId}}")]{{#returnType}}
+        [SwaggerResponse(200, type: typeof({{&returnType}}))]{{/returnType}}
+        public {{#returnType}}IActionResult{{/returnType}}{{^returnType}}void{{/returnType}} {{operationId}}({{#allParams}}{{>pathParam}}{{>queryParam}}{{>bodyParam}}{{>formParam}}{{>headerParam}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
+        { {{#returnType}}
+            string exampleJson = null;
+            {{#isListCollection}}{{>listReturn}}{{/isListCollection}}{{^isListCollection}}{{#isMapContainer}}{{>mapReturn}}{{/isMapContainer}}{{^isMapContainer}}{{>objectReturn}}{{/isMapContainer}}{{/isListCollection}}
+            {{!TODO: defaultResponse, examples, auth, consumes, produces, nickname, externalDocs, imports, security}}
+            return new ObjectResult(example);{{/returnType}}{{^returnType}}
+            throw new NotImplementedException();{{/returnType}}
+        }
+{{/operation}}
+    }
+{{/operations}}
+}
diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/formParam.mustache b/modules/swagger-codegen/src/main/resources/aspnet5/formParam.mustache
new file mode 100644
index 00000000000..1e743e1e4c7
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/aspnet5/formParam.mustache
@@ -0,0 +1 @@
+{{#isFormParam}}[FromForm]{{&dataType}} {{paramName}}{{/isFormParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/gitignore b/modules/swagger-codegen/src/main/resources/aspnet5/gitignore
new file mode 100644
index 00000000000..cd9b840e549
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/aspnet5/gitignore
@@ -0,0 +1,208 @@
+PID
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+build/
+bld/
+[Bb]in/
+[Oo]bj/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# DNX
+project.lock.json
+artifacts/
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+
+# Windows Azure Build Output
+csx/
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.pfx
+*.publishsettings
+node_modules/
+bower_components/
+orleans.codegen.cs
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/global.json b/modules/swagger-codegen/src/main/resources/aspnet5/global.json
new file mode 100644
index 00000000000..4a6d1feac95
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/aspnet5/global.json
@@ -0,0 +1,8 @@
+{
+  "projects": [ "src", "." ],
+  "sdk": {
+    "version": "1.0.0-rc1-final",
+    "runtime": "coreclr",
+    "architecture": "x64"
+  }
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/headerParam.mustache b/modules/swagger-codegen/src/main/resources/aspnet5/headerParam.mustache
new file mode 100644
index 00000000000..e61cadb1131
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/aspnet5/headerParam.mustache
@@ -0,0 +1 @@
+{{#isHeaderParam}}[FromHeader]{{&dataType}} {{paramName}}{{/isHeaderParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/listReturn.mustache b/modules/swagger-codegen/src/main/resources/aspnet5/listReturn.mustache
new file mode 100644
index 00000000000..d609e67148c
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/aspnet5/listReturn.mustache
@@ -0,0 +1,4 @@
+
+            var example = exampleJson != null
+            ? JsonConvert.DeserializeObject<{{returnContainer}}<{{#returnType}}{{{returnType}}}{{/returnType}}>>(exampleJson)
+            : Enumerable.Empty<{{#returnType}}{{{returnType}}}{{/returnType}}>();
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/mapReturn.mustache b/modules/swagger-codegen/src/main/resources/aspnet5/mapReturn.mustache
new file mode 100644
index 00000000000..856fb1b3507
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/aspnet5/mapReturn.mustache
@@ -0,0 +1,4 @@
+
+            var example = exampleJson != null
+            ? JsonConvert.DeserializeObject<Dictionary<{{#returnType}}{{{returnType}}}{{/returnType}}>>(exampleJson)
+            : new Dictionary<{{#returnType}}{{{returnType}}}{{/returnType}}>();
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/model.mustache b/modules/swagger-codegen/src/main/resources/aspnet5/model.mustache
new file mode 100644
index 00000000000..08aaed01f3d
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/aspnet5/model.mustache
@@ -0,0 +1,154 @@
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+
+{{#models}}
+{{#model}}
+namespace {{packageName}}.Models
+{
+    /// <summary>
+    /// {{description}}
+    /// </summary>
+    public partial class {{classname}} : {{#parent}}{{{parent}}}, {{/parent}} IEquatable<{{classname}}>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="{{classname}}" /> class.
+        /// </summary>
+{{#vars}}        /// <param name="{{name}}">{{#description}}{{description}}{{/description}}{{^description}}{{name}}{{/description}}{{#required}} (required){{/required}}{{#defaultValue}} (default to {{defaultValue}}){{/defaultValue}}.</param>
+{{/vars}}
+        public {{classname}}({{#vars}}{{{datatype}}} {{name}} = null{{#hasMore}}, {{/hasMore}}{{/vars}})
+        {
+            {{#vars}}{{#required}}// to ensure "{{name}}" is required (not null)
+            if ({{name}} == null)
+            {
+                throw new InvalidDataException("{{name}} is a required property for {{classname}} and cannot be null");
+            }
+            else
+            {
+                this.{{name}} = {{name}};
+            }
+            {{/required}}{{/vars}}{{#vars}}{{^required}}{{#defaultValue}}// use default value if no "{{name}}" provided
+            if ({{name}} == null)
+            {
+                this.{{name}} = {{{defaultValue}}};
+            }
+            else
+            {
+                this.{{name}} = {{name}};
+            }
+            {{/defaultValue}}{{^defaultValue}}this.{{name}} = {{name}};
+            {{/defaultValue}}{{/required}}{{/vars}}
+        }
+
+        {{#vars}}
+        /// <summary>
+        /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{{description}}}{{/description}}
+        /// </summary>{{#description}}
+        /// <value>{{{description}}}</value>{{/description}}
+        public {{{datatype}}} {{name}} { get; set; }
+
+        {{/vars}}
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class {{classname}} {\n");
+            {{#vars}}sb.Append("  {{name}}: ").Append({{name}}).Append("\n");
+            {{/vars}}
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public {{#parent}} new {{/parent}}string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="obj">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != GetType()) return false;
+            return Equals(({{classname}})obj);
+        }
+
+        /// <summary>
+        /// Returns true if {{classname}} instances are equal
+        /// </summary>
+        /// <param name="other">Instance of {{classname}} to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals({{classname}} other)
+        {
+
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return {{#vars}}{{#isNotContainer}}
+                (
+                    this.{{name}} == other.{{name}} ||
+                    this.{{name}} != null &&
+                    this.{{name}}.Equals(other.{{name}})
+                ){{#hasMore}} && {{/hasMore}}{{/isNotContainer}}{{^isNotContainer}}
+                (
+                    this.{{name}} == other.{{name}} ||
+                    this.{{name}} != null &&
+                    this.{{name}}.SequenceEqual(other.{{name}})
+                ){{#hasMore}} && {{/hasMore}}{{/isNotContainer}}{{/vars}}{{^vars}}false{{/vars}};
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            // credit: http://stackoverflow.com/a/263416/677735
+            unchecked // Overflow is fine, just wrap
+            {
+                int hash = 41;
+                // Suitable nullity checks etc, of course :)
+                {{#vars}}
+                    if (this.{{name}} != null)
+                    hash = hash * 59 + this.{{name}}.GetHashCode();
+                {{/vars}}
+                return hash;
+            }
+        }
+
+        #region Operators
+
+        public static bool operator ==({{classname}} left, {{classname}} right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=({{classname}} left, {{classname}} right)
+        {
+            return !Equals(left, right);
+        }
+
+        #endregion Operators
+
+    }
+{{/model}}
+{{/models}}
+}
diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/objectReturn.mustache b/modules/swagger-codegen/src/main/resources/aspnet5/objectReturn.mustache
new file mode 100644
index 00000000000..4059a61ac0b
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/aspnet5/objectReturn.mustache
@@ -0,0 +1,4 @@
+
+            var example = exampleJson != null
+            ? JsonConvert.DeserializeObject<{{#returnType}}{{{returnType}}}{{/returnType}}>(exampleJson)
+            : default({{#returnType}}{{{returnType}}}{{/returnType}});
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/pathParam.mustache b/modules/swagger-codegen/src/main/resources/aspnet5/pathParam.mustache
new file mode 100644
index 00000000000..5aa27eb4cb3
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/aspnet5/pathParam.mustache
@@ -0,0 +1 @@
+{{#isPathParam}}[FromRoute]{{&dataType}} {{paramName}}{{/isPathParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/project.mustache b/modules/swagger-codegen/src/main/resources/aspnet5/project.mustache
new file mode 100644
index 00000000000..018084bc7e1
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/aspnet5/project.mustache
@@ -0,0 +1,41 @@
+{
+  "version": "{{packageVersion}}-*",
+  "compilationOptions": {
+    "emitEntryPoint": true
+  },
+  "tooling": {
+    "defaultNamespace": "{{packageName}}"
+  },
+
+  "dependencies": {
+    "Microsoft.AspNet.IISPlatformHandler": "1.0.0-rc1-final",
+    "Microsoft.AspNet.Mvc": "6.0.0-rc1-final",
+    "Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final",
+    "Microsoft.AspNet.StaticFiles": "1.0.0-rc1-final",
+    "Microsoft.Extensions.Configuration.FileProviderExtensions" : "1.0.0-rc1-final",
+    "Microsoft.Extensions.Logging": "1.0.0-rc1-final",
+    "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
+    "Microsoft.Extensions.Logging.Debug" : "1.0.0-rc1-final",
+    "Swashbuckle.SwaggerGen": "6.0.0-rc1-final",
+    "Swashbuckle.SwaggerUi": "6.0.0-rc1-final"
+  },
+
+  "commands": {
+    "web": "Microsoft.AspNet.Server.Kestrel --server.urls http://0.0.0.0:5000"
+  },
+
+  "frameworks": {
+    "dnx451": { },
+    "dnxcore50": { }
+  },
+
+  "exclude": [
+    "wwwroot",
+    "node_modules",
+    "bower_components"
+  ],
+  "publishExclude": [
+    "**.user",
+    "**.vspscc"
+  ]
+}
diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/queryParam.mustache b/modules/swagger-codegen/src/main/resources/aspnet5/queryParam.mustache
new file mode 100644
index 00000000000..42ce87a2b7f
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/aspnet5/queryParam.mustache
@@ -0,0 +1 @@
+{{#isQueryParam}}[FromQuery]{{&dataType}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/tags.mustache b/modules/swagger-codegen/src/main/resources/aspnet5/tags.mustache
new file mode 100644
index 00000000000..c97df19949e
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/aspnet5/tags.mustache
@@ -0,0 +1 @@
+{{!TODO: Need iterable tags object...}}{{#tags}}, Tags = new[] { {{/tags}}"{{#tags}}{{tag}} {{/tags}}"{{#tags}} }{{/tags}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/wwwroot/README.md b/modules/swagger-codegen/src/main/resources/aspnet5/wwwroot/README.md
new file mode 100644
index 00000000000..6a0b78471a3
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/aspnet5/wwwroot/README.md
@@ -0,0 +1,42 @@
+# Welcome to ASP.NET 5 Preview
+
+We've made some big updates in this release, so it’s **important** that you spend a few minutes to learn what’s new.
+
+ASP.NET 5 has been rearchitected to make it **lean** and **composable**. It's fully **open source** and available on [GitHub](http://go.microsoft.com/fwlink/?LinkID=517854).
+Your new project automatically takes advantage of modern client-side utilities like [Bower](http://go.microsoft.com/fwlink/?LinkId=518004) and [npm](http://go.microsoft.com/fwlink/?LinkId=518005) (to add client-side libraries) and [Gulp](http://go.microsoft.com/fwlink/?LinkId=518007) (for client-side build and automation tasks).
+
+We hope you enjoy the new capabilities in ASP.NET 5 and Visual Studio 2015.
+The ASP.NET Team
+
+### You've created a new ASP.NET 5 project. [Learn what's new](http://go.microsoft.com/fwlink/?LinkId=518016)
+
+### This application consists of:
+* Sample pages using ASP.NET MVC 6
+* [Gulp](http://go.microsoft.com/fwlink/?LinkId=518007) and [Bower](http://go.microsoft.com/fwlink/?LinkId=518004) for managing client-side resources
+* Theming using [Bootstrap](http://go.microsoft.com/fwlink/?LinkID=398939)
+
+#### NEW CONCEPTS
+* [The 'wwwroot' explained](http://go.microsoft.com/fwlink/?LinkId=518008)
+* [Configuration in ASP.NET 5](http://go.microsoft.com/fwlink/?LinkId=518012)
+* [Dependency Injection](http://go.microsoft.com/fwlink/?LinkId=518013)
+* [Razor TagHelpers](http://go.microsoft.com/fwlink/?LinkId=518014)
+* [Manage client packages using Gulp](http://go.microsoft.com/fwlink/?LinkID=517849)
+* [Develop on different platforms](http://go.microsoft.com/fwlink/?LinkID=517850)
+
+#### CUSTOMIZE APP
+* [Add Controllers and Views](http://go.microsoft.com/fwlink/?LinkID=398600)
+* [Add Data using EntityFramework](http://go.microsoft.com/fwlink/?LinkID=398602)
+* [Add Authentication using Identity](http://go.microsoft.com/fwlink/?LinkID=398603)
+* [Add real time support using SignalR](http://go.microsoft.com/fwlink/?LinkID=398606)
+* [Add Class library](http://go.microsoft.com/fwlink/?LinkID=398604)
+* [Add Web APIs with MVC 6](http://go.microsoft.com/fwlink/?LinkId=518009)
+* [Add client packages using Bower](http://go.microsoft.com/fwlink/?LinkID=517848)
+
+#### DEPLOY
+* [Run your app locally](http://go.microsoft.com/fwlink/?LinkID=517851)
+* [Run your app on ASP.NET Core 5](http://go.microsoft.com/fwlink/?LinkID=517852)
+* [Run commands in your 'project.json'](http://go.microsoft.com/fwlink/?LinkID=517853)
+* [Publish to Microsoft Azure Web Sites](http://go.microsoft.com/fwlink/?LinkID=398609)
+* [Publish to the file system](http://go.microsoft.com/fwlink/?LinkId=518019)
+
+We would love to hear your [feedback](http://go.microsoft.com/fwlink/?LinkId=518015)
diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/wwwroot/index.html b/modules/swagger-codegen/src/main/resources/aspnet5/wwwroot/index.html
new file mode 100644
index 00000000000..c8c055b34f7
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/aspnet5/wwwroot/index.html
@@ -0,0 +1 @@
+<meta http-equiv="refresh" content="0;URL='./swagger/ui/index.html'" />
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/wwwroot/web.config b/modules/swagger-codegen/src/main/resources/aspnet5/wwwroot/web.config
new file mode 100644
index 00000000000..e70a7778d60
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/aspnet5/wwwroot/web.config
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <system.webServer>
+    <handlers>
+      <add name="httpPlatformHandler" path="*" verb="*" modules="httpPlatformHandler" resourceType="Unspecified"/>
+    </handlers>
+    <httpPlatform processPath="%DNX_PATH%" arguments="%DNX_ARGS%" stdoutLogEnabled="false"/>
+  </system.webServer>
+</configuration>
diff --git a/modules/swagger-codegen/src/main/resources/clojure/git_push.sh.mustache b/modules/swagger-codegen/src/main/resources/clojure/git_push.sh.mustache
new file mode 100755
index 00000000000..e153ce23ecf
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/clojure/git_push.sh.mustache
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="{{{gitUserId}}}"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="{{{gitRepoId}}}"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="{{{releaseNote}}}"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/modules/swagger-codegen/src/main/resources/clojure/gitignore.mustache b/modules/swagger-codegen/src/main/resources/clojure/gitignore.mustache
new file mode 100644
index 00000000000..47fed6c20d9
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/clojure/gitignore.mustache
@@ -0,0 +1,12 @@
+pom.xml
+pom.xml.asc
+*jar
+/lib/
+/classes/
+/target/
+/checkouts/
+.lein-deps-sum
+.lein-repl-history
+.lein-plugins/
+.lein-failures
+.nrepl-port
diff --git a/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
index 142b2e6bbb9..f359e07fcb1 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
@@ -61,7 +61,8 @@ namespace {{packageName}}.Client
         /// Gets or sets the default API client for making HTTP calls.
         /// </summary>
         /// <value>The default API client.</value>
-        public static ApiClient Default = new ApiClient(Configuration.Default);
+        [Obsolete("ApiClient.Default is deprecated, please use 'Configuration.Default.ApiClient' instead.")]
+        public static ApiClient Default;
     
         /// <summary>
         /// Gets or sets the Configuration.
@@ -77,12 +78,13 @@ namespace {{packageName}}.Client
     
         // Creates and sets up a RestRequest prior to a call.
         private RestRequest PrepareRequest(
-            String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
+            String path, RestSharp.Method method, Dictionary<String, String> queryParams, Object postBody,
             Dictionary<String, String> headerParams, Dictionary<String, String> formParams,
-            Dictionary<String, FileParameter> fileParams, Dictionary<String, String> pathParams)
+            Dictionary<String, FileParameter> fileParams, Dictionary<String, String> pathParams,
+            String contentType)
         {
             var request = new RestRequest(path, method);
-   
+
             // add path parameter, if any
             foreach(var param in pathParams)
                 request.AddParameter(param.Key, param.Value, ParameterType.UrlSegment); 
@@ -103,8 +105,17 @@ namespace {{packageName}}.Client
             foreach(var param in fileParams)
                 request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType);
 
-            if (postBody != null) // http body (model) parameter
-                request.AddParameter("application/json", postBody, ParameterType.RequestBody);
+            if (postBody != null) // http body (model or byte[]) parameter
+            {
+                if (postBody.GetType() == typeof(String))
+                {
+                    request.AddParameter("application/json", postBody, ParameterType.RequestBody);
+                }
+                else if (postBody.GetType() == typeof(byte[]))
+                {
+                    request.AddParameter(contentType, postBody, ParameterType.RequestBody);
+                }
+            }
     
             return request;
         }
@@ -120,18 +131,27 @@ namespace {{packageName}}.Client
         /// <param name="formParams">Form parameters.</param>
         /// <param name="fileParams">File parameters.</param>
         /// <param name="pathParams">Path parameters.</param>
+        /// <param name="contentType">Content Type of the request</param>
         /// <returns>Object</returns>
         public Object CallApi(
-            String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
+            String path, RestSharp.Method method, Dictionary<String, String> queryParams, Object postBody,
             Dictionary<String, String> headerParams, Dictionary<String, String> formParams,
-            Dictionary<String, FileParameter> fileParams, Dictionary<String, String> pathParams)
+            Dictionary<String, FileParameter> fileParams, Dictionary<String, String> pathParams,
+            String contentType)
         {
             var request = PrepareRequest(
-                path, method, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
+                path, method, queryParams, postBody, headerParams, formParams, fileParams,
+                pathParams, contentType);
+
+            // set timeout
+            RestClient.Timeout = Configuration.Timeout;
+            // set user agent
+            RestClient.UserAgent = Configuration.UserAgent;
+
             var response = RestClient.Execute(request);
             return (Object) response;
         }
-
+        {{#supportsAsync}}
         /// <summary>
         /// Makes the asynchronous HTTP request.
         /// </summary>
@@ -143,17 +163,20 @@ namespace {{packageName}}.Client
         /// <param name="formParams">Form parameters.</param>
         /// <param name="fileParams">File parameters.</param>
         /// <param name="pathParams">Path parameters.</param>
+        /// <param name="contentType">Content type.</param>
         /// <returns>The Task instance.</returns>
         public async System.Threading.Tasks.Task<Object> CallApiAsync(
-            String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
+            String path, RestSharp.Method method, Dictionary<String, String> queryParams, Object postBody,
             Dictionary<String, String> headerParams, Dictionary<String, String> formParams,
-            Dictionary<String, FileParameter> fileParams, Dictionary<String, String> pathParams)
+            Dictionary<String, FileParameter> fileParams, Dictionary<String, String> pathParams,
+            String contentType)
         {
             var request = PrepareRequest(
-                path, method, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
+                path, method, queryParams, postBody, headerParams, formParams, fileParams,
+                pathParams, contentType);
             var response = await RestClient.ExecuteTaskAsync(request);
             return (Object)response;
-        }
+        }{{/supportsAsync}}
     
         /// <summary>
         /// Escape string (url-encoded).
@@ -194,6 +217,12 @@ namespace {{packageName}}.Client
                 // https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8
                 // For example: 2009-06-15T13:45:30.0000000
                 return ((DateTime)obj).ToString (Configuration.DateTimeFormat);
+            else if (obj is DateTimeOffset)
+                // Return a formatted date string - Can be customized with Configuration.DateTimeFormat
+                // Defaults to an ISO 8601, using the known as a Round-trip date/time pattern ("o")
+                // https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8
+                // For example: 2009-06-15T13:45:30.0000000
+                return ((DateTimeOffset)obj).ToString (Configuration.DateTimeFormat);   
             else if (obj is IList)
             {
                 var flattenedString = new StringBuilder();
@@ -217,12 +246,10 @@ namespace {{packageName}}.Client
         /// <returns>Object representation of the JSON string.</returns>
         public object Deserialize(IRestResponse response, Type type)
         {
-            byte[] data = response.RawBytes;
-            string content = response.Content;
             IList<Parameter> headers = response.Headers;
-            if (type == typeof(Object)) // return an object
+            if (type == typeof(byte[])) // return byte array
             {
-                return content;
+                return response.RawBytes;
             }
 
             if (type == typeof(Stream))
@@ -238,30 +265,30 @@ namespace {{packageName}}.Client
                         var match = regex.Match(header.ToString());
                         if (match.Success)
                         {
-                            string fileName = filePath + match.Groups[1].Value.Replace("\"", "").Replace("'", "");
-                            File.WriteAllBytes(fileName, data);
+                            string fileName = filePath + SanitizeFilename(match.Groups[1].Value.Replace("\"", "").Replace("'", ""));
+                            File.WriteAllBytes(fileName, response.RawBytes);
                             return new FileStream(fileName, FileMode.Open);
                         }
                     }
                 }
-                var stream = new MemoryStream(data);
+                var stream = new MemoryStream(response.RawBytes);
                 return stream;
             }
 
             if (type.Name.StartsWith("System.Nullable`1[[System.DateTime")) // return a datetime object
             {
-                return DateTime.Parse(content,  null, System.Globalization.DateTimeStyles.RoundtripKind);
+                return DateTime.Parse(response.Content,  null, System.Globalization.DateTimeStyles.RoundtripKind);
             }
 
             if (type == typeof(String) || type.Name.StartsWith("System.Nullable")) // return primitive type
             {
-                return ConvertType(content, type); 
+                return ConvertType(response.Content, type); 
             }
     
             // at this point, it must be a model (json)
             try
             {
-                return JsonConvert.DeserializeObject(content, type);
+                return JsonConvert.DeserializeObject(response.Content, type);
             }
             catch (Exception e)
             {
@@ -270,11 +297,11 @@ namespace {{packageName}}.Client
         }
     
         /// <summary>
-        /// Serialize an object into JSON string.
+        /// Serialize an input (model) into JSON string
         /// </summary>
         /// <param name="obj">Object.</param>
         /// <returns>JSON string.</returns>
-        public string Serialize(object obj)
+        public String Serialize(object obj)
         {
             try
             {
@@ -286,6 +313,24 @@ namespace {{packageName}}.Client
             }
         }
     
+        /// <summary>
+        /// Select the Content-Type header's value from the given content-type array:
+        /// if JSON exists in the given array, use it;
+        /// otherwise use the first one defined in 'consumes'
+        /// </summary>
+        /// <param name="contentTypes">The Content-Type array to select from.</param>
+        /// <returns>The Content-Type header to use.</returns>
+        public String SelectHeaderContentType(String[] contentTypes)
+        {
+            if (contentTypes.Length == 0)
+                return null;
+
+            if (contentTypes.Contains("application/json", StringComparer.OrdinalIgnoreCase))
+                return "application/json";
+
+            return contentTypes[0]; // use the first content type specified in 'consumes'
+        }
+
         /// <summary>
         /// Select the Accept header's value from the given accepts array:
         /// if JSON exists in the given array, use it;
@@ -321,7 +366,7 @@ namespace {{packageName}}.Client
         /// <param name="source">Object to be casted</param>
         /// <param name="dest">Target type</param>
         /// <returns>Casted object</returns>
-        public static dynamic ConvertType(dynamic source, Type dest)
+        {{#supportsAsync}}public static dynamic ConvertType(dynamic source, Type dest){{/supportsAsync}}{{^supportsAsync}}public static object ConvertType<T>(T source, Type dest) where T : class{{/supportsAsync}}
         {
             return Convert.ChangeType(source, dest);
         }
@@ -381,6 +426,23 @@ namespace {{packageName}}.Client
             return sb.ToString();
         }
 
-  
+        /// <summary>
+        /// Sanitize filename by removing the path
+        /// </summary>
+        /// <param name="filename">Filename</param>
+        /// <returns>Filename</returns>
+        public static string SanitizeFilename(string filename)
+        {
+            Match match = Regex.Match(filename, @".*[/\\](.*)$");
+
+            if (match.Success)
+            {
+                return match.Groups[1].Value;
+            }
+            else
+            {
+                return filename;
+            }
+        }
     }
 }
diff --git a/modules/swagger-codegen/src/main/resources/csharp/ApiException.mustache b/modules/swagger-codegen/src/main/resources/csharp/ApiException.mustache
index 09dbd0dce50..8e56fb31f43 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/ApiException.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/ApiException.mustache
@@ -17,7 +17,7 @@ namespace {{packageName}}.Client
         /// Gets or sets the error content (body json object)
         /// </summary>
         /// <value>The error content (Http response body).</value>
-        public dynamic ErrorContent { get; private set; }
+        public {{#supportsAsync}}dynamic{{/supportsAsync}}{{^supportsAsync}}object{{/supportsAsync}} ErrorContent { get; private set; }
   
         /// <summary>
         /// Initializes a new instance of the <see cref="ApiException"/> class.
@@ -40,7 +40,7 @@ namespace {{packageName}}.Client
         /// <param name="errorCode">HTTP status code.</param>
         /// <param name="message">Error message.</param>
         /// <param name="errorContent">Error content.</param>
-        public ApiException(int errorCode, string message, dynamic errorContent = null) : base(message)
+        public ApiException(int errorCode, string message, {{#supportsAsync}}dynamic{{/supportsAsync}}{{^supportsAsync}}object{{/supportsAsync}} errorContent = null) : base(message)
         {
             this.ErrorCode = errorCode;
             this.ErrorContent = errorContent;
diff --git a/modules/swagger-codegen/src/main/resources/csharp/ApiResponse.mustache b/modules/swagger-codegen/src/main/resources/csharp/ApiResponse.mustache
index 32816110a1b..c4317c35b65 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/ApiResponse.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/ApiResponse.mustache
@@ -27,10 +27,10 @@ namespace {{packageName}}.Client
         public T Data { get; private set; }
   
         /// <summary>
-        /// Initializes a new instance of the <see cref="ApiResponse"/> class.
+        /// Initializes a new instance of the <see cref="ApiResponse&lt;T&gt;" /> class.
         /// </summary>
         /// <param name="statusCode">HTTP status code.</param>
-        /// <param name="message">Error message.</param>
+        /// <param name="headers">HTTP headers.</param>
         /// <param name="data">Data (parsed HTTP body)</param>
         public ApiResponse(int statusCode, IDictionary<string, string> headers, T data)
         {
diff --git a/modules/swagger-codegen/src/main/resources/csharp/AssemblyInfo.mustache b/modules/swagger-codegen/src/main/resources/csharp/AssemblyInfo.mustache
index 8a19fd01393..bf80d7d4568 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/AssemblyInfo.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/AssemblyInfo.mustache
@@ -1,6 +1,5 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
-using System.Windows;
 
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
diff --git a/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache b/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache
index 7062a73c1e1..f9c492a28ec 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache
@@ -24,6 +24,8 @@ namespace {{packageName}}.Client
         /// <param name="apiKeyPrefix">Dictionary of API key prefix</param>
         /// <param name="tempFolderPath">Temp folder path</param>
         /// <param name="dateTimeFormat">DateTime format string</param>
+        /// <param name="timeout">HTTP connection timeout (in milliseconds)</param>
+        /// <param name="userAgent">HTTP user agent</param>
         public Configuration(ApiClient apiClient = null,
                              Dictionary<String, String> defaultHeader = null,
                              string username = null,
@@ -33,17 +35,16 @@ namespace {{packageName}}.Client
                              Dictionary<String, String> apiKeyPrefix = null,
                              string tempFolderPath = null,
                              string dateTimeFormat = null,
-                             int timeout = 100000
+                             int timeout = 100000,
+                             string userAgent = "{{#httpUserAgent}}{{.}}{{/httpUserAgent}}{{^httpUserAgent}}Swagger-Codegen/{{packageVersion}}/csharp{{/httpUserAgent}}"
                             )
         {
-            if (apiClient == null)
-                ApiClient = ApiClient.Default;
-            else 
-                ApiClient = apiClient;
+            setApiClientUsingDefault(apiClient);
 
             Username = username;
             Password = password;
             AccessToken = accessToken;
+            UserAgent = userAgent;
 
             if (defaultHeader != null)
                 DefaultHeader = defaultHeader;
@@ -63,18 +64,15 @@ namespace {{packageName}}.Client
         /// <param name="apiClient">Api client.</param>
         public Configuration(ApiClient apiClient)
         {
-            if (apiClient == null)
-                ApiClient = ApiClient.Default;
-            else 
-                ApiClient = apiClient;
+            setApiClientUsingDefault(apiClient);
         }
-  
+
         /// <summary>
         /// Version of the package.
         /// </summary>
         /// <value>Version of the package.</value>
         public const string Version = "{{packageVersion}}";
-  
+
         /// <summary>
         /// Gets or sets the default Configuration.
         /// </summary>
@@ -91,7 +89,8 @@ namespace {{packageName}}.Client
 
             set 
             {
-                ApiClient.RestClient.Timeout = value;
+                if (ApiClient != null)
+                    ApiClient.RestClient.Timeout = value;
             }
         }
 
@@ -101,8 +100,31 @@ namespace {{packageName}}.Client
         /// <value>The API client.</value>
         public ApiClient ApiClient;
 
+        /// <summary>
+        /// Set the ApiClient using Default or ApiClient instance.
+        /// </summary>
+        /// <param name="apiClient">An instance of ApiClient.</param>
+        /// <returns></returns>
+        public void setApiClientUsingDefault (ApiClient apiClient = null)
+        {
+            if (apiClient == null)
+            {
+                if (Default != null && Default.ApiClient == null)
+                    Default.ApiClient = new ApiClient();
+
+                ApiClient = Default != null ? Default.ApiClient : new ApiClient();
+            }
+            else
+            {
+                if (Default != null && Default.ApiClient == null)
+                    Default.ApiClient = apiClient;
+
+                ApiClient = apiClient;
+            }
+        }
+
         private Dictionary<String, String> _defaultHeaderMap = new Dictionary<String, String>();
-        
+
         /// <summary>
         /// Gets or sets the default header.
         /// </summary>
@@ -127,18 +149,24 @@ namespace {{packageName}}.Client
             _defaultHeaderMap.Add(key, value);
         }
 
+        /// <summary>
+        /// Gets or sets the HTTP user agent.
+        /// </summary>
+        /// <value>Http user agent.</value>
+        public String UserAgent { get; set; }
+
         /// <summary>
         /// Gets or sets the username (HTTP basic authentication).
         /// </summary>
         /// <value>The username.</value>
         public String Username { get; set; }
-  
+
         /// <summary>
         /// Gets or sets the password (HTTP basic authentication).
         /// </summary>
         /// <value>The password.</value>
         public String Password { get; set; }
-  
+
         /// <summary>
         /// Gets or sets the access token for OAuth2 authentication.
         /// </summary>
@@ -150,7 +178,7 @@ namespace {{packageName}}.Client
         /// </summary>
         /// <value>The API key.</value>
         public Dictionary<String, String> ApiKey = new Dictionary<String, String>();
-  
+
         /// <summary>
         /// Gets or sets the prefix (e.g. Token) of the API key based on the authentication name.
         /// </summary>
@@ -172,9 +200,9 @@ namespace {{packageName}}.Client
             else
                 return apiKeyValue;
         }
-  
+
         private string _tempFolderPath = Path.GetTempPath();
-  
+
         /// <summary>
         /// Gets or sets the temporary folder path to store the files downloaded from the server.
         /// </summary>
@@ -182,19 +210,19 @@ namespace {{packageName}}.Client
         public String TempFolderPath
         {
             get { return _tempFolderPath; }
-  
-            set 
+
+            set
             {
                 if (String.IsNullOrEmpty(value))
                 {
                     _tempFolderPath = value;
                     return;
                 }
-      
+
                 // create the directory if it does not exist
                 if (!Directory.Exists(value)) 
                     Directory.CreateDirectory(value);
-      
+
                 // check if the path contains directory separator at the end
                 if (value[value.Length - 1] == Path.DirectorySeparatorChar)
                     _tempFolderPath = value;
@@ -249,7 +277,7 @@ namespace {{packageName}}.Client
                      .Where(x => x.Name == "System.Core").First().Version.ToString()  + "\n";
             report += "    Version of the API: {{version}}\n";
             report += "    SDK Package Version: {{packageVersion}}\n";
-  
+
             return report;
         }
     }
diff --git a/modules/swagger-codegen/src/main/resources/csharp/Newtonsoft.Json.dll b/modules/swagger-codegen/src/main/resources/csharp/Newtonsoft.Json.dll
deleted file mode 100644
index ae725c4b598..00000000000
Binary files a/modules/swagger-codegen/src/main/resources/csharp/Newtonsoft.Json.dll and /dev/null differ
diff --git a/modules/swagger-codegen/src/main/resources/csharp/Project.mustache b/modules/swagger-codegen/src/main/resources/csharp/Project.mustache
new file mode 100644
index 00000000000..d418dc74f8b
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/csharp/Project.mustache
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{{packageGuid}}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>{{packageTitle}}</RootNamespace>
+    <AssemblyName>{{packageTitle}}</AssemblyName>
+    <TargetFrameworkVersion>{{targetFramework}}</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.WebRequest" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Newtonsoft.Json">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>{{binRelativePath}}/Newtonsoft.Json.8.0.2/lib/{{targetFrameworkNuget}}/Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="RestSharp">
+      <HintPath>{{binRelativePath}}/RestSharp.105.2.3/lib/{{targetFrameworkNuget}}/RestSharp.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs"/>
+    <Compile Include="Api\*.cs"/>
+    <Compile Include="Client\*.cs"/>
+    <Compile Include="Model\*.cs"/>
+  </ItemGroup>
+  <Import Project="$(MsBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
+
diff --git a/modules/swagger-codegen/src/main/resources/csharp/README.md b/modules/swagger-codegen/src/main/resources/csharp/README.md
index bbab203d23f..794a7c49b1b 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/README.md
+++ b/modules/swagger-codegen/src/main/resources/csharp/README.md
@@ -1,15 +1,22 @@
 ## Frameworks supported
-- .NET 3.5 or later
+- .NET 4.0 or later
 - Windows Phone 7.1 (Mango)
 
 ## Dependencies
-- [RestSharp] (https://www.nuget.org/packages/RestSharp)
-- [Json.NET] (https://www.nuget.org/packages/Newtonsoft.Json/)
+- [RestSharp] (https://www.nuget.org/packages/RestSharp) - 105.1.0 or later
+- [Json.NET] (https://www.nuget.org/packages/Newtonsoft.Json/) - 7.0.0 or later 
 
-
-NOTE: The DLLs included in the package may not be the latest version. We recommned using [NuGet] (https://docs.nuget.org/consume/installing-nuget) to obtain the latest version of the packages:
+The DLLs included in the package may not be the latest version. We recommned using [NuGet] (https://docs.nuget.org/consume/installing-nuget) to obtain the latest version of the packages:
 ```
 Install-Package RestSharp
 Install-Package Newtonsoft.Json
-``` 
+```
 
+NOTE: RestSharp versions greater than 105.1.0 have a bug which causes file uploads to fail. See [RestSharp#742](https://github.com/restsharp/RestSharp/issues/742)
+
+## Installation
+Run the following command to generate the DLL
+- [Mac/Linux] compile-mono.sh
+- [Windows] compile.bat
+
+Then include the DLL (under the `bin` folder) in the C# project
diff --git a/modules/swagger-codegen/src/main/resources/csharp/RestSharp.dll b/modules/swagger-codegen/src/main/resources/csharp/RestSharp.dll
deleted file mode 100644
index a7331ed6e23..00000000000
Binary files a/modules/swagger-codegen/src/main/resources/csharp/RestSharp.dll and /dev/null differ
diff --git a/modules/swagger-codegen/src/main/resources/csharp/api.mustache b/modules/swagger-codegen/src/main/resources/csharp/api.mustache
index 51f8b3f9394..02c6e0ad2b3 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/api.mustache
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using RestSharp;
 using {{packageName}}.Client;
@@ -15,6 +16,7 @@ namespace {{packageName}}.Api
     /// </summary>
     public interface I{{classname}}
     {
+        #region Synchronous Operations
         {{#operation}}
         /// <summary>
         /// {{summary}}
@@ -22,7 +24,8 @@ namespace {{packageName}}.Api
         /// <remarks>
         /// {{notes}}
         /// </remarks>
-        {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
+        /// <exception cref="{{packageName}}.Client.ApiException">Thrown when fails to make API call</exception>
+        {{#allParams}}/// <param name="{{paramName}}">{{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}</param>
         {{/allParams}}/// <returns>{{#returnType}}{{returnType}}{{/returnType}}</returns>
         {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{operationId}} ({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = null{{/optionalMethodArgument}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
   
@@ -32,17 +35,23 @@ namespace {{packageName}}.Api
         /// <remarks>
         /// {{notes}}
         /// </remarks>
-        {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
+        /// <exception cref="{{packageName}}.Client.ApiException">Thrown when fails to make API call</exception>
+        {{#allParams}}/// <param name="{{paramName}}">{{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}</param>
         {{/allParams}}/// <returns>ApiResponse of {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Object(void){{/returnType}}</returns>
         ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}}> {{operationId}}WithHttpInfo ({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = null{{/optionalMethodArgument}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
-
+        {{/operation}}
+        #endregion Synchronous Operations
+        {{#supportsAsync}}
+        #region Asynchronous Operations
+        {{#operation}}
         /// <summary>
         /// {{summary}}
         /// </summary>
         /// <remarks>
         /// {{notes}}
         /// </remarks>
-        {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
+        /// <exception cref="{{packageName}}.Client.ApiException">Thrown when fails to make API call</exception>
+        {{#allParams}}/// <param name="{{paramName}}">{{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}</param>
         {{/allParams}}/// <returns>Task of {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}void{{/returnType}}</returns>
         {{#returnType}}System.Threading.Tasks.Task<{{{returnType}}}>{{/returnType}}{{^returnType}}System.Threading.Tasks.Task{{/returnType}} {{operationId}}Async ({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = null{{/optionalMethodArgument}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
 
@@ -52,10 +61,13 @@ namespace {{packageName}}.Api
         /// <remarks>
         /// {{notes}}
         /// </remarks>
-        {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
+        /// <exception cref="{{packageName}}.Client.ApiException">Thrown when fails to make API call</exception>
+        {{#allParams}}/// <param name="{{paramName}}">{{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}</param>
         {{/allParams}}/// <returns>Task of ApiResponse{{#returnType}} ({{returnType}}){{/returnType}}</returns>
         System.Threading.Tasks.Task<ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}}>> {{operationId}}AsyncWithHttpInfo ({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = null{{/optionalMethodArgument}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
         {{/operation}}
+        #endregion Asynchronous Operations
+        {{/supportsAsync}}
     }
   
     /// <summary>
@@ -70,6 +82,12 @@ namespace {{packageName}}.Api
         public {{classname}}(String basePath)
         {
             this.Configuration = new Configuration(new ApiClient(basePath));
+
+            // ensure API client has configuration ready
+            if (Configuration.ApiClient.Configuration == null)
+            {
+                this.Configuration.ApiClient.Configuration = this.Configuration;
+            }
         }
     
         /// <summary>
@@ -84,6 +102,12 @@ namespace {{packageName}}.Api
                 this.Configuration = Configuration.Default; 
             else
                 this.Configuration = configuration;
+
+            // ensure API client has configuration ready
+            if (Configuration.ApiClient.Configuration == null)
+            {
+                this.Configuration.ApiClient.Configuration = this.Configuration;
+            }
         }
 
         /// <summary>
@@ -137,116 +161,133 @@ namespace {{packageName}}.Api
         /// <summary>
         /// {{summary}} {{notes}}
         /// </summary>
-        {{#allParams}}/// <param name="{{paramName}}">{{description}}</param> 
+        /// <exception cref="{{packageName}}.Client.ApiException">Thrown when fails to make API call</exception>
+        {{#allParams}}/// <param name="{{paramName}}">{{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}</param> 
         {{/allParams}}/// <returns>{{#returnType}}{{returnType}}{{/returnType}}</returns>
         public {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{operationId}} ({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = null{{/optionalMethodArgument}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
         {
-             {{#returnType}}ApiResponse<{{{returnType}}}> response = {{operationId}}WithHttpInfo({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
-             return response.Data;{{/returnType}}{{^returnType}}{{operationId}}WithHttpInfo({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{/returnType}}
+             {{#returnType}}ApiResponse<{{{returnType}}}> localVarResponse = {{operationId}}WithHttpInfo({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
+             return localVarResponse.Data;{{/returnType}}{{^returnType}}{{operationId}}WithHttpInfo({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{/returnType}}
         }
 
         /// <summary>
         /// {{summary}} {{notes}}
         /// </summary>
-        {{#allParams}}/// <param name="{{paramName}}">{{description}}</param> 
+        /// <exception cref="{{packageName}}.Client.ApiException">Thrown when fails to make API call</exception>
+        {{#allParams}}/// <param name="{{paramName}}">{{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}</param> 
         {{/allParams}}/// <returns>ApiResponse of {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Object(void){{/returnType}}</returns>
         public ApiResponse<{{#returnType}} {{{returnType}}} {{/returnType}}{{^returnType}}Object{{/returnType}}> {{operationId}}WithHttpInfo ({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = null{{/optionalMethodArgument}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
         {
             {{#allParams}}{{#required}}
             // verify the required parameter '{{paramName}}' is set
-            if ({{paramName}} == null) throw new ApiException(400, "Missing required parameter '{{paramName}}' when calling {{operationId}}");
+            if ({{paramName}} == null)
+                throw new ApiException(400, "Missing required parameter '{{paramName}}' when calling {{classname}}->{{operationId}}");
             {{/required}}{{/allParams}}
     
-            var path_ = "{{path}}";
+            var localVarPath = "{{path}}";
     
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}}
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
-            String[] http_header_accepts = new String[] {
+            String[] localVarHttpHeaderAccepts = new String[] {
                 {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}}
             };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            {{#pathParams}}if ({{paramName}} != null) pathParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // path parameter
+            localVarPathParams.Add("format", "json");
+            {{#pathParams}}if ({{paramName}} != null) localVarPathParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // path parameter
             {{/pathParams}}
-            {{#queryParams}}if ({{paramName}} != null) queryParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // query parameter
+            {{#queryParams}}if ({{paramName}} != null) localVarQueryParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // query parameter
             {{/queryParams}}
-            {{#headerParams}}if ({{paramName}} != null) headerParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // header parameter
+            {{#headerParams}}if ({{paramName}} != null) localVarHeaderParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // header parameter
             {{/headerParams}}
-            {{#formParams}}if ({{paramName}} != null) {{#isFile}}fileParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToFile("{{baseName}}", {{paramName}}));{{/isFile}}{{^isFile}}formParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // form parameter{{/isFile}}
+            {{#formParams}}if ({{paramName}} != null) {{#isFile}}localVarFileParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToFile("{{baseName}}", {{paramName}}));{{/isFile}}{{^isFile}}localVarFormParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // form parameter{{/isFile}}
             {{/formParams}}
-            {{#bodyParam}}postBody = Configuration.ApiClient.Serialize({{paramName}}); // http body (model) parameter
-            {{/bodyParam}}
+            {{#bodyParam}}if ({{paramName}}.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = Configuration.ApiClient.Serialize({{paramName}}); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = {{paramName}}; // byte array
+            }{{/bodyParam}}
 
-            {{#authMethods}}
-            // authentication ({{name}}) required
+            {{#authMethods}}// authentication ({{name}}) required
             {{#isApiKey}}{{#isKeyInHeader}}
-            var apiKeyValue = Configuration.GetApiKeyWithPrefix("{{keyParamName}}");
-            if (!String.IsNullOrEmpty(apiKeyValue))
+            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("{{keyParamName}}")))
             {
-                headerParams["{{keyParamName}}"] = apiKeyValue;
+                localVarHeaderParams["{{keyParamName}}"] = Configuration.GetApiKeyWithPrefix("{{keyParamName}}");
             }{{/isKeyInHeader}}{{#isKeyInQuery}}
-            var apiKeyValue = Configuration.GetApiKeyWithPrefix("{{keyParamName}}");
-            if (!String.IsNullOrEmpty(apiKeyValue))
+            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("{{keyParamName}}")))
             {
-                queryParams["{{keyParamName}}"] = apiKeyValue;
+                localVarQueryParams["{{keyParamName}}"] = Configuration.GetApiKeyWithPrefix("{{keyParamName}}");
             }{{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}
             // http basic authentication required
             if (!String.IsNullOrEmpty(Configuration.Username) || !String.IsNullOrEmpty(Configuration.Password))
             {
-                headerParams["Authorization"] = "Basic " + Base64Encode(Configuration.Username + ":" + Configuration.Password);
+                localVarHeaderParams["Authorization"] = "Basic " + ApiClient.Base64Encode(Configuration.Username + ":" + Configuration.Password);
             }{{/isBasic}}{{#isOAuth}}
             // oauth required
             if (!String.IsNullOrEmpty(Configuration.AccessToken))
             {
-                headerParams["Authorization"] = "Bearer " + Configuration.AccessToken;
+                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
             }{{/isOAuth}}
             {{/authMethods}}
     
             // make the HTTP request
-            IRestResponse response = (IRestResponse) Configuration.ApiClient.CallApi(path_, Method.{{httpMethod}}, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
+            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath, 
+                Method.{{httpMethod}}, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
 
-            int statusCode = (int) response.StatusCode;
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
     
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling {{operationId}}: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling {{operationId}}: " + response.ErrorMessage, response.ErrorMessage);
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling {{operationId}}: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling {{operationId}}: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
     
-            {{#returnType}}return new ApiResponse<{{{returnType}}}>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                ({{{returnType}}}) Configuration.ApiClient.Deserialize(response, typeof({{{returnType}}})));{{/returnType}}
-            {{^returnType}}return new ApiResponse<Object>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+            {{#returnType}}return new ApiResponse<{{{returnType}}}>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                ({{{returnType}}}) Configuration.ApiClient.Deserialize(localVarResponse, typeof({{#returnContainer}}{{{returnContainer}}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}})));{{/returnType}}
+            {{^returnType}}return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);{{/returnType}}
         }
-    
+
+        {{#supportsAsync}}
         /// <summary>
         /// {{summary}} {{notes}}
         /// </summary>
-        {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
+        /// <exception cref="{{packageName}}.Client.ApiException">Thrown when fails to make API call</exception>
+        {{#allParams}}/// <param name="{{paramName}}">{{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}</param>
         {{/allParams}}/// <returns>Task of {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}void{{/returnType}}</returns>
         {{#returnType}}public async System.Threading.Tasks.Task<{{{returnType}}}>{{/returnType}}{{^returnType}}public async System.Threading.Tasks.Task{{/returnType}} {{operationId}}Async ({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = null{{/optionalMethodArgument}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
         {
-             {{#returnType}}ApiResponse<{{{returnType}}}> response = await {{operationId}}AsyncWithHttpInfo({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
-             return response.Data;{{/returnType}}{{^returnType}}await {{operationId}}AsyncWithHttpInfo({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{/returnType}}
+             {{#returnType}}ApiResponse<{{{returnType}}}> localVarResponse = await {{operationId}}AsyncWithHttpInfo({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
+             return localVarResponse.Data;{{/returnType}}{{^returnType}}await {{operationId}}AsyncWithHttpInfo({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{/returnType}}
 
         }
 
         /// <summary>
         /// {{summary}} {{notes}}
         /// </summary>
-        {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
+        /// <exception cref="{{packageName}}.Client.ApiException">Thrown when fails to make API call</exception>
+        {{#allParams}}/// <param name="{{paramName}}">{{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}</param>
         {{/allParams}}/// <returns>Task of ApiResponse{{#returnType}} ({{returnType}}){{/returnType}}</returns>
         public async System.Threading.Tasks.Task<ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}}>> {{operationId}}AsyncWithHttpInfo ({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = null{{/optionalMethodArgument}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
         {
@@ -254,79 +295,91 @@ namespace {{packageName}}.Api
             if ({{paramName}} == null) throw new ApiException(400, "Missing required parameter '{{paramName}}' when calling {{operationId}}");
             {{/required}}{{/allParams}}
     
-            var path_ = "{{path}}";
+            var localVarPath = "{{path}}";
     
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>();
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}}
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
-            String[] http_header_accepts = new String[] {
+            String[] localVarHttpHeaderAccepts = new String[] {
                 {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}}
             };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            {{#pathParams}}if ({{paramName}} != null) pathParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // path parameter
+            localVarPathParams.Add("format", "json");
+            {{#pathParams}}if ({{paramName}} != null) localVarPathParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // path parameter
             {{/pathParams}}
-            {{#queryParams}}if ({{paramName}} != null) queryParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // query parameter
+            {{#queryParams}}if ({{paramName}} != null) localVarQueryParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // query parameter
             {{/queryParams}}
-            {{#headerParams}}if ({{paramName}} != null) headerParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // header parameter
+            {{#headerParams}}if ({{paramName}} != null) localVarHeaderParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // header parameter
             {{/headerParams}}
-            {{#formParams}}if ({{paramName}} != null) {{#isFile}}fileParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToFile("{{baseName}}", {{paramName}}));{{/isFile}}{{^isFile}}formParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // form parameter{{/isFile}}
+            {{#formParams}}if ({{paramName}} != null) {{#isFile}}localVarFileParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToFile("{{baseName}}", {{paramName}}));{{/isFile}}{{^isFile}}localVarFormParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // form parameter{{/isFile}}
             {{/formParams}}
-            {{#bodyParam}}postBody = Configuration.ApiClient.Serialize({{paramName}}); // http body (model) parameter
-            {{/bodyParam}}
+            {{#bodyParam}}if ({{paramName}}.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = Configuration.ApiClient.Serialize({{paramName}}); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = {{paramName}}; // byte array
+            }{{/bodyParam}}
 
             {{#authMethods}}
             // authentication ({{name}}) required
             {{#isApiKey}}{{#isKeyInHeader}}
-            var apiKeyValue = Configuration.GetApiKeyWithPrefix("{{keyParamName}}");
-            if (!String.IsNullOrEmpty(apiKeyValue))
+            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("{{keyParamName}}")))
             {
-                headerParams["{{keyParamName}}"] = apiKeyValue;
+                localVarHeaderParams["{{keyParamName}}"] = Configuration.GetApiKeyWithPrefix("{{keyParamName}}");
             }{{/isKeyInHeader}}{{#isKeyInQuery}}
-            var apiKeyValue = Configuration.GetApiKeyWithPrefix("{{keyParamName}}");
-            if (!String.IsNullOrEmpty(apiKeyValue))
+            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("{{keyParamName}}")))
             {
-                queryParams["{{keyParamName}}"] = apiKeyValue;
+                localVarQueryParams["{{keyParamName}}"] = Configuration.GetApiKeyWithPrefix("{{keyParamName}}");
             }{{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}
             // http basic authentication required
             if (!String.IsNullOrEmpty(Configuration.Username) || !String.IsNullOrEmpty(Configuration.Password))
             {
-                headerParams["Authorization"] = "Basic " + Base64Encode(Configuration.Username + ":" + Configuration.Password);
+                localVarHeaderParams["Authorization"] = "Basic " + ApiClient.Base64Encode(Configuration.Username + ":" + Configuration.Password);
             }{{/isBasic}}{{#isOAuth}}
             // oauth required
             if (!String.IsNullOrEmpty(Configuration.AccessToken))
             {
-                headerParams["Authorization"] = "Bearer " + Configuration.AccessToken;
+                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
             }{{/isOAuth}}
             {{/authMethods}}
 
             // make the HTTP request
-            IRestResponse response = (IRestResponse) await Configuration.ApiClient.CallApiAsync(path_, Method.{{httpMethod}}, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
+            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath, 
+                Method.{{httpMethod}}, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams, 
+                localVarPathParams, localVarHttpContentType);
 
-            int statusCode = (int) response.StatusCode;
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
  
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling {{operationId}}: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling {{operationId}}: " + response.ErrorMessage, response.ErrorMessage);
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling {{operationId}}: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling {{operationId}}: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
 
-            {{#returnType}}return new ApiResponse<{{{returnType}}}>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                ({{{returnType}}}) Configuration.ApiClient.Deserialize(response, typeof({{{returnType}}})));{{/returnType}}
-            {{^returnType}}return new ApiResponse<Object>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+            {{#returnType}}return new ApiResponse<{{{returnType}}}>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                ({{{returnType}}}) Configuration.ApiClient.Deserialize(localVarResponse, typeof({{#returnContainer}}{{{returnContainer}}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}})));{{/returnType}}
+            {{^returnType}}return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);{{/returnType}}
-        }
+        }{{/supportsAsync}}
         {{/operation}}
     }
     {{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/csharp/api_test.mustache b/modules/swagger-codegen/src/main/resources/csharp/api_test.mustache
new file mode 100644
index 00000000000..d44ebca31b5
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/csharp/api_test.mustache
@@ -0,0 +1,72 @@
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reflection;
+using RestSharp;
+using NUnit.Framework;
+
+using {{packageName}}.Client;
+using {{packageName}}.Api;
+{{#hasImport}}using {{packageName}}.Model;
+{{/hasImport}}
+
+namespace {{packageName}}.Test
+{
+    /// <summary>
+    ///  Class for testing {{classname}}
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by Swagger Codegen.
+    /// Please update the test case below to test the API endpoint.
+    /// </remarks>
+    [TestFixture]
+    public class {{classname}}Tests
+    {
+        private {{classname}} instance;
+
+        /// <summary>
+        /// Setup before each unit test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+           instance = new {{classname}}();
+        }
+
+        /// <summary>
+        /// Clean up after each unit test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of {{classname}}
+        /// </summary>
+        [Test]
+        public void {{operationId}}InstanceTest()
+        {
+            Assert.IsInstanceOf<{{classname}}> (instance, "instance is a {{classname}}");
+        }
+
+        {{#operations}}{{#operation}}
+        /// <summary>
+        /// Test {{operationId}}
+        /// </summary>
+        [Test]
+        public void {{operationId}}Test()
+        {
+            // TODO: add unit test for the method '{{operationId}}'
+            {{#allParams}}{{{dataType}}} {{paramName}} = null; // TODO: replace null with proper value
+            {{/allParams}}
+            {{#returnType}}var response = {{/returnType}}instance.{{operationId}}({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
+            {{#returnType}}Assert.IsInstanceOf<{{{returnType}}}> (response, "response is {{{returnType}}}");{{/returnType}} 
+        }
+        {{/operation}}{{/operations}}
+    }
+
+}
diff --git a/modules/swagger-codegen/src/main/resources/csharp/compile-mono.sh.mustache b/modules/swagger-codegen/src/main/resources/csharp/compile-mono.sh.mustache
new file mode 100644
index 00000000000..b1b0c4f0c73
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/csharp/compile-mono.sh.mustache
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+frameworkVersion={{targetFrameworkNuget}}
+netfx=${frameworkVersion#net}
+
+wget -nc https://nuget.org/nuget.exe;
+mozroots --import --sync
+mono nuget.exe install vendor/packages.config -o vendor;
+mkdir -p bin;
+
+cp vendor/Newtonsoft.Json.8.0.2/lib/{{targetFrameworkNuget}}/Newtonsoft.Json.dll bin/Newtonsoft.Json.dll;
+cp vendor/RestSharp.105.1.0/lib/{{targetFrameworkNuget}}/RestSharp.dll bin/RestSharp.dll;
+
+mcs -sdk:${netfx} -r:bin/Newtonsoft.Json.dll,\
+bin/RestSharp.dll,\
+System.Runtime.Serialization.dll \
+-target:library \
+-out:bin/{{packageName}}.dll \
+-recurse:'src/*.cs' \
+-doc:bin/{{packageName}}.xml \
+-platform:anycpu
diff --git a/modules/swagger-codegen/src/main/resources/csharp/compile.mustache b/modules/swagger-codegen/src/main/resources/csharp/compile.mustache
index e35879e0efa..68199991671 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/compile.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/compile.mustache
@@ -1,3 +1,14 @@
-SET CSCPATH=%SYSTEMROOT%\Microsoft.NET\Framework\v4.0.30319
-%CSCPATH%\csc /reference:bin/Newtonsoft.Json.dll;bin/RestSharp.dll /target:library /out:bin/{{packageName}}.dll /recurse:src\*.cs /doc:bin/{{packageName}}.xml
+@echo off
 
+{{#supportsAsync}}SET CSCPATH=%SYSTEMROOT%\Microsoft.NET\Framework\v4.0.30319{{/supportsAsync}}
+{{^supportsAsync}}SET CSCPATH=%SYSTEMROOT%\Microsoft.NET\Framework\v3.5{{/supportsAsync}}
+
+if not exist ".\nuget.exe" powershell -Command "(new-object System.Net.WebClient).DownloadFile('https://nuget.org/nuget.exe', '.\nuget.exe')"
+.\nuget.exe install vendor/packages.config -o vendor
+
+if not exist ".\bin" mkdir bin
+
+copy vendor\Newtonsoft.Json.8.0.2\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll bin\Newtonsoft.Json.dll
+copy vendor\RestSharp.105.1.0\lib\{{targetFrameworkNuget}}\RestSharp.dll bin\RestSharp.dll
+
+%CSCPATH%\csc /reference:bin\Newtonsoft.Json.dll;bin\RestSharp.dll /target:library /out:bin\{{packageName}}.dll /recurse:src\*.cs /doc:bin\{{packageName}}.xml
diff --git a/modules/swagger-codegen/src/main/resources/csharp/enumClass.mustache b/modules/swagger-codegen/src/main/resources/csharp/enumClass.mustache
new file mode 100644
index 00000000000..d882e33595c
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/csharp/enumClass.mustache
@@ -0,0 +1,6 @@
+        public enum {{vendorExtensions.plainDatatypeWithEnum}} {
+            {{#allowableValues}}{{#enumVars}}
+            [EnumMember(Value = "{{jsonname}}")]
+            {{name}}{{^-last}},
+            {{/-last}}{{#-last}}{{/-last}}{{/enumVars}}{{/allowableValues}}
+        }
diff --git a/modules/swagger-codegen/src/main/resources/csharp/git_push.sh.mustache b/modules/swagger-codegen/src/main/resources/csharp/git_push.sh.mustache
new file mode 100755
index 00000000000..e153ce23ecf
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/csharp/git_push.sh.mustache
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="{{{gitUserId}}}"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="{{{gitRepoId}}}"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="{{{releaseNote}}}"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/modules/swagger-codegen/src/main/resources/csharp/gitignore.mustache b/modules/swagger-codegen/src/main/resources/csharp/gitignore.mustache
new file mode 100644
index 00000000000..754beb8bedc
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/csharp/gitignore.mustache
@@ -0,0 +1,185 @@
+# Ref: https://gist.github.com/kmorcinek/2710267
+# Download this file using PowerShell v3 under Windows with the following comand
+# Invoke-WebRequest https://gist.githubusercontent.com/kmorcinek/2710267/raw/ -OutFile .gitignore
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+
+[Dd]ebug/
+[Rr]elease/
+x64/
+build/
+[Bb]in/
+[Oo]bj/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.log
+*.scc
+
+# OS generated files #
+.DS_Store*
+ehthumbs.db
+Icon?
+Thumbs.db
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.Publish.xml
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql/
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.[Pp]ublish.xml
+*.pfx
+*.publishsettings
+modulesbin/
+tempbin/
+
+# EPiServer Site file (VPP)
+AppData/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# vim
+*.txt~
+*.swp
+*.swo
+ 
+ # svn
+ .svn
+
+ # SQL Server files
+ **/App_Data/*.mdf
+ **/App_Data/*.ldf
+ **/App_Data/*.sdf
+
+
+ #LightSwitch generated files
+ GeneratedArtifacts/
+ _Pvt_Extensions/
+ ModelManifest.xml
+
+ # =========================
+ # Windows detritus
+ # =========================
+
+ # Windows image file caches
+ Thumbs.db
+ ehthumbs.db
+
+ # Folder config file
+ Desktop.ini
+
+ # Recycle Bin used on file shares
+ $RECYCLE.BIN/
+
+ # Mac desktop service store files
+ .DS_Store
+
+ # SASS Compiler cache
+ .sass-cache
+
+ # Visual Studio 2014 CTP
+ **/*.sln.ide
diff --git a/modules/swagger-codegen/src/main/resources/csharp/model.mustache b/modules/swagger-codegen/src/main/resources/csharp/model.mustache
index ad942039677..347834f329a 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/model.mustache
@@ -4,39 +4,75 @@ using System.IO;
 using System.Text;
 using System.Collections;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 {{#models}}
 {{#model}}
 namespace {{packageName}}.Model
 {
-
     /// <summary>
     /// {{description}}
     /// </summary>
     [DataContract]
-    public class {{classname}} : {{#parent}}{{{parent}}}, {{/parent}} IEquatable<{{classname}}>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="{{classname}}" /> class.
-        /// </summary>
-        public {{classname}}()
-        {
-            {{#vars}}{{#defaultValue}}this.{{name}} = {{{defaultValue}}};
-            {{/defaultValue}}{{/vars}}
-        }
-
-        {{#vars}}
+    public partial class {{classname}} : {{#parent}}{{{parent}}}, {{/parent}} IEquatable<{{classname}}>
+    { {{#vars}}{{#isEnum}}
+    
         /// <summary>
         /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{{description}}}{{/description}}
         /// </summary>{{#description}}
         /// <value>{{{description}}}</value>{{/description}}
-        [DataMember(Name="{{baseName}}", EmitDefaultValue=false)]
-        public {{{datatype}}} {{name}} { get; set; }
-  
-        {{/vars}}
-  
+        [JsonConverter(typeof(StringEnumConverter))]
+{{>enumClass}}{{/isEnum}}{{#items.isEnum}}{{#items}}
+{{>enumClass}}{{/items}}{{/items.isEnum}}{{/vars}}
+    {{#vars}}{{#isEnum}}
+        /// <summary>
+        /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{{description}}}{{/description}}
+        /// </summary>{{#description}}
+        /// <value>{{{description}}}</value>{{/description}}
+        [DataMember(Name="{{baseName}}", EmitDefaultValue={{emitDefaultValue}})]
+        public {{{datatypeWithEnum}}} {{name}} { get; set; }
+    {{/isEnum}}{{/vars}}
+        /// <summary>
+        /// Initializes a new instance of the <see cref="{{classname}}" /> class.
+        /// Initializes a new instance of the <see cref="{{classname}}" />class.
+        /// </summary>
+{{#vars}}{{^isReadOnly}}        /// <param name="{{name}}">{{#description}}{{description}}{{/description}}{{^description}}{{name}}{{/description}}{{#required}} (required){{/required}}{{#defaultValue}} (default to {{defaultValue}}){{/defaultValue}}.</param>
+{{/isReadOnly}}{{/vars}}
+        public {{classname}}({{#vars}}{{^isReadOnly}}{{{datatypeWithEnum}}} {{name}} = null{{#hasMore}}, {{/hasMore}}{{/isReadOnly}}{{/vars}})
+        {
+            {{#vars}}{{^isReadOnly}}{{#required}}// to ensure "{{name}}" is required (not null)
+            if ({{name}} == null)
+            {
+                throw new InvalidDataException("{{name}} is a required property for {{classname}} and cannot be null");
+            }
+            else
+            {
+                this.{{name}} = {{name}};
+            }
+            {{/required}}{{/isReadOnly}}{{/vars}}{{#vars}}{{^isReadOnly}}{{^required}}{{#defaultValue}}// use default value if no "{{name}}" provided
+            if ({{name}} == null)
+            {
+                this.{{name}} = {{{defaultValue}}};
+            }
+            else
+            {
+                this.{{name}} = {{name}};
+            }
+            {{/defaultValue}}{{^defaultValue}}this.{{name}} = {{name}};
+            {{/defaultValue}}{{/required}}{{/isReadOnly}}{{/vars}}
+        }
+        
+    {{#vars}}{{^isEnum}}
+        /// <summary>
+        /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}}
+        /// </summary>{{#description}}
+        /// <value>{{description}}</value>{{/description}}
+        [DataMember(Name="{{baseName}}", EmitDefaultValue={{emitDefaultValue}})]
+        public {{{datatype}}} {{name}} { get; {{#isReadOnly}}private {{/isReadOnly}}set; }
+    {{/isEnum}}{{/vars}}
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -74,7 +110,7 @@ namespace {{packageName}}.Model
         /// <summary>
         /// Returns true if {{classname}} instances are equal
         /// </summary>
-        /// <param name="obj">Instance of {{classname}} to be compared</param>
+        /// <param name="other">Instance of {{classname}} to be compared</param>
         /// <returns>Boolean</returns>
         public bool Equals({{classname}} other)
         {
@@ -108,7 +144,7 @@ namespace {{packageName}}.Model
                 // Suitable nullity checks etc, of course :)
                 {{#vars}}
                 if (this.{{name}} != null)
-                    hash = hash * 57 + this.{{name}}.GetHashCode();
+                    hash = hash * 59 + this.{{name}}.GetHashCode();
                 {{/vars}}
                 return hash;
             }
diff --git a/modules/swagger-codegen/src/main/resources/csharp/model_test.mustache b/modules/swagger-codegen/src/main/resources/csharp/model_test.mustache
new file mode 100644
index 00000000000..c2e8d948050
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/csharp/model_test.mustache
@@ -0,0 +1,70 @@
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using {{packageName}}.Api;
+using {{packageName}}.Model;
+using {{packageName}}.Client;
+using System.Reflection;
+
+{{#models}}
+{{#model}}
+namespace {{packageName}}.Test
+{
+    /// <summary>
+    ///  Class for testing {{classname}}
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by Swagger Codegen.
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class {{classname}}Tests
+    {
+        private {{classname}} instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            instance = new {{classname}}();
+        }
+    
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }   
+
+        /// <summary>
+        /// Test an instance of {{classname}}
+        /// </summary>
+        [Test]
+        public void {{classname}}InstanceTest()
+        {
+            Assert.IsInstanceOf<{{classname}}> (instance, "instance is a {{classname}}");
+        }
+
+        {{#vars}}
+        /// <summary>
+        /// Test the property '{{name}}' 
+        /// </summary>
+        [Test]
+        public void {{name}}Test()
+        {
+            // TODO: unit test for the property '{{name}}' 
+        }
+        {{/vars}}
+
+    }
+
+}
+{{/model}}
+{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/csharp/packages.config.mustache b/modules/swagger-codegen/src/main/resources/csharp/packages.config.mustache
new file mode 100644
index 00000000000..bd4428e687e
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/csharp/packages.config.mustache
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="RestSharp" version="105.1.0" targetFramework="{{targetFrameworkNuget}}" developmentDependency="true" />
+  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="{{targetFrameworkNuget}}" developmentDependency="true" />
+</packages>
diff --git a/modules/swagger-codegen/src/main/resources/dart/git_push.sh.mustache b/modules/swagger-codegen/src/main/resources/dart/git_push.sh.mustache
new file mode 100755
index 00000000000..e153ce23ecf
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/dart/git_push.sh.mustache
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="{{{gitUserId}}}"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="{{{gitRepoId}}}"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="{{{releaseNote}}}"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/modules/swagger-codegen/src/main/resources/dart/gitignore.mustache b/modules/swagger-codegen/src/main/resources/dart/gitignore.mustache
new file mode 100644
index 00000000000..7c280441649
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/dart/gitignore.mustache
@@ -0,0 +1,27 @@
+# See https://www.dartlang.org/tools/private-files.html
+
+# Files and directories created by pub
+.buildlog
+.packages
+.project
+.pub/
+build/
+**/packages/
+
+# Files created by dart2js
+# (Most Dart developers will use pub build to compile Dart, use/modify these 
+#  rules if you intend to use dart2js directly
+#  Convention is to use extension '.dart.js' for Dart compiled to Javascript to
+#  differentiate from explicit Javascript files)
+*.dart.js
+*.part.js
+*.js.deps
+*.js.map
+*.info.json
+
+# Directory created by dartdoc
+doc/api/
+
+# Don't commit pubspec lock file 
+# (Library packages only! Remove pattern if developing an application package)
+pubspec.lock
diff --git a/modules/swagger-codegen/src/main/resources/flash/.gitignore b/modules/swagger-codegen/src/main/resources/flash/.gitignore
new file mode 100644
index 00000000000..f112f7fb78f
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/flash/.gitignore
@@ -0,0 +1,11 @@
+# Build and Release Folders
+bin/
+bin-debug/
+bin-release/
+
+# Other files and folders
+.settings/
+
+# Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties`
+# should NOT be excluded as they contain compiler settings and other important
+# information for Eclipse / Flash Builder.
diff --git a/modules/swagger-codegen/src/main/resources/flash/ApiInvoker.as b/modules/swagger-codegen/src/main/resources/flash/ApiInvoker.as
index 98d94052ec4..6d8466390a6 100644
--- a/modules/swagger-codegen/src/main/resources/flash/ApiInvoker.as
+++ b/modules/swagger-codegen/src/main/resources/flash/ApiInvoker.as
@@ -2,6 +2,19 @@ package io.swagger.common {
 import io.swagger.event.ApiClientEvent;
 import io.swagger.event.Response;
 
+import flash.events.EventDispatcher;
+import flash.utils.*;
+import mx.rpc.AsyncToken;
+import mx.rpc.events.ResultEvent;
+import mx.rpc.events.FaultEvent;
+import mx.utils.ObjectUtil;
+import mx.rpc.http.HTTPService;
+import mx.messaging.messages.HTTPRequestMessage;
+import mx.messaging.ChannelSet;
+import mx.messaging.channels.DirectHTTPChannel;
+import asaxb.xml.bind.ASAXBContext;
+import asaxb.xml.bind.Unmarshaller;
+
 public class ApiInvoker extends EventDispatcher {
 
     private static const DELETE_DATA_DUMMY:String = "dummyDataRequiredForDeleteOverride";
@@ -99,7 +112,7 @@ public class ApiInvoker extends EventDispatcher {
         var qualifiedClassName:String = objDescriptor.@name;
         qualifiedClassName = qualifiedClassName.replace("::", ".");
         var className:String = qualifiedClassName.substring(qualifiedClassName.lastIndexOf(".") + 1);
-        className = className().toLowerCase() + className.substring(1);
+        className = className.toLowerCase() + className.substring(1);
         writer.xml.setName(className);
 
         for each(property in objDescriptor.elements("variable")) {
@@ -178,7 +191,7 @@ public class ApiInvoker extends EventDispatcher {
             httpService.useProxy = true;
 
             var channelSet:ChannelSet = new ChannelSet();
-            var httpChannel:HTTPChannel = new HTTPChannel();
+            var httpChannel:DirectHTTPChannel = new DirectHTTPChannel("");
             httpChannel.uri = ApiUrlHelper.getProxyUrl(_proxyHostName, _proxyPath);
             channelSet.addChannel(httpChannel);
             httpService.channelSet = channelSet;
@@ -188,6 +201,11 @@ public class ApiInvoker extends EventDispatcher {
     }
 
     private function onApiRequestResult(event:ResultEvent):void {
+        
+        // I put this in comments. Here, it's trying to parse XML and it fails if it's not XML.
+        // Therefore, it's better to have the raw result that we can parse as we want. 
+        // TODO: Create different parser (JSON, XML, etc.)
+        /*
         var completionListener:Function = event.token.completionListener;
         var result:Object = event.result;
         var resultType:Class = event.token.returnType;
@@ -214,6 +232,9 @@ public class ApiInvoker extends EventDispatcher {
         }
 
         var response:Response = new Response(true, resultObject);
+        */
+
+        var response:Response = new Response(true, event.result);
         response.requestId = event.token.requestId;
         var successEventType:String = event.token.completionEventType != null ? event.token.completionEventType : ApiClientEvent.SUCCESS_EVENT;
 
@@ -252,4 +273,4 @@ public class ApiInvoker extends EventDispatcher {
 
 
 }
-}
\ No newline at end of file
+}
diff --git a/modules/swagger-codegen/src/main/resources/flash/ApiUrlHelper.as b/modules/swagger-codegen/src/main/resources/flash/ApiUrlHelper.as
index 4333c6c7e4c..8779610cd48 100644
--- a/modules/swagger-codegen/src/main/resources/flash/ApiUrlHelper.as
+++ b/modules/swagger-codegen/src/main/resources/flash/ApiUrlHelper.as
@@ -31,7 +31,7 @@ internal class ApiUrlHelper {
     }
 
     internal static function getProxyUrl(hostName: String, proxyPath: String): String{
-        if (hostName(hostName.length - 1) == "/") //remove trailing slash
+        if (hostName..charAt(hostName.length) == "/") //remove trailing slash
         {
             hostName = hostName.substring(0, hostName.length - 1);
         }
diff --git a/modules/swagger-codegen/src/main/resources/flash/README.txt b/modules/swagger-codegen/src/main/resources/flash/README.txt
new file mode 100644
index 00000000000..c9a2a38d6a6
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/flash/README.txt
@@ -0,0 +1,65 @@
+README for the Flash application. 
+
+These instructions are given using the version 4.7 of Flash Builder. 
+
+How to use the Flash client library:
+
+The code which is given to you is to be considered as a Library. Therefore, in Flash Builder, you have to:
+1. Create an ActionScript Library Project. (Warning: If you are dealing with Files as parameter, you need to include the Adobe AIR libraries)
+2. Copy the src folder from the flash library to the project.
+3. Copy the lib folder.
+4. Copy the build.properties and build.xml. (You can update the paths in build.properties)
+5. Right+Click on the project folder and go to Properties. Then go to the tab 'ActionScript Library Build Path' and add these two SWC: 'as3corelib.swc' and 'ASAXB-0.1.1.swc'. (They are located in the folder lib)
+6. Create the Flash Application
+
+How to use the Flash client library in an application:
+
+Using the Flash client library (especially getting the response message from the server) is a bit tricky.
+
+The response message is given through an EventDispatcher. Therefore, you have to create an EventDispatcher and listen to the endpoints that you're calling. Below, you will find a pseudo-code explaining how to do this.
+
+After creating an application in java, you will have a mxml file. In this mxml file, you need to declare a Script (given below) after the Declarations.
+
+<fx:Script>
+<![CDATA[
+
+    // Import the different libraries you need
+    // ... 
+
+    // Import the io.swagger libraries
+    import io.swagger.common.ApiUserCredentials;
+	import io.swagger.event.ApiClientEvent;
+    import io.swagger.client.api.[[API]]; // Put your Api here.
+
+    // Variables
+	private var cred:ApiUserCredentials;
+	private var dispatcher:EventDispatcher;
+    private var myAPI:[[API]]; // Change [[API]] to be the real name
+
+    // Function that print in the console the message of the response
+    public function onEvent(event:ApiClientEvent):void {
+        // trace only prints when in debug mod. Be carefule about that.		
+        trace(event.response.payload); 
+	}   
+
+    // Main function
+    public main():void {
+        // Define a dispatcher
+		dispatcher = new EventDispatcher();
+        // Define the EventListener. Fill the [[function]] by the name of the function you have in
+        // the API file.  
+		dispatcher.addEventListener([[function]], onEvent);
+
+        // To create the API, you need the ApiUserCredentials and the dispatcher.
+        cred = new ApiUserCredentials([[host]], [[basePath]] , [[apiToken]]); 
+        // You can add more parameters. Go see the function in ApiUserCredential.as in io/swagger/common
+
+        // Create the API
+        myAPI = new [[API]](cred, dispatcher); // change [[API]] to be the real name
+        
+        // Now, you can use the API
+        myAPI.[[function]]([[PARAMETERS]]);
+        // Change [[function]] and add your parameters. Then, you will see the response in the console.
+    }     
+]]>
+</fx:Script>
diff --git a/modules/swagger-codegen/src/main/resources/flash/api.mustache b/modules/swagger-codegen/src/main/resources/flash/api.mustache
index 7fa8cb03d0a..2f5ccfe0dbb 100644
--- a/modules/swagger-codegen/src/main/resources/flash/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/flash/api.mustache
@@ -34,7 +34,7 @@ public class {{classname}} extends SwaggerApi {
     /*
      * Returns {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}
      */
-    public function {{nickname}} ({{#allParams}}{{paramName}}: {{{dataType}}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{#hasMore}}, {{/hasMore}}{{/allParams}}): String {
+    public function {{nickname}} ({{#allParams}}{{paramName}}: {{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/allParams}}): String {
         // create path and map variables
         var path: String = "{{path}}".replace(/{format}/g,"xml"){{#pathParams}}.replace("{" + "{{paramName}}" + "}", getApiInvoker().escapeString({{{paramName}}})){{/pathParams}};
 
diff --git a/modules/swagger-codegen/src/main/resources/flaskConnexion/README.mustache b/modules/swagger-codegen/src/main/resources/flaskConnexion/README.mustache
index 7e80a2086ef..cc7805c9b97 100644
--- a/modules/swagger-codegen/src/main/resources/flaskConnexion/README.mustache
+++ b/modules/swagger-codegen/src/main/resources/flaskConnexion/README.mustache
@@ -3,25 +3,26 @@
 ## Overview
 This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project. By using the
 [OpenAPI-Spec](https://github.com/swagger-api/swagger-core/wiki) from a remote server, you can easily generate a server stub.  This
-is an example of building a swagger-enabled flask server.
+is an example of building a swagger-enabled Flask server.
 
-This example uses the [connexion](https://github.com/zalando/connexion) library on top of Flask.
+This example uses the [Connexion](https://github.com/zalando/connexion) library on top of Flask.
 
 To run the server, please execute the following:
 
 ```
+sudo pip3 install -U connexion # install Connexion from PyPI
 python3 app.py
 ```
 
 and open your browser to here:
 
 ```
-http://localhost:{{serverPort}}/ui
+http://localhost:{{serverPort}}{{contextPath}}/ui/
 ```
 
-Your swagger definition lives here:
+Your Swagger definition lives here:
 
 ```
-http://localhost:{{serverPort}}{{basePathWithoutHost}}/swagger.json
+http://localhost:{{serverPort}}{{contextPath}}/swagger.json
 ```
 
diff --git a/modules/swagger-codegen/src/main/resources/flaskConnexion/app.mustache b/modules/swagger-codegen/src/main/resources/flaskConnexion/app.mustache
index 14af64be6f9..ded223fb36d 100644
--- a/modules/swagger-codegen/src/main/resources/flaskConnexion/app.mustache
+++ b/modules/swagger-codegen/src/main/resources/flaskConnexion/app.mustache
@@ -3,7 +3,6 @@
 import connexion
 
 if __name__ == '__main__':
-    app = connexion.App(__name__, {{serverPort}},
-    specification_dir='./swagger/')
+    app = connexion.App(__name__, specification_dir='./swagger/')
     app.add_api('swagger.yaml', arguments={'title': '{{appDescription}}'})
-    app.run()
+    app.run(port={{serverPort}})
diff --git a/modules/swagger-codegen/src/main/resources/go/README.mustache b/modules/swagger-codegen/src/main/resources/go/README.mustache
new file mode 100644
index 00000000000..586b35ed3f5
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/go/README.mustache
@@ -0,0 +1,12 @@
+# Go API client for {{packageName}}
+
+## Overview
+This API client was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.  By using the [swagger-spec](https://github.com/swagger-api/swagger-spec) from a remote server, you can easily generate an API client.
+
+
+## Installation
+Put the package under your project folder and add the following in import:
+```
+    "./{{packageName}}"
+```
+
diff --git a/modules/swagger-codegen/src/main/resources/go/api.mustache b/modules/swagger-codegen/src/main/resources/go/api.mustache
new file mode 100644
index 00000000000..49b7f92693e
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/go/api.mustache
@@ -0,0 +1,108 @@
+package {{packageName}}
+
+{{#operations}}
+import (
+    "strings"
+    "fmt"
+    "encoding/json"
+    "errors"
+    "github.com/dghubble/sling"
+{{#imports}}    "{{import}}"
+{{/imports}}
+)
+
+type {{classname}} struct {
+    basePath  string
+}
+
+func New{{classname}}() *{{classname}}{
+    return &{{classname}} {
+        basePath:   "{{basePath}}",
+    }
+}
+
+func New{{classname}}WithBasePath(basePath string) *{{classname}}{
+    return &{{classname}} {
+        basePath:   basePath,
+    }
+}
+
+{{#operation}}
+/**
+ * {{summary}}
+ * {{notes}}
+{{#allParams}} * @param {{paramName}} {{description}}
+{{/allParams}} * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
+ */
+//func (a {{classname}}) {{nickname}} ({{#allParams}}{{paramName}} {{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) ({{#returnType}}{{{returnType}}}, {{/returnType}}error) {
+func (a {{classname}}) {{nickname}} ({{#allParams}}{{paramName}} {{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) ({{#returnType}}{{{returnType}}}, {{/returnType}}error) {
+
+    _sling := sling.New().{{httpMethod}}(a.basePath)
+
+    // create path and map variables
+    path := "{{basePathWithoutHost}}{{path}}"
+{{#pathParams}}    path = strings.Replace(path, "{" + "{{baseName}}" + "}", fmt.Sprintf("%v", {{paramName}}), -1)
+{{/pathParams}}
+
+    _sling = _sling.Path(path)
+
+{{#hasQueryParams}}    type QueryParams struct {
+        {{#queryParams}}{{paramName}}    {{dataType}} `url:"{{baseName}},omitempty"`
+        {{/queryParams}}
+}
+    _sling = _sling.QueryStruct(&QueryParams{ {{#queryParams}}{{paramName}}: {{paramName}}{{#hasMore}},{{/hasMore}}{{/queryParams}} })
+{{/hasQueryParams}}
+    // accept header
+    accepts := []string { {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }
+    for key := range accepts {
+        _sling = _sling.Set("Accept", accepts[key])
+        break // only use the first Accept
+    }
+{{#hasHeaderParams}}{{#headerParams}}    // header params "{{baseName}}"
+    _sling = _sling.Set("{{baseName}}", {{paramName}})
+{{/headerParams}}{{/hasHeaderParams}}
+{{#hasFormParams}}    type FormParams struct {
+{{#formParams}}        {{paramName}}    {{dataType}} `url:"{{baseName}},omitempty"`
+{{/formParams}}
+    }
+    _sling = _sling.BodyForm(&FormParams{ {{#formParams}}{{paramName}}: {{paramName}}{{#hasMore}},{{/hasMore}}{{/formParams}} })
+{{/hasFormParams}}
+{{#hasBodyParam}}{{#bodyParams}}// body params
+    _sling = _sling.BodyJSON({{paramName}})
+{{/bodyParams}}{{/hasBodyParam}}
+{{#returnType}}  var successPayload = new({{returnType}}){{/returnType}}
+
+  // We use this map (below) so that any arbitrary error JSON can be handled.
+  // FIXME: This is in the absence of this Go generator honoring the non-2xx
+  // response (error) models, which needs to be implemented at some point.
+  var failurePayload map[string]interface{}
+
+  httpResponse, err := _sling.Receive({{#returnType}}successPayload{{/returnType}}{{^returnType}}nil{{/returnType}}, &failurePayload)
+
+  if err == nil {
+    // err == nil only means that there wasn't a sub-application-layer error (e.g. no network error)
+    if failurePayload != nil {
+      // If the failurePayload is present, there likely was some kind of non-2xx status
+      // returned (and a JSON payload error present)
+      var str []byte
+      str, err = json.Marshal(failurePayload)
+      if err == nil { // For safety, check for an error marshalling... probably superfluous
+        // This will return the JSON error body as a string
+        err = errors.New(string(str))
+      }
+  } else {
+    // So, there was no network-type error, and nothing in the failure payload,
+    // but we should still check the status code
+    if httpResponse == nil {
+      // This should never happen...
+      err = errors.New("No HTTP Response received.")
+    } else if code := httpResponse.StatusCode; 200 > code || code > 299 {
+        err = errors.New("HTTP Error: " + string(httpResponse.StatusCode))
+      }
+    }
+  }
+
+  return {{#returnType}}*successPayload, {{/returnType}}err
+}
+{{/operation}}
+{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/go/git_push.sh.mustache b/modules/swagger-codegen/src/main/resources/go/git_push.sh.mustache
new file mode 100755
index 00000000000..e153ce23ecf
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/go/git_push.sh.mustache
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="{{{gitUserId}}}"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="{{{gitRepoId}}}"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="{{{releaseNote}}}"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/modules/swagger-codegen/src/main/resources/go/gitignore.mustache b/modules/swagger-codegen/src/main/resources/go/gitignore.mustache
new file mode 100644
index 00000000000..daf913b1b34
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/go/gitignore.mustache
@@ -0,0 +1,24 @@
+# Compiled Object files, Static and Dynamic libs (Shared Objects)
+*.o
+*.a
+*.so
+
+# Folders
+_obj
+_test
+
+# Architecture specific extensions/prefixes
+*.[568vq]
+[568vq].out
+
+*.cgo1.go
+*.cgo2.c
+_cgo_defun.c
+_cgo_gotypes.go
+_cgo_export.*
+
+_testmain.go
+
+*.exe
+*.test
+*.prof
diff --git a/modules/swagger-codegen/src/main/resources/go/model.mustache b/modules/swagger-codegen/src/main/resources/go/model.mustache
new file mode 100644
index 00000000000..83ba416883d
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/go/model.mustache
@@ -0,0 +1,15 @@
+package {{packageName}}
+
+{{#models}}
+import (
+{{#imports}}    "{{import}}"
+{{/imports}}
+)
+
+{{#model}}
+type {{classname}} struct {
+    {{#vars}}{{name}}  {{{datatype}}}  `json:"{{baseName}},omitempty"`
+    {{/vars}}
+}
+{{/model}}
+{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/haskell-servant/Apis.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/Apis.mustache
new file mode 100644
index 00000000000..3b60afafec6
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/haskell-servant/Apis.mustache
@@ -0,0 +1,26 @@
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE FlexibleInstances #-}
+module Apis (
+      api
+    , API
+    ) where
+
+{{#apiInfo}}
+{{#apis}}
+import {{package}}.{{classname}} ({{classname}})
+{{/apis}}
+{{/apiInfo}}
+
+import Data.Proxy
+import Servant.API
+import Test.QuickCheck
+import qualified Data.Map as Map
+import Utils
+
+type API = {{#apiInfo}}{{#apis}}{{classname}}{{#hasMore}} :<|> {{/hasMore}}{{/apis}}{{/apiInfo}}
+
+api :: Proxy API
+api = Proxy
diff --git a/modules/swagger-codegen/src/main/resources/haskell-servant/Client.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/Client.mustache
new file mode 100644
index 00000000000..ab48bcbc43e
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/haskell-servant/Client.mustache
@@ -0,0 +1,35 @@
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE TypeOperators #-}
+
+module Main where
+
+import Control.Monad (void)
+import Control.Monad.Trans.Either
+import Control.Monad.IO.Class
+import Servant.API
+import Servant.Client
+
+import Data.List.Split (splitOn)
+import Network.URI (URI (..), URIAuth (..), parseURI)
+import Data.Maybe (fromMaybe)
+import Test.QuickCheck
+import Control.Monad
+{{#models}}
+import {{importPath}}
+{{/models}}
+{{#apiInfo}}
+{{#apis}}
+import {{package}}.{{classname}}
+{{/apis}}
+{{/apiInfo}}
+
+-- userClient :: IO ()
+-- userClient = do 
+--     users <- sample' (arbitrary :: Gen String)
+--     let user = last users
+--     void . runEitherT $ do
+--         getUserByName user >>= (liftIO . putStrLn . show)
+
+main :: IO ()
+main = putStrLn "Hello Server!"
diff --git a/modules/swagger-codegen/src/main/resources/haskell-servant/LICENSE b/modules/swagger-codegen/src/main/resources/haskell-servant/LICENSE
new file mode 100644
index 00000000000..b0033f5f837
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/haskell-servant/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2015 Masahiro Yamauchi
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/modules/swagger-codegen/src/main/resources/haskell-servant/README.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/README.mustache
new file mode 100644
index 00000000000..c8f4b4bbb9d
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/haskell-servant/README.mustache
@@ -0,0 +1,7 @@
+# Generated Servant Codes
+
+## How to use
+
+0. Install haskell-stack
+1. stack build
+2. stack exec client
diff --git a/modules/swagger-codegen/src/main/resources/haskell-servant/Server.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/Server.mustache
new file mode 100644
index 00000000000..68b4ff6ce33
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/haskell-servant/Server.mustache
@@ -0,0 +1,13 @@
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE TypeOperators #-}
+
+module Main where
+
+import Apis
+import Servant
+import Servant.Mock
+import qualified Network.Wai.Handler.Warp as Warp
+
+main :: IO ()
+main = Warp.run 8080 $ serve api (mock api)
diff --git a/modules/swagger-codegen/src/main/resources/haskell-servant/Setup.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/Setup.mustache
new file mode 100644
index 00000000000..9a994af677b
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/haskell-servant/Setup.mustache
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/modules/swagger-codegen/src/main/resources/haskell-servant/Utils.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/Utils.mustache
new file mode 100644
index 00000000000..f6db2602ce8
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/haskell-servant/Utils.mustache
@@ -0,0 +1,27 @@
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE FlexibleInstances #-}
+module Utils where
+
+import GHC.Generics
+import Servant.API
+import Data.List (intercalate)
+import Data.List.Split (splitOn)
+import qualified Data.Map as Map
+import qualified Data.Text as T
+import Test.QuickCheck
+
+instance FromText [String] where
+    fromText = Just . splitOn "," . T.unpack
+
+instance ToText [String] where
+    toText = T.pack . intercalate ","
+
+lkp inputs l = case lookup l inputs of
+        Nothing -> Left $ "label " ++ T.unpack l ++ " not found"
+        Just v  -> Right $ read (T.unpack v)
+
+instance (Ord k, Arbitrary k, Arbitrary v) => Arbitrary (Map.Map k v) where
+    arbitrary = Map.fromList <$> arbitrary
diff --git a/modules/swagger-codegen/src/main/resources/haskell-servant/api.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/api.mustache
new file mode 100644
index 00000000000..c49fcd5eff8
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/haskell-servant/api.mustache
@@ -0,0 +1,82 @@
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+{{#operations}}
+module {{package}}.{{classname}} (
+      {{#operation}}{{operationId}}{{#hasMore}}
+    , {{/hasMore}}{{/operation}}
+    , proxy{{classname}}
+    , {{classname}}
+    ) where
+{{/operations}}
+
+import GHC.Generics
+import Data.Proxy
+import Servant.API
+import Servant.Client
+import Network.URI (URI (..), URIAuth (..), parseURI)
+import Data.Maybe (fromMaybe)
+import Servant.Common.Text
+import Data.List (intercalate)
+import qualified Data.Text as T
+import Utils
+import Test.QuickCheck
+{{#imports}}import {{import}}
+{{/imports}}
+
+{{#operations}}
+{{#operation}}
+{{#hasFormParams}}
+data Form{{#formParams}}{{baseName}}{{/formParams}} = Form{{#formParams}}{{baseName}}{{/formParams}}
+    { {{#formParams}}{{baseName}} :: {{dataType}}{{#hasMore}}
+    , {{/hasMore}}{{/formParams}}
+    } deriving (Show, Eq, Generic)
+
+instance FromFormUrlEncoded Form{{#formParams}}{{baseName}}{{/formParams}} where
+    fromFormUrlEncoded inputs = Form{{#formParams}}{{baseName}}{{/formParams}} <$> {{#formParams}} lkp inputs "{{baseName}}"{{#hasMore}} <*> {{/hasMore}}{{/formParams}}
+instance ToFormUrlEncoded Form{{#formParams}}{{baseName}}{{/formParams}} where
+    toFormUrlEncoded x = [({{#formParams}}(T.pack $ show $ {{package}}.{{classname}}.{{baseName}} x){{#hasMore}}, {{/hasMore}}{{/formParams}})]
+instance Arbitrary Form{{#formParams}}{{baseName}}{{/formParams}} where
+    arbitrary = Form{{#formParams}}{{baseName}}{{/formParams}} <$> {{#formParams}}arbitrary{{#hasMore}} <*> {{/hasMore}}{{/formParams}}
+{{/hasFormParams}}
+
+{{/operation}}
+{{/operations}}
+
+{{#operations}}
+type {{classname}} = {{#operation}}{{& nickname}} -- {{operationId}}{{#hasMore}}
+    :<|> {{/hasMore}}{{/operation}}
+{{/operations}}
+
+proxy{{classname}} :: Proxy {{classname}}
+proxy{{classname}} = Proxy
+
+{{#operations}}
+
+serverPath :: String
+serverPath = "{{basePath}}"
+
+parseHostPort :: String -> (String, Int)
+parseHostPort path = (host,port)
+    where
+        authority = case parseURI path of
+            Just x -> uriAuthority x
+            _      -> Nothing
+        (host, port) = case authority of
+            Just y -> (uriRegName y, (getPort . uriPort) y)
+            _      -> ("localhost", 8080)
+        getPort p = case (length p) of
+            0 -> 80
+            _ -> (read . drop 1) p
+
+(host, port) = parseHostPort serverPath
+
+{{#operation}}
+{{operationId}}{{#hasMore}}
+    :<|> {{/hasMore}}{{/operation}}
+    = client proxy{{classname}} $ BaseUrl Http host port
+{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/haskell-servant/haskell-servant-codegen.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/haskell-servant-codegen.mustache
new file mode 100644
index 00000000000..8b7d7fc54b2
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/haskell-servant/haskell-servant-codegen.mustache
@@ -0,0 +1,62 @@
+name:                haskell-servant-codegen
+version:             0.1.0.0
+synopsis:            Swagger-codegen example for Haskell servant
+description:         Please see README.md
+homepage:            https://github.com/swagger-api/swagger-codegen#readme
+license:             Apache-2.0
+license-file:        LICENSE
+author:              Masahiro Yamauchi
+maintainer:          sgt.yamauchi@gmail.com
+copyright:           2015- Masahiro Yamauchi
+category:            Web
+build-type:          Simple
+-- extra-source-files:
+cabal-version:       >=1.10
+
+library
+  hs-source-dirs:      lib
+  exposed-modules:     Utils{{#models}}{{#model}}
+                     , {{importPath}}{{/model}}{{/models}}
+{{#apiInfo}}
+{{#apis}}
+                     , {{package}}.{{classname}}
+{{/apis}}
+{{/apiInfo}}
+                     , Apis
+  ghc-options:         -Wall
+  build-depends:       base
+                     , aeson
+                     , text
+                     , split
+                     , containers
+                     , network-uri
+                     , QuickCheck
+                     , servant
+                     , servant-client
+  default-language:    Haskell2010
+
+executable client
+  hs-source-dirs:      client
+  main-is:             Main.hs
+  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
+  build-depends:       base
+                     , either
+                     , transformers
+                     , split
+                     , network-uri
+                     , QuickCheck
+                     , servant
+                     , servant-client
+                     , haskell-servant-codegen
+  default-language:    Haskell2010
+
+executable server
+  hs-source-dirs:      server
+  main-is:             Main.hs
+  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
+  build-depends:       base
+                     , warp
+                     , servant-server
+                     , servant-mock
+                     , haskell-servant-codegen
+  default-language:    Haskell2010
diff --git a/modules/swagger-codegen/src/main/resources/haskell-servant/model.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/model.mustache
new file mode 100644
index 00000000000..1f76c197ae2
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/haskell-servant/model.mustache
@@ -0,0 +1,34 @@
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+
+{{#models}}
+{{#model}}
+module {{package}}.{{classname}}
+    ( {{classname}} (..)
+    ) where
+{{/model}}
+{{/models}}
+
+import Data.Aeson
+import GHC.Generics
+import Test.QuickCheck
+{{#imports}}import {{import}}
+{{/imports}}
+
+{{#models}}
+{{#model}}
+
+data {{classname}} = {{classname}}
+    { {{#vars}}{{& name}} :: {{datatype}}{{#hasMore}}
+    , {{/hasMore}}{{/vars}}
+    } deriving (Show, Eq, Generic)
+
+instance FromJSON {{classname}}
+instance ToJSON {{classname}}
+instance Arbitrary {{classname}} where
+    arbitrary = {{classname}} <$> {{#vars}}arbitrary{{#hasMore}} <*> {{/hasMore}}{{/vars}}
+{{/model}}
+{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/haskell-servant/stack.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/stack.mustache
new file mode 100644
index 00000000000..00448df3e95
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/haskell-servant/stack.mustache
@@ -0,0 +1,33 @@
+# For more information, see: https://github.com/commercialhaskell/stack/blob/release/doc/yaml_configuration.md
+
+# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
+resolver: lts-3.17
+
+# Local packages, usually specified by relative directory name
+packages:
+- '.'
+
+# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
+extra-deps:
+- servant-mock-0.4.4.6
+
+# Override default flag values for local packages and extra-deps
+flags: {}
+
+# Extra package databases containing global packages
+extra-package-dbs: []
+
+# Control whether we use the GHC we find on the path
+# system-ghc: true
+
+# Require a specific version of stack, using version ranges
+# require-stack-version: -any # Default
+# require-stack-version: >= 0.1.10.0
+
+# Override the architecture used by stack, especially useful on Windows
+# arch: i386
+# arch: x86_64
+
+# Extra directories used by stack for building
+# extra-include-dirs: [/path/to/dir]
+# extra-lib-dirs: [/path/to/dir]
diff --git a/modules/swagger-codegen/src/main/resources/htmlDocs/bodyParam.mustache b/modules/swagger-codegen/src/main/resources/htmlDocs/bodyParam.mustache
index 2fd81183a5b..45b0373e9c5 100644
--- a/modules/swagger-codegen/src/main/resources/htmlDocs/bodyParam.mustache
+++ b/modules/swagger-codegen/src/main/resources/htmlDocs/bodyParam.mustache
@@ -1,3 +1,3 @@
-{{#isBodyParam}}<div class="param">{{paramName}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}</div>
+{{#isBodyParam}}<div class="param">{{baseName}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}</div>
 
       <div class="param-desc"><span class="param-type">Body Parameter</span> &mdash; {{description}} {{#defaultValue}}default: {{{defaultValue}}}{{/defaultValue}}</div>{{/isBodyParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/htmlDocs/formParam.mustache b/modules/swagger-codegen/src/main/resources/htmlDocs/formParam.mustache
index 97f342e60d7..33b46101417 100644
--- a/modules/swagger-codegen/src/main/resources/htmlDocs/formParam.mustache
+++ b/modules/swagger-codegen/src/main/resources/htmlDocs/formParam.mustache
@@ -1,3 +1,3 @@
-{{#isFormParam}}<div class="param">{{paramName}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}</div>
+{{#isFormParam}}<div class="param">{{baseName}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}</div>
 
       <div class="param-desc"><span class="param-type">Form Parameter</span> &mdash; {{description}} {{#defaultValue}}default: {{{defaultValue}}}{{/defaultValue}}</div>{{/isFormParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/htmlDocs/headerParam.mustache b/modules/swagger-codegen/src/main/resources/htmlDocs/headerParam.mustache
index 903713493be..f5390e7aea1 100644
--- a/modules/swagger-codegen/src/main/resources/htmlDocs/headerParam.mustache
+++ b/modules/swagger-codegen/src/main/resources/htmlDocs/headerParam.mustache
@@ -1,3 +1,3 @@
-{{#isHeaderParam}}<div class="param">{{paramName}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}</div>
+{{#isHeaderParam}}<div class="param">{{baseName}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}</div>
 
       <div class="param-desc"><span class="param-type">Header Parameter</span> &mdash; {{description}} {{#defaultValue}}default: {{{defaultValue}}}{{/defaultValue}}</div>{{/isHeaderParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/htmlDocs/pathParam.mustache b/modules/swagger-codegen/src/main/resources/htmlDocs/pathParam.mustache
index b47805a4f04..b3590871cfa 100644
--- a/modules/swagger-codegen/src/main/resources/htmlDocs/pathParam.mustache
+++ b/modules/swagger-codegen/src/main/resources/htmlDocs/pathParam.mustache
@@ -1,3 +1,3 @@
-{{#isPathParam}}<div class="param">{{paramName}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}</div>
+{{#isPathParam}}<div class="param">{{baseName}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}</div>
 
       <div class="param-desc"><span class="param-type">Path Parameter</span> &mdash; {{description}} {{#defaultValue}}default: {{{defaultValue}}}{{/defaultValue}}</div>{{/isPathParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/htmlDocs/queryParam.mustache b/modules/swagger-codegen/src/main/resources/htmlDocs/queryParam.mustache
index 52147fbd718..27f02a23d81 100644
--- a/modules/swagger-codegen/src/main/resources/htmlDocs/queryParam.mustache
+++ b/modules/swagger-codegen/src/main/resources/htmlDocs/queryParam.mustache
@@ -1,3 +1,3 @@
-{{#isQueryParam}}<div class="param">{{paramName}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}</div>
+{{#isQueryParam}}<div class="param">{{baseName}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}</div>
 
       <div class="param-desc"><span class="param-type">Query Parameter</span> &mdash; {{description}} {{#defaultValue}}default: {{{defaultValue}}}{{/defaultValue}}</div>{{/isQueryParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/nodejs/service.mustache b/modules/swagger-codegen/src/main/resources/nodejs/service.mustache
index 5073d249275..c018e9ae294 100644
--- a/modules/swagger-codegen/src/main/resources/nodejs/service.mustache
+++ b/modules/swagger-codegen/src/main/resources/nodejs/service.mustache
@@ -5,15 +5,14 @@
 exports.{{nickname}} = function(args, res, next) {
   /**
    * parameters expected in the args:
-   {{#allParams}}* {{paramName}} ({{dataType}})
-   {{/allParams}}**/
-
-var examples = {};
-  {{#examples}}
-  examples['{{contentType}}'] = {{{example}}};
-  {{/examples}}
-
+  {{#allParams}}* {{paramName}} ({{dataType}})
+  {{/allParams}}**/
+  {{^returnType}}// no response value expected for this operation
+  {{/returnType}}
   {{#returnType}}
+  var examples = {};
+  {{#examples}}examples['{{contentType}}'] = {{{example}}};
+  {{/examples}}
   if(Object.keys(examples).length > 0) {
     res.setHeader('Content-Type', 'application/json');
     res.end(JSON.stringify(examples[Object.keys(examples)[0]] || {}, null, 2));
@@ -24,5 +23,6 @@ var examples = {};
   {{/returnType}}
   {{^returnType}}res.end();{{/returnType}}
 }
+
 {{/operation}}
 {{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/objc/ApiClient-body.mustache b/modules/swagger-codegen/src/main/resources/objc/ApiClient-body.mustache
index 25b5d9adfbf..a7dec733321 100644
--- a/modules/swagger-codegen/src/main/resources/objc/ApiClient-body.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/ApiClient-body.mustache
@@ -53,6 +53,10 @@ static void (^reachabilityChangeBlock)(int);
     cacheEnabled = enabled;
 }
 
++(void) setReachabilityStatus:(AFNetworkReachabilityStatus)status {
+    reachabilityStatus = status;
+}
+
 - (void)setHeaderValue:(NSString*) value
                 forKey:(NSString*) forKey {
     [self.requestSerializer setValue:value forHTTPHeaderField:forKey];
@@ -136,7 +140,8 @@ static void (^reachabilityChangeBlock)(int);
     NSMutableArray *lowerAccepts = [[NSMutableArray alloc] initWithCapacity:[accepts count]];
     for (NSString *string in accepts) {
         NSString * lowerAccept = [string lowercaseString];
-        if ([lowerAccept containsString:@"application/json"]) {
+	// use rangeOfString instead of containsString for iOS 7 support
+	if ([lowerAccept rangeOfString:@"application/json"].location != NSNotFound) {
             return @"application/json";
         }
         [lowerAccepts addObject:lowerAccept];
@@ -237,6 +242,10 @@ static void (^reachabilityChangeBlock)(int);
     return reachabilityStatus;
 }
 
++(bool) getOfflineState {
+    return offlineState;
+}
+
 +(void) setReachabilityChangeBlock:(void(^)(int))changeBlock {
     reachabilityChangeBlock = changeBlock;
 }
@@ -499,19 +508,19 @@ static void (^reachabilityChangeBlock)(int);
 
 #pragma mark - Perform Request Methods
 
--(NSNumber*)  requestWithCompletionBlock: (NSString*) path
-                                  method: (NSString*) method
-                              pathParams: (NSDictionary *) pathParams
-                             queryParams: (NSDictionary*) queryParams
-                              formParams: (NSDictionary *) formParams
-                                   files: (NSDictionary *) files
-                                    body: (id) body
-                            headerParams: (NSDictionary*) headerParams
-                            authSettings: (NSArray *) authSettings
-                      requestContentType: (NSString*) requestContentType
-                     responseContentType: (NSString*) responseContentType
-                            responseType: (NSString *) responseType
-                         completionBlock: (void (^)(id, NSError *))completionBlock {
+-(NSNumber*) requestWithPath: (NSString*) path
+                      method: (NSString*) method
+                  pathParams: (NSDictionary *) pathParams
+                 queryParams: (NSDictionary*) queryParams
+                  formParams: (NSDictionary *) formParams
+                       files: (NSDictionary *) files
+                        body: (id) body
+                headerParams: (NSDictionary*) headerParams
+                authSettings: (NSArray *) authSettings
+          requestContentType: (NSString*) requestContentType
+         responseContentType: (NSString*) responseContentType
+                responseType: (NSString *) responseType
+             completionBlock: (void (^)(id, NSError *))completionBlock {
     // setting request serializer
     if ([requestContentType isEqualToString:@"application/json"]) {
         self.requestSerializer = [{{classPrefix}}JSONRequestSerializer serializer];
diff --git a/modules/swagger-codegen/src/main/resources/objc/ApiClient-header.mustache b/modules/swagger-codegen/src/main/resources/objc/ApiClient-header.mustache
index 7aded8aabeb..b7ec5bb6021 100644
--- a/modules/swagger-codegen/src/main/resources/objc/ApiClient-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/ApiClient-header.mustache
@@ -64,6 +64,20 @@ extern NSString *const {{classPrefix}}ResponseObjectErrorKey;
  */
 +(void) setOfflineState:(BOOL) state;
 
+/**
+ * Gets if the client is unreachable
+ *
+ * @return The client offline state
+ */
++(bool) getOfflineState;
+
+/**
+ * Sets the client reachability, this may be overridden by the reachability manager if reachability changes
+ *
+ * @param The client reachability.
+ */
++(void) setReachabilityStatus:(AFNetworkReachabilityStatus) status;
+
 /**
  * Gets the client reachability
  *
@@ -186,19 +200,19 @@ extern NSString *const {{classPrefix}}ResponseObjectErrorKey;
  *
  * @return The request id.
  */
--(NSNumber*)  requestWithCompletionBlock:(NSString*) path
-                                  method:(NSString*) method
-                              pathParams:(NSDictionary *) pathParams
-                             queryParams:(NSDictionary*) queryParams
-                              formParams:(NSDictionary *) formParams
-                                   files:(NSDictionary *) files
-                                    body:(id) body
-                            headerParams:(NSDictionary*) headerParams
-                            authSettings: (NSArray *) authSettings
-                      requestContentType:(NSString*) requestContentType
-                     responseContentType:(NSString*) responseContentType
-                            responseType:(NSString *) responseType
-                         completionBlock:(void (^)(id, NSError *))completionBlock;
+-(NSNumber*) requestWithPath:(NSString*) path
+                      method:(NSString*) method
+                  pathParams:(NSDictionary *) pathParams
+                 queryParams:(NSDictionary*) queryParams
+                  formParams:(NSDictionary *) formParams
+                       files:(NSDictionary *) files
+                        body:(id) body
+                headerParams:(NSDictionary*) headerParams
+                authSettings:(NSArray *) authSettings
+          requestContentType:(NSString*) requestContentType
+         responseContentType:(NSString*) responseContentType
+                responseType:(NSString *) responseType
+             completionBlock:(void (^)(id, NSError *))completionBlock;
 
 /**
  * Sanitize object for request
diff --git a/modules/swagger-codegen/src/main/resources/objc/api-body.mustache b/modules/swagger-codegen/src/main/resources/objc/api-body.mustache
index d84e350360f..41560eabd3e 100644
--- a/modules/swagger-codegen/src/main/resources/objc/api-body.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/api-body.mustache
@@ -75,14 +75,13 @@ static {{classname}}* singletonAPI = nil;
 ///
 /// {{{summary}}}
 /// {{{notes}}}
-/// {{#allParams}} @param {{paramName}} {{{description}}}
+/// {{#allParams}} @param {{paramName}} {{{description}}} {{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
 ///
 /// {{/allParams}} @returns {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
 ///
--(NSNumber*) {{nickname}}WithCompletionBlock{{^allParams}}: {{/allParams}}{{#allParams}}{{#secondaryParam}} {{paramName}}{{/secondaryParam}}: ({{{dataType}}}) {{paramName}}
-        {{/allParams}}
-        {{#returnBaseType}}{{#hasParams}}completionHandler: {{/hasParams}}(void (^)({{{returnType}}} output, NSError* error))completionBlock { {{/returnBaseType}}
-        {{^returnBaseType}}{{#hasParams}}completionHandler: {{/hasParams}}(void (^)(NSError* error))completionBlock { {{/returnBaseType}}
+-(NSNumber*) {{#vendorExtensions.x-objc-operationId}}{{vendorExtensions.x-objc-operationId}}{{/vendorExtensions.x-objc-operationId}}{{^vendorExtensions.x-objc-operationId}}{{nickname}}{{#hasParams}}With{{vendorExtensions.firstParamAltName}}{{/hasParams}}{{^hasParams}}WithCompletionHandler: {{/hasParams}}{{/vendorExtensions.x-objc-operationId}}{{#allParams}}{{#secondaryParam}}
+    {{paramName}}{{/secondaryParam}}: ({{{dataType}}}) {{paramName}}{{/allParams}}
+    {{#hasParams}}completionHandler: {{/hasParams}}(void (^)({{#returnBaseType}}{{{returnType}}} output, {{/returnBaseType}}NSError* error)) handler {
 
     {{#allParams}}{{#required}}
     // verify the required parameter '{{paramName}}' is set
@@ -142,7 +141,7 @@ static {{classname}}* singletonAPI = nil;
 
     id bodyParam = nil;
     NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
     {{#bodyParam}}
     bodyParam = {{paramName}};
     {{/bodyParam}}{{^bodyParam}}
@@ -152,7 +151,7 @@ static {{classname}}* singletonAPI = nil;
         formParams[@"{{baseName}}"] = {{paramName}};
     }
     {{/notFile}}{{#isFile}}
-    files[@"{{paramName}}"] = {{paramName}};
+    localVarFiles[@"{{paramName}}"] = {{paramName}};
     {{/isFile}}
     {{/formParams}}
     {{/bodyParam}}
@@ -164,22 +163,21 @@ static {{classname}}* singletonAPI = nil;
     }
     {{/requiredParams}}
     {{/requiredParamCount}}
-    return [self.apiClient requestWithCompletionBlock: resourcePath
-                                               method: @"{{httpMethod}}"
-                                           pathParams: pathParams
-                                          queryParams: queryParams
-                                           formParams: formParams
-                                                files: files
-                                                 body: bodyParam
-                                         headerParams: headerParams
-                                         authSettings: authSettings
-                                   requestContentType: requestContentType
-                                  responseContentType: responseContentType
-                                         responseType: {{^returnType}}nil{{/returnType}}{{#returnType}}@"{{{ returnType }}}"{{/returnType}}
-                                      completionBlock: ^(id data, NSError *error) {
-                  {{^returnType}}completionBlock(error);{{/returnType}}
-                  {{#returnType}}completionBlock(({{{ returnType }}})data, error);{{/returnType}}
-              }
+    return [self.apiClient requestWithPath: resourcePath
+                                    method: @"{{httpMethod}}"
+                                pathParams: pathParams
+                               queryParams: queryParams
+                                formParams: formParams
+                                     files: localVarFiles
+                                      body: bodyParam
+                              headerParams: headerParams
+                              authSettings: authSettings
+                        requestContentType: requestContentType
+                       responseContentType: responseContentType
+                              responseType: {{^returnType}}nil{{/returnType}}{{#returnType}}@"{{{ returnType }}}"{{/returnType}}
+                           completionBlock: ^(id data, NSError *error) {
+                               handler({{#returnType}}({{{ returnType }}})data, {{/returnType}}error);
+                           }
           ];
 }
 
diff --git a/modules/swagger-codegen/src/main/resources/objc/api-header.mustache b/modules/swagger-codegen/src/main/resources/objc/api-header.mustache
index 29c7d9477f2..fdf6726dac8 100644
--- a/modules/swagger-codegen/src/main/resources/objc/api-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/api-header.mustache
@@ -31,12 +31,9 @@
 /// {{/allParams}}
 ///
 /// @return {{{returnType}}}
--(NSNumber*) {{nickname}}WithCompletionBlock {{^allParams}}:{{/allParams}}{{#allParams}}{{#secondaryParam}}     {{paramName}}{{/secondaryParam}}:({{{dataType}}}) {{paramName}} {{#hasMore}}
-{{/hasMore}}{{/allParams}}
-    {{#returnBaseType}}{{#hasParams}}
-    completionHandler: {{/hasParams}}(void (^)({{{returnType}}} output, NSError* error))completionBlock;{{/returnBaseType}}
-    {{^returnBaseType}}{{#hasParams}}
-    completionHandler: {{/hasParams}}(void (^)(NSError* error))completionBlock;{{/returnBaseType}}
+-(NSNumber*) {{#vendorExtensions.x-objc-operationId}}{{vendorExtensions.x-objc-operationId}}{{/vendorExtensions.x-objc-operationId}}{{^vendorExtensions.x-objc-operationId}}{{nickname}}{{#hasParams}}With{{vendorExtensions.firstParamAltName}}{{/hasParams}}{{^hasParams}}WithCompletionHandler: {{/hasParams}}{{/vendorExtensions.x-objc-operationId}}{{#allParams}}{{#secondaryParam}}
+    {{paramName}}{{/secondaryParam}}: ({{{dataType}}}) {{paramName}}{{/allParams}}
+    {{#hasParams}}completionHandler: {{/hasParams}}(void (^)({{#returnBaseType}}{{{returnType}}} output, {{/returnBaseType}}NSError* error)) handler;
 
 {{newline}}
 {{/operation}}
diff --git a/modules/swagger-codegen/src/main/resources/objc/git_push.sh.mustache b/modules/swagger-codegen/src/main/resources/objc/git_push.sh.mustache
new file mode 100755
index 00000000000..e153ce23ecf
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/git_push.sh.mustache
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="{{{gitUserId}}}"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="{{{gitRepoId}}}"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="{{{releaseNote}}}"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/modules/swagger-codegen/src/main/resources/objc/gitignore.mustache b/modules/swagger-codegen/src/main/resources/objc/gitignore.mustache
new file mode 100644
index 00000000000..79d9331b6d4
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/gitignore.mustache
@@ -0,0 +1,53 @@
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+
+## Other
+*.xccheckout
+*.moved-aside
+*.xcuserstate
+*.xcscmblueprint
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# Pods/
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the 
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
+
+fastlane/report.xml
+fastlane/screenshots
diff --git a/modules/swagger-codegen/src/main/resources/objc/model-body.mustache b/modules/swagger-codegen/src/main/resources/objc/model-body.mustache
index 3d70cebfae2..ec5ab3b9f80 100644
--- a/modules/swagger-codegen/src/main/resources/objc/model-body.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/model-body.mustache
@@ -16,6 +16,31 @@
   return self;
 }
 
+{{#discriminator}}
+/**
+ Maps "discriminator" value to the sub-class name, so that inheritance is supported.
+ */
+- (id)initWithDictionary:(NSDictionary *)dict error:(NSError *__autoreleasing *)err {
+
+
+    NSString * discriminatedClassName = [dict valueForKey:@"{{discriminator}}"];
+
+    if(discriminatedClassName == nil ){
+         return [super initWithDictionary:dict error:err];
+    }
+
+    Class class = NSClassFromString([@"{{classPrefix}}" stringByAppendingString:discriminatedClassName]);
+
+    if([self class ] == class) {
+        return [super initWithDictionary:dict error:err];
+    }
+
+
+    return [[class alloc] initWithDictionary:dict error: err];
+
+}
+{{/discriminator}}
+
 /**
  * Maps json key to property name.
  * This method is used by `JSONModel`.
diff --git a/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache
index 4d7d5bb7088..401a33eddad 100644
--- a/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache
@@ -1,4 +1,4 @@
-package WWW::{{moduleName}}::ApiClient;
+package {{moduleName}}::ApiClient;
 
 use strict;
 use warnings;
@@ -18,7 +18,7 @@ use Log::Any qw($log);
 use Carp;
 use Module::Runtime qw(use_module);
 
-use WWW::{{moduleName}}::Configuration;
+use {{moduleName}}::Configuration;
 
 use base 'Class::Singleton';
 
@@ -34,7 +34,7 @@ sub _new_instance
     return bless \%args, $class;
 }
 
-sub _cfg {'WWW::{{moduleName}}::Configuration'}
+sub _cfg {'{{moduleName}}::Configuration'}
 
 # Set the user agent of the API client
 #
@@ -119,8 +119,8 @@ sub call_api {
     else {
     }
    
-    $self->{ua}->timeout($self->{http_timeout} || $WWW::{{moduleName}}::Configuration::http_timeout); 
-    $self->{ua}->agent($self->{http_user_agent} || $WWW::{{moduleName}}::Configuration::http_user_agent);
+    $self->{ua}->timeout($self->{http_timeout} || ${{moduleName}}::Configuration::http_timeout); 
+    $self->{ua}->agent($self->{http_user_agent} || ${{moduleName}}::Configuration::http_user_agent);
     
     $log->debugf("REQUEST: %s", $_request->as_string);
     my $_response = $self->{ua}->request($_request);
@@ -243,7 +243,7 @@ sub deserialize
     } elsif (grep /^$class$/, ('string', 'int', 'float', 'bool', 'object')) {
         return $data;
     } else { # model
-        my $_instance = use_module("WWW::{{moduleName}}::Object::$class")->new;
+        my $_instance = use_module("{{moduleName}}::Object::$class")->new;
         if (ref $data eq "HASH") {
             return $_instance->from_hash($data);
         } else { # string, need to json decode first
@@ -294,11 +294,11 @@ sub get_api_key_with_prefix
 {
 	my ($self, $key_name) = @_;
 
-	my $api_key = $WWW::{{moduleName}}::Configuration::api_key->{$key_name};
+	my $api_key = ${{moduleName}}::Configuration::api_key->{$key_name};
 	
 	return unless $api_key;
 	
-	my $prefix = $WWW::{{moduleName}}::Configuration::api_key_prefix->{$key_name};
+	my $prefix = ${{moduleName}}::Configuration::api_key_prefix->{$key_name};
 	return $prefix ? "$prefix $api_key" : $api_key;
 }	
 
@@ -329,11 +329,11 @@ sub update_params_for_auth {
             if ($api_key) {
                 $query_params->{'{{keyParamName}}'} = $api_key;
             }{{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}
-            if ($WWW::{{moduleName}}::Configuration::username || $WWW::{{moduleName}}::Configuration::password) {
-                $header_params->{'Authorization'} = 'Basic ' . encode_base64($WWW::{{moduleName}}::Configuration::username . ":" . $WWW::{{moduleName}}::Configuration::password);
+            if (${{moduleName}}::Configuration::username || ${{moduleName}}::Configuration::password) {
+                $header_params->{'Authorization'} = 'Basic ' . encode_base64(${{moduleName}}::Configuration::username . ":" . ${{moduleName}}::Configuration::password);
             }{{/isBasic}}{{#isOAuth}}
-            if ($WWW::{{moduleName}}::Configuration::access_token) {
-                $header_params->{'Authorization'} = 'Bearer ' . $WWW::{{moduleName}}::Configuration::access_token;
+            if (${{moduleName}}::Configuration::access_token) {
+                $header_params->{'Authorization'} = 'Bearer ' . ${{moduleName}}::Configuration::access_token;
             }{{/isOAuth}}
         }
         {{/authMethods}}
diff --git a/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache b/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache
index fc119f7a902..ef5f322a014 100644
--- a/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache
@@ -1,4 +1,4 @@
-package WWW::{{moduleName}}::ApiFactory;
+package {{moduleName}}::ApiFactory;
 
 use strict;
 use warnings;
@@ -7,26 +7,26 @@ use utf8;
 use Carp;
 use Module::Find;
 
-usesub WWW::{{moduleName}}::Object;
+usesub {{moduleName}}::Object;
 
-use WWW::{{moduleName}}::ApiClient;
+use {{moduleName}}::ApiClient;
 
 =head1 Name
 
-	WWW::{{moduleName}}::ApiFactory - constructs APIs to retrieve {{moduleName}} objects
+	{{moduleName}}::ApiFactory - constructs APIs to retrieve {{moduleName}} objects
 
 =head1 Synopsis
 
 	package My::Petstore::App;
 	
-	use WWW::{{moduleName}}::ApiFactory;
+	use {{moduleName}}::ApiFactory;
 	
-	my $api_factory = WWW::{{moduleName}}::ApiFactory->new( ... ); # any args for ApiClient constructor
+	my $api_factory = {{moduleName}}::ApiFactory->new( ... ); # any args for ApiClient constructor
 							  
 	# later...
 	my $pet_api = $api_factory->get_api('Pet');  
 	
-	# $pet_api isa WWW::{{moduleName}}::PetApi
+	# $pet_api isa {{moduleName}}::PetApi
 	
 	my $pet = $pet_api->get_pet_by_id(pet_id => $pet_id);
 	
@@ -39,9 +39,9 @@ use WWW::{{moduleName}}::ApiClient;
 =cut
 
 # Load all the API classes and construct a lookup table at startup time
-my %_apis = map { $_ =~ /^WWW::{{moduleName}}::(.*)$/; $1 => $_ } 
+my %_apis = map { $_ =~ /^{{moduleName}}::(.*)$/; $1 => $_ } 
 			grep {$_ =~ /Api$/} 
-			usesub 'WWW::{{moduleName}}';
+			usesub '{{moduleName}}';
 
 =head1 new()
 	
@@ -54,7 +54,7 @@ my %_apis = map { $_ =~ /^WWW::{{moduleName}}::(.*)$/; $1 => $_ }
 
 sub new {
     my ($class, %p) = (shift, @_);
-	$p{api_client} = WWW::{{moduleName}}::ApiClient->instance(%p);			
+	$p{api_client} = {{moduleName}}::ApiClient->instance(%p);			
 	return bless \%p, $class;
 }
 
@@ -64,7 +64,7 @@ sub new {
 	
 	$which is a nickname for the class: 
 	
-		WWW::FooBarClient::BazApi has nickname 'Baz'
+		FooBarClient::BazApi has nickname 'Baz'
 		
 =cut
 
diff --git a/modules/swagger-codegen/src/main/resources/perl/AutoDoc.mustache b/modules/swagger-codegen/src/main/resources/perl/AutoDoc.mustache
index 76da048b069..3c10c2450fe 100644
--- a/modules/swagger-codegen/src/main/resources/perl/AutoDoc.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/AutoDoc.mustache
@@ -1,4 +1,4 @@
-package WWW::{{moduleName}}::Role::AutoDoc;
+package {{moduleName}}::Role::AutoDoc;
 use List::MoreUtils qw(uniq);
 
 use Moose::Role;
@@ -40,7 +40,7 @@ sub _printisa {
 	
 	foreach my $role (@roles) {
 		$rolepkg = $role->{package} || next; # some are anonymous, or something
-		next if $rolepkg eq 'WWW::{{moduleName}}::Role::AutoDoc';
+		next if $rolepkg eq '{{moduleName}}::Role::AutoDoc';
 		$role_reqs = join ', ', keys %{$role->{required_methods}};
 		$role_reqs ||= '';
 		$~ = $how eq 'pod' ? 'ROLES_POD' : 'ROLES';
@@ -424,4 +424,4 @@ $attrname
 
 
 
-1;
\ No newline at end of file
+1;
diff --git a/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache b/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache
index aed1aec3118..9f262543acd 100644
--- a/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache
@@ -68,7 +68,7 @@ sub _deserialize {
     } elsif ( grep( /^$type$/, ('int', 'double', 'string', 'boolean'))) {
         return $data;
     } else { # hash(model)
-        my $_instance = eval "WWW::{{moduleName}}::Object::$type->new()";
+        my $_instance = eval "{{moduleName}}::Object::$type->new()";
         return $_instance->from_hash($data);
     }
 }
diff --git a/modules/swagger-codegen/src/main/resources/perl/Configuration.mustache b/modules/swagger-codegen/src/main/resources/perl/Configuration.mustache
index 75a1ba7f61a..e0ed9bf3295 100644
--- a/modules/swagger-codegen/src/main/resources/perl/Configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/Configuration.mustache
@@ -1,4 +1,4 @@
-package WWW::{{moduleName}}::Configuration;
+package {{moduleName}}::Configuration;
 
 use strict;
 use warnings;
diff --git a/modules/swagger-codegen/src/main/resources/perl/README.mustache b/modules/swagger-codegen/src/main/resources/perl/README.mustache
index ac94b5b0638..630a0a5979b 100644
--- a/modules/swagger-codegen/src/main/resources/perl/README.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/README.mustache
@@ -1,21 +1,25 @@
 # NAME
 
-WWW::{{moduleName}}::Role - a Moose role for the {{appName}} 
+{{moduleName}}::Role - a Moose role for the {{appName}}
 
-## {{appName}} version: {{appVersion}}
+{{#appDescription}}{{{appDescription}}}{{/appDescription}}
 
 # VERSION
 
-Automatically generated by the Perl Swagger Codegen project: 
+Automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
+- API version: {{appVersion}}
+- Package version: {{moduleVersion}}
 - Build date: {{generatedDate}}
 - Build package: {{generatorClass}}
-- Codegen version: 
+{{#infoUrl}}
+For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
+{{/infoUrl}}
 
 ## A note on Moose
 
 This role is the only component of the library that uses Moose. See 
-WWW::{{moduleName}}::ApiFactory for non-Moosey usage. 
+{{moduleName}}::ApiFactory for non-Moosey usage. 
 
 # SYNOPSIS
 
@@ -29,7 +33,7 @@ role.
 
         package MyApp;
         use Moose;
-        with 'WWW::{{moduleName}}::Role';
+        with '{{moduleName}}::Role';
         
         package main;
         
@@ -88,37 +92,37 @@ you are accessing. Usually `prefix` and `in` will be determined by the code gene
 the spec and you will not need to set them at run time. If not, `in` will
 default to 'head' and `prefix` to the empty string. 
 
-The tokens will be placed in the `WWW::{{moduleName}}::Configuration` namespace
+The tokens will be placed in the `{{moduleName}}::Configuration` namespace
 as follows, but you don't need to know about this. 
 
-- `$WWW::{{moduleName}}::Configuration::username`
+- `${{moduleName}}::Configuration::username`
 
     String. The username for basic auth.
 
-- `$WWW::{{moduleName}}::Configuration::password`
+- `${{moduleName}}::Configuration::password`
 
     String. The password for basic auth.
 
-- `$WWW::{{moduleName}}::Configuration::api_key`
+- `${{moduleName}}::Configuration::api_key`
 
     Hashref. Keyed on the name of each key (there can be multiple tokens).
 
-            $WWW::{{moduleName}}::Configuration::api_key = {
+            ${{moduleName}}::Configuration::api_key = {
                     secretKey => 'aaaabbbbccccdddd',
                     anotherKey => '1111222233334444',
                     };
 
-- `$WWW::{{moduleName}}::Configuration::api_key_prefix`
+- `${{moduleName}}::Configuration::api_key_prefix`
 
     Hashref. Keyed on the name of each key (there can be multiple tokens). Note not
     all api keys require a prefix.
 
-            $WWW::{{moduleName}}::Configuration::api_key_prefix = {
+            ${{moduleName}}::Configuration::api_key_prefix = {
                     secretKey => 'string',
                     anotherKey => 'same or some other string',
                     };
 
-- `$WWW::{{moduleName}}::Configuration::access_token`
+- `${{moduleName}}::Configuration::access_token`
 
     String. The OAuth access token. 
 
@@ -134,7 +138,7 @@ created yet) the current value of `base_url`.
 
 Returns an API factory object. You probably won't need to call this directly. 
 
-        $self->api_factory('Pet'); # returns a WWW::{{moduleName}}::PetApi instance
+        $self->api_factory('Pet'); # returns a {{moduleName}}::PetApi instance
         
         $self->pet_api;            # the same
 
@@ -162,12 +166,12 @@ you could also call them on class names.
 
 See the homepage `https://github.com/swagger-api/swagger-codegen` for full details. 
 But briefly, clone the git repository, build the codegen codebase, set up your build 
-config file, then run the API build script. You will need git, Java 7 and Apache 
+config file, then run the API build script. You will need git, Java 7 or 8 and Apache
 maven 3.0.3 or better already installed.
 
 The config file should specify the project name for the generated library: 
 
-        {"moduleName":"MyProjectName"}
+        {"moduleName":"WWW::MyProjectName"}
 
 Your library files will be built under `WWW::MyProjectName`.
 
@@ -216,4 +220,95 @@ spec. If so, this is available via the `class_documentation()` and
         my $omdoc = $api->get_pet_by_id->(pet_id => $pet_id)->method_documentation->{method_name}; 
         
 
-Each of these calls returns a hashref with various useful pieces of information.	
+Each of these calls returns a hashref with various useful pieces of information.
+
+# LOAD THE MODULES
+
+To load the API packages:
+```perl
+{{#apiInfo}}{{#apis}}use {{moduleName}}::{{classname}};
+{{/apis}}{{/apiInfo}}
+```
+
+To load the models:
+```perl
+{{#models}}{{#model}}use {{moduleName}}::Object::{{classname}};
+{{/model}}{{/models}}
+````
+
+# GETTING STARTED
+Put the Perl SDK under the 'lib' folder in your project directory, then run the following
+```perl
+#!/usr/bin/perl
+use lib 'lib';
+use strict;
+use warnings;
+# load the API package
+{{#apiInfo}}{{#apis}}use {{moduleName}}::{{classname}};
+{{/apis}}{{/apiInfo}}
+# load the models
+{{#models}}{{#model}}use {{moduleName}}::Object::{{classname}};
+{{/model}}{{/models}}
+# for displaying the API response data
+use Data::Dumper;
+{{#apiInfo}}{{#apis}}{{#-first}}{{#operations}}{{#operation}}{{#-first}}{{#hasAuthMethods}}{{#authMethods}}{{#isBasic}}
+# Configure HTTP basic authorization: {{{name}}}
+${{{moduleName}}}::Configuration::username = 'YOUR_USERNAME';
+${{{moduleName}}}::Configuration::password = 'YOUR_PASSWORD';{{/isBasic}}{{#isApiKey}}
+# Configure API key authorization: {{{name}}}
+${{{moduleName}}}::Configuration::api_key->{'{{{keyParamName}}}'} = 'YOUR_API_KEY';
+# uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+#${{{moduleName}}}::Configuration::api_key_prefix->{'{{{keyParamName}}}'} = 'BEARER';{{/isApiKey}}{{#isOAuth}}
+# Configure OAuth2 access token for authorization: {{{name}}}
+${{{moduleName}}}::Configuration::access_token = 'YOUR_ACCESS_TOKEN';{{/isOAuth}}{{/authMethods}}
+{{/hasAuthMethods}}
+
+my $api_instance = {{moduleName}}::{{classname}}->new();
+{{#allParams}}my ${{paramName}} = {{#isListContainer}}({{/isListContainer}}{{#isBodyParam}}{{{moduleName}}}::Object::{{dataType}}->new(){{/isBodyParam}}{{^isBodyParam}}{{{example}}}{{/isBodyParam}}{{#isListContainer}}){{/isListContainer}}; # {{{dataType}}} | {{{description}}}
+{{/allParams}}
+
+eval {
+    {{#returnType}}my $result = {{/returnType}}$api_instance->{{{operationId}}}({{#allParams}}{{paramName}} => ${{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{#returnType}}
+    print Dumper($result);{{/returnType}}
+};
+if ($@) {
+    warn "Exception when calling {{classname}}->{{operationId}}: $@\n";
+}
+{{/-first}}{{/operation}}{{/operations}}{{/-first}}{{/apis}}{{/apiInfo}}
+```
+
+# DOCUMENTATION FOR API ENDPOINTS
+
+All URIs are relative to *{{basePath}}*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+{{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}*{{classname}}* | [**{{nickname}}**]({{apiDocPath}}{{classname}}.md#{{nickname}}) | **{{httpMethod}}** {{path}} | {{#summary}}{{summary}}{{/summary}}
+{{/operation}}{{/operations}}{{/apis}}{{/apiInfo}}
+
+# DOCUMENTATION FOR MODELS
+{{#models}}{{#model}} - [{{moduleName}}::Object::{{classname}}]({{modelDocPath}}{{classname}}.md)
+{{/model}}{{/models}}
+
+# DOCUMENTATION FOR AUTHORIATION
+{{^authMethods}} All endpoints do not require authorization.
+{{/authMethods}}{{#authMethods}}{{#last}} Authentication schemes defined for the API:{{/last}}{{/authMethods}}
+{{#authMethods}}## {{{name}}}
+
+{{#isApiKey}}- **Type**: API key 
+- **API key parameter name**: {{{keyParamName}}}
+- **Location**: {{#isKeyInQuery}}URL query string{{/isKeyInQuery}}{{#isKeyInHeader}}HTTP header{{/isKeyInHeader}}
+{{/isApiKey}}
+{{#isBasic}}- **Type**: HTTP basic authentication
+{{/isBasic}}
+{{#isOAuth}}- **Type**: OAuth
+- **Flow**: {{{flow}}}
+- **Authorizatoin URL**: {{{authorizationUrl}}}
+- **Scopes**: {{^scopes}}N/A{{/scopes}}
+{{#scopes}}  - **{{{scope}}}**: {{{description}}}
+{{/scopes}}
+{{/isOAuth}}
+
+{{/authMethods}}
+
+
diff --git a/modules/swagger-codegen/src/main/resources/perl/Role.mustache b/modules/swagger-codegen/src/main/resources/perl/Role.mustache
index ac2298a08e9..fb343ccb890 100644
--- a/modules/swagger-codegen/src/main/resources/perl/Role.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/Role.mustache
@@ -1,11 +1,11 @@
-package WWW::{{moduleName}}::Role;
+package {{moduleName}}::Role;
 use utf8;
 
 use Moose::Role;
 use namespace::autoclean;
 use Class::Inspector;
 use Log::Any qw($log);
-use WWW::{{moduleName}}::ApiFactory;
+use {{moduleName}}::ApiFactory;
 
 has base_url => ( is => 'ro',
                   required => 0,
@@ -14,7 +14,7 @@ has base_url => ( is => 'ro',
                   );
 
 has api_factory => ( is => 'ro',
-                     isa => 'WWW::{{moduleName}}::ApiFactory',
+                     isa => '{{moduleName}}::ApiFactory',
                      builder => '_build_af', 
                      lazy => 1,
                      documentation => 'Builds an instance of the endpoint API class',
@@ -29,7 +29,7 @@ has tokens => ( is => 'ro',
 
 has _cfg => ( is => 'ro',
               isa => 'Str',
-              default => 'WWW::{{moduleName}}::Configuration',
+              default => '{{moduleName}}::Configuration',
               );
 
 has version_info => ( is => 'ro', 
@@ -88,12 +88,12 @@ sub _build_af {
 	my $self = shift;
 	my %args;
 	$args{base_url} = $self->base_url if $self->base_url;
-	return WWW::{{moduleName}}::ApiFactory->new(%args);
+	return {{moduleName}}::ApiFactory->new(%args);
 }
 
 =head1 NAME
 
-WWW::{{moduleName}}::Role - a Moose role for the {{appName}} 
+{{moduleName}}::Role - a Moose role for the {{appName}} 
 
 =head2 {{appName}} version: {{appVersion}}
 
@@ -114,7 +114,7 @@ Automatically generated by the Perl Swagger Codegen project:
 =head2 A note on Moose
 
 This role is the only component of the library that uses Moose. See 
-WWW::{{moduleName}}::ApiFactory for non-Moosey usage. 
+{{moduleName}}::ApiFactory for non-Moosey usage. 
 
 =head1 SYNOPSIS
 
@@ -128,7 +128,7 @@ role.
 
 	package MyApp;
 	use Moose;
-	with 'WWW::{{moduleName}}::Role';
+	with '{{moduleName}}::Role';
 	
 	package main;
 	
@@ -186,39 +186,39 @@ you are accessing. Usually C<prefix> and C<in> will be determined by the code ge
 the spec and you will not need to set them at run time. If not, C<in> will
 default to 'head' and C<prefix> to the empty string. 
 
-The tokens will be placed in the C<WWW::{{moduleName}}::Configuration> namespace
+The tokens will be placed in the C<{{moduleName}}::Configuration> namespace
 as follows, but you don't need to know about this. 
 
 =over 4
 
-=item C<$WWW::{{moduleName}}::Configuration::username>
+=item C<${{moduleName}}::Configuration::username>
 
 String. The username for basic auth.
 
-=item C<$WWW::{{moduleName}}::Configuration::password>
+=item C<${{moduleName}}::Configuration::password>
 
 String. The password for basic auth.
 
-=item C<$WWW::{{moduleName}}::Configuration::api_key>
+=item C<${{moduleName}}::Configuration::api_key>
 
 Hashref. Keyed on the name of each key (there can be multiple tokens).
 
-	$WWW::{{moduleName}}::Configuration::api_key = {
+	${{moduleName}}::Configuration::api_key = {
 		secretKey => 'aaaabbbbccccdddd',
 		anotherKey => '1111222233334444',
 		};
 
-=item C<$WWW::{{moduleName}}::Configuration::api_key_prefix>
+=item C<${{moduleName}}::Configuration::api_key_prefix>
 
 Hashref. Keyed on the name of each key (there can be multiple tokens). Note not
 all api keys require a prefix.
 
-	$WWW::{{moduleName}}::Configuration::api_key_prefix = {
+	${{moduleName}}::Configuration::api_key_prefix = {
 		secretKey => 'string',
 		anotherKey => 'same or some other string',
 		};
 
-=item C<$WWW::{{moduleName}}::Configuration::access_token>
+=item C<${{moduleName}}::Configuration::access_token>
 
 String. The OAuth access token. 
 
@@ -236,7 +236,7 @@ created yet) the current value of C<base_url>.
 
 Returns an API factory object. You probably won't need to call this directly. 
 	
-        $self->api_factory('Pet'); # returns a WWW::{{moduleName}}::PetApi instance
+        $self->api_factory('Pet'); # returns a {{moduleName}}::PetApi instance
         
         $self->pet_api;            # the same
 
@@ -264,12 +264,12 @@ you could also call them on class names.
 
 See the homepage C<https://github.com/swagger-api/swagger-codegen> for full details. 
 But briefly, clone the git repository, build the codegen codebase, set up your build 
-config file, then run the API build script. You will need git, Java 7 and Apache 
+config file, then run the API build script. You will need git, Java 7 or 8 and Apache
 maven 3.0.3 or better already installed.
 
 The config file should specify the project name for the generated library: 
 
-	{"moduleName":"MyProjectName"}
+	{"moduleName":"WWW::MyProjectName"}
 
 Your library files will be built under C<WWW::MyProjectName>.
 
diff --git a/modules/swagger-codegen/src/main/resources/perl/api.mustache b/modules/swagger-codegen/src/main/resources/perl/api.mustache
index f25c63a528c..7e0770f332f 100644
--- a/modules/swagger-codegen/src/main/resources/perl/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/api.mustache
@@ -1,5 +1,5 @@
 #
-# Copyright 2015 SmartBear Software
+# Copyright 2016 SmartBear Software
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 # NOTE: This class is auto generated by the swagger code generator program. 
 # Do not edit the class manually.
 #
-package WWW::{{moduleName}}::{{classname}};
+package {{moduleName}}::{{classname}};
 
 require 5.6.0;
 use strict;
@@ -27,8 +27,8 @@ use Exporter;
 use Carp qw( croak );
 use Log::Any qw($log);
 
-use WWW::{{moduleName}}::ApiClient;
-use WWW::{{moduleName}}::Configuration;
+use {{moduleName}}::ApiClient;
+use {{moduleName}}::Configuration;
 
 use base "Class::Data::Inheritable";
 
@@ -37,7 +37,7 @@ __PACKAGE__->mk_classdata('method_documentation' => {});
 sub new {
     my $class   = shift;
     my (%self) = (
-        'api_client' => WWW::{{moduleName}}::ApiClient->instance,
+        'api_client' => {{moduleName}}::ApiClient->instance,
         @_
     );
 
@@ -54,11 +54,11 @@ sub new {
 {{#operation}}
 
 #
-# {{{nickname}}}
+# {{{operationId}}}
 #
 # {{{summary}}}
 # 
-{{#allParams}}# @param {{dataType}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional){{/required}}
+{{#allParams}}# @param {{dataType}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
 {{/allParams}}
 {
     my $params = {
@@ -70,7 +70,7 @@ sub new {
     },
 {{/allParams}}
     };
-    __PACKAGE__->method_documentation->{ {{nickname}} } = { 
+    __PACKAGE__->method_documentation->{ {{operationId}} } = { 
     	summary => '{{summary}}',
         params => $params,
         returns => {{#returnType}}'{{{returnType}}}'{{/returnType}}{{^returnType}}undef{{/returnType}},
@@ -78,13 +78,13 @@ sub new {
 }
 # @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
 #
-sub {{nickname}} {
+sub {{operationId}} {
     my ($self, %args) = @_;
 
     {{#allParams}}{{#required}}
     # verify the required parameter '{{paramName}}' is set
     unless (exists $args{'{{paramName}}'}) {
-      croak("Missing the required parameter '{{paramName}}' when calling {{nickname}}");
+      croak("Missing the required parameter '{{paramName}}' when calling {{operationId}}");
     }
     {{/required}}{{/allParams}}
 
diff --git a/modules/swagger-codegen/src/main/resources/perl/api_doc.mustache b/modules/swagger-codegen/src/main/resources/perl/api_doc.mustache
new file mode 100644
index 00000000000..eb270b7e216
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/perl/api_doc.mustache
@@ -0,0 +1,76 @@
+# {{moduleName}}::{{classname}}{{#description}}
+{{description}}{{/description}}
+
+## Load the API package
+```perl
+use {{moduleName}}::Object::{{classname}};
+```
+
+All URIs are relative to *{{basePath}}*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+{{#operations}}{{#operation}}[**{{operationId}}**]({{classname}}.md#{{operationId}}) | **{{httpMethod}}** {{path}} | {{#summary}}{{summary}}{{/summary}}
+{{/operation}}{{/operations}}
+
+{{#operations}}
+{{#operation}}
+# **{{{operationId}}}**
+> {{#returnType}}{{{returnType}}} {{/returnType}}{{{operationId}}}({{#allParams}}{{paramName}} => ${{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
+
+{{{summary}}}{{#notes}}
+
+{{{notes}}}{{/notes}}
+
+### Example 
+```perl
+use Data::Dumper;
+{{#hasAuthMethods}}{{#authMethods}}{{#isBasic}}
+# Configure HTTP basic authorization: {{{name}}}
+${{{moduleName}}}::Configuration::username = 'YOUR_USERNAME';
+${{{moduleName}}}::Configuration::password = 'YOUR_PASSWORD';{{/isBasic}}{{#isApiKey}}
+# Configure API key authorization: {{{name}}}
+${{{moduleName}}}::Configuration::api_key->{'{{{keyParamName}}}'} = 'YOUR_API_KEY';
+# uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+#${{{moduleName}}}::Configuration::api_key_prefix->{'{{{keyParamName}}}'} = "BEARER";{{/isApiKey}}{{#isOAuth}}
+# Configure OAuth2 access token for authorization: {{{name}}}
+${{{moduleName}}}::Configuration::access_token = 'YOUR_ACCESS_TOKEN';{{/isOAuth}}{{/authMethods}}
+{{/hasAuthMethods}}
+
+my $api_instance = {{moduleName}}::{{classname}}->new();
+{{#allParams}}my ${{paramName}} = {{#isListContainer}}({{/isListContainer}}{{#isBodyParam}}{{{moduleName}}}::Object::{{dataType}}->new(){{/isBodyParam}}{{^isBodyParam}}{{{example}}}{{/isBodyParam}}{{#isListContainer}}){{/isListContainer}}; # {{{dataType}}} | {{{description}}}
+{{/allParams}}
+
+eval { 
+    {{#returnType}}my $result = {{/returnType}}$api_instance->{{{operationId}}}({{#allParams}}{{paramName}} => ${{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{#returnType}}
+    print Dumper($result);{{/returnType}}
+};
+if ($@) {
+    warn "Exception when calling {{classname}}->{{operationId}}: $@\n";
+}
+```
+
+### Parameters
+{{^allParams}}This endpoint does not need any parameter.{{/allParams}}{{#allParams}}{{#-last}}
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------{{/-last}}{{/allParams}}
+{{#allParams}} **{{paramName}}** | {{#isFile}}**{{dataType}}**{{/isFile}}{{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}{{^isFile}}[**{{dataType}}**]({{baseType}}.md){{/isFile}}{{/isPrimitiveType}}| {{description}} | {{^required}}[optional] {{/required}}{{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}
+{{/allParams}}
+
+### Return type
+
+{{#returnType}}{{#returnTypeIsPrimitive}}**{{{returnType}}}**{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}[**{{{returnType}}}**]({{returnBaseType}}.md){{/returnTypeIsPrimitive}}{{/returnType}}{{^returnType}}void (empty response body){{/returnType}}
+
+### Authorization
+
+{{^authMethods}}No authorization required{{/authMethods}}{{#authMethods}}[{{{name}}}](../README.md#{{{name}}}){{^-last}}, {{/-last}}{{/authMethods}}
+
+### HTTP reuqest headers
+
+ - **Content-Type**: {{#consumes}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/consumes}}{{^consumes}}Not defined{{/consumes}}
+ - **Accept**: {{#produces}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/produces}}{{^produces}}Not defined{{/produces}}
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+{{/operation}}
+{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/perl/api_test.mustache b/modules/swagger-codegen/src/main/resources/perl/api_test.mustache
new file mode 100644
index 00000000000..98d1e9cce99
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/perl/api_test.mustache
@@ -0,0 +1,46 @@
+#
+# Copyright 2016 SmartBear Software
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+# NOTE: This class is auto generated by Swagger Codegen
+# Please update the test case below to test the API endpoints.
+#
+use Test::More tests => 1; #TODO update number of test cases
+use Test::Exception;
+
+use lib 'lib';
+use strict;
+use warnings;
+
+use_ok('{{moduleName}}::{{classname}}');
+
+my $api = {{moduleName}}::{{classname}}->new();
+isa_ok($api, '{{moduleName}}::{{classname}}');
+
+{{#operations}}
+{{#operation}}
+#
+# {{{nickname}}} test
+#
+{
+{{#allParams}}    my ${{paramName}} = undef; # replace NULL with a proper value
+{{/allParams}}
+    my $result = $api->{{nickname}}({{#allParams}}{{paramName}} => ${{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
+}
+
+{{/operation}}
+{{/operations}}
+
+1;
diff --git a/modules/swagger-codegen/src/main/resources/perl/autodoc.script.mustache b/modules/swagger-codegen/src/main/resources/perl/autodoc.script.mustache
index 240936d9b51..35f8f65fc9f 100644
--- a/modules/swagger-codegen/src/main/resources/perl/autodoc.script.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/autodoc.script.mustache
@@ -15,14 +15,14 @@ my $my_app = $options{c} || 'My::App';
 if ($options{c}) {
 	eval <<LOAD;
 use $my_app;
-apply_all_roles($my_app, "WWW::{{moduleName}}::Role::AutoDoc");
+apply_all_roles($my_app, "{{moduleName}}::Role::AutoDoc");
 LOAD
 	die $@ if $@;
 }
 else {
 	package My::App;
 	use Moose;
-	with ('WWW::{{moduleName}}::Role', 'WWW::{{moduleName}}::Role::AutoDoc');
+	with ('{{moduleName}}::Role', '{{moduleName}}::Role::AutoDoc');
 }
 
 package main;
diff --git a/modules/swagger-codegen/src/main/resources/perl/git_push.sh.mustache b/modules/swagger-codegen/src/main/resources/perl/git_push.sh.mustache
new file mode 100755
index 00000000000..e153ce23ecf
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/perl/git_push.sh.mustache
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="{{{gitUserId}}}"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="{{{gitRepoId}}}"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="{{{releaseNote}}}"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/modules/swagger-codegen/src/main/resources/perl/gitignore.mustache b/modules/swagger-codegen/src/main/resources/perl/gitignore.mustache
new file mode 100644
index 00000000000..ae2ad536abb
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/perl/gitignore.mustache
@@ -0,0 +1,20 @@
+/blib/
+/.build/
+_build/
+cover_db/
+inc/
+Build
+!Build/
+Build.bat
+.last_cover_stats
+/Makefile
+/Makefile.old
+/MANIFEST.bak
+/META.yml
+/META.json
+/MYMETA.*
+nytprof.out
+/pm_to_blib
+*.o
+*.bs
+/_eumm/
diff --git a/modules/swagger-codegen/src/main/resources/perl/object.mustache b/modules/swagger-codegen/src/main/resources/perl/object.mustache
index d2e1b2a2a50..79c59cebaf3 100644
--- a/modules/swagger-codegen/src/main/resources/perl/object.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/object.mustache
@@ -1,6 +1,6 @@
 {{#models}}
 {{#model}}
-package WWW::{{moduleName}}::Object::{{classname}};
+package {{moduleName}}::Object::{{classname}};
 
 require 5.6.0;
 use strict;
diff --git a/modules/swagger-codegen/src/main/resources/perl/object_doc.mustache b/modules/swagger-codegen/src/main/resources/perl/object_doc.mustache
new file mode 100644
index 00000000000..b76874f9050
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/perl/object_doc.mustache
@@ -0,0 +1,16 @@
+{{#models}}{{#model}}# {{moduleName}}::Object::{{classname}}
+
+## Load the model package
+```perl
+use {{moduleName}}::Object::{{classname}};
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{datatype}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{datatype}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}
+{{/vars}}
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+{{/model}}{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/perl/object_test.mustache b/modules/swagger-codegen/src/main/resources/perl/object_test.mustache
new file mode 100644
index 00000000000..dd76f9ac2d7
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/perl/object_test.mustache
@@ -0,0 +1,21 @@
+# NOTE: This class is auto generated by the Swagger Codegen
+# Please update the test case below to test the model.
+
+use Test::More tests => 2;
+use Test::Exception;
+
+use lib 'lib';
+use strict;
+use warnings;
+
+{{#models}}
+{{#model}}
+
+use_ok('{{moduleName}}::Object::{{classname}}');
+
+my $instance = {{moduleName}}::Object::{{classname}}->new();
+
+isa_ok($instance, '{{moduleName}}::Object::{{classname}}');
+
+{{/model}}
+{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/php/.travis.yml b/modules/swagger-codegen/src/main/resources/php/.travis.yml
new file mode 100644
index 00000000000..3c97d942552
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/php/.travis.yml
@@ -0,0 +1,10 @@
+language: php
+sudo: false
+php:
+    - 5.4
+    - 5.5
+    - 5.6
+    - 7.0
+    - hhvm
+before_install: "composer install"
+script: "phpunit lib/Tests"
diff --git a/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache
index be18e221972..891149d8f55 100644
--- a/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache
@@ -11,7 +11,7 @@
  * @link     https://github.com/swagger-api/swagger-codegen
  */
 /**
- *  Copyright 2015 SmartBear Software
+ *  Copyright 2016 SmartBear Software
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -150,7 +150,7 @@ class ApiClient
         if ($postData and in_array('Content-Type: application/x-www-form-urlencoded', $headers)) {
             $postData = http_build_query($postData);
         } elseif ((is_object($postData) or is_array($postData)) and !in_array('Content-Type: multipart/form-data', $headers)) { // json model
-            $postData = json_encode($this->serializer->sanitizeForSerialization($postData));
+            $postData = json_encode(\{{invokerPackage}}\ObjectSerializer::sanitizeForSerialization($postData));
         }
 
         $url = $this->config->getHost() . $resourcePath;
@@ -230,7 +230,7 @@ class ApiClient
             throw new ApiException("API call to $url timed out: ".serialize($response_info), 0, null, null);
         } elseif ($response_info['http_code'] >= 200 && $response_info['http_code'] <= 299 ) {
             // return raw body if response is a file
-            if ($responseType == '\SplFileObject') {
+            if ($responseType == '\SplFileObject' || $responseType == 'string') {
                 return array($http_body, $response_info['http_code'], $http_header);
             }
 
diff --git a/modules/swagger-codegen/src/main/resources/php/ApiException.mustache b/modules/swagger-codegen/src/main/resources/php/ApiException.mustache
index b9022f42a90..eee688001ed 100644
--- a/modules/swagger-codegen/src/main/resources/php/ApiException.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/ApiException.mustache
@@ -10,7 +10,7 @@
  * @link     https://github.com/swagger-api/swagger-codegen
  */
 /**
- *  Copyright 2015 SmartBear Software
+ *  Copyright 2016 SmartBear Software
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/modules/swagger-codegen/src/main/resources/php/ObjectSerializer.mustache b/modules/swagger-codegen/src/main/resources/php/ObjectSerializer.mustache
index 8e224fd1a65..759bf3c6bfb 100644
--- a/modules/swagger-codegen/src/main/resources/php/ObjectSerializer.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/ObjectSerializer.mustache
@@ -11,7 +11,7 @@
  * @link     https://github.com/swagger-api/swagger-codegen
  */
 /**
- *  Copyright 2015 SmartBear Software
+ *  Copyright 2016 SmartBear Software
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -46,32 +46,32 @@ class ObjectSerializer
 {
 
     /**
-     * Build a JSON POST object
+     * Serialize data
      *
      * @param mixed $data the data to serialize
      *
      * @return string serialized form of $data
      */
-    public function sanitizeForSerialization($data)
+    public static function sanitizeForSerialization($data)
     {
         if (is_scalar($data) || null === $data) {
             $sanitized = $data;
         } elseif ($data instanceof \DateTime) {
-            $sanitized = $data->format(\DateTime::ISO8601);
+            $sanitized = $data->format(\DateTime::ATOM);
         } elseif (is_array($data)) {
             foreach ($data as $property => $value) {
-                $data[$property] = $this->sanitizeForSerialization($value);
+                $data[$property] = self::sanitizeForSerialization($value);
             }
             $sanitized = $data;
         } elseif (is_object($data)) {
             $values = array();
-            foreach (array_keys($data::$swaggerTypes) as $property) {
-                $getter = $data::$getters[$property];
+            foreach (array_keys($data::swaggerTypes()) as $property) {
+                $getter = $data::getters()[$property];
                 if ($data->$getter() !== null) {
-                    $values[$data::$attributeMap[$property]] = $this->sanitizeForSerialization($data->$getter());
+                    $values[$data::attributeMap()[$property]] = self::sanitizeForSerialization($data->$getter());
                 }
             }
-            $sanitized = $values;
+            $sanitized = (object)$values;
         } else {
             $sanitized = (string)$data;
         }
@@ -79,6 +79,23 @@ class ObjectSerializer
         return $sanitized;
     }
 
+    /**
+     * Sanitize filename by removing path.
+     * e.g. ../../sun.gif becomes sun.gif 
+     *
+     * @param string $filename filename to be sanitized
+     *
+     * @return string the sanitized filename
+     */
+    public function sanitizeFilename($filename)
+    {
+        if (preg_match("/.*[\/\\\\](.*)$/", $filename, $match)) {
+            return $match[1];
+        } else {
+            return $filename;
+        }
+    }
+
     /**
      * Take value and turn it into a string suitable for inclusion in
      * the path, by url-encoding.
@@ -136,7 +153,7 @@ class ObjectSerializer
      */
     public function toFormValue($value)
     {
-        if ($value instanceof SplFileObject) {
+        if ($value instanceof \SplFileObject) {
             return $value->getRealPath();
         } else {
             return $this->toString($value);
@@ -155,7 +172,7 @@ class ObjectSerializer
     public function toString($value)
     {
         if ($value instanceof \DateTime) { // datetime in ISO8601 format
-            return $value->format(\DateTime::ISO8601);
+            return $value->format(\DateTime::ATOM);
         } else {
             return $value;
         }
@@ -197,13 +214,14 @@ class ObjectSerializer
     /**
      * Deserialize a JSON string into an object
      *
-     * @param mixed  $data       object or primitive to be deserialized
-     * @param string $class      class name is passed as a string
-     * @param string $httpHeader HTTP headers
+     * @param mixed  $data          object or primitive to be deserialized
+     * @param string $class         class name is passed as a string
+     * @param string $httpHeaders   HTTP headers
+     * @param string $discriminator discriminator if polymorphism is used
      *
      * @return object an instance of $class
      */
-    public function deserialize($data, $class, $httpHeader=null)
+    public static function deserialize($data, $class, $httpHeaders=null, $discriminator=null)
     {
         if (null === $data) {
             $deserialized = null;
@@ -214,25 +232,38 @@ class ObjectSerializer
                 $subClass_array = explode(',', $inner, 2);
                 $subClass = $subClass_array[1];
                 foreach ($data as $key => $value) {
-                    $deserialized[$key] = $this->deserialize($value, $subClass);
+                    $deserialized[$key] = self::deserialize($value, $subClass, null, $discriminator);
                 }
             }
         } elseif (strcasecmp(substr($class, -2), '[]') == 0) {
             $subClass = substr($class, 0, -2);
             $values = array();
             foreach ($data as $key => $value) {
-                $values[] = $this->deserialize($value, $subClass);
+                $values[] = self::deserialize($value, $subClass, null, $discriminator);
             }
             $deserialized = $values;
+        } elseif ($class === 'object') {
+            settype($data, 'array');
+            $deserialized = $data;
         } elseif ($class === '\DateTime') {
-            $deserialized = new \DateTime($data);
+            // Some API's return an invalid, empty string as a
+            // date-time property. DateTime::__construct() will return
+            // the current time for empty input which is probably not
+            // what is meant. The invalid empty string is probably to
+            // be interpreted as a missing field/value. Let's handle
+            // this graceful.
+            if (!empty($data)) {
+                $deserialized = new \DateTime($data);
+            } else {
+                $deserialized = null;
+            }
         } elseif (in_array($class, array({{&primitives}}))) {
             settype($data, $class);
             $deserialized = $data;
         } elseif ($class === '\SplFileObject') {
             // determine file name
-            if (array_key_exists('Content-Disposition', $httpHeaders) && preg_match('/inline; filename=[\'"]?([^\'"\s]+)[\'"]?$/i', $httpHeader['Content-Disposition'], $match)) {
-                $filename = Configuration::getDefaultConfiguration()->getTempFolderPath().$match[1];
+            if (array_key_exists('Content-Disposition', $httpHeaders) && preg_match('/inline; filename=[\'"]?([^\'"\s]+)[\'"]?$/i', $httpHeaders['Content-Disposition'], $match)) {
+                $filename = Configuration::getDefaultConfiguration()->getTempFolderPath() . sanitizeFilename($match[1]);
             } else {
                 $filename = tempnam(Configuration::getDefaultConfiguration()->getTempFolderPath(), '');
             }
@@ -241,17 +272,24 @@ class ObjectSerializer
             error_log("[INFO] Written $byte_written byte to $filename. Please move the file to a proper folder or delete the temp file after processing.\n", 3, Configuration::getDefaultConfiguration()->getDebugFile());
       
         } else {
+            // If a discriminator is defined and points to a valid subclass, use it.
+            if (!empty($discriminator) && isset($data->{$discriminator}) && is_string($data->{$discriminator})) {
+                $subclass = '\{{invokerPackage}}\Model\\' . $data->{$discriminator};
+                if (is_subclass_of($subclass, $class)) {
+                    $class = $subclass;
+                }
+            }
             $instance = new $class();
-            foreach ($instance::$swaggerTypes as $property => $type) {
-                $propertySetter = $instance::$setters[$property];
+            foreach ($instance::swaggerTypes() as $property => $type) {
+                $propertySetter = $instance::setters()[$property];
      
-                if (!isset($propertySetter) || !isset($data->{$instance::$attributeMap[$property]})) {
+                if (!isset($propertySetter) || !isset($data->{$instance::attributeMap()[$property]})) {
                     continue;
                 }
      
-                $propertyValue = $data->{$instance::$attributeMap[$property]};
+                $propertyValue = $data->{$instance::attributeMap()[$property]};
                 if (isset($propertyValue)) {
-                    $instance->$propertySetter($this->deserialize($propertyValue, $type));
+                    $instance->$propertySetter(self::deserialize($propertyValue, $type, null, $discriminator));
                 }
             }
             $deserialized = $instance;
diff --git a/modules/swagger-codegen/src/main/resources/php/README.mustache b/modules/swagger-codegen/src/main/resources/php/README.mustache
new file mode 100644
index 00000000000..8275c4c9d7c
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/php/README.mustache
@@ -0,0 +1,131 @@
+# {{packagePath}}
+{{#appDescription}}
+{{{appDescription}}}
+{{/appDescription}}
+
+This PHP package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
+
+- API version: {{appVersion}}
+- Package version: {{artifactVersion}}
+- Build date: {{generatedDate}}
+- Build package: {{generatorClass}}
+{{#infoUrl}}
+For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
+{{/infoUrl}}
+
+## Requirements
+
+PHP 5.4.0 and later
+
+## Installation & Usage
+### Composer
+
+To install the bindings via [Composer](http://getcomposer.org/), add the following to `composer.json`:
+
+```
+{
+  "repositories": [
+    {
+      "type": "git",
+      "url": "https://github.com/{{#gitUserId}}{{.}}{{/gitUserId}}{{^gitUserId}}{{composerVendorName}}{{/gitUserId}}/{{#gitRepoId}}{{.}}{{/gitRepoId}}{{^gitRepoId}}{{composerProjectName}}{{/gitRepoId}}.git"
+    }
+  ],
+  "require": {
+    "{{#gitUserId}}{{.}}{{/gitUserId}}{{^gitUserId}}{{composerVendorName}}{{/gitUserId}}/{{#gitRepoId}}{{.}}{{/gitRepoId}}{{^gitRepoId}}{{composerProjectName}}{{/gitRepoId}}": "*@dev"
+  }
+}
+```
+
+Then run `composer install`
+
+### Manual Installation
+
+Download the files and include `autoload.php`:
+
+```php
+    require_once('/path/to/{{packagePath}}/autoload.php');
+```
+
+## Tests 
+
+To run the unit tests:
+
+```
+composer install
+./vendor/bin/phpunit lib/Tests
+```
+
+## Getting Started
+
+Please follow the [installation procedure](#installation--usage) and then run the following:
+
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+{{#apiInfo}}{{#apis}}{{#-first}}{{#operations}}{{#operation}}{{#-first}}{{#hasAuthMethods}}{{#authMethods}}{{#isBasic}}
+// Configure HTTP basic authorization: {{{name}}}
+{{{invokerPackage}}}\Configuration::getDefaultConfiguration()->setUsername('YOUR_USERNAME');
+{{{invokerPackage}}}\Configuration::getDefaultConfiguration()->setPassword('YOUR_PASSWORD');{{/isBasic}}{{#isApiKey}}
+// Configure API key authorization: {{{name}}}
+{{{invokerPackage}}}\Configuration::getDefaultConfiguration()->setApiKey('{{{keyParamName}}}', 'YOUR_API_KEY');
+// Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+// {{{invokerPackage}}}\Configuration::getDefaultConfiguration()->setApiKeyPrefix('{{{keyParamName}}}', 'BEARER');{{/isApiKey}}{{#isOAuth}}
+// Configure OAuth2 access token for authorization: {{{name}}}
+{{{invokerPackage}}}\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');{{/isOAuth}}{{/authMethods}}
+{{/hasAuthMethods}}
+
+$api_instance = new {{invokerPackage}}\Api\{{classname}}();
+{{#allParams}}${{paramName}} = {{{example}}}; // {{{dataType}}} | {{{description}}}
+{{/allParams}}
+
+try {
+    {{#returnType}}$result = {{/returnType}}$api_instance->{{{operationId}}}({{#allParams}}${{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{#returnType}}
+    print_r($result);{{/returnType}}
+} catch (Exception $e) {
+    echo 'Exception when calling {{classname}}->{{operationId}}: ', $e->getMessage(), "\n";
+}
+{{/-first}}{{/operation}}{{/operations}}{{/-first}}{{/apis}}{{/apiInfo}}
+?>
+```
+
+## Documentation for API Endpoints
+
+All URIs are relative to *{{basePath}}*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+{{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}*{{classname}}* | [**{{operationId}}**]({{apiDocPath}}{{classname}}.md#{{operationIdLowerCase}}) | **{{httpMethod}}** {{path}} | {{#summary}}{{summary}}{{/summary}}
+{{/operation}}{{/operations}}{{/apis}}{{/apiInfo}}
+
+## Documentation For Models
+
+{{#models}}{{#model}} - [{{{classname}}}]({{modelDocPath}}{{{classname}}}.md)
+{{/model}}{{/models}}
+
+## Documentation For Authorization
+
+{{^authMethods}} All endpoints do not require authorization.
+{{/authMethods}}{{#authMethods}}{{#last}} Authentication schemes defined for the API:{{/last}}{{/authMethods}}
+{{#authMethods}}## {{{name}}}
+
+{{#isApiKey}}- **Type**: API key 
+- **API key parameter name**: {{{keyParamName}}}
+- **Location**: {{#isKeyInQuery}}URL query string{{/isKeyInQuery}}{{#isKeyInHeader}}HTTP header{{/isKeyInHeader}}
+{{/isApiKey}}
+{{#isBasic}}- **Type**: HTTP basic authentication
+{{/isBasic}}
+{{#isOAuth}}- **Type**: OAuth
+- **Flow**: {{{flow}}}
+- **Authorizatoin URL**: {{{authorizationUrl}}}
+- **Scopes**: {{^scopes}}N/A{{/scopes}}
+{{#scopes}} - **{{{scope}}}**: {{{description}}}
+{{/scopes}}
+{{/isOAuth}}
+
+{{/authMethods}}
+
+## Author
+
+{{#apiInfo}}{{#apis}}{{^hasMore}}{{infoEmail}}
+{{/hasMore}}{{/apis}}{{/apiInfo}}
+
diff --git a/modules/swagger-codegen/src/main/resources/php/api.mustache b/modules/swagger-codegen/src/main/resources/php/api.mustache
index 2521cc61cff..adbbd8e1fe2 100644
--- a/modules/swagger-codegen/src/main/resources/php/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/api.mustache
@@ -10,7 +10,7 @@
  * @link     https://github.com/swagger-api/swagger-codegen
  */
 /**
- *  Copyright 2015 SmartBear Software
+ *  Copyright 2016 SmartBear Software
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -96,7 +96,7 @@ use \{{invokerPackage}}\ObjectSerializer;
      *
      * {{{summary}}}
      *
-  {{#allParams}}   * @param {{dataType}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional){{/required}}
+  {{#allParams}}   * @param {{dataType}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
   {{/allParams}}   * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
      * @throws \{{invokerPackage}}\ApiException on non-2xx response
      */
@@ -112,7 +112,7 @@ use \{{invokerPackage}}\ObjectSerializer;
      *
      * {{{summary}}}
      *
-  {{#allParams}}   * @param {{dataType}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional){{/required}}
+  {{#allParams}}   * @param {{dataType}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
   {{/allParams}}   * @return Array of {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}null{{/returnType}}, HTTP status code, HTTP response headers (array of strings)
      * @throws \{{invokerPackage}}\ApiException on non-2xx response
      */
@@ -126,8 +126,6 @@ use \{{invokerPackage}}\ObjectSerializer;
   
         // parse inputs
         $resourcePath = "{{path}}";
-        $resourcePath = str_replace("{format}", "json", $resourcePath);
-        $method = "{{httpMethod}}";
         $httpBody = '';
         $queryParams = array();
         $headerParams = array();
@@ -169,6 +167,9 @@ use \{{invokerPackage}}\ObjectSerializer;
                 $resourcePath
             );
         }{{/pathParams}}
+        // default format to json
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+
         {{#formParams}}// form params
         if (${{paramName}} !== null) {
             {{#isFile}}
@@ -213,7 +214,7 @@ use \{{invokerPackage}}\ObjectSerializer;
         // make the API Call
         try {
             list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
-                $resourcePath, $method,
+                $resourcePath, '{{httpMethod}}',
                 $queryParams, $httpBody,
                 $headerParams{{#returnType}}, '{{returnType}}'{{/returnType}}
             );
@@ -222,14 +223,14 @@ use \{{invokerPackage}}\ObjectSerializer;
                 return array(null, $statusCode, $httpHeader);
             }
 
-            return array($this->apiClient->getSerializer()->deserialize($response, '{{returnType}}', $httpHeader), $statusCode, $httpHeader);
+            return array(\{{invokerPackage}}\ObjectSerializer::deserialize($response, '{{returnType}}', $httpHeader{{#discriminator}}, '{{discriminator}}'{{/discriminator}}), $statusCode, $httpHeader);
             {{/returnType}}{{^returnType}}
             return array(null, $statusCode, $httpHeader);
             {{/returnType}}
         } catch (ApiException $e) {
             switch ($e->getCode()) { {{#responses}}{{#dataType}}
             {{^isWildcard}}case {{code}}:{{/isWildcard}}{{#isWildcard}}default:{{/isWildcard}}
-                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '{{dataType}}', $e->getResponseHeaders());
+                $data = \{{invokerPackage}}\ObjectSerializer::deserialize($e->getResponseBody(), '{{dataType}}', $e->getResponseHeaders());
                 $e->setResponseObject($data);
                 break;{{/dataType}}{{/responses}}
             }
diff --git a/modules/swagger-codegen/src/main/resources/php/api_doc.mustache b/modules/swagger-codegen/src/main/resources/php/api_doc.mustache
new file mode 100644
index 00000000000..bb55e80604c
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/php/api_doc.mustache
@@ -0,0 +1,72 @@
+# {{invokerPackage}}\{{classname}}{{#description}}
+{{description}}{{/description}}
+
+All URIs are relative to *{{basePath}}*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+{{#operations}}{{#operation}}[**{{operationId}}**]({{classname}}.md#{{operationId}}) | **{{httpMethod}}** {{path}} | {{#summary}}{{summary}}{{/summary}}
+{{/operation}}{{/operations}}
+
+{{#operations}}
+{{#operation}}
+# **{{{operationId}}}**
+> {{#returnType}}{{{returnType}}} {{/returnType}}{{{operationId}}}({{#allParams}}${{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
+
+{{{summary}}}{{#notes}}
+
+{{{notes}}}{{/notes}}
+
+### Example 
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+{{#hasAuthMethods}}{{#authMethods}}{{#isBasic}}
+// Configure HTTP basic authorization: {{{name}}}
+{{{invokerPackage}}}\Configuration::getDefaultConfiguration()->setUsername('YOUR_USERNAME');
+{{{invokerPackage}}}\Configuration::getDefaultConfiguration()->setPassword('YOUR_PASSWORD');{{/isBasic}}{{#isApiKey}}
+// Configure API key authorization: {{{name}}}
+{{{invokerPackage}}}\Configuration::getDefaultConfiguration()->setApiKey('{{{keyParamName}}}', 'YOUR_API_KEY');
+// Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+// {{{invokerPackage}}}\Configuration::getDefaultConfiguration()->setApiKeyPrefix('{{{keyParamName}}}', 'BEARER');{{/isApiKey}}{{#isOAuth}}
+// Configure OAuth2 access token for authorization: {{{name}}}
+{{{invokerPackage}}}\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');{{/isOAuth}}{{/authMethods}}
+{{/hasAuthMethods}}
+
+$api_instance = new {{invokerPackage}}\Api\{{classname}}();
+{{#allParams}}${{paramName}} = {{{example}}}; // {{{dataType}}} | {{{description}}}
+{{/allParams}}
+
+try { 
+    {{#returnType}}$result = {{/returnType}}$api_instance->{{{operationId}}}({{#allParams}}${{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{#returnType}}
+    print_r($result);{{/returnType}}
+} catch (Exception $e) {
+    echo 'Exception when calling {{classname}}->{{operationId}}: ', $e->getMessage(), "\n";
+}
+?>
+```
+
+### Parameters
+{{^allParams}}This endpoint does not need any parameter.{{/allParams}}{{#allParams}}{{#-last}}
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------{{/-last}}{{/allParams}}
+{{#allParams}} **{{paramName}}** | {{#isFile}}**{{dataType}}**{{/isFile}}{{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}{{^isFile}}[**{{dataType}}**]({{baseType}}.md){{/isFile}}{{/isPrimitiveType}}| {{description}} | {{^required}}[optional] {{/required}}{{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}
+{{/allParams}}
+
+### Return type
+
+{{#returnType}}{{#returnTypeIsPrimitive}}**{{{returnType}}}**{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}[**{{{returnType}}}**]({{returnBaseType}}.md){{/returnTypeIsPrimitive}}{{/returnType}}{{^returnType}}void (empty response body){{/returnType}}
+
+### Authorization
+
+{{^authMethods}}No authorization required{{/authMethods}}{{#authMethods}}[{{{name}}}](../README.md#{{{name}}}){{^-last}}, {{/-last}}{{/authMethods}}
+
+### HTTP reuqest headers
+
+ - **Content-Type**: {{#consumes}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/consumes}}{{^consumes}}Not defined{{/consumes}}
+ - **Accept**: {{#produces}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/produces}}{{^produces}}Not defined{{/produces}}
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+{{/operation}}
+{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/php/api_test.mustache b/modules/swagger-codegen/src/main/resources/php/api_test.mustache
new file mode 100644
index 00000000000..fc07d338301
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/php/api_test.mustache
@@ -0,0 +1,79 @@
+<?php
+/**
+ * {{classname}}Test
+ * PHP version 5
+ *
+ * @category Class
+ * @package  {{invokerPackage}}
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+ * NOTE: This class is auto generated by the swagger code generator program. 
+ * https://github.com/swagger-api/swagger-codegen 
+ * Please update the test case below to test the endpoint.
+ */
+
+namespace {{apiPackage}};
+
+use \{{invokerPackage}}\Configuration;
+use \{{invokerPackage}}\ApiClient;
+use \{{invokerPackage}}\ApiException;
+use \{{invokerPackage}}\ObjectSerializer;
+
+/**
+ * {{classname}}Test Class Doc Comment
+ *
+ * @category Class
+ * @package  {{invokerPackage}}
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+{{#operations}}class {{classname}}Test extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    {{#operation}}
+    /**
+     * Test case for {{{operationId}}}
+     *
+     * {{{summary}}}
+     *
+     */
+    public function test_{{operationId}}() {
+
+    }
+    {{/operation}}
+}
+{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/php/composer.mustache b/modules/swagger-codegen/src/main/resources/php/composer.mustache
index 994b6f1ccc7..64564e4ec57 100644
--- a/modules/swagger-codegen/src/main/resources/php/composer.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/composer.mustache
@@ -1,5 +1,5 @@
 {
-    "name": "{{composerVendorName}}/{{composerProjectName}}",{{#artifactVersion}}
+    "name": "{{#gitUserId}}{{.}}{{/gitUserId}}{{^gitUserId}}{{composerVendorName}}{{/gitUserId}}/{{#gitRepoId}}{{.}}{{/gitRepoId}}{{^gitRepoId}}{{composerProjectName}}{{/gitRepoId}}",{{#artifactVersion}}
     "version": "{{artifactVersion}}",{{/artifactVersion}}
     "description": "{{description}}",
     "keywords": [
diff --git a/modules/swagger-codegen/src/main/resources/php/configuration.mustache b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
index 161affb1c9d..0062fa8c25f 100644
--- a/modules/swagger-codegen/src/main/resources/php/configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
@@ -11,7 +11,7 @@
  */
 
 /**
- *  Copyright 2015 SmartBear Software
+ *  Copyright 2016 SmartBear Software
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -110,7 +110,7 @@ class Configuration
      *
      * @var string
      */
-    protected $userAgent = "PHP-Swagger/{{artifactVersion}}";
+    protected $userAgent = "{{#httpUserAgent}}{{{.}}}{{/httpUserAgent}}{{^httpUserAgent}}Swagger-Codegen/{{{artifactVersion}}}/php{{/httpUserAgent}}";
 
     /**
      * Debug switch (default set to false)
diff --git a/modules/swagger-codegen/src/main/resources/php/git_push.sh.mustache b/modules/swagger-codegen/src/main/resources/php/git_push.sh.mustache
new file mode 100755
index 00000000000..e153ce23ecf
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/php/git_push.sh.mustache
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="{{{gitUserId}}}"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="{{{gitRepoId}}}"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="{{{releaseNote}}}"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/modules/swagger-codegen/src/main/resources/php/model.mustache b/modules/swagger-codegen/src/main/resources/php/model.mustache
index 66cabf0122b..b58af994c24 100644
--- a/modules/swagger-codegen/src/main/resources/php/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/model.mustache
@@ -13,7 +13,7 @@
  * @link     https://github.com/swagger-api/swagger-codegen
  */
 /**
- *  Copyright 2015 SmartBear Software
+ *  Copyright 2016 SmartBear Software
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -46,7 +46,7 @@ use \ArrayAccess;
  * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
  * @link        https://github.com/swagger-api/swagger-codegen
  */
-class {{classname}} implements ArrayAccess
+class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}implements ArrayAccess
 {
     /**
       * Array of property to type mappings. Used for (de)serialization 
@@ -57,6 +57,10 @@ class {{classname}} implements ArrayAccess
         {{/hasMore}}{{/vars}}
     );
   
+    static function swaggerTypes() {
+        return self::$swaggerTypes{{#parent}} + parent::swaggerTypes(){{/parent}};
+    }
+
     /** 
       * Array of attributes where the key is the local name, and the value is the original name
       * @var string[] 
@@ -66,6 +70,10 @@ class {{classname}} implements ArrayAccess
         {{/hasMore}}{{/vars}}
     );
   
+    static function attributeMap() {
+        return {{#parent}}parent::attributeMap() + {{/parent}}self::$attributeMap;
+    }
+
     /**
       * Array of attributes to setter functions (for deserialization of responses)
       * @var string[]
@@ -75,6 +83,10 @@ class {{classname}} implements ArrayAccess
         {{/hasMore}}{{/vars}}
     );
   
+    static function setters() {
+        return {{#parent}}parent::setters() + {{/parent}}self::$setters;
+    }
+
     /**
       * Array of attributes to getter functions (for serialization of requests)
       * @var string[]
@@ -84,6 +96,10 @@ class {{classname}} implements ArrayAccess
         {{/hasMore}}{{/vars}}
     );
   
+    static function getters() {
+        return {{#parent}}parent::getters() + {{/parent}}self::$getters;
+    }
+
     {{#vars}}
     /**
       * ${{name}} {{#description}}{{{description}}}{{/description}}
@@ -98,6 +114,7 @@ class {{classname}} implements ArrayAccess
      */
     public function __construct(array $data = null)
     {
+        {{#parent}}parent::__construct($data);{{/parent}}
         if ($data != null) {
             {{#vars}}$this->{{name}} = $data["{{name}}"];{{#hasMore}}
             {{/hasMore}}{{/vars}}
@@ -176,9 +193,9 @@ class {{classname}} implements ArrayAccess
     public function __toString()
     {
         if (defined('JSON_PRETTY_PRINT')) {
-            return json_encode(get_object_vars($this), JSON_PRETTY_PRINT);
+            return json_encode(\{{invokerPackage}}\ObjectSerializer::sanitizeForSerialization($this), JSON_PRETTY_PRINT);
         } else {
-            return json_encode(get_object_vars($this));
+            return json_encode(\{{invokerPackage}}\ObjectSerializer::sanitizeForSerialization($this));
         }
     }
 }
diff --git a/modules/swagger-codegen/src/main/resources/php/model_doc.mustache b/modules/swagger-codegen/src/main/resources/php/model_doc.mustache
new file mode 100644
index 00000000000..569550df372
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/php/model_doc.mustache
@@ -0,0 +1,11 @@
+{{#models}}{{#model}}# {{classname}}
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{datatype}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{datatype}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
+{{/vars}}
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+{{/model}}{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/php/model_test.mustache b/modules/swagger-codegen/src/main/resources/php/model_test.mustache
new file mode 100644
index 00000000000..0d615eca102
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/php/model_test.mustache
@@ -0,0 +1,74 @@
+<?php
+{{#models}}
+{{#model}}
+/**
+ * {{classname}}Test
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  {{invokerPackage}}
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Please update the test case below to test the model.
+ */
+
+namespace {{modelPackage}};
+
+/**
+ * {{classname}}Test Class Doc Comment
+ *
+ * @category    Class
+ * @description {{description}}
+ * @package     {{invokerPackage}}
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class {{classname}}Test extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    /**
+     * Test {{classname}}
+     */
+    public function test{{classname}}() {
+
+    }
+
+}
+{{/model}}
+{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/python/__init__model.mustache b/modules/swagger-codegen/src/main/resources/python/__init__model.mustache
index 734e0692350..da086c10873 100644
--- a/modules/swagger-codegen/src/main/resources/python/__init__model.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/__init__model.mustache
@@ -1,5 +1,5 @@
 from __future__ import absolute_import
 
 # import models into model package
-{{#models}}{{#model}}from .{{classVarName}} import {{classname}}{{/model}}
+{{#models}}{{#model}}from .{{classFilename}} import {{classname}}{{/model}}
 {{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/python/__init__package.mustache b/modules/swagger-codegen/src/main/resources/python/__init__package.mustache
index 76b4fcedd45..5265587cfd9 100644
--- a/modules/swagger-codegen/src/main/resources/python/__init__package.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/__init__package.mustache
@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
 # import models into sdk package
-{{#models}}{{#model}}from .models.{{classVarName}} import {{classname}}
+{{#models}}{{#model}}from .models.{{classFilename}} import {{classname}}
 {{/model}}{{/models}}
 # import apis into sdk package
 {{#apiInfo}}{{#apis}}from .apis.{{classVarName}} import {{classname}}
diff --git a/modules/swagger-codegen/src/main/resources/python/api.mustache b/modules/swagger-codegen/src/main/resources/python/api.mustache
index 474cf84f356..230f05d94af 100644
--- a/modules/swagger-codegen/src/main/resources/python/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/api.mustache
@@ -2,7 +2,7 @@
 
 """
 {{classname}}.py
-Copyright 2015 SmartBear Software
+Copyright 2016 SmartBear Software
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -68,7 +68,7 @@ class {{classname}}(object):
         :param callback function: The callback function
             for asynchronous request. (optional)
 {{#allParams}}
-        :param {{dataType}} {{paramName}}: {{{description}}}{{#required}} (required){{/required}}{{#optional}}(optional){{/optional}}
+        :param {{dataType}} {{paramName}}: {{{description}}}{{#required}} (required){{/required}}{{#optional}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/optional}}
 {{/allParams}}
         :return: {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}None{{/returnType}}
                  If the method is called asynchronously,
@@ -97,8 +97,6 @@ class {{classname}}(object):
 {{/allParams}}
 
         resource_path = '{{path}}'.replace('{format}', 'json')
-        method = '{{httpMethod}}'
-
         path_params = {}
 {{#pathParams}}
         if '{{paramName}}' in params:
@@ -117,11 +115,11 @@ class {{classname}}(object):
             header_params['{{baseName}}'] = params['{{paramName}}']
 {{/headerParams}}
 
-        form_params = {}
-        files = {}
+        form_params = []
+        local_var_files = {}
 {{#formParams}}
         if '{{paramName}}' in params:
-            {{#notFile}}form_params['{{baseName}}'] = params['{{paramName}}']{{/notFile}}{{#isFile}}files['{{baseName}}'] = params['{{paramName}}']{{/isFile}}
+            {{#notFile}}form_params.append(('{{baseName}}', params['{{paramName}}'])){{/notFile}}{{#isFile}}local_var_files['{{baseName}}'] = params['{{paramName}}']{{/isFile}}
 {{/formParams}}
 
         body_params = None
@@ -143,13 +141,13 @@ class {{classname}}(object):
         # Authentication setting
         auth_settings = [{{#authMethods}}'{{name}}'{{#hasMore}}, {{/hasMore}}{{/authMethods}}]
 
-        response = self.api_client.call_api(resource_path, method,
+        response = self.api_client.call_api(resource_path, '{{httpMethod}}',
                                             path_params,
                                             query_params,
                                             header_params,
                                             body=body_params,
                                             post_params=form_params,
-                                            files=files,
+                                            files=local_var_files,
                                             response_type={{#returnType}}'{{returnType}}'{{/returnType}}{{^returnType}}None{{/returnType}},
                                             auth_settings=auth_settings,
                                             callback=params.get('callback'))
diff --git a/modules/swagger-codegen/src/main/resources/python/api_client.mustache b/modules/swagger-codegen/src/main/resources/python/api_client.mustache
index f6e34f041e3..98fee823591 100644
--- a/modules/swagger-codegen/src/main/resources/python/api_client.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/api_client.mustache
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-Copyright 2015 SmartBear Software
+Copyright 2016 SmartBear Software
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -81,7 +81,7 @@ class ApiClient(object):
             self.host = host
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Python-Swagger/{{packageVersion}}'
+        self.user_agent = '{{#httpUserAgent}}{{{.}}}{{/httpUserAgent}}{{^httpUserAgent}}Swagger-Codegen/{{{packageVersion}}}/python{{/httpUserAgent}}'
 
     @property
     def user_agent(self):
@@ -386,22 +386,23 @@ class ApiClient(object):
         :param files: File parameters.
         :return: Form parameters with files.
         """
-        params = {}
+        params = []
 
         if post_params:
-            params.update(post_params)
+            params = post_params
 
         if files:
             for k, v in iteritems(files):
                 if not v:
                     continue
-
-                with open(v, 'rb') as f:
-                    filename = os.path.basename(f.name)
-                    filedata = f.read()
-                    mimetype = mimetypes.\
-                        guess_type(filename)[0] or 'application/octet-stream'
-                    params[k] = tuple([filename, filedata, mimetype])
+                file_names = v if type(v) is list else [v]
+                for n in file_names:
+                    with open(n, 'rb') as f:
+                        filename = os.path.basename(f.name)
+                        filedata = f.read()
+                        mimetype = mimetypes.\
+                            guess_type(filename)[0] or 'application/octet-stream'
+                        params.append(tuple([k, tuple([filename, filedata, mimetype])]))
 
         return params
 
diff --git a/modules/swagger-codegen/src/main/resources/python/configuration.mustache b/modules/swagger-codegen/src/main/resources/python/configuration.mustache
index bab1d09d761..8f878f82318 100644
--- a/modules/swagger-codegen/src/main/resources/python/configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/configuration.mustache
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-Copyright 2015 SmartBear Software
+Copyright 2016 SmartBear Software
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/modules/swagger-codegen/src/main/resources/python/git_push.sh.mustache b/modules/swagger-codegen/src/main/resources/python/git_push.sh.mustache
new file mode 100755
index 00000000000..e153ce23ecf
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/python/git_push.sh.mustache
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="{{{gitUserId}}}"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="{{{gitRepoId}}}"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="{{{releaseNote}}}"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/modules/swagger-codegen/src/main/resources/python/gitignore.mustache b/modules/swagger-codegen/src/main/resources/python/gitignore.mustache
new file mode 100644
index 00000000000..1dbc687de01
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/python/gitignore.mustache
@@ -0,0 +1,62 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+#Ipython Notebook
+.ipynb_checkpoints
diff --git a/modules/swagger-codegen/src/main/resources/python/model.mustache b/modules/swagger-codegen/src/main/resources/python/model.mustache
index aae43175a2e..bd33a997c3e 100644
--- a/modules/swagger-codegen/src/main/resources/python/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/model.mustache
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-Copyright 2015 SmartBear Software
+Copyright 2016 SmartBear Software
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -97,6 +97,12 @@ class {{classname}}(object):
                 ))
             elif hasattr(value, "to_dict"):
                 result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
             else:
                 result[attr] = value
 
@@ -114,14 +120,14 @@ class {{classname}}(object):
         """
         return self.to_str()
 
-    def __eq__(self, other): 
+    def __eq__(self, other):
         """
         Returns true if both objects are equal
         """
         return self.__dict__ == other.__dict__
 
     def __ne__(self, other):
-        """ 
+        """
         Returns true if both objects are not equal
         """
         return not self == other
diff --git a/modules/swagger-codegen/src/main/resources/python/rest.mustache b/modules/swagger-codegen/src/main/resources/python/rest.mustache
index 0d1f4ce1da8..c5b9a4e6f91 100644
--- a/modules/swagger-codegen/src/main/resources/python/rest.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/rest.mustache
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-Copyright 2015 SmartBear Software
+Copyright 2016 SmartBear Software
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/modules/swagger-codegen/src/main/resources/qt5cpp/api-body.mustache b/modules/swagger-codegen/src/main/resources/qt5cpp/api-body.mustache
index b6341104188..fc69cfa4404 100644
--- a/modules/swagger-codegen/src/main/resources/qt5cpp/api-body.mustache
+++ b/modules/swagger-codegen/src/main/resources/qt5cpp/api-body.mustache
@@ -29,7 +29,7 @@ void
 
     {{#queryParams}}
     {{^collectionFormat}}
-    if(fullPath.indexOf("?") > 0) 
+    if (fullPath.indexOf("?") > 0) 
       fullPath.append("&");
     else 
       fullPath.append("?");
@@ -40,10 +40,10 @@ void
 
     {{#collectionFormat}}
 
-    if({{{paramName}}}->size() > 0) {
-      if(QString("{{collectionFormat}}").indexOf("multi") == 0) {
+    if ({{{paramName}}}->size() > 0) {
+      if (QString("{{collectionFormat}}").indexOf("multi") == 0) {
         foreach({{{baseType}}} t, *{{paramName}}) {
-          if(fullPath.indexOf("?") > 0)
+          if (fullPath.indexOf("?") > 0)
             fullPath.append("&");
           else 
             fullPath.append("?");
@@ -51,28 +51,28 @@ void
         }
       }
       else if (QString("{{collectionFormat}}").indexOf("ssv") == 0) {
-        if(fullPath.indexOf("?") > 0)
+        if (fullPath.indexOf("?") > 0)
           fullPath.append("&");
         else 
           fullPath.append("?");
         fullPath.append("{{paramName}}=");
         qint32 count = 0;
         foreach({{{baseType}}} t, *{{paramName}}) {
-          if(count > 0) {
+          if (count > 0) {
             fullPath.append(" ");
           }
           fullPath.append(stringValue(t));
         }
       }
       else if (QString("{{collectionFormat}}").indexOf("tsv") == 0) {
-        if(fullPath.indexOf("?") > 0)
+        if (fullPath.indexOf("?") > 0)
           fullPath.append("&");
         else 
           fullPath.append("?");
         fullPath.append("{{paramName}}=");
         qint32 count = 0;
         foreach({{{baseType}}} t, *{{paramName}}) {
-          if(count > 0) {
+          if (count > 0) {
             fullPath.append("\t");
           }
           fullPath.append(stringValue(t));
@@ -86,11 +86,10 @@ void
     HttpRequestWorker *worker = new HttpRequestWorker();
     HttpRequestInput input(fullPath, "{{httpMethod}}");
 
-    {{#formParams}}{{^isFile}}
-    if({{paramName}} != NULL) {
-        input.add_var("{{paramName}}", *{{paramName}});
+    {{#formParams}}if ({{paramName}} != NULL) {
+        {{^isFile}}input.add_var("{{paramName}}", *{{paramName}});{{/isFile}}{{#isFile}}input.add_file("{{paramName}}", *{{paramName}}.local_filename, *{{paramName}}.request_filename, *{{paramName}}.mime_type);{{/isFile}}
     }
-    {{/isFile}}{{/formParams}}
+    {{/formParams}}
 
     {{#bodyParams}}
     {{#isContainer}}
diff --git a/modules/swagger-codegen/src/main/resources/ruby/README.mustache b/modules/swagger-codegen/src/main/resources/ruby/README.mustache
new file mode 100644
index 00000000000..164285e1533
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/ruby/README.mustache
@@ -0,0 +1,128 @@
+# {{gemName}}
+
+{{moduleName}} - the Ruby gem for the {{appName}}
+
+{{#appDescription}}
+{{{appDescription}}}
+{{/appDescription}}
+
+This SDK is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
+
+- API version: {{appVersion}}
+- Package version: {{gemVersion}}
+- Build date: {{generatedDate}}
+- Build package: {{generatorClass}}
+{{#infoUrl}}
+For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
+{{/infoUrl}}
+
+## Installation
+
+### Build a gem
+
+To build the Ruby code into a gem:
+
+```shell
+gem build {{{gemName}}}.gemspec
+```
+
+Then either install the gem locally:
+
+```shell
+gem install ./{{{gemName}}}-{{{gemVersion}}}.gem
+```
+
+or publish the gem to a gem hosting service, e.g. [RubyGems](https://rubygems.org/).
+
+Finally add this to the Gemfile:
+
+    gem '{{{gemName}}}', '~> {{{gemVersion}}}'
+
+### Install from Git
+
+If the Ruby gem is hosted at a git repository: https://github.com/{{#gitUserId}}{{.}}{{/gitUserId}}{{^gitUserId}}YOUR_GIT_USERNAME{{/gitUserId}}/{{#gitRepoId}}{{.}}{{/gitRepoId}}{{^gitRepoId}}YOUR_GIT_REPO{{/gitRepoId}}, then add the following in the Gemfile:
+
+    gem '{{{gemName}}}', :git => 'https://github.com/{{#gitUserId}}{{.}}{{/gitUserId}}{{^gitUserId}}YOUR_GIT_USERNAME{{/gitUserId}}/{{#gitRepoId}}{{.}}{{/gitRepoId}}{{^gitRepoId}}YOUR_GIT_REPO{{/gitRepoId}}.git'
+
+### Include the Ruby code directly
+
+Include the Ruby code directly using `-I` as follows:
+
+```shell
+ruby -Ilib script.rb
+```
+
+## Getting Started
+
+Please follow the [installation](#installation) procedure and then run the following code:
+```ruby
+# Load the gem
+require '{{{gemName}}}'
+{{#apiInfo}}{{#apis}}{{#-first}}{{#operations}}{{#operation}}{{#-first}}{{#hasAuthMethods}}
+# Setup authorization
+{{{moduleName}}}.configure do |config|{{#authMethods}}{{#isBasic}}
+  # Configure HTTP basic authorization: {{{name}}}
+  config.username = 'YOUR USERNAME'
+  config.password = 'YOUR PASSWORD'{{/isBasic}}{{#isApiKey}}
+  # Configure API key authorization: {{{name}}}
+  config.api_key['{{{keyParamName}}}'] = 'YOUR API KEY'
+  # Uncomment the following line to set a prefix for the API key, e.g. 'BEARER' (defaults to nil)
+  #config.api_key_prefix['{{{keyParamName}}}'] = 'BEARER'{{/isApiKey}}{{#isOAuth}}
+  # Configure OAuth2 access token for authorization: {{{name}}}
+  config.access_token = 'YOUR ACCESS TOKEN'{{/isOAuth}}
+{{/authMethods}}end
+{{/hasAuthMethods}}
+
+api_instance = {{{moduleName}}}::{{{classname}}}.new{{#hasParams}}
+{{#vendorExtensions.x-codegen-hasRequiredParams}}{{#allParams}}{{#required}}
+{{{paramName}}} = {{{example}}} # {{{dataType}}} | {{{description}}}
+{{/required}}{{/allParams}}{{/vendorExtensions.x-codegen-hasRequiredParams}}{{#hasOptionalParams}}
+opts = { {{#allParams}}{{^required}}
+  {{{paramName}}}: {{{example}}}{{#vendorExtensions.x-codegen-hasMoreOptional}},{{/vendorExtensions.x-codegen-hasMoreOptional}} # {{{dataType}}} | {{{description}}}{{/required}}{{/allParams}}
+}{{/hasOptionalParams}}{{/hasParams}}
+
+begin
+{{#summary}}  #{{{.}}}
+{{/summary}}  {{#returnType}}result = {{/returnType}}api_instance.{{{operationId}}}{{#hasParams}}({{#allParams}}{{#required}}{{{paramName}}}{{#vendorExtensions.x-codegen-hasMoreRequired}}, {{/vendorExtensions.x-codegen-hasMoreRequired}}{{/required}}{{/allParams}}{{#hasOptionalParams}}{{#vendorExtensions.x-codegen-hasRequiredParams}}, {{/vendorExtensions.x-codegen-hasRequiredParams}}opts{{/hasOptionalParams}}){{/hasParams}}{{#returnType}}
+  p result{{/returnType}}
+rescue {{{moduleName}}}::ApiError => e
+  puts "Exception when calling {{classname}}->{{{operationId}}}: #{e}"
+end
+{{/-first}}{{/operation}}{{/operations}}{{/-first}}{{/apis}}{{/apiInfo}}
+```
+
+## Documentation for API Endpoints
+
+All URIs are relative to *{{basePath}}*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+{{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}*{{moduleName}}::{{classname}}* | [**{{operationId}}**]({{apiDocPath}}{{classname}}.md#{{operationId}}) | **{{httpMethod}}** {{path}} | {{#summary}}{{{summary}}}{{/summary}}
+{{/operation}}{{/operations}}{{/apis}}{{/apiInfo}}
+
+## Documentation for Models
+
+{{#models}}{{#model}} - [{{moduleName}}::{{classname}}]({{modelDocPath}}{{classname}}.md)
+{{/model}}{{/models}}
+
+## Documentation for Authorization
+
+{{^authMethods}} All endpoints do not require authorization.
+{{/authMethods}}{{#authMethods}}{{#last}} Authentication schemes defined for the API:{{/last}}{{/authMethods}}
+{{#authMethods}}### {{name}}
+
+{{#isApiKey}}- **Type**: API key
+- **API key parameter name**: {{keyParamName}}
+- **Location**: {{#isKeyInQuery}}URL query string{{/isKeyInQuery}}{{#isKeyInHeader}}HTTP header{{/isKeyInHeader}}
+{{/isApiKey}}
+{{#isBasic}}- **Type**: HTTP basic authentication
+{{/isBasic}}
+{{#isOAuth}}- **Type**: OAuth
+- **Flow**: {{flow}}
+- **Authorizatoin URL**: {{authorizationUrl}}
+- **Scopes**: {{^scopes}}N/A{{/scopes}}
+{{#scopes}}  - {{scope}}: {{description}}
+{{/scopes}}
+{{/isOAuth}}
+
+{{/authMethods}}
diff --git a/modules/swagger-codegen/src/main/resources/ruby/api.mustache b/modules/swagger-codegen/src/main/resources/ruby/api.mustache
index d7967135336..d67b39f0d48 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/api.mustache
@@ -1,3 +1,7 @@
+=begin
+{{> api_info}}
+=end
+
 require "uri"
 
 module {{moduleName}}
@@ -10,11 +14,11 @@ module {{moduleName}}
     end
 {{#operation}}
 {{newline}}
-    # {{summary}}
-    # {{notes}}
+    # {{{summary}}}
+    # {{{notes}}}
 {{#allParams}}{{#required}}    # @param {{paramName}} {{description}}
 {{/required}}{{/allParams}}    # @param [Hash] opts the optional parameters
-{{#allParams}}{{^required}}    # @option opts [{{{dataType}}}] :{{paramName}} {{description}}
+{{#allParams}}{{^required}}    # @option opts [{{{dataType}}}] :{{paramName}} {{description}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}}
 {{/required}}{{/allParams}}    # @return [{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}nil{{/returnType}}]
     def {{operationId}}({{#allParams}}{{#required}}{{paramName}}, {{/required}}{{/allParams}}opts = {})
       {{#returnType}}data, status_code, headers = {{/returnType}}{{operationId}}_with_http_info({{#allParams}}{{#required}}{{paramName}}, {{/required}}{{/allParams}}opts)
@@ -43,7 +47,7 @@ module {{moduleName}}
       end
       {{/isEnum}}{{/required}}{{/allParams}}
       # resource path
-      path = "{{path}}".sub('{format}','json'){{#pathParams}}.sub('{' + '{{baseName}}' + '}', {{paramName}}.to_s){{/pathParams}}
+      local_var_path = "{{path}}".sub('{format}','json'){{#pathParams}}.sub('{' + '{{baseName}}' + '}', {{paramName}}.to_s){{/pathParams}}
 
       # query parameters
       query_params = {}{{#queryParams}}{{#required}}
@@ -72,9 +76,8 @@ module {{moduleName}}
       {{^bodyParam}}post_body = nil
       {{/bodyParam}}{{#bodyParam}}post_body = @api_client.object_to_http_body({{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:'{{{paramName}}}']{{/required}})
       {{/bodyParam}}
-
       auth_names = [{{#authMethods}}'{{name}}'{{#hasMore}}, {{/hasMore}}{{/authMethods}}]
-      data, status_code, headers = @api_client.call_api(:{{httpMethod}}, path,
+      data, status_code, headers = @api_client.call_api(:{{httpMethod}}, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
@@ -90,7 +93,3 @@ module {{moduleName}}
   end
 {{/operations}}
 end
-
-
-
-
diff --git a/modules/swagger-codegen/src/main/resources/ruby/api_client.mustache b/modules/swagger-codegen/src/main/resources/ruby/api_client.mustache
index 54854efe332..520a50b76ca 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/api_client.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/api_client.mustache
@@ -1,3 +1,7 @@
+=begin
+{{> api_info}}
+=end
+
 require 'date'
 require 'json'
 require 'logger'
@@ -17,7 +21,7 @@ module {{moduleName}}
 
     def initialize(config = Configuration.default)
       @config = config
-      @user_agent = "ruby-swagger-#{VERSION}"
+      @user_agent = "{{#httpUserAgent}}{{{.}}}{{/httpUserAgent}}{{^httpUserAgent}}Swagger-Codegen/#{VERSION}/ruby{{/httpUserAgent}}"
       @default_headers = {
         'Content-Type' => "application/json",
         'User-Agent' => @user_agent
@@ -75,10 +79,11 @@ module {{moduleName}}
         :ssl_verifypeer => @config.verify_ssl,
         :sslcert => @config.cert_file,
         :sslkey => @config.key_file,
-        :cainfo => @config.ssl_ca_cert,
         :verbose => @config.debugging
       }
 
+      req_opts[:cainfo] = @config.ssl_ca_cert if @config.ssl_ca_cert
+
       if [:post, :patch, :put, :delete].include?(http_method)
         req_body = build_request_body(header_params, form_params, opts[:body])
         req_opts.update :body => req_body
@@ -106,6 +111,9 @@ module {{moduleName}}
       body = response.body
       return nil if body.nil? || body.empty?
 
+      # return response body directly for String return type
+      return body if return_type == 'String'
+
       # handle file downloading - save response body into a tmp file and return the File instance
       return download_file(response) if return_type == 'File'
 
@@ -146,7 +154,7 @@ module {{moduleName}}
         # parse date time (expecting ISO 8601 format)
         Date.parse data
       when 'Object'
-        # generic object, return directly
+        # generic object (usually a Hash), return directly
         data
       when /\AArray<(.+)>\z/
         # e.g. Array<Pet>
@@ -170,23 +178,37 @@ module {{moduleName}}
     # from the "Content-Disposition" header if provided, otherwise a random filename.
     #
     # @see Configuration#temp_folder_path
-    # @return [File] the file downloaded
+    # @return [Tempfile] the file downloaded
     def download_file(response)
-      tmp_file = Tempfile.new '', @config.temp_folder_path
       content_disposition = response.headers['Content-Disposition']
       if content_disposition
         filename = content_disposition[/filename=['"]?([^'"\s]+)['"]?/, 1]
-        path = File.join File.dirname(tmp_file), filename
+        prefix = sanitize_filename(filename)
       else
-        path = tmp_file.path
+        prefix = 'download-'
       end
-      # close and delete temp file
-      tmp_file.close!
+      prefix = prefix + '-' unless prefix.end_with?('-')
 
-      File.open(path, 'w') { |file| file.write(response.body) }
-      @config.logger.info "File written to #{path}. Please move the file to a proper folder "\
-                          "for further processing and delete the temp afterwards"
-      File.new(path)
+      tempfile = nil
+      encoding = response.body.encoding
+      Tempfile.open(prefix, @config.temp_folder_path, encoding: encoding) do |file|
+        file.write(response.body)
+        tempfile = file
+      end
+      @config.logger.info "Temp file written to #{tempfile.path}, please copy the file to a proper folder "\
+                          "with e.g. `FileUtils.cp(tempfile.path, '/new/file/path')` otherwise the temp file "\
+                          "will be deleted automatically with GC. It's also recommended to delete the temp file "\
+                          "explicitly with `tempfile.delete`"
+      tempfile
+    end
+
+    # Sanitize filename by removing path.
+    # e.g. ../../sun.gif becomes sun.gif
+    #
+    # @param [String] filename the filename to be sanitized
+    # @return [String] the sanitized filename
+    def sanitize_filename(filename)
+      filename.gsub /.*[\/\\]/, ''
     end
 
     def build_request_url(path)
@@ -260,7 +282,7 @@ module {{moduleName}}
     # @param [Object] model object to be converted into JSON string
     # @return [String] JSON string representation of the object
     def object_to_http_body(model)
-      return if model.nil?
+      return model if model.nil? || model.is_a?(String)
       _body = nil
       if model.is_a?(Array)
         _body = model.map{|m| object_to_hash(m) }
diff --git a/modules/swagger-codegen/src/main/resources/ruby/api_doc.mustache b/modules/swagger-codegen/src/main/resources/ruby/api_doc.mustache
new file mode 100644
index 00000000000..6d36e7dfe89
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/ruby/api_doc.mustache
@@ -0,0 +1,79 @@
+# {{moduleName}}::{{classname}}{{#description}}
+{{description}}{{/description}}
+
+All URIs are relative to *{{basePath}}*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+{{#operations}}{{#operation}}[**{{operationId}}**]({{classname}}.md#{{operationId}}) | **{{httpMethod}}** {{path}} | {{#summary}}{{summary}}{{/summary}}
+{{/operation}}{{/operations}}
+
+{{#operations}}
+{{#operation}}
+# **{{operationId}}**
+> {{#returnType}}{{returnType}} {{/returnType}}{{operationId}}{{#hasParams}}({{#allParams}}{{#required}}{{{paramName}}}{{#vendorExtensions.x-codegen-hasMoreRequired}}, {{/vendorExtensions.x-codegen-hasMoreRequired}}{{/required}}{{/allParams}}{{#hasOptionalParams}}{{#vendorExtensions.x-codegen-hasRequiredParams}}, {{/vendorExtensions.x-codegen-hasRequiredParams}}opts{{/hasOptionalParams}}){{/hasParams}}
+
+{{{summary}}}{{#notes}}
+
+{{{notes}}}{{/notes}}
+
+### Example
+```ruby
+# load the gem
+require '{{{gemName}}}'
+{{#hasAuthMethods}}
+# setup authorization 
+{{{moduleName}}}.configure do |config|{{#authMethods}}{{#isBasic}}
+  # Configure HTTP basic authorization: {{{name}}}
+  config.username = 'YOUR USERNAME'
+  config.password = 'YOUR PASSWORD'{{/isBasic}}{{#isApiKey}}
+  # Configure API key authorization: {{{name}}}
+  config.api_key['{{{keyParamName}}}'] = 'YOUR API KEY'
+  # Uncomment the following line to set a prefix for the API key, e.g. 'BEARER' (defaults to nil)
+  #config.api_key_prefix['{{{keyParamName}}}'] = 'BEARER'{{/isApiKey}}{{#isOAuth}}
+  # Configure OAuth2 access token for authorization: {{{name}}}
+  config.access_token = 'YOUR ACCESS TOKEN'{{/isOAuth}}
+{{/authMethods}}end
+{{/hasAuthMethods}}
+
+api_instance = {{{moduleName}}}::{{{classname}}}.new{{#hasParams}}
+{{#vendorExtensions.x-codegen-hasRequiredParams}}{{#allParams}}{{#required}}
+{{{paramName}}} = {{{example}}} # {{{dataType}}} | {{{description}}}
+{{/required}}{{/allParams}}{{/vendorExtensions.x-codegen-hasRequiredParams}}{{#hasOptionalParams}}
+opts = { {{#allParams}}{{^required}}
+  {{{paramName}}}: {{{example}}}{{#vendorExtensions.x-codegen-hasMoreOptional}},{{/vendorExtensions.x-codegen-hasMoreOptional}} # {{{dataType}}} | {{{description}}}{{/required}}{{/allParams}}
+}{{/hasOptionalParams}}{{/hasParams}}
+
+begin
+{{#summary}}  #{{{.}}}
+{{/summary}}  {{#returnType}}result = {{/returnType}}api_instance.{{{operationId}}}{{#hasParams}}({{#allParams}}{{#required}}{{{paramName}}}{{#vendorExtensions.x-codegen-hasMoreRequired}}, {{/vendorExtensions.x-codegen-hasMoreRequired}}{{/required}}{{/allParams}}{{#hasOptionalParams}}{{#vendorExtensions.x-codegen-hasRequiredParams}}, {{/vendorExtensions.x-codegen-hasRequiredParams}}opts{{/hasOptionalParams}}){{/hasParams}}{{#returnType}}
+  p result{{/returnType}}
+rescue {{{moduleName}}}::ApiError => e
+  puts "Exception when calling {{classname}}->{{{operationId}}}: #{e}"
+end
+```
+
+### Parameters
+{{^allParams}}This endpoint does not need any parameter.{{/allParams}}{{#allParams}}{{#-last}}
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------{{/-last}}{{/allParams}}
+{{#allParams}} **{{paramName}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isFile}}**{{dataType}}**{{/isFile}}{{^isFile}}[**{{dataType}}**]({{baseType}}.md){{/isFile}}{{/isPrimitiveType}}| {{description}} | {{^required}}[optional] {{/required}}{{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}
+{{/allParams}}
+
+### Return type
+
+{{#returnType}}{{#returnTypeIsPrimitive}}**{{returnType}}**{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}[**{{returnType}}**]({{returnBaseType}}.md){{/returnTypeIsPrimitive}}{{/returnType}}{{^returnType}}nil (empty response body){{/returnType}}
+
+### Authorization
+
+{{^authMethods}}No authorization required{{/authMethods}}{{#authMethods}}[{{name}}](../README.md#{{name}}){{^-last}}, {{/-last}}{{/authMethods}}
+
+### HTTP reuqest headers
+
+ - **Content-Type**: {{#consumes}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/consumes}}{{^consumes}}Not defined{{/consumes}}
+ - **Accept**: {{#produces}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/produces}}{{^produces}}Not defined{{/produces}}
+
+
+
+{{/operation}}
+{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/ruby/api_error.mustache b/modules/swagger-codegen/src/main/resources/ruby/api_error.mustache
index f8b598dad71..ddd8cda32f5 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/api_error.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/api_error.mustache
@@ -1,3 +1,7 @@
+=begin
+{{> api_info}}
+=end
+
 module {{moduleName}}
   class ApiError < StandardError
     attr_reader :code, :response_headers, :response_body
diff --git a/modules/swagger-codegen/src/main/resources/ruby/api_info.mustache b/modules/swagger-codegen/src/main/resources/ruby/api_info.mustache
new file mode 100644
index 00000000000..28301757e70
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/ruby/api_info.mustache
@@ -0,0 +1,18 @@
+{{#appName}}{{{appName}}}
+
+{{/appName}}
+{{#appDescription}}{{{appDescription}}}
+
+{{/appDescription}}
+{{#version}}OpenAPI spec version: {{version}}{{/version}}
+{{#infoEmail}}Contact: {{{infoEmail}}}{{/infoEmail}}
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+{{#licenseInfo}}
+License: {{{licenseInfo}}}
+{{#licenseUrl}}{{licenseUrl}}{{/licenseUrl}}
+
+{{/licenseInfo}}
+{{#termsOfService}}
+Terms of Service: {{{termsOfService}}}
+{{/termsOfService}}
diff --git a/modules/swagger-codegen/src/main/resources/ruby/api_test.mustache b/modules/swagger-codegen/src/main/resources/ruby/api_test.mustache
new file mode 100644
index 00000000000..7e95c2d6446
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/ruby/api_test.mustache
@@ -0,0 +1,47 @@
+=begin
+{{> api_info}}
+=end
+
+require 'spec_helper'
+require 'json'
+
+# Unit tests for {{moduleName}}::{{classname}}
+# Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
+# Please update as you see appropriate
+{{#operations}}describe '{{classname}}' do
+  before do
+    # run before each test
+    @instance = {{moduleName}}::{{classname}}.new
+  end
+
+  after do
+    # run after each test
+  end
+
+  describe 'test an instance of {{classname}}' do
+    it 'should create an instact of {{classname}}' do
+      @instance.should be_a({{moduleName}}::{{classname}})
+    end
+  end
+
+{{#operation}}
+  # unit tests for {{operationId}}
+  # {{summary}}
+  # {{notes}}
+{{#allParams}}{{#required}}  # @param {{paramName}} {{description}}
+{{/required}}{{/allParams}}  # @param [Hash] opts the optional parameters
+{{#allParams}}{{^required}}  # @option opts [{{{dataType}}}] :{{paramName}} {{description}}
+{{/required}}{{/allParams}}  # @return [{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}nil{{/returnType}}]
+  describe '{{operationId}} test' do
+    it "should work" do
+      # assertion here
+      # should be_a()
+      # should be_nil
+      # should ==
+      # should_not ==
+    end
+  end
+
+{{/operation}}
+end
+{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/ruby/base_object.mustache b/modules/swagger-codegen/src/main/resources/ruby/base_object.mustache
index d4ea5b334a6..2c7747c4127 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/base_object.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/base_object.mustache
@@ -31,11 +31,14 @@
       when :Float
         value.to_f
       when :BOOLEAN
-        if value =~ /^(true|t|yes|y|1)$/i
+        if value.to_s =~ /^(true|t|yes|y|1)$/i
           true
         else
           false
         end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
       when /\AArray<(?<inner_type>.+)>\z/
         inner_type = Regexp.last_match[:inner_type]
         value.map { |v| _deserialize(inner_type, v) }
diff --git a/modules/swagger-codegen/src/main/resources/ruby/gem.mustache b/modules/swagger-codegen/src/main/resources/ruby/gem.mustache
index ec5ee0ac17c..c9ae0ebf96e 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/gem.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/gem.mustache
@@ -1,3 +1,7 @@
+=begin
+{{> api_info}}
+=end
+
 # Common files
 require '{{gemName}}/api_client'
 require '{{gemName}}/api_error'
@@ -6,7 +10,8 @@ require '{{gemName}}/configuration'
 
 # Models
 {{#models}}
-require '{{importPath}}'
+{{#model}}
+require '{{gemName}}/{{modelPackage}}/{{classFilename}}'{{/model}}
 {{/models}}
 
 # APIs
diff --git a/modules/swagger-codegen/src/main/resources/ruby/gemspec.mustache b/modules/swagger-codegen/src/main/resources/ruby/gemspec.mustache
index 5c9c1c1a497..7ab8a9e73d7 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/gemspec.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/gemspec.mustache
@@ -6,12 +6,13 @@ Gem::Specification.new do |s|
   s.name        = "{{gemName}}"
   s.version     = {{moduleName}}::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Zeke Sikelianos", "Tony Tam"]
-  s.email       = ["zeke@wordnik.com", "fehguy@gmail.com"]
-  s.homepage    = "http://swagger.io"
-  s.summary     = %q{A ruby wrapper for the swagger APIs}
-  s.description = %q{This gem maps to a swagger API}
-  s.license     = "Apache-2.0"
+  s.authors     = ["{{gemAuthor}}"]
+  s.email       = ["{{gemAuthorEmail}}"]
+  s.homepage    = "{{gemHomepage}}"
+  s.summary     = "{{gemSummary}}"
+  s.description = "{{gemDescription}}"
+  s.license     = "{{gemLicense}}"
+
 
   s.add_runtime_dependency 'typhoeus', '~> 0.2', '>= 0.2.1'
   s.add_runtime_dependency 'json', '~> 1.4', '>= 1.4.6'
@@ -22,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'autotest', '~> 4.4', '>= 4.4.6'
   s.add_development_dependency 'autotest-rails-pure', '~> 4.1', '>= 4.1.2'
   s.add_development_dependency 'autotest-growl', '~> 0.2', '>= 0.2.16'
-  s.add_development_dependency 'autotest-fsevent', '~> 0.2', '>= 0.2.10'
+  s.add_development_dependency 'autotest-fsevent', '~> 0.2', '>= 0.2.11'
 
   s.files         = `find *`.split("\n").uniq.sort.select{|f| !f.empty? }
   s.test_files    = `find spec/*`.split("\n")
diff --git a/modules/swagger-codegen/src/main/resources/ruby/git_push.sh.mustache b/modules/swagger-codegen/src/main/resources/ruby/git_push.sh.mustache
new file mode 100755
index 00000000000..e153ce23ecf
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/ruby/git_push.sh.mustache
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="{{{gitUserId}}}"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="{{{gitRepoId}}}"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="{{{releaseNote}}}"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/modules/swagger-codegen/src/main/resources/ruby/gitignore.mustache b/modules/swagger-codegen/src/main/resources/ruby/gitignore.mustache
new file mode 100644
index 00000000000..a8b1cda23f8
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/ruby/gitignore.mustache
@@ -0,0 +1,36 @@
+*.gem
+*.rbc
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/spec/examples.txt
+/test/tmp/
+/test/version_tmp/
+/tmp/
+
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalization:
+/.bundle/
+/vendor/bundle
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+# Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
diff --git a/modules/swagger-codegen/src/main/resources/ruby/model.mustache b/modules/swagger-codegen/src/main/resources/ruby/model.mustache
index 21de688e525..86567e1d594 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/model.mustache
@@ -1,3 +1,7 @@
+=begin
+{{> api_info}}
+=end
+
 require 'date'
 
 module {{moduleName}}{{#models}}{{#model}}{{#description}}
diff --git a/modules/swagger-codegen/src/main/resources/ruby/model_doc.mustache b/modules/swagger-codegen/src/main/resources/ruby/model_doc.mustache
new file mode 100644
index 00000000000..00befadc578
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/ruby/model_doc.mustache
@@ -0,0 +1,9 @@
+{{#models}}{{#model}}# {{moduleName}}::{{classname}}
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{datatype}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{datatype}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}
+{{/vars}}
+
+{{/model}}{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/ruby/model_test.mustache b/modules/swagger-codegen/src/main/resources/ruby/model_test.mustache
new file mode 100644
index 00000000000..f5204447975
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/ruby/model_test.mustache
@@ -0,0 +1,40 @@
+=begin
+{{> api_info}}
+=end
+
+require 'spec_helper'
+require 'json'
+require 'date'
+
+# Unit tests for {{moduleName}}::{{classname}}
+# Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
+# Please update as you see appropriate
+{{#models}}{{#model}}describe '{{classname}}' do
+  before do
+    # run before each test
+    @instance = {{moduleName}}::{{classname}}.new
+  end
+
+  after do
+    # run after each test
+  end
+
+  describe 'test an instance of {{classname}}' do
+    it 'should create an instact of {{classname}}' do
+      @instance.should be_a({{moduleName}}::{{classname}}) 
+    end
+  end
+{{#vars}}
+  describe 'test attribute "{{{name}}}"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+{{/vars}}
+end
+{{/model}}{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/ruby/version.mustache b/modules/swagger-codegen/src/main/resources/ruby/version.mustache
index 67cfc8ea325..982bcdb3e52 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/version.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/version.mustache
@@ -1,3 +1,7 @@
+=begin
+{{> api_info}}
+=end
+
 module {{moduleName}}
   VERSION = "{{gemVersion}}"
 end
diff --git a/modules/swagger-codegen/src/main/resources/scala/api.mustache b/modules/swagger-codegen/src/main/resources/scala/api.mustache
index 3b74dca8162..41b58374dea 100644
--- a/modules/swagger-codegen/src/main/resources/scala/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/scala/api.mustache
@@ -27,7 +27,7 @@ class {{classname}}(val defBasePath: String = "{{basePath}}",
   /**
    * {{summary}}
    * {{notes}}
-{{#allParams}}   * @param {{paramName}} {{description}}
+{{#allParams}}   * @param {{paramName}} {{description}} {{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
 {{/allParams}}   * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
    */
   def {{operationId}} ({{#allParams}}{{paramName}}: {{dataType}}{{#defaultValue}} /* = {{{defaultValue}}} */{{/defaultValue}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {{#returnType}}: Option[{{returnType}}]{{/returnType}} = {
diff --git a/modules/swagger-codegen/src/main/resources/scala/git_push.sh.mustache b/modules/swagger-codegen/src/main/resources/scala/git_push.sh.mustache
new file mode 100755
index 00000000000..e153ce23ecf
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/scala/git_push.sh.mustache
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="{{{gitUserId}}}"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="{{{gitRepoId}}}"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="{{{releaseNote}}}"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/modules/swagger-codegen/src/main/resources/scala/gitignore.mustache b/modules/swagger-codegen/src/main/resources/scala/gitignore.mustache
new file mode 100644
index 00000000000..c58d83b3189
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/scala/gitignore.mustache
@@ -0,0 +1,17 @@
+*.class
+*.log
+
+# sbt specific
+.cache
+.history
+.lib/
+dist/*
+target/
+lib_managed/
+src_managed/
+project/boot/
+project/plugins/project/
+
+# Scala-IDE specific
+.scala_dependencies
+.worksheet
diff --git a/modules/swagger-codegen/src/main/resources/scala/pom.mustache b/modules/swagger-codegen/src/main/resources/scala/pom.mustache
index 7a2e36c935a..51256c42491 100644
--- a/modules/swagger-codegen/src/main/resources/scala/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/scala/pom.mustache
@@ -210,7 +210,7 @@
     <joda-version>1.2</joda-version>
     <joda-time-version>2.2</joda-time-version>
     <jersey-version>1.19</jersey-version>
-    <swagger-core-version>1.5.4</swagger-core-version>
+    <swagger-core-version>1.5.8</swagger-core-version>
     <jersey-async-version>1.0.5</jersey-async-version>
     <maven-plugin.version>1.0.0</maven-plugin.version>
     <jackson-version>2.4.2</jackson-version>
diff --git a/modules/swagger-codegen/src/main/resources/swift/Models.mustache b/modules/swagger-codegen/src/main/resources/swift/Models.mustache
index af8f5c875a7..d3090faf2a0 100644
--- a/modules/swagger-codegen/src/main/resources/swift/Models.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift/Models.mustache
@@ -109,13 +109,19 @@ class Decoders {
             }
             // Decoder for NSDate
             Decoders.addDecoder(clazz: NSDate.self) { (source: AnyObject) -> NSDate in
-                let sourceString = source as! String
-                for formatter in formatters {
-                    if let date = formatter.dateFromString(sourceString) {
-                        return date
+               if let sourceString = source as? String {
+                    for formatter in formatters {
+                        if let date = formatter.dateFromString(sourceString) {
+                            return date
+                        }
                     }
+                
                 }
-                fatalError("formatter failed to parse \(sourceString)")
+                if let sourceInt = source as? Int {
+                    // treat as a java date
+                    return NSDate(timeIntervalSince1970: Double(sourceInt / 1000) )
+                }
+                fatalError("formatter failed to parse \(source)")
             } {{#models}}{{#model}}
 
 			// Decoder for [{{{classname}}}]
@@ -126,8 +132,8 @@ class Decoders {
             Decoders.addDecoder(clazz: {{{classname}}}.self) { (source: AnyObject) -> {{{classname}}} in
                 let sourceDictionary = source as! [NSObject:AnyObject]
                 let instance = {{classname}}(){{#vars}}{{#isEnum}}
-                instance.{{name}} = (sourceDictionary["{{name}}"] as? String).map { {{classname}}.{{datatypeWithEnum}}(rawValue: $0)! }{{#unwrapRequired}}{{#required}}!{{/required}}{{/unwrapRequired}} {{/isEnum}}{{^isEnum}}
-                instance.{{name}} = Decoders.decode{{^unwrapRequired}}Optional{{/unwrapRequired}}{{#unwrapRequired}}{{^required}}Optional{{/required}}{{/unwrapRequired}}(clazz: {{{baseType}}}.self, source: sourceDictionary["{{name}}"]{{#unwrapRequired}}{{#required}}!{{/required}}{{/unwrapRequired}}){{/isEnum}}{{/vars}}
+                instance.{{name}} = {{classname}}.{{datatypeWithEnum}}(rawValue: (sourceDictionary["{{baseName}}"] as? String) ?? ""){{#unwrapRequired}}{{#required}}!{{/required}}{{/unwrapRequired}} {{/isEnum}}{{^isEnum}}
+                instance.{{name}} = Decoders.decode{{^unwrapRequired}}Optional{{/unwrapRequired}}{{#unwrapRequired}}{{^required}}Optional{{/required}}{{/unwrapRequired}}(clazz: {{{baseType}}}.self, source: sourceDictionary["{{baseName}}"]{{#unwrapRequired}}{{#required}}!{{/required}}{{/unwrapRequired}}){{/isEnum}}{{/vars}}
                 return instance
             }{{/model}}
 			{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/swift/api.mustache b/modules/swagger-codegen/src/main/resources/swift/api.mustache
index 1bc74597bc9..ada4ec90d36 100644
--- a/modules/swagger-codegen/src/main/resources/swift/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift/api.mustache
@@ -8,48 +8,88 @@
 import Alamofire{{#usePromiseKit}}
 import PromiseKit{{/usePromiseKit}}
 
+{{#swiftUseApiNamespace}}
 extension {{projectName}}API {
-    {{#description}}
-    /** {{description}} */{{/description}}
-    public class {{classname}}: APIBase {
-    {{#operation}}
-        /**
-         {{#summary}}
-         {{{summary}}}
-         {{/summary}}
-         - {{httpMethod}} {{path}}{{#notes}}
-         - {{{notes}}}{{/notes}}{{#subresourceOperation}}
-         - subresourceOperation: {{subresourceOperation}}{{/subresourceOperation}}{{#defaultResponse}}
-         - defaultResponse: {{defaultResponse}}{{/defaultResponse}}{{#authMethods}}
-         - {{#isBasic}}BASIC{{/isBasic}}{{#isOAuth}}OAuth{{/isOAuth}}{{#isApiKey}}API Key{{/isApiKey}}:
-           - type: {{type}}{{#keyParamName}} {{keyParamName}} {{#isKeyInQuery}}(QUERY){{/isKeyInQuery}}{{#isKeyInHeaer}}(HEADER){{/isKeyInHeaer}}{{/keyParamName}}
-           - name: {{name}}{{/authMethods}}{{#responseHeaders}}
-         - responseHeaders: {{responseHeaders}}{{/responseHeaders}}{{#examples}}
-         - examples: {{{examples}}}{{/examples}}{{#externalDocs}}
-         - externalDocs: {{externalDocs}}{{/externalDocs}}{{#hasParams}}
-         {{/hasParams}}{{#allParams}}
-         - parameter {{paramName}}: ({{#isFormParam}}form{{/isFormParam}}{{#isQueryParam}}query{{/isQueryParam}}{{#isPathParam}}path{{/isPathParam}}{{#isHeaderParam}}header{{/isHeaderParam}}{{#isBodyParam}}body{{/isBodyParam}}) {{description}}{{/allParams}}
+{{/swiftUseApiNamespace}}
 
-         - returns: RequestBuilder<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{description}}
-         */
-        public class func {{operationId}}({{#allParams}}{{^secondaryParam}}{{paramName}} {{/secondaryParam}}{{paramName}}: {{{dataType}}}{{^required}}?{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> RequestBuilder<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {
-            {{^pathParams}}let{{/pathParams}}{{#pathParams}}{{^secondaryParam}}var{{/secondaryParam}}{{/pathParams}} path = "{{path}}"{{#pathParams}}
-            path = path.stringByReplacingOccurrencesOfString("{{=<% %>=}}{<%paramName%>}<%={{ }}=%>", withString: "\({{paramName}})", options: .LiteralSearch, range: nil){{/pathParams}}
-            let URLString = {{projectName}}API.basePath + path
-            {{#bodyParam}}
-            let parameters = {{paramName}}{{^required}}?{{/required}}.encodeToJSON() as? [String:AnyObject]{{/bodyParam}}{{^bodyParam}}
-            let nillableParameters: [String:AnyObject?] = {{^queryParams}}{{^formParams}}[:]{{/formParams}}{{#formParams}}{{^secondaryParam}}[{{/secondaryParam}}
-                "{{paramName}}": {{paramName}}{{#hasMore}},{{/hasMore}}{{^hasMore}}
-            ]{{/hasMore}}{{/formParams}}{{/queryParams}}{{#queryParams}}{{^secondaryParam}}[{{/secondaryParam}}
-                "{{paramName}}": {{paramName}}{{#hasMore}},{{/hasMore}}{{^hasMore}}
-            ]{{/hasMore}}{{/queryParams}}
-            let parameters = APIHelper.rejectNil(nillableParameters){{/bodyParam}}
-
-            let requestBuilder: RequestBuilder<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}>.Type = {{projectName}}API.requestBuilderFactory.getBuilder()
-
-            return requestBuilder.init(method: "{{httpMethod}}", URLString: URLString, parameters: parameters, isBody: {{^queryParams}}{{^formParams}}true{{/formParams}}{{/queryParams}}{{#queryParams}}{{^secondaryParam}}false{{/secondaryParam}}{{/queryParams}}{{#formParams}}{{^secondaryParam}}false{{/secondaryParam}}{{/formParams}})
+{{#description}}
+/** {{description}} */{{/description}}
+public class {{classname}}: APIBase {
+{{#operation}}
+    /**
+     {{#summary}}
+     {{{summary}}}
+     {{/summary}}{{#allParams}}
+     - parameter {{paramName}}: ({{#isFormParam}}form{{/isFormParam}}{{#isQueryParam}}query{{/isQueryParam}}{{#isPathParam}}path{{/isPathParam}}{{#isHeaderParam}}header{{/isHeaderParam}}{{#isBodyParam}}body{{/isBodyParam}}) {{description}} {{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{/allParams}}
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    public class func {{operationId}}({{#allParams}}{{^secondaryParam}}{{paramName}} {{/secondaryParam}}{{paramName}}: {{{dataType}}}{{^required}}?{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{#hasParams}}, {{/hasParams}}completion: (({{#returnType}}data: {{{returnType}}}?, {{/returnType}}error: ErrorType?) -> Void)) {
+        {{operationId}}WithRequestBuilder({{#allParams}}{{paramName}}: {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}).execute { (response, error) -> Void in
+            completion({{#returnType}}data: response?.body, {{/returnType}}error: error);
         }
-    {{/operation}}
     }
+
+{{#usePromiseKit}}
+    /**
+     {{#summary}}
+     {{{summary}}}
+     {{/summary}}{{#allParams}}
+     - parameter {{paramName}}: ({{#isFormParam}}form{{/isFormParam}}{{#isQueryParam}}query{{/isQueryParam}}{{#isPathParam}}path{{/isPathParam}}{{#isHeaderParam}}header{{/isHeaderParam}}{{#isBodyParam}}body{{/isBodyParam}}) {{description}} {{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{/allParams}}
+     - returns: Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}>
+     */
+    public class func {{operationId}}({{#allParams}}{{^secondaryParam}}{{paramName}} {{/secondaryParam}}{{paramName}}: {{{dataType}}}{{^required}}?{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {
+        let deferred = Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}>.pendingPromise()
+        {{operationId}}({{#allParams}}{{paramName}}: {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) { {{#returnType}}data, {{/returnType}}error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill({{#returnType}}data!{{/returnType}})
+            }
+        }
+        return deferred.promise
+    }
+{{/usePromiseKit}}
+
+    /**
+     {{#summary}}
+     {{{summary}}}
+     {{/summary}}
+     - {{httpMethod}} {{path}}{{#notes}}
+     - {{{notes}}}{{/notes}}{{#subresourceOperation}}
+     - subresourceOperation: {{subresourceOperation}}{{/subresourceOperation}}{{#defaultResponse}}
+     - defaultResponse: {{defaultResponse}}{{/defaultResponse}}{{#authMethods}}
+     - {{#isBasic}}BASIC{{/isBasic}}{{#isOAuth}}OAuth{{/isOAuth}}{{#isApiKey}}API Key{{/isApiKey}}:
+       - type: {{type}}{{#keyParamName}} {{keyParamName}} {{#isKeyInQuery}}(QUERY){{/isKeyInQuery}}{{#isKeyInHeaer}}(HEADER){{/isKeyInHeaer}}{{/keyParamName}}
+       - name: {{name}}{{/authMethods}}{{#responseHeaders}}
+     - responseHeaders: {{responseHeaders}}{{/responseHeaders}}{{#examples}}
+     - examples: {{{examples}}}{{/examples}}{{#externalDocs}}
+     - externalDocs: {{externalDocs}}{{/externalDocs}}{{#hasParams}}
+     {{/hasParams}}{{#allParams}}
+     - parameter {{paramName}}: ({{#isFormParam}}form{{/isFormParam}}{{#isQueryParam}}query{{/isQueryParam}}{{#isPathParam}}path{{/isPathParam}}{{#isHeaderParam}}header{{/isHeaderParam}}{{#isBodyParam}}body{{/isBodyParam}}) {{description}} {{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{/allParams}}
+
+     - returns: RequestBuilder<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{description}}
+     */
+    public class func {{operationId}}WithRequestBuilder({{#allParams}}{{^secondaryParam}}{{paramName}} {{/secondaryParam}}{{paramName}}: {{{dataType}}}{{^required}}?{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> RequestBuilder<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {
+        {{^pathParams}}let{{/pathParams}}{{#pathParams}}{{^secondaryParam}}var{{/secondaryParam}}{{/pathParams}} path = "{{path}}"{{#pathParams}}
+        path = path.stringByReplacingOccurrencesOfString("{{=<% %>=}}{<%paramName%>}<%={{ }}=%>", withString: "\({{paramName}})", options: .LiteralSearch, range: nil){{/pathParams}}
+        let URLString = {{projectName}}API.basePath + path
+        {{#bodyParam}}
+        let parameters = {{paramName}}{{^required}}?{{/required}}.encodeToJSON() as? [String:AnyObject]{{/bodyParam}}{{^bodyParam}}
+        let nillableParameters: [String:AnyObject?] = {{^queryParams}}{{^formParams}}[:]{{/formParams}}{{#formParams}}{{^secondaryParam}}[{{/secondaryParam}}
+            "{{baseName}}": {{paramName}}{{#hasMore}},{{/hasMore}}{{^hasMore}}
+        ]{{/hasMore}}{{/formParams}}{{/queryParams}}{{#queryParams}}{{^secondaryParam}}[{{/secondaryParam}}
+            "{{baseName}}": {{paramName}}{{#hasMore}},{{/hasMore}}{{^hasMore}}
+        ]{{/hasMore}}{{/queryParams}}
+        let parameters = APIHelper.rejectNil(nillableParameters){{/bodyParam}}
+
+        let requestBuilder: RequestBuilder<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}>.Type = {{projectName}}API.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "{{httpMethod}}", URLString: URLString, parameters: parameters, isBody: {{^queryParams}}{{^formParams}}true{{/formParams}}{{/queryParams}}{{#queryParams}}{{^secondaryParam}}false{{/secondaryParam}}{{/queryParams}}{{#formParams}}{{^secondaryParam}}false{{/secondaryParam}}{{/formParams}})
+    }
+
+{{/operation}}
 }
+{{#swiftUseApiNamespace}}
+}
+{{/swiftUseApiNamespace}}
 {{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/swift/git_push.sh.mustache b/modules/swagger-codegen/src/main/resources/swift/git_push.sh.mustache
new file mode 100755
index 00000000000..e153ce23ecf
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/swift/git_push.sh.mustache
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="{{{gitUserId}}}"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="{{{gitRepoId}}}"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="{{{releaseNote}}}"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/modules/swagger-codegen/src/main/resources/swift/gitignore.mustache b/modules/swagger-codegen/src/main/resources/swift/gitignore.mustache
new file mode 100644
index 00000000000..5e5d5cebcf4
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/swift/gitignore.mustache
@@ -0,0 +1,63 @@
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+
+## Other
+*.xccheckout
+*.moved-aside
+*.xcuserstate
+*.xcscmblueprint
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+
+## Playgrounds
+timeline.xctimeline
+playground.xcworkspace
+
+# Swift Package Manager
+#
+# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
+# Packages/
+.build/
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# Pods/
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the 
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
+
+fastlane/report.xml
+fastlane/screenshots
diff --git a/modules/swagger-codegen/src/main/resources/swift/model.mustache b/modules/swagger-codegen/src/main/resources/swift/model.mustache
index 892a3a59f96..f095940a0c1 100644
--- a/modules/swagger-codegen/src/main/resources/swift/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift/model.mustache
@@ -26,10 +26,10 @@ public class {{classname}}: JSONEncodable {
     // MARK: JSONEncodable
     func encodeToJSON() -> AnyObject {
         var nillableDictionary = [String:AnyObject?](){{#vars}}{{#isNotContainer}}{{#isPrimitiveType}}{{^isEnum}}
-        nillableDictionary["{{name}}"] = self.{{name}}{{/isEnum}}{{/isPrimitiveType}}{{#isEnum}}
-        nillableDictionary["{{name}}"] = self.{{name}}{{^unwrapRequired}}?{{/unwrapRequired}}{{#unwrapRequired}}{{^required}}?{{/required}}{{/unwrapRequired}}.rawValue{{/isEnum}}{{^isPrimitiveType}}
-        nillableDictionary["{{name}}"] = self.{{name}}{{^unwrapRequired}}?{{/unwrapRequired}}{{#unwrapRequired}}{{^required}}?{{/required}}{{/unwrapRequired}}.encodeToJSON(){{/isPrimitiveType}}{{/isNotContainer}}{{#isContainer}}
-        nillableDictionary["{{name}}"] = self.{{name}}{{^unwrapRequired}}?{{/unwrapRequired}}{{#unwrapRequired}}{{^required}}?{{/required}}{{/unwrapRequired}}.encodeToJSON(){{/isContainer}}{{/vars}}
+        nillableDictionary["{{baseName}}"] = self.{{name}}{{/isEnum}}{{/isPrimitiveType}}{{#isEnum}}
+        nillableDictionary["{{baseName}}"] = self.{{name}}{{^unwrapRequired}}?{{/unwrapRequired}}{{#unwrapRequired}}{{^required}}?{{/required}}{{/unwrapRequired}}.rawValue{{/isEnum}}{{^isPrimitiveType}}
+        nillableDictionary["{{baseName}}"] = self.{{name}}{{^unwrapRequired}}?{{/unwrapRequired}}{{#unwrapRequired}}{{^required}}?{{/required}}{{/unwrapRequired}}.encodeToJSON(){{/isPrimitiveType}}{{/isNotContainer}}{{#isContainer}}
+        nillableDictionary["{{baseName}}"] = self.{{name}}{{^unwrapRequired}}?{{/unwrapRequired}}{{#unwrapRequired}}{{^required}}?{{/required}}{{/unwrapRequired}}.encodeToJSON(){{/isContainer}}{{/vars}}
         let dictionary: [String:AnyObject] = APIHelper.rejectNil(nillableDictionary) ?? [:]
         return dictionary
     }
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/AbstractOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/AbstractOptionsTest.java
index 002e4ba8f29..ede3feb50b4 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/AbstractOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/AbstractOptionsTest.java
@@ -22,6 +22,7 @@ public abstract class AbstractOptionsTest {
         this.optionsProvider = optionsProvider;
     }
 
+    @SuppressWarnings("unused")
     @Test
     public void checkOptionsProcessing() {
         getCodegenConfig().additionalProperties().putAll(optionsProvider.createOptions());
@@ -49,7 +50,7 @@ public abstract class AbstractOptionsTest {
         }
     }
 
-    private Function<CliOption, String> getCliOptionTransformer() {
+    private static Function<CliOption, String> getCliOptionTransformer() {
         return new Function<CliOption, String>() {
             @Override
             public String apply(CliOption option) {
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/ClientAuthInputTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/ClientAuthInputTest.java
index 59552bba148..490affe0764 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/ClientAuthInputTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/ClientAuthInputTest.java
@@ -7,6 +7,7 @@ import org.testng.annotations.Test;
 
 import java.util.List;
 
+@SuppressWarnings("static-method")
 public class ClientAuthInputTest {
 
     @Test(description = "read a file upload param from a 2.0 spec")
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/CodegenConfigLoaderTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/CodegenConfigLoaderTest.java
index b91e506a4f9..cf4e4a201fb 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/CodegenConfigLoaderTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/CodegenConfigLoaderTest.java
@@ -11,6 +11,7 @@ import java.util.Set;
 
 import static org.testng.Assert.assertEquals;
 
+@SuppressWarnings("static-method")
 public class CodegenConfigLoaderTest {
 
     @DataProvider(name = "codegenConfig")
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/CodegenTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/CodegenTest.java
index 68c2b4b170b..4b422bb3c63 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/CodegenTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/CodegenTest.java
@@ -81,6 +81,40 @@ public class CodegenTest {
         Assert.assertNull(statusParam.hasMore);
     }
 
+    @Test(description = "handle enum array in query parameter test")
+    public void enumArrayQueryParameterTest() {
+        final Swagger model = parseAndPrepareSwagger("src/test/resources/2_0/petstore.json");
+        final DefaultCodegen codegen = new DefaultCodegen();
+        final String path = "/pet/findByStatus";
+        final Operation p = model.getPaths().get(path).getGet();
+        final CodegenOperation op = codegen.fromOperation(path, "get", p, model.getDefinitions());
+
+        Assert.assertEquals(op.queryParams.size(), 1);
+
+        final CodegenParameter statusParam = op.queryParams.get(0);
+        Assert.assertEquals(statusParam.items.datatypeWithEnum, "StatusEnum");
+        Assert.assertNotNull(statusParam.items);
+        Assert.assertTrue(statusParam.items.isEnum);
+        Assert.assertEquals(statusParam.items._enum.size(), 3);
+    }
+
+    @Test(description = "handle enum in query parameter test")
+    public void enumQueryParameterTest() {
+        final Swagger model = parseAndPrepareSwagger("src/test/resources/2_0/petstore.json");
+        final DefaultCodegen codegen = new DefaultCodegen();
+        final String path = "/store/findByStatus";
+        final Operation p = model.getPaths().get(path).getGet();
+        final CodegenOperation op = codegen.fromOperation(path, "get", p, model.getDefinitions());
+
+        Assert.assertEquals(op.queryParams.size(), 1);
+
+        final CodegenParameter statusParam = op.queryParams.get(0);
+        Assert.assertEquals(statusParam.datatypeWithEnum, "StatusEnum");
+        Assert.assertTrue(statusParam.isEnum);
+        Assert.assertEquals(statusParam._enum.size(), 3);
+    }
+
+
     @Test(description = "handle required parameters from a 2.0 spec as required when figuring out Swagger types")
     public void requiredParametersTest() {
         final Swagger model = parseAndPrepareSwagger("src/test/resources/2_0/requiredTest.json");
@@ -141,6 +175,17 @@ public class CodegenTest {
         Assert.assertTrue(op.responses.get(0).isBinary);
     }
     
+    @Test(description = "discriminator is present")
+    public void discriminatorTest() {
+        final Swagger model = parseAndPrepareSwagger("src/test/resources/2_0/discriminatorTest.json");
+        final DefaultCodegen codegen = new DefaultCodegen();
+        final String path = "/pets";
+        final Operation p = model.getPaths().get(path).getGet();
+        final CodegenOperation op = codegen.fromOperation(path, "get", p, model.getDefinitions());
+
+        Assert.assertEquals(op.discriminator, "className");
+    }
+
     @Test(description = "use operation consumes and produces")
     public void localConsumesAndProducesTest() {
         final Swagger model = parseAndPrepareSwagger("src/test/resources/2_0/globalConsumesAndProduces.json");
@@ -189,7 +234,7 @@ public class CodegenTest {
 
     }
 
-    private Swagger parseAndPrepareSwagger(String path) {
+    private static Swagger parseAndPrepareSwagger(String path) {
         Swagger swagger = new SwaggerParser().read(path);
         // resolve inline models
         new InlineModelResolver().flatten(swagger);
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/DefaultGeneratorTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/DefaultGeneratorTest.java
index ed83c89c8f0..bfc25b8f5cc 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/DefaultGeneratorTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/DefaultGeneratorTest.java
@@ -52,12 +52,23 @@ public class DefaultGeneratorTest {
         gen.opts(clientOptInput);
         Map<String, List<CodegenOperation>> paths = gen.processPaths(swagger.getPaths());
 
-        CodegenSecurity apiKey, petstoreAuth;
+        CodegenSecurity cs, apiKey, petstoreAuth;
 
         // security of "getPetById": api_key
         CodegenOperation getPetById = findCodegenOperationByOperationId(paths, "getPetById");
-        assertEquals(getPetById.authMethods.size(), 1);
-        apiKey = getPetById.authMethods.iterator().next();
+        assertEquals(getPetById.authMethods.size(), 2);
+        cs = getPetById.authMethods.get(0);
+        if ("api_key".equals(cs.name)) {
+            apiKey = cs;
+            petstoreAuth = getPetById.authMethods.get(1);
+        } else {
+            petstoreAuth = cs;
+            apiKey = getPetById.authMethods.get(1);
+        }
+        assertEquals(petstoreAuth.name, "petstore_auth");
+        assertEquals(petstoreAuth.type, "oauth2");
+
+
         assertEquals(apiKey.name, "api_key");
         assertEquals(apiKey.type, "apiKey");
 
@@ -88,8 +99,17 @@ public class DefaultGeneratorTest {
 
         // security of "getPetById": api_key
         CodegenOperation getPetById = findCodegenOperationByOperationId(paths, "getPetById");
-        assertEquals(getPetById.authMethods.size(), 1);
-        apiKey = getPetById.authMethods.iterator().next();
+        assertEquals(getPetById.authMethods.size(), 2);
+        cs = getPetById.authMethods.get(0);
+        if ("api_key".equals(cs.name)) {
+            apiKey = cs;
+            petstoreAuth = getPetById.authMethods.get(1);
+        } else {
+            petstoreAuth = cs;
+            apiKey = getPetById.authMethods.get(1);
+        }
+        assertEquals(petstoreAuth.type, "oauth2");
+        assertEquals(petstoreAuth.name, "petstore_auth");
         assertEquals(apiKey.name, "api_key");
         assertEquals(apiKey.type, "apiKey");
 
@@ -164,8 +184,8 @@ public class DefaultGeneratorTest {
         changeContent(order);
         //delete file
         final File pom = new File(output, POM_FILE);
-        if (!pom.delete()) {
-            fail();
+        if (pom.exists() && !pom.delete()) {
+            fail("it doesn't delete");
         }
 
         //generate content third time with skipOverwrite flag, so changed file should not be rewritten
@@ -173,7 +193,8 @@ public class DefaultGeneratorTest {
         codegenConfig.setSkipOverwrite(true);
         new DefaultGenerator().opts(clientOptInput).generate();
         assertEquals(FileUtils.readFileToString(order, StandardCharsets.UTF_8), TEST_SKIP_OVERWRITE);
-        assertTrue(pom.exists());
+        // Disabling this check, it's not valid with the DefaultCodegen.writeOptional(...) arg
+//        assertTrue(pom.exists());
     }
 
     @Test
@@ -200,13 +221,13 @@ public class DefaultGeneratorTest {
         }
     }
 
-    private void changeContent(File file) throws IOException {
+    private static void changeContent(File file) throws IOException {
         Writer out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), UTF_8));
         out.write(TEST_SKIP_OVERWRITE);
         out.close();
     }
 
-    private CodegenOperation findCodegenOperationByOperationId(Map<String, List<CodegenOperation>> paths, String operationId) {
+    private static CodegenOperation findCodegenOperationByOperationId(Map<String, List<CodegenOperation>> paths, String operationId) {
         for (List<CodegenOperation> ops : paths.values()) {
             for (CodegenOperation co : ops) {
                 if (operationId.equals(co.operationId)) {
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/ExampleGeneratorTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/ExampleGeneratorTest.java
index 339b77badbd..d4c22b88aad 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/ExampleGeneratorTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/ExampleGeneratorTest.java
@@ -18,6 +18,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+@SuppressWarnings("static-method")
 public class ExampleGeneratorTest {
 
     @Test(description = "check handling of recursive models")
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/InlineModelResolverTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/InlineModelResolverTest.java
index f972711138b..f82e40bb41c 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/InlineModelResolverTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/InlineModelResolverTest.java
@@ -12,6 +12,7 @@ import java.util.Map;
 
 import static org.testng.AssertJUnit.*;
 
+@SuppressWarnings("static-method")
 public class InlineModelResolverTest {
     @Test
     public void resolveInlineModelTest() throws Exception {
@@ -178,7 +179,7 @@ public class InlineModelResolverTest {
         assertTrue(inner instanceof RefProperty);
 
         RefProperty rp = (RefProperty) inner;
-        
+
         assertEquals(rp.getType(), "ref");
         assertEquals(rp.get$ref(), "#/definitions/body");
         assertEquals(rp.getSimpleRef(), "body");
@@ -348,4 +349,287 @@ public class InlineModelResolverTest {
 
         Json.prettyPrint(swagger);
     }
+
+    @Test
+    public void testArbitraryObjectBodyParam() {
+        Swagger swagger = new Swagger();
+
+        swagger.path("/hello", new Path()
+                .get(new Operation()
+                        .parameter(new BodyParameter()
+                                .name("body")
+                                .schema(new ModelImpl()))));
+
+        new InlineModelResolver().flatten(swagger);
+
+        Operation operation = swagger.getPaths().get("/hello").getGet();
+        BodyParameter bp = (BodyParameter)operation.getParameters().get(0);
+        assertTrue(bp.getSchema() instanceof ModelImpl);
+        ModelImpl m = (ModelImpl) bp.getSchema();
+        assertNull(m.getType());
+    }
+
+    @Test
+    public void testArbitraryObjectBodyParamInline() {
+        Swagger swagger = new Swagger();
+
+        swagger.path("/hello", new Path()
+                .get(new Operation()
+                        .parameter(new BodyParameter()
+                                .name("body")
+                                .schema(new ModelImpl()
+                                        .property("arbitrary", new ObjectProperty())))));
+
+        new InlineModelResolver().flatten(swagger);
+
+        Operation operation = swagger.getPaths().get("/hello").getGet();
+        BodyParameter bp = (BodyParameter)operation.getParameters().get(0);
+        assertTrue(bp.getSchema() instanceof RefModel);
+
+        Model body = swagger.getDefinitions().get("body");
+        assertTrue(body instanceof ModelImpl);
+
+        ModelImpl impl = (ModelImpl) body;
+        Property p = impl.getProperties().get("arbitrary");
+        assertNotNull(p);
+        assertTrue(p instanceof ObjectProperty);
+    }
+
+    @Test
+    public void testArbitraryObjectBodyParamWithArray() {
+        Swagger swagger = new Swagger();
+
+        swagger.path("/hello", new Path()
+                .get(new Operation()
+                        .parameter(new BodyParameter()
+                                .name("body")
+                                .schema(new ArrayModel()
+                                        .items(new ObjectProperty())))));
+
+        new InlineModelResolver().flatten(swagger);
+
+        Parameter param = swagger.getPaths().get("/hello").getGet().getParameters().get(0);
+        assertTrue(param instanceof BodyParameter);
+
+        BodyParameter bp = (BodyParameter) param;
+        Model schema = bp.getSchema();
+
+        assertTrue(schema instanceof ArrayModel);
+
+        ArrayModel am = (ArrayModel) schema;
+        Property inner = am.getItems();
+        assertTrue(inner instanceof ObjectProperty);
+
+        ObjectProperty op = (ObjectProperty) inner;
+        assertNotNull(op);
+        assertNull(op.getProperties());
+    }
+
+    @Test
+    public void testArbitraryObjectBodyParamArrayInline() {
+        Swagger swagger = new Swagger();
+
+        swagger.path("/hello", new Path()
+                .get(new Operation()
+                        .parameter(new BodyParameter()
+                                .name("body")
+                                .schema(new ArrayModel()
+                                        .items(new ObjectProperty()
+                                            .property("arbitrary", new ObjectProperty()))))));
+
+        new InlineModelResolver().flatten(swagger);
+
+        Parameter param = swagger.getPaths().get("/hello").getGet().getParameters().get(0);
+        assertTrue(param instanceof BodyParameter);
+
+        BodyParameter bp = (BodyParameter) param;
+        Model schema = bp.getSchema();
+
+        assertTrue(schema instanceof ArrayModel);
+
+        ArrayModel am = (ArrayModel) schema;
+        Property inner = am.getItems();
+        assertTrue(inner instanceof RefProperty);
+
+        RefProperty rp = (RefProperty) inner;
+
+        assertEquals(rp.getType(), "ref");
+        assertEquals(rp.get$ref(), "#/definitions/body");
+        assertEquals(rp.getSimpleRef(), "body");
+
+        Model inline = swagger.getDefinitions().get("body");
+        assertNotNull(inline);
+        assertTrue(inline instanceof ModelImpl);
+        ModelImpl impl = (ModelImpl) inline;
+        Property p = impl.getProperties().get("arbitrary");
+        assertNotNull(p);
+        assertTrue(p instanceof ObjectProperty);
+    }
+
+    @Test
+    public void testArbitraryObjectResponse() {
+        Swagger swagger = new Swagger();
+
+        swagger.path("/foo/bar", new Path()
+            .get(new Operation()
+                    .response(200, new Response()
+                            .description("it works!")
+                            .schema(new ObjectProperty()))));
+        new InlineModelResolver().flatten(swagger);
+
+        Map<String, Response> responses = swagger.getPaths().get("/foo/bar").getGet().getResponses();
+
+        Response response = responses.get("200");
+        assertNotNull(response);
+        assertTrue(response.getSchema() instanceof ObjectProperty);
+        ObjectProperty op = (ObjectProperty) response.getSchema();
+        assertNull(op.getProperties());
+    }
+
+    @Test
+    public void testArbitraryObjectResponseArray() {
+        Swagger swagger = new Swagger();
+
+        swagger.path("/foo/baz", new Path()
+                .get(new Operation()
+                        .response(200, new Response()
+                                .description("it works!")
+                                .schema(new ArrayProperty()
+                                        .items(new ObjectProperty())))));
+        new InlineModelResolver().flatten(swagger);
+
+        Response response = swagger.getPaths().get("/foo/baz").getGet().getResponses().get("200");
+        assertTrue(response.getSchema() instanceof ArrayProperty);
+
+        ArrayProperty am = (ArrayProperty) response.getSchema();
+        Property items = am.getItems();
+        assertTrue(items instanceof ObjectProperty);
+        ObjectProperty op = (ObjectProperty) items;
+        assertNull(op.getProperties());
+    }
+
+    @Test
+    public void testArbitraryObjectResponseArrayInline() {
+        Swagger swagger = new Swagger();
+
+        swagger.path("/foo/baz", new Path()
+                .get(new Operation()
+                        .response(200, new Response()
+                                .vendorExtension("x-foo", "bar")
+                                .description("it works!")
+                                .schema(new ArrayProperty()
+                                        .items(new ObjectProperty()
+                                            .property("arbitrary", new ObjectProperty()))))));
+
+        new InlineModelResolver().flatten(swagger);
+
+        Response response = swagger.getPaths().get("/foo/baz").getGet().getResponses().get("200");
+        assertNotNull(response);
+
+        assertNotNull(response.getSchema());
+        Property responseProperty = response.getSchema();
+        assertTrue(responseProperty instanceof ArrayProperty);
+
+        ArrayProperty ap = (ArrayProperty) responseProperty;
+        Property p = ap.getItems();
+        assertNotNull(p);
+
+        RefProperty rp = (RefProperty) p;
+        assertEquals(rp.getType(), "ref");
+        assertEquals(rp.get$ref(), "#/definitions/inline_response_200");
+        assertEquals(rp.getSimpleRef(), "inline_response_200");
+
+        Model inline = swagger.getDefinitions().get("inline_response_200");
+        assertNotNull(inline);
+        assertTrue(inline instanceof ModelImpl);
+        ModelImpl impl = (ModelImpl) inline;
+        Property inlineProp = impl.getProperties().get("arbitrary");
+        assertNotNull(inlineProp);
+        assertTrue(inlineProp instanceof ObjectProperty);
+        ObjectProperty op = (ObjectProperty) inlineProp;
+        assertNull(op.getProperties());
+    }
+
+    @Test
+    public void testArbitraryObjectResponseMapInline() {
+        Swagger swagger = new Swagger();
+
+        MapProperty schema = new MapProperty();
+        schema.setAdditionalProperties(new ObjectProperty());
+
+        swagger.path("/foo/baz", new Path()
+                .get(new Operation()
+                        .response(200, new Response()
+                                .description("it works!")
+                                .schema(schema))));
+        new InlineModelResolver().flatten(swagger);
+
+        Response response = swagger.getPaths().get("/foo/baz").getGet().getResponses().get("200");
+
+        Property property = response.getSchema();
+        assertTrue(property instanceof MapProperty);
+        assertTrue(swagger.getDefinitions().size() == 0);
+        Property inlineProp = ((MapProperty) property).getAdditionalProperties();
+        assertTrue(inlineProp instanceof ObjectProperty);
+        ObjectProperty op = (ObjectProperty) inlineProp;
+        assertNull(op.getProperties());
+    }
+
+    @Test
+    public void testArbitraryObjectModelInline() {
+        Swagger swagger = new Swagger();
+
+        swagger.addDefinition("User", new ModelImpl()
+                .name("user")
+                .description("a common user")
+                .property("name", new StringProperty())
+                .property("arbitrary", new ObjectProperty()
+                        .title("title")
+                        ._default("default")
+                        .access("access")
+                        .readOnly(false)
+                        .required(true)
+                        .description("description")
+                        .name("name")));
+
+        new InlineModelResolver().flatten(swagger);
+
+        ModelImpl user = (ModelImpl)swagger.getDefinitions().get("User");
+        assertNotNull(user);
+        Property inlineProp = user.getProperties().get("arbitrary");
+        assertTrue(inlineProp instanceof ObjectProperty);
+        ObjectProperty op = (ObjectProperty) inlineProp;
+        assertNull(op.getProperties());
+    }
+
+    @Test
+    public void testArbitraryObjectModelWithArrayInline() {
+        Swagger swagger = new Swagger();
+
+        swagger.addDefinition("User", new ArrayModel()
+                .items(new ObjectProperty()
+                        .title("title")
+                        ._default("default")
+                        .access("access")
+                        .readOnly(false)
+                        .required(true)
+                        .description("description")
+                        .name("name")
+                        .property("arbitrary", new ObjectProperty())));
+
+        new InlineModelResolver().flatten(swagger);
+
+        Model model = swagger.getDefinitions().get("User");
+        assertTrue(model instanceof ArrayModel);
+        ArrayModel am = (ArrayModel) model;
+        Property inner = am.getItems();
+        assertTrue(inner instanceof RefProperty);
+
+        ModelImpl userInner = (ModelImpl)swagger.getDefinitions().get("User_inner");
+        assertNotNull(userInner);
+        Property inlineProp = userInner.getProperties().get("arbitrary");
+        assertTrue(inlineProp instanceof ObjectProperty);
+        ObjectProperty op = (ObjectProperty) inlineProp;
+        assertNull(op.getProperties());
+    }
 }
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/SwaggerMigratorTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/SwaggerMigratorTest.java
index 2a7e9ec532a..cf19c2058c4 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/SwaggerMigratorTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/SwaggerMigratorTest.java
@@ -5,6 +5,7 @@ import io.swagger.parser.SwaggerParser;
 
 import org.testng.annotations.Test;
 
+@SuppressWarnings("static-method")
 public class SwaggerMigratorTest {
 
     @Test(description = "read a 1.2 spec")
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/akkascala/AkkaScalaClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/akkascala/AkkaScalaClientOptionsTest.java
index 1b6f878b512..7ad1ff07e2b 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/akkascala/AkkaScalaClientOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/akkascala/AkkaScalaClientOptionsTest.java
@@ -22,6 +22,7 @@ public class AkkaScalaClientOptionsTest extends AbstractOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/android/AndroidClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/android/AndroidClientOptionsTest.java
index 26d55d7e9b2..538614436f4 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/android/AndroidClientOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/android/AndroidClientOptionsTest.java
@@ -22,6 +22,7 @@ public class AndroidClientOptionsTest extends AbstractOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/aspnet5/AspNet5ServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/aspnet5/AspNet5ServerOptionsTest.java
new file mode 100644
index 00000000000..f42eee01fe0
--- /dev/null
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/aspnet5/AspNet5ServerOptionsTest.java
@@ -0,0 +1,42 @@
+package io.swagger.codegen.aspnet5;
+
+import io.swagger.codegen.AbstractOptionsTest;
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.languages.AspNet5ServerCodegen;
+import io.swagger.codegen.options.AspNet5ServerOptionsProvider;
+import mockit.Expectations;
+import mockit.Tested;
+
+public class AspNet5ServerOptionsTest extends AbstractOptionsTest {
+
+    @Tested
+    private AspNet5ServerCodegen serverCodegen;
+
+    public AspNet5ServerOptionsTest() {
+        super(new AspNet5ServerOptionsProvider());
+    }
+
+    @Override
+    protected CodegenConfig getCodegenConfig() {
+        return serverCodegen;
+    }
+
+    @SuppressWarnings("unused")
+    @Override
+    protected void setExpectations() {
+        new Expectations(serverCodegen) {{
+            serverCodegen.setPackageName(AspNet5ServerOptionsProvider.PACKAGE_NAME_VALUE);
+            times = 1;
+            serverCodegen.setPackageVersion(AspNet5ServerOptionsProvider.PACKAGE_VERSION_VALUE);
+            times = 1;
+            serverCodegen.setSourceFolder(AspNet5ServerOptionsProvider.SOURCE_FOLDER_VALUE);
+            times = 1;
+            serverCodegen.useDateTimeOffset(true);
+            times = 1;
+            serverCodegen.setUseCollection(false);
+            times = 1;
+            serverCodegen.setReturnICollection(false);
+            times = 1;
+        }};
+    }
+}
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/asyncscala/AsyncScalaClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/asyncscala/AsyncScalaClientOptionsTest.java
index b6b90ae7a7c..8ea0280434a 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/asyncscala/AsyncScalaClientOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/asyncscala/AsyncScalaClientOptionsTest.java
@@ -22,6 +22,7 @@ public class AsyncScalaClientOptionsTest extends AbstractOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/config/CodegenConfiguratorTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/config/CodegenConfiguratorTest.java
index 2245f2f5877..6f39eb1af99 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/config/CodegenConfiguratorTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/config/CodegenConfiguratorTest.java
@@ -25,6 +25,7 @@ import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
+@SuppressWarnings("static-method")
 public class CodegenConfiguratorTest {
 
     @Mocked
@@ -45,6 +46,7 @@ public class CodegenConfiguratorTest {
     @Tested
     CodegenConfigurator configurator;
 
+    @SuppressWarnings("unused")
     @Test
     public void testVerbose() throws Exception {
 
@@ -75,6 +77,7 @@ public class CodegenConfiguratorTest {
         assertValueInMap(clientOptInput.getConfig().additionalProperties(), CodegenConstants.TEMPLATE_DIR, toAbsolutePathDir(templateDir));
     }
 
+    @SuppressWarnings("unused")
     @Test
     public void testSystemProperties() throws Exception {
 
@@ -286,6 +289,7 @@ public class CodegenConfiguratorTest {
         assertValueInMap(configurator.getDynamicProperties(), CodegenConstants.LOCAL_VARIABLE_PREFIX, "_");
     }
 
+    @SuppressWarnings("unused")
     private ClientOptInput setupAndRunGenericTest(CodegenConfigurator configurator) {
 
         final String spec = "swagger.yaml";
@@ -315,10 +319,11 @@ public class CodegenConfiguratorTest {
         return result;
     }
 
-    private String toAbsolutePathDir(String outputDir) {
+    private static String toAbsolutePathDir(String outputDir) {
         return Paths.get(outputDir).toAbsolutePath().toAbsolutePath().toString();
     }
 
+    @SuppressWarnings("unused")
     private void setupStandardExpectations(final String spec, final String languageName, final String auth, final CodegenConfig config) {
 
         new StrictExpectations() {{
@@ -339,7 +344,7 @@ public class CodegenConfiguratorTest {
         }};
     }
 
-    private void assertValueInMap(Map map, String propertyKey, String expectedPropertyValue) {
+    private static void assertValueInMap(Map<?, ?> map, String propertyKey, String expectedPropertyValue) {
         assertTrue(map.containsKey(propertyKey));
         assertEquals(map.get(propertyKey), expectedPropertyValue);
     }
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpClientOptionsTest.java
index ec5246f7723..71975fcee66 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpClientOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpClientOptionsTest.java
@@ -22,6 +22,7 @@ public class CSharpClientOptionsTest extends AbstractOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
@@ -31,6 +32,22 @@ public class CSharpClientOptionsTest extends AbstractOptionsTest {
             times = 1;
             clientCodegen.setPackageVersion(CSharpClientOptionsProvider.PACKAGE_VERSION_VALUE);
             times = 1;
+            clientCodegen.setOptionalAssemblyInfoFlag(true);
+            times = 1;
+            clientCodegen.setSourceFolder(CSharpClientOptionsProvider.SOURCE_FOLDER_VALUE);
+            times = 1;
+            clientCodegen.useDateTimeOffset(true);
+            times = 1;
+            clientCodegen.setOptionalProjectFileFlag(true);
+            times = 1;
+            clientCodegen.setPackageGuid(CSharpClientOptionsProvider.PACKAGE_GUID_VALUE);
+            times = 1;
+            clientCodegen.setUseCollection(false);
+            times = 1;
+            clientCodegen.setReturnICollection(false);
+            times = 1;
+            clientCodegen.setOptionalEmitDefaultValue(true);
+            times = 1;
         }};
     }
 }
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpModelTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpModelTest.java
new file mode 100644
index 00000000000..236bd44e32b
--- /dev/null
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpModelTest.java
@@ -0,0 +1,334 @@
+package io.swagger.codegen.csharp;
+
+import io.swagger.codegen.CodegenModel;
+import io.swagger.codegen.CodegenProperty;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.languages.CSharpClientCodegen;
+import io.swagger.models.ArrayModel;
+import io.swagger.models.Model;
+import io.swagger.models.ModelImpl;
+import io.swagger.models.Path;
+import io.swagger.models.Swagger;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.DateTimeProperty;
+import io.swagger.models.properties.LongProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.RefProperty;
+import io.swagger.models.properties.StringProperty;
+import io.swagger.parser.SwaggerParser;
+
+import com.google.common.collect.Sets;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.util.Map;
+
+@SuppressWarnings("static-method")
+public class CSharpModelTest {
+
+    @Test(description = "convert a model with array property to default List<T>")
+    public void arrayPropertyTest() {
+        final Model model = getArrayTestModel();
+
+        final DefaultCodegen codegen = new CSharpClientCodegen();
+        final CodegenModel generated = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(generated.name, "sample");
+        Assert.assertEquals(generated.classname, "Sample");
+        Assert.assertEquals(generated.description, "a sample model");
+        Assert.assertEquals(generated.vars.size(), 2);
+
+        final CodegenProperty property = generated.vars.get(1);
+        Assert.assertEquals(property.baseName, "examples");
+        Assert.assertEquals(property.getter, "getExamples");
+        Assert.assertEquals(property.setter, "setExamples");
+        Assert.assertEquals(property.datatype, "List<string>");
+        Assert.assertEquals(property.name, "Examples");
+        Assert.assertEquals(property.defaultValue, null);
+        Assert.assertEquals(property.baseType, "List");
+        Assert.assertEquals(property.containerType, "array");
+        Assert.assertNull(property.required);
+        Assert.assertTrue(property.isContainer);
+    }
+
+    @Test(description = "convert a model with array property to Collection<T>")
+    public void arrayPropertyCollectionOptionTest() {
+        final Model model = getArrayTestModel();
+
+        final CSharpClientCodegen codegen = new CSharpClientCodegen();
+        codegen.setUseCollection(true);
+
+        final CodegenModel generated = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(generated.name, "sample");
+        Assert.assertEquals(generated.vars.size(), 2);
+
+        final CodegenProperty property = generated.vars.get(1);
+        Assert.assertEquals(property.baseName, "examples");
+        Assert.assertEquals(property.name, "Examples");
+        Assert.assertEquals(property.defaultValue, null);
+        Assert.assertEquals(property.datatype, "Collection<string>");
+        Assert.assertEquals(property.baseType, "Collection");
+        Assert.assertEquals(property.containerType, "array");
+        Assert.assertNull(property.required);
+        Assert.assertTrue(property.isContainer);
+    }
+
+    @Test(description = "convert a model with array property to Collection<T>")
+    public void arrayPropertyICollectionOptionTest() {
+        final Model model = getArrayTestModel();
+
+        final CSharpClientCodegen codegen = new CSharpClientCodegen();
+        codegen.setUseCollection(true);
+        codegen.setReturnICollection(true);
+
+        final CodegenModel generated = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(generated.name, "sample");
+        Assert.assertEquals(generated.vars.size(), 2);
+
+        final CodegenProperty property = generated.vars.get(1);
+        Assert.assertEquals(property.baseName, "examples");
+        Assert.assertEquals(property.name, "Examples");
+        Assert.assertEquals(property.datatype, "Collection<string>",
+                "returnICollection option should not modify property datatype");
+        Assert.assertEquals(property.defaultValue, null);
+        Assert.assertEquals(property.baseType, "Collection",
+                "returnICollection option should not modify property baseType");
+        Assert.assertEquals(property.containerType, "array");
+        Assert.assertNull(property.required);
+        Assert.assertTrue(property.isContainer);
+    }
+
+    private Model getArrayTestModel() {
+        return new ModelImpl()
+                .description("a sample model")
+                .property("id", new LongProperty())
+                .property("examples", new ArrayProperty().items(new StringProperty()))
+                .required("id");
+    }
+
+    @Test(description = "convert a simple model")
+    public void simpleModelTest() {
+        final Model model = new ModelImpl()
+                .description("a sample model")
+                .property("id", new LongProperty())
+                .property("name", new StringProperty())
+                .property("createdAt", new DateTimeProperty())
+                .required("id")
+                .required("name");
+        final DefaultCodegen codegen = new CSharpClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "a sample model");
+        Assert.assertEquals(cm.vars.size(), 3);
+
+        final CodegenProperty property1 = cm.vars.get(0);
+        Assert.assertEquals(property1.baseName, "id");
+        Assert.assertEquals(property1.datatype, "long?");
+        Assert.assertEquals(property1.name, "Id");
+        Assert.assertNull(property1.defaultValue);
+        Assert.assertEquals(property1.baseType, "long?");
+        Assert.assertTrue(property1.hasMore);
+        Assert.assertTrue(property1.required);
+        Assert.assertTrue(property1.isPrimitiveType);
+        Assert.assertTrue(property1.isNotContainer);
+
+        final CodegenProperty property2 = cm.vars.get(1);
+        Assert.assertEquals(property2.baseName, "name");
+        Assert.assertEquals(property2.datatype, "string");
+        Assert.assertEquals(property2.name, "Name");
+        Assert.assertNull(property2.defaultValue);
+        Assert.assertEquals(property2.baseType, "string");
+        Assert.assertTrue(property2.hasMore);
+        Assert.assertTrue(property2.required);
+        Assert.assertTrue(property2.isPrimitiveType);
+        Assert.assertTrue(property2.isNotContainer);
+
+        final CodegenProperty property3 = cm.vars.get(2);
+        Assert.assertEquals(property3.baseName, "createdAt");
+        Assert.assertEquals(property3.datatype, "DateTime?");
+        Assert.assertEquals(property3.name, "CreatedAt");
+        Assert.assertNull(property3.defaultValue);
+        Assert.assertEquals(property3.baseType, "DateTime?");
+        Assert.assertNull(property3.hasMore);
+        Assert.assertNull(property3.required);
+        Assert.assertTrue(property3.isNotContainer);
+    }
+
+    @Test(description = "convert a model with list property")
+    public void listPropertyTest() {
+        final Model model = new ModelImpl()
+                .description("a sample model")
+                .property("id", new LongProperty())
+                .property("urls", new ArrayProperty()
+                        .items(new StringProperty()))
+                .required("id");
+        final DefaultCodegen codegen = new CSharpClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "a sample model");
+        Assert.assertEquals(cm.vars.size(), 2);
+
+        final CodegenProperty property1 = cm.vars.get(0);
+        Assert.assertEquals(property1.baseName, "id");
+        Assert.assertEquals(property1.datatype, "long?");
+        Assert.assertEquals(property1.name, "Id");
+        Assert.assertNull(property1.defaultValue);
+        Assert.assertEquals(property1.baseType, "long?");
+        Assert.assertTrue(property1.hasMore);
+        Assert.assertTrue(property1.required);
+        Assert.assertTrue(property1.isPrimitiveType);
+        Assert.assertTrue(property1.isNotContainer);
+
+        final CodegenProperty property2 = cm.vars.get(1);
+        Assert.assertEquals(property2.baseName, "urls");
+        Assert.assertEquals(property2.datatype, "List<string>");
+        Assert.assertEquals(property2.name, "Urls");
+        Assert.assertNull(property2.defaultValue);
+        Assert.assertEquals(property2.baseType, "List");
+        Assert.assertNull(property2.hasMore);
+        Assert.assertEquals(property2.containerType, "array");
+        Assert.assertNull(property2.required);
+        Assert.assertTrue(property2.isPrimitiveType);
+        Assert.assertTrue(property2.isContainer);
+    }
+
+    @Test(description = "convert a model with a map property")
+    public void mapPropertyTest() {
+        final Model model = new ModelImpl()
+                .description("a sample model")
+                .property("translations", new MapProperty()
+                        .additionalProperties(new StringProperty()))
+                .required("id");
+        final DefaultCodegen codegen = new CSharpClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "a sample model");
+        Assert.assertEquals(cm.vars.size(), 1);
+
+        final CodegenProperty property1 = cm.vars.get(0);
+        Assert.assertEquals(property1.baseName, "translations");
+        Assert.assertEquals(property1.datatype, "Dictionary<string, string>");
+        Assert.assertEquals(property1.name, "Translations");
+        Assert.assertEquals(property1.baseType, "Dictionary");
+        Assert.assertEquals(property1.containerType, "map");
+        Assert.assertNull(property1.required);
+        Assert.assertTrue(property1.isContainer);
+        Assert.assertTrue(property1.isPrimitiveType);
+    }
+
+    @Test(description = "convert a model with complex property")
+    public void complexPropertyTest() {
+        final Model model = new ModelImpl()
+                .description("a sample model")
+                .property("children", new RefProperty("#/definitions/Children"));
+        final DefaultCodegen codegen = new CSharpClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "a sample model");
+        Assert.assertEquals(cm.vars.size(), 1);
+
+        final CodegenProperty property1 = cm.vars.get(0);
+        Assert.assertEquals(property1.baseName, "children");
+        Assert.assertEquals(property1.datatype, "Children");
+        Assert.assertEquals(property1.name, "Children");
+        Assert.assertEquals(property1.baseType, "Children");
+        Assert.assertNull(property1.required);
+        Assert.assertTrue(property1.isNotContainer);
+    }
+
+    @Test(description = "convert a model with complex list property")
+    public void complexListPropertyTest() {
+        final Model model = new ModelImpl()
+                .description("a sample model")
+                .property("children", new ArrayProperty()
+                        .items(new RefProperty("#/definitions/Children")));
+        final DefaultCodegen codegen = new CSharpClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "a sample model");
+        Assert.assertEquals(cm.vars.size(), 1);
+
+        final CodegenProperty property1 = cm.vars.get(0);
+        Assert.assertEquals(property1.baseName, "children");
+        Assert.assertEquals(property1.complexType, "Children");
+        Assert.assertEquals(property1.datatype, "List<Children>");
+        Assert.assertEquals(property1.name, "Children");
+        Assert.assertEquals(property1.baseType, "List");
+        Assert.assertEquals(property1.containerType, "array");
+        Assert.assertNull(property1.required);
+        Assert.assertTrue(property1.isContainer);
+    }
+
+    @Test(description = "convert a model with complex map property")
+    public void complexMapPropertyTest() {
+        final Model model = new ModelImpl()
+                .description("a sample model")
+                .property("children", new MapProperty()
+                        .additionalProperties(new RefProperty("#/definitions/Children")));
+        final DefaultCodegen codegen = new CSharpClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "a sample model");
+        Assert.assertEquals(cm.vars.size(), 1);
+        Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("Children")).size(), 1);
+
+        final CodegenProperty property1 = cm.vars.get(0);
+        Assert.assertEquals(property1.baseName, "children");
+        Assert.assertEquals(property1.complexType, "Children");
+        Assert.assertEquals(property1.datatype, "Dictionary<string, Children>");
+        Assert.assertEquals(property1.name, "Children");
+        Assert.assertEquals(property1.baseType, "Dictionary");
+        Assert.assertEquals(property1.containerType, "map");
+        Assert.assertNull(property1.required);
+        Assert.assertTrue(property1.isContainer);
+        Assert.assertNull(property1.isNotContainer);
+    }
+
+    @Test(description = "convert an array model")
+    public void arrayModelTest() {
+        final Model model = new ArrayModel()
+                .description("an array model")
+                .items(new RefProperty("#/definitions/Children"));
+        final DefaultCodegen codegen = new CSharpClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "an array model");
+        Assert.assertEquals(cm.vars.size(), 0);
+        Assert.assertEquals(cm.parent, "List<Children>");
+        Assert.assertEquals(cm.imports.size(), 1);
+        Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("Children")).size(), 1);
+    }
+
+    @Test(description = "convert an map model")
+    public void mapModelTest() {
+        final Model model = new ModelImpl()
+                .description("a map model")
+                .additionalProperties(new RefProperty("#/definitions/Children"));
+        final DefaultCodegen codegen = new CSharpClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "a map model");
+        Assert.assertEquals(cm.vars.size(), 0);
+        Assert.assertEquals(cm.parent, "Dictionary<String, Children>");
+        Assert.assertEquals(cm.imports.size(), 1);
+        Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("Children")).size(), 1);
+    }
+}
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharpdotnettwo/CsharpDotNet2ClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharpdotnettwo/CsharpDotNet2ClientOptionsTest.java
index 7e30e2b1cd0..cb3854e2bd8 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharpdotnettwo/CsharpDotNet2ClientOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharpdotnettwo/CsharpDotNet2ClientOptionsTest.java
@@ -22,6 +22,7 @@ public class CsharpDotNet2ClientOptionsTest extends AbstractOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/dart/DartClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/dart/DartClientOptionsTest.java
index b002fd99978..519ac4943cc 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/dart/DartClientOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/dart/DartClientOptionsTest.java
@@ -22,6 +22,7 @@ public class DartClientOptionsTest extends AbstractOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/flash/FlashClienOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/flash/FlashClienOptionsTest.java
index 21a9cb5e03b..d3debf29579 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/flash/FlashClienOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/flash/FlashClienOptionsTest.java
@@ -8,8 +8,6 @@ import io.swagger.codegen.options.FlashClienOptionsProvider;
 import mockit.Expectations;
 import mockit.Tested;
 
-import java.util.Map;
-
 public class FlashClienOptionsTest extends AbstractOptionsTest {
 
     @Tested
@@ -24,6 +22,7 @@ public class FlashClienOptionsTest extends AbstractOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/haskellservant/HaskellServantOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/haskellservant/HaskellServantOptionsTest.java
new file mode 100644
index 00000000000..d5848e47cae
--- /dev/null
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/haskellservant/HaskellServantOptionsTest.java
@@ -0,0 +1,36 @@
+package io.swagger.codegen.haskellservant;
+
+import io.swagger.codegen.AbstractOptionsTest;
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.languages.HaskellServantCodegen;
+import io.swagger.codegen.options.HaskellServantOptionsProvider;
+
+import mockit.Expectations;
+import mockit.Tested;
+
+public class HaskellServantOptionsTest extends AbstractOptionsTest {
+
+    @Tested
+    private HaskellServantCodegen clientCodegen;
+
+    public HaskellServantOptionsTest() {
+        super(new HaskellServantOptionsProvider());
+    }
+
+    @Override
+    protected CodegenConfig getCodegenConfig() {
+        return clientCodegen;
+    }
+
+    @Override
+    protected void setExpectations() {
+        new Expectations(clientCodegen) {{
+            clientCodegen.setModelPackage(HaskellServantOptionsProvider.MODEL_PACKAGE_VALUE);
+            times = 1;
+            clientCodegen.setApiPackage(HaskellServantOptionsProvider.API_PACKAGE_VALUE);
+            times = 1;
+            clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(HaskellServantOptionsProvider.SORT_PARAMS_VALUE));
+            times = 1;
+        }};
+    }
+}
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/haskellservant/HaskellTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/haskellservant/HaskellTest.java
new file mode 100644
index 00000000000..e371a4f311e
--- /dev/null
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/haskellservant/HaskellTest.java
@@ -0,0 +1,20 @@
+package io.swagger.codegen.haskellservant;
+
+import io.swagger.codegen.CodegenModel;
+import io.swagger.codegen.CodegenOperation;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.languages.HaskellServantCodegen;
+import io.swagger.models.Operation;
+import io.swagger.models.Swagger;
+import io.swagger.parser.SwaggerParser;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class HaskellTest {
+
+    @Test(description = "convert a haskell model with dots")
+    public void modelTest() {
+        Assert.assertEquals(true, true);
+    }
+}
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/inflector/JavaInflectorServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/inflector/JavaInflectorServerOptionsTest.java
index 8c54a382993..0987a0d236e 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/inflector/JavaInflectorServerOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/inflector/JavaInflectorServerOptionsTest.java
@@ -21,6 +21,7 @@ public class JavaInflectorServerOptionsTest extends JavaClientOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
@@ -44,7 +45,7 @@ public class JavaInflectorServerOptionsTest extends JavaClientOptionsTest {
             times = 1;
             clientCodegen.setSerializableModel(Boolean.valueOf(JavaInflectorServerOptionsProvider.SERIALIZABLE_MODEL_VALUE));
             times = 1;
-            clientCodegen.setLibrary(JavaInflectorServerOptionsProvider.LIBRARY_VALUE);
+            clientCodegen.setLibrary(JavaInflectorServerOptionsProvider.DEFAULT_LIBRARY_VALUE);
             times = 1;
             clientCodegen.setFullJavaUtil(Boolean.valueOf(JavaInflectorServerOptionsProvider.FULL_JAVA_UTIL_VALUE));
             times = 1;
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java
index 29166bc8750..701f9586eec 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java
@@ -27,6 +27,7 @@ public class JavaClientOptionsTest extends AbstractOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
@@ -50,7 +51,7 @@ public class JavaClientOptionsTest extends AbstractOptionsTest {
             times = 1;
             clientCodegen.setSerializableModel(Boolean.valueOf(JavaOptionsProvider.SERIALIZABLE_MODEL_VALUE));
             times = 1;
-            clientCodegen.setLibrary(JavaOptionsProvider.LIBRARY_VALUE);
+            clientCodegen.setLibrary(JavaOptionsProvider.DEFAULT_LIBRARY_VALUE);
             times = 1;
             clientCodegen.setFullJavaUtil(Boolean.valueOf(JavaOptionsProvider.FULL_JAVA_UTIL_VALUE));
             times = 1;
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaInheritanceTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaInheritanceTest.java
index 66b48cd6b89..dcd87b4d700 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaInheritanceTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaInheritanceTest.java
@@ -15,6 +15,7 @@ import org.testng.annotations.Test;
 
 public class JavaInheritanceTest {
 
+    @SuppressWarnings("static-method")
     @Test(description = "convert a composed model")
     public void javaInheritanceTest() {
         final Model model = new ComposedModel().parent(new RefModel("Base"))
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelEnumTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelEnumTest.java
index 2babdc189e1..5ac5f788590 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelEnumTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelEnumTest.java
@@ -18,6 +18,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
+@SuppressWarnings("static-method")
 public class JavaModelEnumTest {
 
     @Test(description = "convert a java model with an enum")
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelTest.java
index dc815e351aa..d69b2361db1 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelTest.java
@@ -20,10 +20,12 @@ import io.swagger.models.properties.StringProperty;
 
 import com.google.common.collect.Sets;
 import org.testng.Assert;
+import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import java.util.List;
 
+@SuppressWarnings("static-method")
 public class JavaModelTest {
 
     @Test(description = "convert a simple java model")
@@ -31,7 +33,8 @@ public class JavaModelTest {
         final Model model = new ModelImpl()
                 .description("a sample model")
                 .property("id", new LongProperty())
-                .property("name", new StringProperty())
+                .property("name", new StringProperty()
+                        .example("Tony"))
                 .property("createdAt", new DateTimeProperty())
                 .required("id")
                 .required("name");
@@ -65,6 +68,7 @@ public class JavaModelTest {
         Assert.assertEquals(property2.name, "name");
         Assert.assertEquals(property2.defaultValue, "null");
         Assert.assertEquals(property2.baseType, "String");
+        Assert.assertEquals(property2.example, "Tony");
         Assert.assertTrue(property2.hasMore);
         Assert.assertTrue(property2.required);
         Assert.assertTrue(property2.isNotContainer);
@@ -283,8 +287,8 @@ public class JavaModelTest {
         Assert.assertEquals(cm.description, "an array model");
         Assert.assertEquals(cm.vars.size(), 0);
         Assert.assertEquals(cm.parent, "ArrayList<Children>");
-        Assert.assertEquals(cm.imports.size(), 3);
-        Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("List", "ArrayList", "Children")).size(), 3);
+        Assert.assertEquals(cm.imports.size(), 4);
+        Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("ApiModel", "List", "ArrayList", "Children")).size(), 4);
     }
 
     @Test(description = "convert an map model")
@@ -300,8 +304,8 @@ public class JavaModelTest {
         Assert.assertEquals(cm.description, "an map model");
         Assert.assertEquals(cm.vars.size(), 0);
         Assert.assertEquals(cm.parent, "HashMap<String, Children>");
-        Assert.assertEquals(cm.imports.size(), 3);
-        Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("Map", "HashMap", "Children")).size(), 3);
+        Assert.assertEquals(cm.imports.size(), 4);
+        Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("ApiModel", "Map", "HashMap", "Children")).size(), 4);
     }
 
     @Test(description = "convert a model with upper-case property names")
@@ -453,4 +457,28 @@ public class JavaModelTest {
 
         Assert.assertNull(cm.allowableValues);
     }
+
+    @DataProvider(name = "modelNames")
+    public static Object[][] primeNumbers() {
+        return new Object[][] {
+                {"sample", "Sample"},
+                {"sample_name", "SampleName"},
+                {"sample__name", "SampleName"},
+                {"/sample", "Sample"},
+                {"\\sample", "Sample"},
+                {"sample.name", "SampleName"},
+                {"_sample", "Sample"},
+                {"Sample", "Sample"},
+        };
+    }
+
+    @Test(dataProvider = "modelNames", description = "avoid inner class")
+    public void modelNameTest(String name, String expectedName) {
+        final Model model = new ModelImpl();
+        final DefaultCodegen codegen = new JavaClientCodegen();
+        final CodegenModel cm = codegen.fromModel(name, model);
+
+        Assert.assertEquals(cm.name, name);
+        Assert.assertEquals(cm.classname, expectedName);
+    }
 }
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/jaxrs/AllowableValuesTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/jaxrs/AllowableValuesTest.java
index 9ae5e6dc3e4..4a4e6ff9180 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/jaxrs/AllowableValuesTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/jaxrs/AllowableValuesTest.java
@@ -31,7 +31,7 @@ public class AllowableValuesTest {
     }
 
     @DataProvider(name = PROVIDER_NAME)
-    private Object[][] resource() {
+    private static Object[][] resource() {
         final CodegenParameter param1 = new CodegenParameter();
         final CodegenParameter param2 = new CodegenParameter() {{
             allowableValues = ImmutableMap.<String, Object>of("values", ImmutableList.of("item1", "item2", "item3"));
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/javascript/JavaScriptClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/javascript/JavaScriptClientOptionsTest.java
new file mode 100644
index 00000000000..927d4d7755b
--- /dev/null
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/javascript/JavaScriptClientOptionsTest.java
@@ -0,0 +1,71 @@
+package io.swagger.codegen.javascript;
+
+import io.swagger.codegen.AbstractOptionsTest;
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.options.JavaScriptOptionsProvider;
+import io.swagger.codegen.languages.JavascriptClientCodegen;
+import io.swagger.codegen.options.OptionsProvider;
+
+import mockit.Expectations;
+import mockit.Tested;
+
+public class JavaScriptClientOptionsTest extends AbstractOptionsTest {
+    @Tested
+    private JavascriptClientCodegen clientCodegen;
+
+    public JavaScriptClientOptionsTest() {
+        super(new JavaScriptOptionsProvider());
+    }
+
+    protected JavaScriptClientOptionsTest(OptionsProvider optionsProvider) {
+        super(optionsProvider);
+    }
+
+    @Override
+    protected CodegenConfig getCodegenConfig() {
+        return clientCodegen;
+    }
+
+    @Override
+    protected void setExpectations() {
+        // Commented generic options not yet supported by JavaScript codegen.
+        new Expectations(clientCodegen) {{
+            clientCodegen.setModelPackage(JavaScriptOptionsProvider.MODEL_PACKAGE_VALUE);
+            times = 1;
+            clientCodegen.setApiPackage(JavaScriptOptionsProvider.API_PACKAGE_VALUE);
+            times = 1;
+            clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(JavaScriptOptionsProvider.SORT_PARAMS_VALUE));
+            times = 1;
+//            clientCodegen.setInvokerPackage(JavaScriptOptionsProvider.INVOKER_PACKAGE_VALUE);
+//            times = 1;
+//            clientCodegen.setGroupId(JavaScriptOptionsProvider.GROUP_ID_VALUE);
+//            times = 1;
+//            clientCodegen.setArtifactId(JavaScriptOptionsProvider.ARTIFACT_ID_VALUE);
+//            times = 1;
+//            clientCodegen.setArtifactVersion(JavaScriptOptionsProvider.ARTIFACT_VERSION_VALUE);
+//            times = 1;
+            clientCodegen.setSourceFolder(JavaScriptOptionsProvider.SOURCE_FOLDER_VALUE);
+            times = 1;
+            clientCodegen.setLocalVariablePrefix(JavaScriptOptionsProvider.LOCAL_PREFIX_VALUE);
+            times = 1;
+            clientCodegen.setProjectName(JavaScriptOptionsProvider.PROJECT_NAME_VALUE);
+            times = 1;
+            clientCodegen.setModuleName(JavaScriptOptionsProvider.MODULE_NAME_VALUE);
+            times = 1;
+            clientCodegen.setProjectDescription(JavaScriptOptionsProvider.PROJECT_DESCRIPTION_VALUE);
+            times = 1;
+            clientCodegen.setProjectVersion(JavaScriptOptionsProvider.PROJECT_VERSION_VALUE);
+            times = 1;
+            clientCodegen.setProjectLicenseName(JavaScriptOptionsProvider.PROJECT_LICENSE_NAME_VALUE);
+            times = 1;
+            clientCodegen.setUsePromises(Boolean.valueOf(JavaScriptOptionsProvider.USE_PROMISES_VALUE));
+            times = 1;
+            clientCodegen.setUseInheritance(Boolean.valueOf(JavaScriptOptionsProvider.USE_INHERITANCE_VALUE));
+            times = 1;
+            clientCodegen.setEmitModelMethods(Boolean.valueOf(JavaScriptOptionsProvider.EMIT_MODEL_METHODS_VALUE));
+            times = 1;
+            clientCodegen.setEmitJSDoc(Boolean.valueOf(JavaScriptOptionsProvider.EMIT_JS_DOC_VALUE));
+            times = 1;
+        }};
+    }
+}
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/javascript/JavaScriptInheritanceTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/javascript/JavaScriptInheritanceTest.java
new file mode 100644
index 00000000000..94285e46888
--- /dev/null
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/javascript/JavaScriptInheritanceTest.java
@@ -0,0 +1,102 @@
+package io.swagger.codegen.javascript;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.Sets;
+
+import io.swagger.codegen.CodegenModel;
+import io.swagger.codegen.languages.JavascriptClientCodegen;
+import io.swagger.models.ComposedModel;
+import io.swagger.models.Model;
+import io.swagger.models.ModelImpl;
+import io.swagger.models.RefModel;
+import io.swagger.models.properties.StringProperty;
+
+public class JavaScriptInheritanceTest {
+    @SuppressWarnings("static-method")
+    @Test(description = "convert a composed model with inheritance enabled")
+    public void javascriptInheritanceTest() {
+        ModelImpl base = new ModelImpl();
+        base.addProperty("baseProp", new StringProperty().required(true));
+        ModelImpl intf1 = new ModelImpl();
+        intf1.addProperty("intf1Prop", new StringProperty());
+        ModelImpl intf2 = new ModelImpl();
+        intf2.addProperty("intf2Prop", new StringProperty().required(true));
+        ModelImpl child = new ModelImpl();
+        child.addProperty("childProp", new StringProperty().required(true));
+
+        final Map<String, Model> allDefinitions = new HashMap<String, Model>();
+        allDefinitions.put("Base", base);
+        allDefinitions.put("Interface1", intf1);
+        allDefinitions.put("Interface2", intf2);
+
+        final Model model = new ComposedModel().parent(new RefModel("Base"))
+                .interfaces(Arrays.asList(new RefModel("Interface1"), new RefModel("Interface2")))
+                .child(child);
+
+        final JavascriptClientCodegen codegen = new JavascriptClientCodegen();
+        codegen.setUseInheritance(true);
+
+        final CodegenModel cm = codegen.fromModel("sample", model, allDefinitions);
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.parent, "Base");
+        Assert.assertEquals(cm.interfaces, Arrays.asList("Interface1", "Interface2"));
+        Assert.assertEquals(cm.imports, Sets.newHashSet("Base", "Interface1", "Interface2"));
+        Assert.assertEquals(cm.vars.size(), 1);
+        Assert.assertEquals(cm.vars.get(0).name, "childProp");
+        Assert.assertEquals(cm.allVars.size(), 4);
+        String[] allVars = {"baseProp", "intf1Prop", "intf2Prop", "childProp"};
+        for (int i = 0; i < allVars.length; i++) {
+            Assert.assertEquals(cm.allVars.get(i).name, allVars[i]);
+        }
+        Assert.assertEquals(cm.mandatory, Sets.newHashSet("childProp"));
+        Assert.assertEquals(cm.allMandatory, Sets.newHashSet("baseProp", "intf2Prop", "childProp"));
+    }
+
+    @SuppressWarnings("static-method")
+    @Test(description = "convert a composed model with inheritance disabled")
+    public void javascriptNoInheritanceTest() {
+        ModelImpl base = new ModelImpl();
+        base.addProperty("baseProp", new StringProperty().required(true));
+        ModelImpl intf1 = new ModelImpl();
+        intf1.addProperty("intf1Prop", new StringProperty());
+        ModelImpl intf2 = new ModelImpl();
+        intf2.addProperty("intf2Prop", new StringProperty().required(true));
+        ModelImpl child = new ModelImpl();
+        child.addProperty("childProp", new StringProperty().required(true));
+
+        final Map<String, Model> allDefinitions = new HashMap<String, Model>();
+        allDefinitions.put("Base", base);
+        allDefinitions.put("Interface1", intf1);
+        allDefinitions.put("Interface2", intf2);
+
+        final Model model = new ComposedModel().parent(new RefModel("Base"))
+                .interfaces(Arrays.asList(new RefModel("Interface1"), new RefModel("Interface2")))
+                .child(child);
+
+        final JavascriptClientCodegen codegen = new JavascriptClientCodegen();
+        codegen.setUseInheritance(false);
+
+        final CodegenModel cm = codegen.fromModel("sample", model, allDefinitions);
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.parent, "Base");
+        Assert.assertEquals(cm.interfaces, Arrays.asList("Interface1", "Interface2"));
+        Assert.assertEquals(cm.imports, Sets.newHashSet("Base", "Interface1", "Interface2"));
+        Assert.assertEquals(cm.vars.size(), 4);
+        Assert.assertEquals(cm.allVars.size(), 4);
+        String[] allVars = {"baseProp", "intf1Prop", "intf2Prop", "childProp"};
+        for (int i = 0; i < allVars.length; i++) {
+            Assert.assertEquals(cm.vars.get(i).name, allVars[i]);
+            Assert.assertEquals(cm.allVars.get(i).name, allVars[i]);
+        }
+        Assert.assertEquals(cm.mandatory, Sets.newHashSet("baseProp", "intf2Prop", "childProp"));
+        Assert.assertEquals(cm.allMandatory, Sets.newHashSet("baseProp", "intf2Prop", "childProp"));
+    }
+}
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/javascript/JavaScriptModelEnumTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/javascript/JavaScriptModelEnumTest.java
new file mode 100644
index 00000000000..5e2306d73fb
--- /dev/null
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/javascript/JavaScriptModelEnumTest.java
@@ -0,0 +1,95 @@
+package io.swagger.codegen.javascript;
+
+import io.swagger.codegen.CodegenModel;
+import io.swagger.codegen.CodegenProperty;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.languages.JavaClientCodegen;
+import io.swagger.codegen.languages.JavascriptClientCodegen;
+import io.swagger.models.ComposedModel;
+import io.swagger.models.Model;
+import io.swagger.models.ModelImpl;
+import io.swagger.models.RefModel;
+import io.swagger.models.properties.Property;
+import io.swagger.models.properties.StringProperty;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+@SuppressWarnings("static-method")
+public class JavaScriptModelEnumTest {
+    @Test(description = "convert a JavaScript model with an enum")
+    public void converterTest() {
+        final StringProperty enumProperty = new StringProperty();
+        enumProperty.setEnum(Arrays.asList("VALUE1", "VALUE2", "VALUE3"));
+        final ModelImpl model = new ModelImpl().property("name", enumProperty);
+
+        final DefaultCodegen codegen = new JavascriptClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.vars.size(), 1);
+
+        final CodegenProperty enumVar = cm.vars.get(0);
+        Assert.assertEquals(enumVar.baseName, "name");
+        Assert.assertEquals(enumVar.datatype, "String");
+        Assert.assertEquals(enumVar.datatypeWithEnum, "NameEnum");
+        Assert.assertEquals(enumVar.name, "name");
+        Assert.assertEquals(enumVar.defaultValue, null);
+        Assert.assertEquals(enumVar.baseType, "String");
+        Assert.assertTrue(enumVar.isEnum);
+    }
+
+    @Test(description = "not override identical parent enums")
+    public void overrideEnumTest() {
+        final StringProperty identicalEnumProperty = new StringProperty();
+        identicalEnumProperty.setEnum(Arrays.asList("VALUE1", "VALUE2", "VALUE3"));
+
+        final StringProperty subEnumProperty = new StringProperty();
+        subEnumProperty.setEnum(Arrays.asList("SUB1", "SUB2", "SUB3"));
+
+        // Add one enum property to the parent
+        final Map<String, Property> parentProperties = new HashMap<String, Property>();
+        parentProperties.put("sharedThing", identicalEnumProperty);
+
+        // Add TWO enums to the subType model; one of which is identical to the one in parent class
+        final Map<String, Property> subProperties = new HashMap<String, Property>();
+        subProperties.put("sharedThing", identicalEnumProperty);
+        subProperties.put("unsharedThing", identicalEnumProperty);
+
+        final ModelImpl parentModel = new ModelImpl();
+        parentModel.setProperties(parentProperties);
+        parentModel.name("parentModel");
+
+        final ModelImpl subModel = new ModelImpl();
+        subModel.setProperties(subProperties);
+        subModel.name("subModel");
+
+        final ComposedModel model = new ComposedModel()
+                .parent(new RefModel(parentModel.getName()))
+                .child(subModel)
+                .interfaces(new ArrayList<RefModel>());
+
+        final DefaultCodegen codegen = new JavaClientCodegen();
+        final Map<String, Model> allModels = new HashMap<String, Model>();
+        allModels.put(parentModel.getName(), parentModel);
+        allModels.put(subModel.getName(), subModel);
+
+        final CodegenModel cm = codegen.fromModel("sample", model, allModels);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.parent, "ParentModel");
+        Assert.assertTrue(cm.imports.contains("ParentModel"));
+
+        // Assert that only the unshared/uninherited enum remains
+        Assert.assertEquals(cm.vars.size(), 1);
+        final CodegenProperty enumVar = cm.vars.get(0);
+        Assert.assertEquals(enumVar.baseName, "unsharedThing");
+        Assert.assertEquals(enumVar.datatype, "String");
+        Assert.assertEquals(enumVar.datatypeWithEnum, "UnsharedThingEnum");
+        Assert.assertTrue(enumVar.isEnum);
+    }
+}
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/javascript/JavaScriptModelTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/javascript/JavaScriptModelTest.java
new file mode 100644
index 00000000000..bb7afb942b7
--- /dev/null
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/javascript/JavaScriptModelTest.java
@@ -0,0 +1,491 @@
+package io.swagger.codegen.javascript;
+
+import java.util.List;
+
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.Sets;
+
+import io.swagger.codegen.CodegenModel;
+import io.swagger.codegen.CodegenParameter;
+import io.swagger.codegen.CodegenProperty;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.languages.JavascriptClientCodegen;
+import io.swagger.models.ArrayModel;
+import io.swagger.models.Model;
+import io.swagger.models.ModelImpl;
+import io.swagger.models.parameters.QueryParameter;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.ByteArrayProperty;
+import io.swagger.models.properties.DateTimeProperty;
+import io.swagger.models.properties.IntegerProperty;
+import io.swagger.models.properties.LongProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.RefProperty;
+import io.swagger.models.properties.StringProperty;
+
+@SuppressWarnings("static-method")
+public class JavaScriptModelTest {
+    @Test(description = "convert a simple java model")
+    public void simpleModelTest() {
+        final Model model = new ModelImpl()
+                .description("a sample model")
+                .property("id", new LongProperty())
+                .property("name", new StringProperty()
+                        .example("Tony"))
+                .property("createdAt", new DateTimeProperty())
+                .required("id")
+                .required("name");
+        final DefaultCodegen codegen = new JavascriptClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "a sample model");
+        Assert.assertEquals(cm.vars.size(), 3);
+
+        final List<CodegenProperty> vars = cm.vars;
+
+        final CodegenProperty property1 = vars.get(0);
+        Assert.assertEquals(property1.baseName, "id");
+        Assert.assertEquals(property1.getter, "getId");
+        Assert.assertEquals(property1.setter, "setId");
+        Assert.assertEquals(property1.datatype, "Integer");
+        Assert.assertEquals(property1.name, "id");
+        Assert.assertEquals(property1.defaultValue, null);
+        Assert.assertEquals(property1.baseType, "Integer");
+        Assert.assertTrue(property1.hasMore);
+        Assert.assertTrue(property1.required);
+        Assert.assertTrue(property1.isNotContainer);
+
+        final CodegenProperty property2 = vars.get(1);
+        Assert.assertEquals(property2.baseName, "name");
+        Assert.assertEquals(property2.getter, "getName");
+        Assert.assertEquals(property2.setter, "setName");
+        Assert.assertEquals(property2.datatype, "String");
+        Assert.assertEquals(property2.name, "name");
+        Assert.assertEquals(property2.defaultValue, null);
+        Assert.assertEquals(property2.baseType, "String");
+        Assert.assertEquals(property2.example, "Tony");
+        Assert.assertTrue(property2.hasMore);
+        Assert.assertTrue(property2.required);
+        Assert.assertTrue(property2.isNotContainer);
+
+        final CodegenProperty property3 = vars.get(2);
+        Assert.assertEquals(property3.baseName, "createdAt");
+        Assert.assertEquals(property3.getter, "getCreatedAt");
+        Assert.assertEquals(property3.setter, "setCreatedAt");
+        Assert.assertEquals(property3.datatype, "Date");
+        Assert.assertEquals(property3.name, "createdAt");
+        Assert.assertEquals(property3.defaultValue, null);
+        Assert.assertEquals(property3.baseType, "Date");
+        Assert.assertNull(property3.hasMore);
+        Assert.assertNull(property3.required);
+        Assert.assertTrue(property3.isNotContainer);
+    }
+
+    @Test(description = "convert a model with list property")
+    public void listPropertyTest() {
+        final Model model = new ModelImpl()
+                .description("a sample model")
+                .property("id", new LongProperty())
+                .property("urls", new ArrayProperty()
+                        .items(new StringProperty()))
+                .required("id");
+        final DefaultCodegen codegen = new JavascriptClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "a sample model");
+        Assert.assertEquals(cm.vars.size(), 2);
+
+        final CodegenProperty property = cm.vars.get(1);
+        Assert.assertEquals(property.baseName, "urls");
+        Assert.assertEquals(property.getter, "getUrls");
+        Assert.assertEquals(property.setter, "setUrls");
+        Assert.assertEquals(property.datatype, "[String]");
+        Assert.assertEquals(property.name, "urls");
+        // FIXME: should an array property have an empty array as its default value? What if the property is required?
+        Assert.assertEquals(property.defaultValue, /*"[]"*/null);
+        Assert.assertEquals(property.baseType, "Array");
+        Assert.assertEquals(property.containerType, "array");
+        Assert.assertNull(property.required);
+        Assert.assertTrue(property.isContainer);
+    }
+
+    @Test(description = "convert a model with a map property")
+    public void mapPropertyTest() {
+        final Model model = new ModelImpl()
+                .description("a sample model")
+                .property("translations", new MapProperty()
+                        .additionalProperties(new StringProperty()))
+                .required("id");
+        final DefaultCodegen codegen = new JavascriptClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "a sample model");
+        Assert.assertEquals(cm.vars.size(), 1);
+
+        final CodegenProperty property = cm.vars.get(0);
+        Assert.assertEquals(property.baseName, "translations");
+        Assert.assertEquals(property.getter, "getTranslations");
+        Assert.assertEquals(property.setter, "setTranslations");
+        Assert.assertEquals(property.datatype, "{String: String}");
+        Assert.assertEquals(property.name, "translations");
+        // FIXME: should a map property have an empty object as its default value? What if the property is required?
+        Assert.assertEquals(property.defaultValue, /*"{}"*/null);
+        Assert.assertEquals(property.baseType, "Object");
+        Assert.assertEquals(property.containerType, "map");
+        Assert.assertNull(property.required);
+        Assert.assertTrue(property.isContainer);
+    }
+
+    @Test(description = "convert a model with a map with complex list property")
+    public void mapWithListPropertyTest() {
+        final Model model = new ModelImpl()
+                .description("a sample model")
+                .property("translations",
+                        new MapProperty().additionalProperties(new ArrayProperty().items(new RefProperty("Pet"))))
+                .required("id");
+        final DefaultCodegen codegen = new JavascriptClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "a sample model");
+        Assert.assertEquals(cm.vars.size(), 1);
+
+        final CodegenProperty property = cm.vars.get(0);
+        Assert.assertEquals(property.baseName, "translations");
+        Assert.assertEquals(property.getter, "getTranslations");
+        Assert.assertEquals(property.setter, "setTranslations");
+        Assert.assertEquals(property.datatype, "{String: [Pet]}");
+        Assert.assertEquals(property.name, "translations");
+        // FIXME: should a map property have an empty object as its default value? What if the property is required?
+        Assert.assertEquals(property.defaultValue, /*"{}"*/null);
+        Assert.assertEquals(property.baseType, "Object");
+        Assert.assertEquals(property.containerType, "map");
+        Assert.assertNull(property.required);
+        Assert.assertTrue(property.isContainer);
+    }
+
+    @Test(description = "convert a model with a 2D list property")
+    public void list2DPropertyTest() {
+        final Model model = new ModelImpl().name("sample").property("list2D", new ArrayProperty().items(
+                new ArrayProperty().items(new RefProperty("Pet"))));
+        final DefaultCodegen codegen = new JavascriptClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.vars.size(), 1);
+
+        final CodegenProperty property = cm.vars.get(0);
+        Assert.assertEquals(property.baseName, "list2D");
+        Assert.assertEquals(property.getter, "getList2D");
+        Assert.assertEquals(property.setter, "setList2D");
+        Assert.assertEquals(property.datatype, "[[Pet]]");
+        Assert.assertEquals(property.name, "list2D");
+        // FIXME: should an array property have an empty array as its default value? What if the property is required?
+        Assert.assertEquals(property.defaultValue, /*"[]"*/null);
+        Assert.assertEquals(property.baseType, "Array");
+        Assert.assertEquals(property.containerType, "array");
+        Assert.assertNull(property.required);
+        Assert.assertTrue(property.isContainer);
+    }
+
+    @Test(description = "convert a model with complex properties")
+    public void complexPropertiesTest() {
+        final Model model = new ModelImpl().description("a sample model")
+                .property("children", new RefProperty("#/definitions/Children"));
+        final DefaultCodegen codegen = new JavascriptClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "a sample model");
+        Assert.assertEquals(cm.vars.size(), 1);
+
+        final CodegenProperty property = cm.vars.get(0);
+        Assert.assertEquals(property.baseName, "children");
+        Assert.assertEquals(property.getter, "getChildren");
+        Assert.assertEquals(property.setter, "setChildren");
+        Assert.assertEquals(property.datatype, "Children");
+        Assert.assertEquals(property.name, "children");
+        Assert.assertEquals(property.defaultValue, null);
+        Assert.assertEquals(property.baseType, "Children");
+        Assert.assertNull(property.required);
+        Assert.assertTrue(property.isNotContainer);
+    }
+
+    @Test(description = "convert a model with complex list property")
+    public void complexListPropertyTest() {
+        final Model model = new ModelImpl()
+                .description("a sample model")
+                .property("children", new ArrayProperty().items(new RefProperty("#/definitions/Children")));
+        final DefaultCodegen codegen = new JavascriptClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "a sample model");
+        Assert.assertEquals(cm.vars.size(), 1);
+
+        final CodegenProperty property = cm.vars.get(0);
+        Assert.assertEquals(property.baseName, "children");
+        Assert.assertEquals(property.complexType, "Children");
+        Assert.assertEquals(property.getter, "getChildren");
+        Assert.assertEquals(property.setter, "setChildren");
+        // FIXME: what should datatype be for a JavaScript array? 
+//        Assert.assertEquals(property.datatype, "Array<Children>");
+        Assert.assertEquals(property.name, "children");
+        // FIXME: should an array property have an empty array as its default value? What if the property is required?
+        Assert.assertEquals(property.defaultValue, /*"[]"*/null);
+        Assert.assertEquals(property.baseType, "Array");
+        Assert.assertEquals(property.containerType, "array");
+        Assert.assertNull(property.required);
+        Assert.assertTrue(property.isContainer);
+    }
+
+    @Test(description = "convert a model with complex map property")
+    public void complexMapPropertyTest() {
+        final Model model = new ModelImpl()
+                .description("a sample model")
+                .property("children", new MapProperty().additionalProperties(new RefProperty("#/definitions/Children")));
+        final DefaultCodegen codegen = new JavascriptClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "a sample model");
+        Assert.assertEquals(cm.vars.size(), 1);
+        Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("Children")).size(), 1);
+
+        final CodegenProperty property = cm.vars.get(0);
+        Assert.assertEquals(property.baseName, "children");
+        Assert.assertEquals(property.complexType, "Children");
+        Assert.assertEquals(property.getter, "getChildren");
+        Assert.assertEquals(property.setter, "setChildren");
+        // TODO: create a functional test to see whether map properties actually work.
+        Assert.assertEquals(property.datatype, /*"Object<String, Children>"*/"{String: Children}");
+        Assert.assertEquals(property.name, "children");
+        // FIXME: should a map property have an empty object as its default value? What if the property is required?
+        Assert.assertEquals(property.defaultValue, /*"{}"*/ null);
+        Assert.assertEquals(property.baseType, "Object");
+        Assert.assertEquals(property.containerType, "map");
+        Assert.assertNull(property.required);
+        Assert.assertTrue(property.isContainer);
+        Assert.assertNull(property.isNotContainer);
+    }
+
+    @Test(description = "convert an array model")
+    public void arrayModelTest() {
+        final Model model = new ArrayModel()
+                .description("an array model")
+                .items(new RefProperty("#/definitions/Children"));
+        final DefaultCodegen codegen = new JavascriptClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "an array model");
+        Assert.assertEquals(cm.vars.size(), 0);
+        Assert.assertEquals(cm.parent, "Array<Children>");
+        Assert.assertEquals(cm.imports.size(), 1);
+        Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("Children")).size(), 1);
+    }
+
+    @Test(description = "convert a map model")
+    public void mapModelTest() {
+        final Model model = new ModelImpl()
+                .description("an map model")
+                .additionalProperties(new RefProperty("#/definitions/Children"));
+        final DefaultCodegen codegen = new JavascriptClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "an map model");
+        Assert.assertEquals(cm.vars.size(), 0);
+        Assert.assertEquals(cm.parent, "Object<String, Children>");
+        Assert.assertEquals(cm.imports.size(), 1);
+        Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("Children")).size(), 1);
+    }
+
+    @Test(description = "convert a model with uppercase property names")
+    public void upperCaseNamesTest() {
+        final Model model = new ModelImpl()
+                .description("a model with uppercase property names")
+                .property("NAME", new StringProperty())
+                .required("NAME");
+        final DefaultCodegen codegen = new JavascriptClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.vars.size(), 1);
+
+        final CodegenProperty property = cm.vars.get(0);
+        Assert.assertEquals(property.baseName, "NAME");
+        Assert.assertEquals(property.getter, "getNAME");
+        Assert.assertEquals(property.setter, "setNAME");
+        Assert.assertEquals(property.datatype, "String");
+        Assert.assertEquals(property.name, "NAME");
+        Assert.assertEquals(property.defaultValue, null);
+        Assert.assertEquals(property.baseType, "String");
+        Assert.assertNull(property.hasMore);
+        Assert.assertTrue(property.required);
+        Assert.assertTrue(property.isNotContainer);
+    }
+
+    @Test(description = "convert a model with a 2nd char uppercase property names")
+    public void secondCharUpperCaseNamesTest() {
+        final Model model = new ModelImpl()
+                .description("a model with a 2nd char uppercase property names")
+                .property("pId", new StringProperty())
+                .required("pId");
+        final DefaultCodegen codegen = new JavascriptClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.vars.size(), 1);
+
+        final CodegenProperty property = cm.vars.get(0);
+        Assert.assertEquals(property.baseName, "pId");
+        Assert.assertEquals(property.getter, "getPId");
+        Assert.assertEquals(property.setter, "setPId");
+        Assert.assertEquals(property.datatype, "String");
+        Assert.assertEquals(property.name, "pId");
+        Assert.assertEquals(property.defaultValue, null);
+        Assert.assertEquals(property.baseType, "String");
+        Assert.assertNull(property.hasMore);
+        Assert.assertTrue(property.required);
+        Assert.assertTrue(property.isNotContainer);
+    }
+
+    @Test(description = "convert hyphens per issue 503")
+    public void hyphensTest() {
+        final Model model = new ModelImpl()
+                .description("a sample model")
+                .property("created-at", new DateTimeProperty());
+        final DefaultCodegen codegen = new JavascriptClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        final CodegenProperty property = cm.vars.get(0);
+        Assert.assertEquals(property.baseName, "created-at");
+        Assert.assertEquals(property.getter, "getCreatedAt");
+        Assert.assertEquals(property.setter, "setCreatedAt");
+        Assert.assertEquals(property.name, "createdAt");
+    }
+
+    @Test(description = "convert query[password] to queryPassword")
+    public void squareBracketsTest() {
+        final Model model = new ModelImpl()
+                .description("a sample model")
+                .property("query[password]", new StringProperty());
+        final DefaultCodegen codegen = new JavascriptClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        final CodegenProperty property = cm.vars.get(0);
+        Assert.assertEquals(property.baseName, "query[password]");
+        Assert.assertEquals(property.getter, "getQueryPassword");
+        Assert.assertEquals(property.setter, "setQueryPassword");
+        Assert.assertEquals(property.name, "queryPassword");
+    }
+
+    @Test(description = "properly escape names per 567")
+    public void escapeNamesTest() {
+        final Model model = new ModelImpl()
+                .description("a sample model")
+                .property("created-at", new DateTimeProperty());
+        final DefaultCodegen codegen = new JavascriptClientCodegen();
+        final CodegenModel cm = codegen.fromModel("with.dots", model);
+
+        Assert.assertEquals(cm.classname, "WithDots");
+    }
+
+    @Test(description = "convert a model with binary data")
+    public void binaryDataTest() {
+        final Model model = new ModelImpl()
+                .description("model with binary")
+                .property("inputBinaryData", new ByteArrayProperty());
+        final DefaultCodegen codegen = new JavascriptClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        final CodegenProperty property = cm.vars.get(0);
+        Assert.assertEquals(property.baseName, "inputBinaryData");
+        Assert.assertEquals(property.getter, "getInputBinaryData");
+        Assert.assertEquals(property.setter, "setInputBinaryData");
+        Assert.assertEquals(property.datatype, "String");
+        Assert.assertEquals(property.name, "inputBinaryData");
+        Assert.assertEquals(property.defaultValue, null);
+        Assert.assertEquals(property.baseType, "String");
+        Assert.assertNull(property.hasMore);
+        Assert.assertNull(property.required);
+        Assert.assertTrue(property.isNotContainer);
+    }
+
+    @Test(description = "translate an invalid param name")
+    public void invalidParamNameTest() {
+        final Model model = new ModelImpl()
+                .description("a model with a 2nd char uppercase property name")
+                .property("_", new StringProperty());
+        final DefaultCodegen codegen = new JavascriptClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.vars.size(), 1);
+
+        final CodegenProperty property = cm.vars.get(0);
+        Assert.assertEquals(property.baseName, "_");
+        Assert.assertEquals(property.getter, "getU");
+        Assert.assertEquals(property.setter, "setU");
+        Assert.assertEquals(property.datatype, "String");
+        Assert.assertEquals(property.name, "u");
+        Assert.assertEquals(property.defaultValue, null);
+        Assert.assertEquals(property.baseType, "String");
+        Assert.assertNull(property.hasMore);
+        Assert.assertTrue(property.isNotContainer);
+    }
+
+    @Test(description = "convert a parameter")
+    public void convertParameterTest() {
+        final QueryParameter parameter = new QueryParameter()
+                .property(new IntegerProperty())
+                .name("limit")
+                .required(true);
+        final DefaultCodegen codegen = new JavascriptClientCodegen();
+        final CodegenParameter cm = codegen.fromParameter(parameter, null);
+
+        Assert.assertNull(cm.allowableValues);
+    }
+
+    @DataProvider(name = "modelNames")
+    public static Object[][] primeNumbers() {
+        return new Object[][] {
+                {"sample", "Sample"},
+                {"sample_name", "SampleName"},
+                {"sample__name", "SampleName"},
+                {"/sample", "Sample"},
+                {"\\sample", "Sample"},
+                {"sample.name", "SampleName"},
+                {"_sample", "Sample"},
+                {"Sample", "Sample"},
+        };
+    }
+
+    @Test(dataProvider = "modelNames", description = "avoid inner class")
+    public void modelNameTest(String name, String expectedName) {
+        final Model model = new ModelImpl();
+        final DefaultCodegen codegen = new JavascriptClientCodegen();
+        final CodegenModel cm = codegen.fromModel(name, model);
+
+        Assert.assertEquals(cm.name, name);
+        Assert.assertEquals(cm.classname, expectedName);
+    }
+}
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java
index 055bb721ad8..ddc8f2af06f 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java
@@ -2,7 +2,7 @@ package io.swagger.codegen.jaxrs;
 
 import io.swagger.codegen.CodegenConfig;
 import io.swagger.codegen.java.JavaClientOptionsTest;
-import io.swagger.codegen.languages.JaxRSServerCodegen;
+import io.swagger.codegen.languages.JavaJerseyServerCodegen;
 import io.swagger.codegen.options.JaxRSServerOptionsProvider;
 
 import mockit.Expectations;
@@ -11,7 +11,7 @@ import mockit.Tested;
 public class JaxRSServerOptionsTest extends JavaClientOptionsTest {
 
     @Tested
-    private JaxRSServerCodegen clientCodegen;
+    private JavaJerseyServerCodegen clientCodegen;
 
     public JaxRSServerOptionsTest() {
         super(new JaxRSServerOptionsProvider());
@@ -22,6 +22,7 @@ public class JaxRSServerOptionsTest extends JavaClientOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
@@ -45,7 +46,7 @@ public class JaxRSServerOptionsTest extends JavaClientOptionsTest {
             times = 1;
             clientCodegen.setSerializableModel(Boolean.valueOf(JaxRSServerOptionsProvider.SERIALIZABLE_MODEL_VALUE));
             times = 1;
-            clientCodegen.setLibrary(JaxRSServerOptionsProvider.LIBRARY_VALUE);
+            clientCodegen.setLibrary(JaxRSServerOptionsProvider.DEFAULT_LIBRARY_VALUE);
             times = 1;
             clientCodegen.setFullJavaUtil(Boolean.valueOf(JaxRSServerOptionsProvider.FULL_JAVA_UTIL_VALUE));
             times = 1;
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxrsJava8ModelTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxrsJava8ModelTest.java
index 55219787f89..34c91e28335 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxrsJava8ModelTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxrsJava8ModelTest.java
@@ -1,7 +1,8 @@
 package io.swagger.codegen.jaxrs;
 
 import io.swagger.codegen.CodegenModel;
-import io.swagger.codegen.languages.JaxRSServerCodegen;
+
+import io.swagger.codegen.languages.JavaJerseyServerCodegen;
 import io.swagger.models.Model;
 import io.swagger.models.ModelImpl;
 import io.swagger.models.properties.DateProperty;
@@ -12,7 +13,9 @@ import org.testng.annotations.Test;
 
 import static org.testng.Assert.assertEquals;
 
+@SuppressWarnings("static-method")
 public class JaxrsJava8ModelTest {
+    
     @Test(description = "convert a simple java model with java8 types")
     public void simpleModelTest() {
         final Model model = new ModelImpl()
@@ -23,7 +26,7 @@ public class JaxrsJava8ModelTest {
                 .required("id")
                 .required("name");
 
-        final JaxRSServerCodegen codegen = new JaxRSServerCodegen();
+        final JavaJerseyServerCodegen codegen = new JavaJerseyServerCodegen();
         codegen.setDateLibrary("java8");
         codegen.processOpts();
         final CodegenModel cm = codegen.fromModel("sample", model);
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxrsJodaModelTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxrsJodaModelTest.java
index 3f2ac1a9ec1..8c71c51418c 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxrsJodaModelTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxrsJodaModelTest.java
@@ -1,7 +1,7 @@
 package io.swagger.codegen.jaxrs;
 
 import io.swagger.codegen.CodegenModel;
-import io.swagger.codegen.languages.JaxRSServerCodegen;
+import io.swagger.codegen.languages.JavaJerseyServerCodegen;
 import io.swagger.models.Model;
 import io.swagger.models.ModelImpl;
 import io.swagger.models.properties.DateProperty;
@@ -12,7 +12,9 @@ import org.testng.annotations.Test;
 
 import static org.testng.Assert.assertEquals;
 
+@SuppressWarnings("static-method")
 public class JaxrsJodaModelTest {
+    
     @Test(description = "convert a simple java model with Joda types")
     public void simpleModelTest() {
         final Model model = new ModelImpl()
@@ -23,7 +25,7 @@ public class JaxrsJodaModelTest {
                 .required("id")
                 .required("name");
 
-        final JaxRSServerCodegen codegen = new JaxRSServerCodegen();
+        final JavaJerseyServerCodegen codegen = new JavaJerseyServerCodegen();
         codegen.setDateLibrary("joda");
         codegen.processOpts();
         final CodegenModel cm = codegen.fromModel("sample", model);
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/languages/BooleanOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/languages/BooleanOptionsTest.java
index da2d5e35e2a..3566f2e98e2 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/languages/BooleanOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/languages/BooleanOptionsTest.java
@@ -13,6 +13,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+@SuppressWarnings("static-method")
 public class BooleanOptionsTest {
     private static final String OPTIONS_PROVIDER = "Codegen";
 
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/languages/ClojureClientCodegenTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/languages/ClojureClientCodegenTest.java
new file mode 100644
index 00000000000..60d22d9cfe9
--- /dev/null
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/languages/ClojureClientCodegenTest.java
@@ -0,0 +1,38 @@
+package io.swagger.codegen.languages;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class ClojureClientCodegenTest {
+    ClojureClientCodegen codegen = new ClojureClientCodegen();
+
+    @Test
+    public void testSanitizeTag() throws Exception {
+        Assert.assertEquals(codegen.sanitizeTag("users-api"), "users_api");
+        Assert.assertEquals(codegen.sanitizeTag("users_api"), "users_api");
+        Assert.assertEquals(codegen.sanitizeTag("users api"), "users_api");
+        Assert.assertEquals(codegen.sanitizeTag("users.api"), "users_api");
+        Assert.assertEquals(codegen.sanitizeTag("Users Api"), "Users_Api");
+        Assert.assertEquals(codegen.sanitizeTag("UsersApi"), "UsersApi");
+        Assert.assertEquals(codegen.sanitizeTag("usersapi"), "usersapi");
+        Assert.assertEquals(codegen.sanitizeTag("Usersapi"), "Usersapi");
+    }
+
+    @Test
+    public void testToApiName() throws Exception {
+        Assert.assertEquals(codegen.toApiName("users_api"), "users-api");
+        Assert.assertEquals(codegen.toApiName("Users_Api"), "users-api");
+        Assert.assertEquals(codegen.toApiName("UsersApi"), "users-api");
+        Assert.assertEquals(codegen.toApiName("usersapi"), "usersapi");
+        Assert.assertEquals(codegen.toApiName("Usersapi"), "usersapi");
+    }
+
+    @Test
+    public void testToApiFilename() throws Exception {
+        Assert.assertEquals(codegen.toApiFilename("users_api"), "users_api");
+        Assert.assertEquals(codegen.toApiFilename("Users_Api"), "users_api");
+        Assert.assertEquals(codegen.toApiFilename("UsersApi"), "users_api");
+        Assert.assertEquals(codegen.toApiFilename("usersapi"), "usersapi");
+        Assert.assertEquals(codegen.toApiFilename("Usersapi"), "usersapi");
+    }
+}
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/nodejs/NodeJSServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/nodejs/NodeJSServerOptionsTest.java
index ce905315ae3..c1cfa43b08b 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/nodejs/NodeJSServerOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/nodejs/NodeJSServerOptionsTest.java
@@ -22,6 +22,7 @@ public class NodeJSServerOptionsTest extends AbstractOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcClientOptionsTest.java
index 33f20625e16..795c6ee2d9c 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcClientOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcClientOptionsTest.java
@@ -22,6 +22,7 @@ public class ObjcClientOptionsTest extends AbstractOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcModelTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcModelTest.java
index f48f20ce119..fed94aa04f6 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcModelTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcModelTest.java
@@ -24,6 +24,7 @@ import org.testng.annotations.Test;
 
 import java.util.Map;
 
+@SuppressWarnings("static-method")
 public class ObjcModelTest {
 
     @Test(description = "convert a simple java model")
@@ -34,7 +35,8 @@ public class ObjcModelTest {
                 .property("name", new StringProperty())
                 .property("createdAt", new DateTimeProperty())
                 .required("id")
-                .required("name");
+                .required("name")
+                .discriminator("test");
         final DefaultCodegen codegen = new ObjcClientCodegen();
         final CodegenModel cm = codegen.fromModel("sample", model);
 
@@ -42,6 +44,7 @@ public class ObjcModelTest {
         Assert.assertEquals(cm.classname, "SWGSample");
         Assert.assertEquals(cm.description, "a sample model");
         Assert.assertEquals(cm.vars.size(), 3);
+        Assert.assertEquals(cm.discriminator,"test");
 
         final CodegenProperty property1 = cm.vars.get(0);
         Assert.assertEquals(property1.baseName, "id");
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AspNet5ServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AspNet5ServerOptionsProvider.java
new file mode 100644
index 00000000000..962fc1182d3
--- /dev/null
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AspNet5ServerOptionsProvider.java
@@ -0,0 +1,35 @@
+package io.swagger.codegen.options;
+
+import com.google.common.collect.ImmutableMap;
+import io.swagger.codegen.CodegenConstants;
+
+import java.util.Map;
+
+public class AspNet5ServerOptionsProvider implements OptionsProvider {
+    public static final String PACKAGE_NAME_VALUE = "swagger_server_aspnet5";
+    public static final String PACKAGE_VERSION_VALUE = "1.0.0-SNAPSHOT";
+    public static final String SOURCE_FOLDER_VALUE = "src_aspnet5";
+	
+    @Override
+    public String getLanguage() {
+        return "aspnet5";
+    }
+
+    @Override
+    public Map<String, String> createOptions() {
+        ImmutableMap.Builder<String, String> builder = new ImmutableMap.Builder<String, String>();
+        return builder.put(CodegenConstants.PACKAGE_NAME, PACKAGE_NAME_VALUE)
+                .put(CodegenConstants.PACKAGE_VERSION, PACKAGE_VERSION_VALUE)
+                .put(CodegenConstants.SOURCE_FOLDER, SOURCE_FOLDER_VALUE)
+                .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, "true")
+                .put(CodegenConstants.USE_DATETIME_OFFSET, "true")
+                .put(CodegenConstants.USE_COLLECTION, "false")
+                .put(CodegenConstants.RETURN_ICOLLECTION, "false")
+                .build();
+    }
+
+    @Override
+    public boolean isServer() {
+        return true;
+    }
+}
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/CSharpClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/CSharpClientOptionsProvider.java
index 94440db97c0..5f43f5cf155 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/CSharpClientOptionsProvider.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/CSharpClientOptionsProvider.java
@@ -9,7 +9,9 @@ import java.util.Map;
 public class CSharpClientOptionsProvider implements OptionsProvider {
     public static final String PACKAGE_NAME_VALUE = "swagger_client_csharp";
     public static final String PACKAGE_VERSION_VALUE = "1.0.0-SNAPSHOT";
-
+    public static final String SOURCE_FOLDER_VALUE = "src_csharp";
+    public static final String PACKAGE_GUID_VALUE = "{894EAEBB-649A-498C-A735-10D0BD7B73E0}";
+	
     @Override
     public String getLanguage() {
         return "csharp";
@@ -22,6 +24,15 @@ public class CSharpClientOptionsProvider implements OptionsProvider {
                 .put(CodegenConstants.PACKAGE_VERSION, PACKAGE_VERSION_VALUE)
                 .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, "true")
                 .put(CodegenConstants.OPTIONAL_METHOD_ARGUMENT, "true")
+                .put(CodegenConstants.OPTIONAL_ASSEMBLY_INFO, "true")
+                .put(CodegenConstants.USE_DATETIME_OFFSET, "true")
+                .put(CodegenConstants.SOURCE_FOLDER, SOURCE_FOLDER_VALUE)
+                .put(CodegenConstants.USE_COLLECTION, "false")
+                .put(CodegenConstants.RETURN_ICOLLECTION, "false")
+                .put(CodegenConstants.OPTIONAL_PROJECT_FILE, "true")
+                .put(CodegenConstants.OPTIONAL_PROJECT_GUID, PACKAGE_GUID_VALUE)
+                .put(CodegenConstants.DOTNET_FRAMEWORK, "4.x")
+                .put(CodegenConstants.OPTIONAL_EMIT_DEFAULT_VALUES, "true")
                 .build();
     }
 
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/HaskellServantOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/HaskellServantOptionsProvider.java
new file mode 100644
index 00000000000..cc4f7f3a9b3
--- /dev/null
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/HaskellServantOptionsProvider.java
@@ -0,0 +1,34 @@
+package io.swagger.codegen.options;
+
+import io.swagger.codegen.CodegenConstants;
+
+import com.google.common.collect.ImmutableMap;
+
+import java.util.Map;
+
+public class HaskellServantOptionsProvider implements OptionsProvider {
+    public static final String MODEL_PACKAGE_VALUE = "Model";
+    public static final String API_PACKAGE_VALUE = "Api";
+    public static final String SORT_PARAMS_VALUE = "false";
+    public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true";
+
+    @Override
+    public String getLanguage() {
+        return "haskell";
+    }
+
+    @Override
+    public Map<String, String> createOptions() {
+        ImmutableMap.Builder<String, String> builder = new ImmutableMap.Builder<String, String>();
+        return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE)
+                .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE)
+                .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE)
+                .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE)
+                .build();
+    }
+
+    @Override
+    public boolean isServer() {
+        return true;
+    }
+}
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaOptionsProvider.java
index 7e5fd36793a..d2b51b06fe4 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaOptionsProvider.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaOptionsProvider.java
@@ -1,10 +1,9 @@
 package io.swagger.codegen.options;
 
+import com.google.common.collect.ImmutableMap;
 import io.swagger.codegen.CodegenConstants;
 import io.swagger.codegen.languages.JavaClientCodegen;
 
-import com.google.common.collect.ImmutableMap;
-
 import java.util.Map;
 
 public class JavaOptionsProvider implements OptionsProvider {
@@ -17,15 +16,19 @@ public class JavaOptionsProvider implements OptionsProvider {
     public static final String ARTIFACT_VERSION_VALUE = "1.0.0-SNAPSHOT";
     public static final String SOURCE_FOLDER_VALUE = "src/main/java/test";
     public static final String LOCAL_PREFIX_VALUE = "tst";
-    public static final String LIBRARY_VALUE = "jersey2";
+    public static final String DEFAULT_LIBRARY_VALUE = "jersey2";
     public static final String SERIALIZABLE_MODEL_VALUE = "false";
     public static final String FULL_JAVA_UTIL_VALUE = "true";
     public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true";
 
-    @Override
-    public Map<String, String> createOptions() {
-        ImmutableMap.Builder<String, String> builder = new ImmutableMap.Builder<String, String>();
-        return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE)
+    private ImmutableMap<String, String> options;
+
+    /**
+     * Create an options provider with the default options.
+     */
+    public JavaOptionsProvider() {
+        options = new ImmutableMap.Builder<String, String>()
+                .put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE)
                 .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE)
                 .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE)
                 .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE)
@@ -37,11 +40,29 @@ public class JavaOptionsProvider implements OptionsProvider {
                 .put(CodegenConstants.LOCAL_VARIABLE_PREFIX, LOCAL_PREFIX_VALUE)
                 .put(CodegenConstants.SERIALIZABLE_MODEL, SERIALIZABLE_MODEL_VALUE)
                 .put(JavaClientCodegen.FULL_JAVA_UTIL, FULL_JAVA_UTIL_VALUE)
-                .put(CodegenConstants.LIBRARY, LIBRARY_VALUE)
+                .put(CodegenConstants.LIBRARY, DEFAULT_LIBRARY_VALUE)
                 .put(CodegenConstants.SERIALIZE_BIG_DECIMAL_AS_STRING, "true")
+                .put(JavaClientCodegen.USE_RX_JAVA, "false")
+                .put(JavaClientCodegen.DATE_LIBRARY, "joda")
+                .put("hideGenerationTimestamp", "true")
                 .build();
     }
 
+    /**
+     * Use the default options, but override the ones found in additionalOptions.
+     */
+    public JavaOptionsProvider(Map<String, String> additionalOptions) {
+        options = new ImmutableMap.Builder<String, String>()
+                .putAll(options)
+                .putAll(additionalOptions)
+                .build();
+    }
+
+    @Override
+    public Map<String, String> createOptions() {
+        return options;
+    }
+
     @Override
     public boolean isServer() {
         return false;
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaScriptOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaScriptOptionsProvider.java
new file mode 100644
index 00000000000..9b0f06a1031
--- /dev/null
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaScriptOptionsProvider.java
@@ -0,0 +1,88 @@
+package io.swagger.codegen.options;
+
+import io.swagger.codegen.CodegenConstants;
+import io.swagger.codegen.options.OptionsProvider;
+import io.swagger.codegen.languages.JavascriptClientCodegen;
+
+import com.google.common.collect.ImmutableMap;
+
+import java.util.Map;
+
+public class JavaScriptOptionsProvider implements OptionsProvider {
+    public static final String ARTIFACT_ID_VALUE = "swagger-javascript-client-test";
+    public static final String MODEL_PACKAGE_VALUE = "model";
+    public static final String API_PACKAGE_VALUE = "api";
+//    public static final String INVOKER_PACKAGE_VALUE = "js";
+    public static final String SORT_PARAMS_VALUE = "false";
+    public static final String GROUP_ID_VALUE = "io.swagger.test";
+    public static final String ARTIFACT_VERSION_VALUE = "1.0.0-SNAPSHOT";
+    public static final String SOURCE_FOLDER_VALUE = "src/main/javascript";
+    public static final String LOCAL_PREFIX_VALUE = "_";
+//    public static final String SERIALIZABLE_MODEL_VALUE = "false";
+    public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true";
+    public static final String PROJECT_NAME_VALUE = "JavaScript Client Test";
+    public static final String MODULE_NAME_VALUE = "JavaScriptClient";
+    public static final String PROJECT_DESCRIPTION_VALUE = "Tests JavaScript code generator options";
+    public static final String PROJECT_VERSION_VALUE = "1.0.0";
+    public static final String PROJECT_LICENSE_NAME_VALUE = "Apache";
+    public static final String USE_PROMISES_VALUE = "true";
+    public static final String USE_INHERITANCE_VALUE = "false";
+    public static final String EMIT_MODEL_METHODS_VALUE = "true";
+    public static final String EMIT_JS_DOC_VALUE = "false";
+
+    private ImmutableMap<String, String> options;
+
+    /**
+     * Create an options provider with the default options.
+     */
+    public JavaScriptOptionsProvider() {
+        // Commented generic options not yet supported by JavaScript codegen.
+        options = new ImmutableMap.Builder<String, String>()
+                .put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE)
+                .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE)
+                .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE)
+                .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE)
+//                .put(CodegenConstants.INVOKER_PACKAGE, INVOKER_PACKAGE_VALUE)
+//                .put(CodegenConstants.GROUP_ID, GROUP_ID_VALUE)
+//                .put(CodegenConstants.ARTIFACT_ID, ARTIFACT_ID_VALUE)
+//                .put(CodegenConstants.ARTIFACT_VERSION, ARTIFACT_VERSION_VALUE)
+                .put(CodegenConstants.SOURCE_FOLDER, SOURCE_FOLDER_VALUE)
+                .put(CodegenConstants.LOCAL_VARIABLE_PREFIX, LOCAL_PREFIX_VALUE)
+//                .put(CodegenConstants.SERIALIZE_BIG_DECIMAL_AS_STRING, "true")
+                .put(JavascriptClientCodegen.PROJECT_NAME, PROJECT_NAME_VALUE)
+                .put(JavascriptClientCodegen.MODULE_NAME, MODULE_NAME_VALUE)
+                .put(JavascriptClientCodegen.PROJECT_DESCRIPTION, PROJECT_DESCRIPTION_VALUE)
+                .put(JavascriptClientCodegen.PROJECT_VERSION, PROJECT_VERSION_VALUE)
+                .put(JavascriptClientCodegen.PROJECT_LICENSE_NAME, PROJECT_LICENSE_NAME_VALUE)
+                .put(JavascriptClientCodegen.USE_PROMISES, USE_PROMISES_VALUE)
+                .put(JavascriptClientCodegen.USE_INHERITANCE, USE_INHERITANCE_VALUE)
+                .put(JavascriptClientCodegen.EMIT_MODEL_METHODS, EMIT_MODEL_METHODS_VALUE)
+                .put(JavascriptClientCodegen.EMIT_JS_DOC, EMIT_JS_DOC_VALUE)
+                .build();
+    }
+
+    /**
+     * Use the default options, but override the ones found in additionalOptions.
+     */
+    public JavaScriptOptionsProvider(Map<String, String> additionalOptions) {
+        options = new ImmutableMap.Builder<String, String>()
+                .putAll(options)
+                .putAll(additionalOptions)
+                .build();
+    }
+
+    @Override
+    public Map<String, String> createOptions() {
+        return options;
+    }
+
+    @Override
+    public boolean isServer() {
+        return false;
+    }
+
+    @Override
+    public String getLanguage() {
+        return "javascript";
+    }
+}
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavascriptClosureAnularClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavascriptClosureAnularClientOptionsProvider.java
new file mode 100644
index 00000000000..3bc5a3df22d
--- /dev/null
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavascriptClosureAnularClientOptionsProvider.java
@@ -0,0 +1,30 @@
+package io.swagger.codegen.options;
+
+import io.swagger.codegen.CodegenConstants;
+
+import com.google.common.collect.ImmutableMap;
+
+import java.util.Map;
+
+public class JavascriptClosureAnularClientOptionsProvider implements OptionsProvider {
+    public static final String SORT_PARAMS_VALUE = "false";
+    public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true";
+
+    @Override
+    public String getLanguage() {
+        return "javascript-closure-angular";
+    }
+
+    @Override
+    public Map<String, String> createOptions() {
+        ImmutableMap.Builder<String, String> builder = new ImmutableMap.Builder<String, String>();
+        return builder.put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE)
+                .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE)
+                .build();
+    }
+
+    @Override
+    public boolean isServer() {
+        return false;
+    }
+}
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java
index e7286094564..f2735614f19 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java
@@ -1,7 +1,6 @@
 package io.swagger.codegen.options;
 
 import com.google.common.collect.ImmutableMap;
-import io.swagger.codegen.languages.JaxRSServerCodegen;
 import io.swagger.codegen.CodegenConstants;
 
 import java.util.Map;
@@ -26,8 +25,9 @@ public class JaxRSServerOptionsProvider extends JavaOptionsProvider {
 
         ImmutableMap.Builder<String, String> builder = new ImmutableMap.Builder<String, String>();
         builder.putAll(options)
-                .put(CodegenConstants.IMPL_FOLDER, IMPL_FOLDER_VALUE)
-                .put(JaxRSServerCodegen.DATE_LIBRARY, "joda");
+            .put(CodegenConstants.IMPL_FOLDER, IMPL_FOLDER_VALUE)
+            //.put(JavaJaxRSJersey1ServerCodegen.DATE_LIBRARY, "joda") //java.lang.IllegalArgumentException: Multiple entries with same key: dateLibrary=joda and dateLibrary=joda
+            .put("title", "Test title");
 
         return builder.build();
     }
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/NodeJSServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/NodeJSServerOptionsProvider.java
index 3d49fcb8d01..6252bbd08fc 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/NodeJSServerOptionsProvider.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/NodeJSServerOptionsProvider.java
@@ -12,7 +12,7 @@ public class NodeJSServerOptionsProvider implements OptionsProvider {
 
     @Override
     public String getLanguage() {
-        return "nodejs";
+        return "nodejs-server";
     }
 
     @Override
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/RubyClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/RubyClientOptionsProvider.java
index d80341f0200..64e388d38ef 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/RubyClientOptionsProvider.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/RubyClientOptionsProvider.java
@@ -13,6 +13,12 @@ public class RubyClientOptionsProvider implements OptionsProvider {
     public static final String GEM_VERSION_VALUE = "1.0.0-SNAPSHOT";
     public static final String SORT_PARAMS_VALUE = "false";
     public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true";
+    public static final String GEM_LICENSE_VALUE = "MIT";
+    public static final String GEM_HOMEPAGE_VALUE = "homepage";
+    public static final String GEM_SUMMARY_VALUE = "summary";
+    public static final String GEM_DESCRIPTION_VALUE = "description";
+    public static final String GEM_AUTHOR_VALUE =  "foo";
+    public static final String GEM_AUTHOR_EMAIL_VALUE = "foo";
 
     @Override
     public String getLanguage() {
@@ -25,6 +31,12 @@ public class RubyClientOptionsProvider implements OptionsProvider {
         return builder.put(RubyClientCodegen.GEM_NAME, GEM_NAME_VALUE)
                 .put(RubyClientCodegen.MODULE_NAME, MODULE_NAME_VALUE)
                 .put(RubyClientCodegen.GEM_VERSION, GEM_VERSION_VALUE)
+                .put(RubyClientCodegen.GEM_LICENSE, GEM_LICENSE_VALUE)
+                .put(RubyClientCodegen.GEM_DESCRIPTION, GEM_DESCRIPTION_VALUE)
+                .put(RubyClientCodegen.GEM_HOMEPAGE, GEM_HOMEPAGE_VALUE)
+                .put(RubyClientCodegen.GEM_SUMMARY, GEM_SUMMARY_VALUE)
+                .put(RubyClientCodegen.GEM_AUTHOR, GEM_AUTHOR_VALUE)
+                .put(RubyClientCodegen.GEM_AUTHOR_EMAIL, GEM_AUTHOR_EMAIL_VALUE)
                 .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE)
                 .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE)
                 .build();
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringMVCServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringMVCServerOptionsProvider.java
index e52373c3c08..a9d77c40393 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringMVCServerOptionsProvider.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringMVCServerOptionsProvider.java
@@ -8,7 +8,7 @@ import java.util.Map;
 
 public class SpringMVCServerOptionsProvider extends JavaOptionsProvider {
     public static final String CONFIG_PACKAGE_VALUE = "configPackage";
-    public static final String LIBRARY_VALUE = "j8-async";
+    public static final String LIBRARY_VALUE = "j8-async"; //FIXME hidding value from super class
 
     @Override
     public String getLanguage() {
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticDocOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticDocOptionsProvider.java
index 5e198a0e91a..d5d14238ec7 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticDocOptionsProvider.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticDocOptionsProvider.java
@@ -9,6 +9,10 @@ import java.util.Map;
 public class StaticDocOptionsProvider implements OptionsProvider {
     public static final String SORT_PARAMS_VALUE = "false";
     public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true";
+    public static final String ARTIFACT_ID_VALUE = "swagger-java-client-test";
+    public static final String INVOKER_PACKAGE_VALUE = "io.swagger.client.test";
+    public static final String GROUP_ID_VALUE = "io.swagger.test";
+    public static final String ARTIFACT_VERSION_VALUE = "1.0.0-SNAPSHOT";
 
     @Override
     public String getLanguage() {
@@ -20,6 +24,10 @@ public class StaticDocOptionsProvider implements OptionsProvider {
         ImmutableMap.Builder<String, String> builder = new ImmutableMap.Builder<String, String>();
         return builder.put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE)
                 .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE)
+                .put(CodegenConstants.INVOKER_PACKAGE, INVOKER_PACKAGE_VALUE)
+                .put(CodegenConstants.GROUP_ID, GROUP_ID_VALUE)
+                .put(CodegenConstants.ARTIFACT_ID, ARTIFACT_ID_VALUE)
+                .put(CodegenConstants.ARTIFACT_VERSION, ARTIFACT_VERSION_VALUE)
                 .build();
     }
 
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticHtmlOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticHtmlOptionsProvider.java
index f236ff40dc0..899eed6f4b7 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticHtmlOptionsProvider.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/StaticHtmlOptionsProvider.java
@@ -9,6 +9,10 @@ import java.util.Map;
 public class StaticHtmlOptionsProvider implements OptionsProvider {
     public static final String SORT_PARAMS_VALUE = "false";
     public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true";
+    public static final String ARTIFACT_ID_VALUE = "swagger-java-client-test";
+    public static final String INVOKER_PACKAGE_VALUE = "io.swagger.client.test";
+    public static final String GROUP_ID_VALUE = "io.swagger.test";
+    public static final String ARTIFACT_VERSION_VALUE = "1.0.0-SNAPSHOT";
 
     @Override
     public String getLanguage() {
@@ -20,6 +24,16 @@ public class StaticHtmlOptionsProvider implements OptionsProvider {
         ImmutableMap.Builder<String, String> builder = new ImmutableMap.Builder<String, String>();
         return builder.put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE)
                 .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE)
+                .put("appName", "Swagger Sample")
+                .put("appDescription", "A sample swagger server")
+                .put("infoUrl", "https://helloreverb.com")
+                .put("infoEmail", "hello@helloreverb.com")
+                .put("licenseInfo", "All rights reserved")
+                .put("licenseUrl", "http://apache.org/licenses/LICENSE-2.0.html")
+                .put(CodegenConstants.INVOKER_PACKAGE, INVOKER_PACKAGE_VALUE)
+                .put(CodegenConstants.GROUP_ID, GROUP_ID_VALUE)
+                .put(CodegenConstants.ARTIFACT_ID, ARTIFACT_ID_VALUE)
+                .put(CodegenConstants.ARTIFACT_VERSION, ARTIFACT_VERSION_VALUE)
                 .build();
     }
 
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwiftOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwiftOptionsProvider.java
index 507d3b62829..3794cb9a76f 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwiftOptionsProvider.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SwiftOptionsProvider.java
@@ -25,6 +25,7 @@ public class SwiftOptionsProvider implements OptionsProvider {
     public static final String POD_DESCRIPTION_VALUE = "podDescription";
     public static final String POD_SCREENSHOTS_VALUE = "podScreenshots";
     public static final String POD_DOCUMENTATION_URL_VALUE = "podDocumentationURL";
+    public static final String SWIFT_USE_API_NAMESPACE_VALUE = "swiftUseApiNamespace";
 
     @Override
     public String getLanguage() {
@@ -50,6 +51,7 @@ public class SwiftOptionsProvider implements OptionsProvider {
                 .put(SwiftCodegen.POD_DESCRIPTION, POD_DESCRIPTION_VALUE)
                 .put(SwiftCodegen.POD_SCREENSHOTS, POD_SCREENSHOTS_VALUE)
                 .put(SwiftCodegen.POD_DOCUMENTATION_URL, POD_DOCUMENTATION_URL_VALUE)
+                .put(SwiftCodegen.SWIFT_USE_API_NAMESPACE, SWIFT_USE_API_NAMESPACE_VALUE)
                 .build();
     }
 
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptAngularClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptAngularClientOptionsProvider.java
index d7d4e5392fc..3899ed26b29 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptAngularClientOptionsProvider.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptAngularClientOptionsProvider.java
@@ -9,6 +9,7 @@ import java.util.Map;
 public class TypeScriptAngularClientOptionsProvider implements OptionsProvider {
     public static final String SORT_PARAMS_VALUE = "false";
     public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true";
+    public static final String MODEL_PROPERTY_NAMING_VALUE = "camelCase";
 
     @Override
     public String getLanguage() {
@@ -20,6 +21,7 @@ public class TypeScriptAngularClientOptionsProvider implements OptionsProvider {
         ImmutableMap.Builder<String, String> builder = new ImmutableMap.Builder<String, String>();
         return builder.put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE)
                 .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE)
+                .put(CodegenConstants.MODEL_PROPERTY_NAMING, MODEL_PROPERTY_NAMING_VALUE)
                 .build();
     }
 
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptNodeClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptNodeClientOptionsProvider.java
index e1c0259222e..01966ff7169 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptNodeClientOptionsProvider.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptNodeClientOptionsProvider.java
@@ -9,6 +9,7 @@ import java.util.Map;
 public class TypeScriptNodeClientOptionsProvider implements OptionsProvider {
     public static final String SORT_PARAMS_VALUE = "false";
     public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true";
+    public static final String MODEL_PROPERTY_NAMING_VALUE = "camelCase";
 
     @Override
     public String getLanguage() {
@@ -20,6 +21,7 @@ public class TypeScriptNodeClientOptionsProvider implements OptionsProvider {
         ImmutableMap.Builder<String, String> builder = new ImmutableMap.Builder<String, String>();
         return builder.put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE)
                 .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE)
+                .put(CodegenConstants.MODEL_PROPERTY_NAMING, MODEL_PROPERTY_NAMING_VALUE)
                 .build();
     }
 
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/perl/PerlClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/perl/PerlClientOptionsTest.java
index d85b0c9dbc1..b277acbbe5c 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/perl/PerlClientOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/perl/PerlClientOptionsTest.java
@@ -22,6 +22,7 @@ public class PerlClientOptionsTest extends AbstractOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/php/PhpClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/php/PhpClientOptionsTest.java
index e50185a3e8d..fb5e21d1cce 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/php/PhpClientOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/php/PhpClientOptionsTest.java
@@ -22,6 +22,7 @@ public class PhpClientOptionsTest extends AbstractOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/php/PhpModelTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/php/PhpModelTest.java
index 79da2d2ccda..ef6d6984895 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/php/PhpModelTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/php/PhpModelTest.java
@@ -16,8 +16,10 @@ import io.swagger.models.properties.StringProperty;
 
 import com.google.common.collect.Sets;
 import org.testng.Assert;
+import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
+@SuppressWarnings("static-method")
 public class PhpModelTest {
 
     @Test(description = "convert a simple php model")
@@ -36,7 +38,8 @@ public class PhpModelTest {
         Assert.assertEquals(cm.classname, "Sample");
         Assert.assertEquals(cm.description, "a sample model");
         Assert.assertEquals(cm.vars.size(), 3);
-        Assert.assertEquals(cm.imports.size(), 1);
+        // {{imports}} is not used in template
+        //Assert.assertEquals(cm.imports.size(), 1);
 
         final CodegenProperty property1 = cm.vars.get(0);
         Assert.assertEquals(property1.baseName, "id");
@@ -196,7 +199,8 @@ public class PhpModelTest {
         Assert.assertEquals(cm.classname, "Sample");
         Assert.assertEquals(cm.description, "a sample model");
         Assert.assertEquals(cm.vars.size(), 1);
-        Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("Children")).size(), 1);
+        // {{imports}} is not used in template
+        //Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("Children")).size(), 1);
 
         final CodegenProperty property1 = cm.vars.get(0);
         Assert.assertEquals(property1.baseName, "children");
@@ -237,7 +241,31 @@ public class PhpModelTest {
         Assert.assertEquals(cm.classname, "Sample");
         Assert.assertEquals(cm.description, "a map model");
         Assert.assertEquals(cm.vars.size(), 0);
-        Assert.assertEquals(cm.imports.size(), 2);
-        Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("Children")).size(), 1);
+        // {{imports}} is not used in template
+        //Assert.assertEquals(cm.imports.size(), 2);
+        //Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("Children")).size(), 1);
+    }
+
+    @DataProvider(name = "modelNames")
+    public static Object[][] primeNumbers() {
+        return new Object[][] {
+            {"sample", "Sample"},
+            {"sample_name", "SampleName"},
+            {"sample__name", "SampleName"},
+            {"/sample", "Sample"},
+            {"\\sample", "\\Sample"},
+            {"sample.name", "SampleName"},
+            {"_sample", "Sample"},
+        };
+    }
+
+    @Test(dataProvider = "modelNames", description = "avoid inner class")
+    public void modelNameTest(String name, String expectedName) {
+        final Model model = new ModelImpl();
+        final DefaultCodegen codegen = new PhpClientCodegen();
+        final CodegenModel cm = codegen.fromModel(name, model);
+
+        Assert.assertEquals(cm.name, name);
+        Assert.assertEquals(cm.classname, expectedName);
     }
 }
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonClientOptionsTest.java
index fc68a9e92e1..2682200e60a 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonClientOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonClientOptionsTest.java
@@ -22,6 +22,7 @@ public class PythonClientOptionsTest extends AbstractOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonTest.java
index 07c4bc76b03..5478200ca9c 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonTest.java
@@ -2,15 +2,30 @@ package io.swagger.codegen.python;
 
 import io.swagger.codegen.CodegenModel;
 import io.swagger.codegen.CodegenOperation;
+import io.swagger.codegen.CodegenProperty;
 import io.swagger.codegen.DefaultCodegen;
 import io.swagger.codegen.languages.PythonClientCodegen;
+import io.swagger.models.ArrayModel;
+import io.swagger.models.Model;
+import io.swagger.models.ModelImpl;
 import io.swagger.models.Operation;
 import io.swagger.models.Swagger;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.DateTimeProperty;
+import io.swagger.models.properties.LongProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.RefProperty;
+import io.swagger.models.properties.StringProperty;
 import io.swagger.parser.SwaggerParser;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
+import org.testng.annotations.ITestAnnotation;
 
+import com.google.common.collect.Sets;
+import java.util.Map;
+
+@SuppressWarnings("static-method")
 public class PythonTest {
 
     @Test(description = "convert a python model with dots")
@@ -34,4 +49,232 @@ public class PythonTest {
         Assert.assertEquals(codegenOperation.returnType, "V1beta3Binding");
         Assert.assertEquals(codegenOperation.returnBaseType, "V1beta3Binding");
     }
+
+    @Test(description = "convert a simple java model")
+    public void simpleModelTest() {
+        final Model model = new ModelImpl()
+                .description("a sample model")
+                .property("id", new LongProperty())
+                .property("name", new StringProperty())
+                .property("createdAt", new DateTimeProperty())
+                .required("id")
+                .required("name");
+        final DefaultCodegen codegen = new PythonClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "a sample model");
+        Assert.assertEquals(cm.vars.size(), 3);
+
+        final CodegenProperty property1 = cm.vars.get(0);
+        Assert.assertEquals(property1.baseName, "id");
+        Assert.assertEquals(property1.datatype, "int");
+        Assert.assertEquals(property1.name, "id");
+        Assert.assertNull(property1.defaultValue);
+        Assert.assertEquals(property1.baseType, "int");
+        Assert.assertTrue(property1.hasMore);
+        Assert.assertTrue(property1.required);
+        Assert.assertTrue(property1.isPrimitiveType);
+        Assert.assertTrue(property1.isNotContainer);
+
+        final CodegenProperty property2 = cm.vars.get(1);
+        Assert.assertEquals(property2.baseName, "name");
+        Assert.assertEquals(property2.datatype, "str");
+        Assert.assertEquals(property2.name, "name");
+        Assert.assertNull(property2.defaultValue);
+        Assert.assertEquals(property2.baseType, "str");
+        Assert.assertTrue(property2.hasMore);
+        Assert.assertTrue(property2.required);
+        Assert.assertTrue(property2.isPrimitiveType);
+        Assert.assertTrue(property2.isNotContainer);
+
+        final CodegenProperty property3 = cm.vars.get(2);
+        Assert.assertEquals(property3.baseName, "createdAt");
+        Assert.assertEquals(property3.datatype, "datetime");
+        Assert.assertEquals(property3.name, "created_at");
+        Assert.assertNull(property3.defaultValue);
+        Assert.assertEquals(property3.baseType, "datetime");
+        Assert.assertNull(property3.hasMore);
+        Assert.assertNull(property3.required);
+        Assert.assertTrue(property3.isNotContainer);
+    }
+
+    @Test(description = "convert a model with list property")
+    public void listPropertyTest() {
+        final Model model = new ModelImpl()
+                .description("a sample model")
+                .property("id", new LongProperty())
+                .property("urls", new ArrayProperty()
+                        .items(new StringProperty()))
+                .required("id");
+        final DefaultCodegen codegen = new PythonClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "a sample model");
+        Assert.assertEquals(cm.vars.size(), 2);
+
+        final CodegenProperty property1 = cm.vars.get(0);
+        Assert.assertEquals(property1.baseName, "id");
+        Assert.assertEquals(property1.datatype, "int");
+        Assert.assertEquals(property1.name, "id");
+        Assert.assertNull(property1.defaultValue);
+        Assert.assertEquals(property1.baseType, "int");
+        Assert.assertTrue(property1.hasMore);
+        Assert.assertTrue(property1.required);
+        Assert.assertTrue(property1.isPrimitiveType);
+        Assert.assertTrue(property1.isNotContainer);
+
+        final CodegenProperty property2 = cm.vars.get(1);
+        Assert.assertEquals(property2.baseName, "urls");
+        Assert.assertEquals(property2.datatype, "list[str]");
+        Assert.assertEquals(property2.name, "urls");
+        Assert.assertNull(property2.defaultValue);
+        Assert.assertEquals(property2.baseType, "list");
+        Assert.assertNull(property2.hasMore);
+        Assert.assertEquals(property2.containerType, "array");
+        Assert.assertNull(property2.required);
+        Assert.assertTrue(property2.isPrimitiveType);
+        Assert.assertTrue(property2.isContainer);
+    }
+
+    @Test(description = "convert a model with a map property")
+    public void mapPropertyTest() {
+        final Model model = new ModelImpl()
+                .description("a sample model")
+                .property("translations", new MapProperty()
+                        .additionalProperties(new StringProperty()))
+                .required("id");
+        final DefaultCodegen codegen = new PythonClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "a sample model");
+        Assert.assertEquals(cm.vars.size(), 1);
+
+        final CodegenProperty property1 = cm.vars.get(0);
+        Assert.assertEquals(property1.baseName, "translations");
+        Assert.assertEquals(property1.datatype, "dict(str, str)");
+        Assert.assertEquals(property1.name, "translations");
+        Assert.assertEquals(property1.baseType, "dict");
+        Assert.assertEquals(property1.containerType, "map");
+        Assert.assertNull(property1.required);
+        Assert.assertTrue(property1.isContainer);
+        Assert.assertTrue(property1.isPrimitiveType);
+    }
+
+    @Test(description = "convert a model with complex property")
+    public void complexPropertyTest() {
+        final Model model = new ModelImpl()
+                .description("a sample model")
+                .property("children", new RefProperty("#/definitions/Children"));
+        final DefaultCodegen codegen = new PythonClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "a sample model");
+        Assert.assertEquals(cm.vars.size(), 1);
+
+        final CodegenProperty property1 = cm.vars.get(0);
+        Assert.assertEquals(property1.baseName, "children");
+        Assert.assertEquals(property1.datatype, "Children");
+        Assert.assertEquals(property1.name, "children");
+        Assert.assertEquals(property1.baseType, "Children");
+        Assert.assertNull(property1.required);
+        Assert.assertTrue(property1.isNotContainer);
+    }
+
+    @Test(description = "convert a model with complex list property")
+    public void complexListPropertyTest() {
+        final Model model = new ModelImpl()
+                .description("a sample model")
+                .property("children", new ArrayProperty()
+                        .items(new RefProperty("#/definitions/Children")));
+        final DefaultCodegen codegen = new PythonClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "a sample model");
+        Assert.assertEquals(cm.vars.size(), 1);
+
+        final CodegenProperty property1 = cm.vars.get(0);
+        Assert.assertEquals(property1.baseName, "children");
+        Assert.assertEquals(property1.complexType, "Children");
+        Assert.assertEquals(property1.datatype, "list[Children]");
+        Assert.assertEquals(property1.name, "children");
+        Assert.assertEquals(property1.baseType, "list");
+        Assert.assertEquals(property1.containerType, "array");
+        Assert.assertNull(property1.required);
+        Assert.assertTrue(property1.isContainer);
+    }
+
+    @Test(description = "convert a model with complex map property")
+    public void complexMapPropertyTest() {
+        final Model model = new ModelImpl()
+                .description("a sample model")
+                .property("children", new MapProperty()
+                        .additionalProperties(new RefProperty("#/definitions/Children")));
+        final DefaultCodegen codegen = new PythonClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "a sample model");
+        Assert.assertEquals(cm.vars.size(), 1);
+        Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("Children")).size(), 1);
+
+        final CodegenProperty property1 = cm.vars.get(0);
+        Assert.assertEquals(property1.baseName, "children");
+        Assert.assertEquals(property1.complexType, "Children");
+        Assert.assertEquals(property1.datatype, "dict(str, Children)");
+        Assert.assertEquals(property1.name, "children");
+        Assert.assertEquals(property1.baseType, "dict");
+        Assert.assertEquals(property1.containerType, "map");
+        Assert.assertNull(property1.required);
+        Assert.assertTrue(property1.isContainer);
+        Assert.assertNull(property1.isNotContainer);
+    }
+
+
+    // should not start with 'null'. need help from the community to investigate further
+    @Test(enabled = false, description = "convert an array model")
+    public void arrayModelTest() {
+        final Model model = new ArrayModel()
+                .description("an array model")
+                .items(new RefProperty("#/definitions/Children"));
+        final DefaultCodegen codegen = new PythonClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "an array model");
+        Assert.assertEquals(cm.vars.size(), 0);
+        Assert.assertEquals(cm.parent, "null<Children>");
+        Assert.assertEquals(cm.imports.size(), 1);
+        Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("Children")).size(), 1);
+    }
+
+    // should not start with 'null'. need help from the community to investigate further
+    @Test(enabled = false, description = "convert an map model")
+    public void mapModelTest() {
+        final Model model = new ModelImpl()
+                .description("a map model")
+                .additionalProperties(new RefProperty("#/definitions/Children"));
+        final DefaultCodegen codegen = new PythonClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "a map model");
+        Assert.assertEquals(cm.vars.size(), 0);
+        Assert.assertEquals(cm.parent, "null<String, Children>");
+        Assert.assertEquals(cm.imports.size(), 2); // TODO: need to verify
+        Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("Children")).size(), 1);
+    }
+
 }
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/qtfivecpp/Qt5CPPOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/qtfivecpp/Qt5CPPOptionsTest.java
index 389721d3841..1bc1147cd00 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/qtfivecpp/Qt5CPPOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/qtfivecpp/Qt5CPPOptionsTest.java
@@ -22,6 +22,7 @@ public class Qt5CPPOptionsTest extends AbstractOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/ruby/RubyClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/ruby/RubyClientOptionsTest.java
index b679de923c8..f61367e8220 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/ruby/RubyClientOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/ruby/RubyClientOptionsTest.java
@@ -22,6 +22,7 @@ public class RubyClientOptionsTest extends AbstractOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
@@ -31,6 +32,19 @@ public class RubyClientOptionsTest extends AbstractOptionsTest {
             times = 1;
             clientCodegen.setGemVersion(RubyClientOptionsProvider.GEM_VERSION_VALUE);
             times = 1;
+            clientCodegen.setGemLicense(RubyClientOptionsProvider.GEM_LICENSE_VALUE);
+            times = 1;
+            clientCodegen.setGemHomepage(RubyClientOptionsProvider.GEM_HOMEPAGE_VALUE);
+            times = 1;
+            clientCodegen.setGemDescription(RubyClientOptionsProvider.GEM_DESCRIPTION_VALUE);
+            times = 1;
+            clientCodegen.setGemSummary(RubyClientOptionsProvider.GEM_SUMMARY_VALUE);
+            times = 1;
+            clientCodegen.setGemAuthor(RubyClientOptionsProvider.GEM_AUTHOR_VALUE);
+            times = 1;
+            clientCodegen.setGemAuthorEmail(RubyClientOptionsProvider.GEM_AUTHOR_EMAIL_VALUE);
+            times = 1;
+
         }};
     }
 }
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/scala/ScalaClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/scala/ScalaClientOptionsTest.java
index 0e916aebd76..fe0b3b3b544 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/scala/ScalaClientOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/scala/ScalaClientOptionsTest.java
@@ -22,6 +22,7 @@ public class ScalaClientOptionsTest extends AbstractOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/scala/ScalaModelTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/scala/ScalaModelTest.java
index 81290c47387..e3c12d028fb 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/scala/ScalaModelTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/scala/ScalaModelTest.java
@@ -18,6 +18,7 @@ import com.google.common.collect.Sets;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+@SuppressWarnings("static-method")
 public class ScalaModelTest {
 
     @Test(description = "convert a simple scala model")
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/scalatra/ScalatraServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/scalatra/ScalatraServerOptionsTest.java
index 49bbe4373b6..70c3dd30987 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/scalatra/ScalatraServerOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/scalatra/ScalatraServerOptionsTest.java
@@ -22,6 +22,7 @@ public class ScalatraServerOptionsTest extends AbstractOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/silex/SilexServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/silex/SilexServerOptionsTest.java
index 11681230289..c32ef13fd82 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/silex/SilexServerOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/silex/SilexServerOptionsTest.java
@@ -22,6 +22,7 @@ public class SilexServerOptionsTest extends AbstractOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/sinatra/SinatraServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/sinatra/SinatraServerOptionsTest.java
index 6691cf27f86..56e81aba251 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/sinatra/SinatraServerOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/sinatra/SinatraServerOptionsTest.java
@@ -22,6 +22,7 @@ public class SinatraServerOptionsTest extends AbstractOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/slim/SlimFrameworkServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/slim/SlimFrameworkServerOptionsTest.java
index 51c668bd931..554f4ca0db5 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/slim/SlimFrameworkServerOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/slim/SlimFrameworkServerOptionsTest.java
@@ -22,6 +22,7 @@ public class SlimFrameworkServerOptionsTest extends AbstractOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/springmvc/SpringMVCServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/springmvc/SpringMVCServerOptionsTest.java
index d4b984ffcd2..c24162c1a3c 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/springmvc/SpringMVCServerOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/springmvc/SpringMVCServerOptionsTest.java
@@ -22,6 +22,7 @@ public class SpringMVCServerOptionsTest extends JavaClientOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/staticDocs/StaticDocOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/staticDocs/StaticDocOptionsTest.java
index bc2da143efb..9f9f6da27a1 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/staticDocs/StaticDocOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/staticDocs/StaticDocOptionsTest.java
@@ -22,6 +22,7 @@ public class StaticDocOptionsTest extends AbstractOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/staticDocs/StaticOperationTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/staticDocs/StaticOperationTest.java
index f3e08e80541..6b16b3b7f5b 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/staticDocs/StaticOperationTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/staticDocs/StaticOperationTest.java
@@ -10,6 +10,7 @@ import io.swagger.models.properties.StringProperty;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+@SuppressWarnings("static-method")
 public class StaticOperationTest {
 
     @Test(description = "convert a string parameter")
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/statichtml/StaticHtmlOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/statichtml/StaticHtmlOptionsTest.java
index befe62e32c4..91ba418fb91 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/statichtml/StaticHtmlOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/statichtml/StaticHtmlOptionsTest.java
@@ -22,6 +22,7 @@ public class StaticHtmlOptionsTest extends AbstractOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/statichtml/StaticHtmlTagsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/statichtml/StaticHtmlTagsTest.java
new file mode 100644
index 00000000000..ad84f8ca0c7
--- /dev/null
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/statichtml/StaticHtmlTagsTest.java
@@ -0,0 +1,134 @@
+package io.swagger.codegen.statichtml;
+
+import static org.testng.Assert.assertEquals;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.annotation.Nullable;
+
+import org.apache.commons.lang.StringUtils;
+import org.junit.rules.TemporaryFolder;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import com.google.common.base.Function;
+import com.google.common.collect.Lists;
+
+import io.swagger.codegen.ClientOptInput;
+import io.swagger.codegen.ClientOpts;
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.DefaultGenerator;
+import io.swagger.codegen.languages.StaticHtmlGenerator;
+import io.swagger.models.Operation;
+import io.swagger.models.Path;
+import io.swagger.models.Swagger;
+import io.swagger.parser.SwaggerParser;
+
+public class StaticHtmlTagsTest {
+
+    public TemporaryFolder folder = new TemporaryFolder();
+
+    @BeforeMethod
+    public void setUp() throws Exception {
+        folder.create();
+    }
+
+    @AfterMethod
+    public void tearDown() throws Exception {
+        folder.delete();
+    }
+    
+    @Test 
+    public void testApiTags() throws Exception {
+        final Swagger swagger = new SwaggerParser().read("src/test/resources/2_0/petstore.json");
+
+        final int maxTagsToTest = 2; // how to flip it randomly from 2 to 1, and shuffle ops?
+        // if an op has a few tags it will be duplicated here, but it's exactly what we expect in doc
+        final List<Operation> expectedOperations = new ArrayList<Operation>();
+        
+        final String capitalCommatizedTags = pickupFewTagsAndOps(swagger,
+                maxTagsToTest, expectedOperations);
+        
+        final Collection<Object> seenOperations = new ArrayList<Object>();
+        CodegenConfig codegenConfig =  new StaticHtmlGenerator(){ // new StaticDocCodegen(){
+            public  Map<String, Object> postProcessSupportingFileData(Map<String, Object> objs)  {
+                //System.out.println(getOperations(objs));
+                final Collection<?> actualOperations = getOperations(objs);
+                seenOperations.addAll(actualOperations);
+                assertEquals(actualOperations.size(), expectedOperations.size(), 
+                        "Expectig the same size of ops for -Dapis="+capitalCommatizedTags +
+                        " in fact, actual "+actualOperations+" doesn't seem like expecting " 
+                                + expectedOperations);
+                return objs;
+            }
+        };
+        codegenConfig.setOutputDir(folder.getRoot().getAbsolutePath());
+            
+        ClientOptInput clientOptInput = new ClientOptInput().opts(new ClientOpts()).swagger(swagger)
+                .config(codegenConfig);
+
+        final String apisBackup = System.setProperty("apis", capitalCommatizedTags);
+        try {
+            DefaultGenerator gen = new DefaultGenerator();
+            gen.opts(clientOptInput);
+            gen.generate();
+            assertEquals(seenOperations.isEmpty(), false, 
+                    "something has been changed in code and now code bypass the mock above...");
+        } finally {
+            if (apisBackup!=null) {
+                System.setProperty("apis", apisBackup);
+            }else{
+                System.clearProperty("apis");  
+            }
+        }
+    }
+
+    protected String pickupFewTagsAndOps(final Swagger swagger,
+            final int maxTagsToTest, final Collection<Operation> expectedOperations) {
+        Set<String> expectedTags = new HashSet<String>();
+        for ( Path path:swagger.getPaths().values() ) {
+            for ( Operation op : path.getOperations() ) {
+                for ( String tag : op.getTags() ) {
+                    if (expectedTags.size() < maxTagsToTest) {
+                        expectedTags.add(tag);
+                        expectedOperations.add(op);
+                    } else {
+                        if ( expectedTags.contains(tag) ) {
+                            expectedOperations.add(op);
+                        }
+                    }
+                }
+            }
+        }
+        
+        final String capitalCommatizedTags = StringUtils.join(
+                Lists.transform(Lists.newArrayList(expectedTags), 
+                        new Function<String, String>() { 
+            @Nullable
+            @Override
+            public String apply(final String input) {
+                return StringUtils.capitalize(input);
+            }
+        }), ",");
+        return capitalCommatizedTags;
+    }
+    
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    protected static Collection getOperations(Map<String, Object> objs) {
+        final ArrayList rez = new ArrayList();
+        final Map apiInfo = (Map)objs.get("apiInfo");
+        for(Object apiElem : ((List)apiInfo.get("apis"))){ 
+            Map<String, Object> api = (Map<String, Object>) apiElem;
+            rez.addAll( (Collection) // what if the same op goes on two tags??
+            ((Map)api.get("operations")).get("operation"));
+        }
+        return rez;
+    }
+}
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/swagger/SwaggerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swagger/SwaggerOptionsTest.java
index f2f461f2b70..ba142d314e9 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/swagger/SwaggerOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swagger/SwaggerOptionsTest.java
@@ -22,6 +22,7 @@ public class SwaggerOptionsTest extends AbstractOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/swaggeryaml/SwaggerYamlOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swaggeryaml/SwaggerYamlOptionsTest.java
index a1478a8ba05..0ed24654f0a 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/swaggeryaml/SwaggerYamlOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swaggeryaml/SwaggerYamlOptionsTest.java
@@ -22,6 +22,7 @@ public class SwaggerYamlOptionsTest extends AbstractOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/swift/SwiftOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swift/SwiftOptionsTest.java
index 7d3504f67de..7b8ccb61632 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/swift/SwiftOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swift/SwiftOptionsTest.java
@@ -22,6 +22,7 @@ public class SwiftOptionsTest extends AbstractOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/tizen/TizenClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/tizen/TizenClientOptionsTest.java
index 83ebb8be15e..35262568fa5 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/tizen/TizenClientOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/tizen/TizenClientOptionsTest.java
@@ -22,6 +22,7 @@ public class TizenClientOptionsTest extends AbstractOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularClientOptionsTest.java
index 3fdf817dc58..17d9c1ed205 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularClientOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularClientOptionsTest.java
@@ -22,11 +22,14 @@ public class TypeScriptAngularClientOptionsTest extends AbstractOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
             clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(TypeScriptAngularClientOptionsProvider.SORT_PARAMS_VALUE));
             times = 1;
+            clientCodegen.setModelPropertyNaming(TypeScriptAngularClientOptionsProvider.MODEL_PROPERTY_NAMING_VALUE);
+            times = 1;
         }};
     }
 }
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularModelTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularModelTest.java
index 55bbbeffdba..26e8f841be9 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularModelTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularModelTest.java
@@ -17,6 +17,7 @@ import com.google.common.collect.Sets;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+@SuppressWarnings("static-method")
 public class TypeScriptAngularModelTest {
 
     @Test(description = "convert a simple TypeScript Angular model")
@@ -58,7 +59,7 @@ public class TypeScriptAngularModelTest {
 
         final CodegenProperty property3 = cm.vars.get(2);
         Assert.assertEquals(property3.baseName, "createdAt");
-        Assert.assertEquals(property3.complexType, "Date");
+        Assert.assertEquals(property3.complexType, null);
         Assert.assertEquals(property3.datatype, "Date");
         Assert.assertEquals(property3.name, "createdAt");
         Assert.assertEquals(property3.defaultValue, "null");
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptnode/TypeScriptNodeClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptnode/TypeScriptNodeClientOptionsTest.java
index 2374011b1b9..67b55de138a 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptnode/TypeScriptNodeClientOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptnode/TypeScriptNodeClientOptionsTest.java
@@ -22,11 +22,14 @@ public class TypeScriptNodeClientOptionsTest extends AbstractOptionsTest {
         return clientCodegen;
     }
 
+    @SuppressWarnings("unused")
     @Override
     protected void setExpectations() {
         new Expectations(clientCodegen) {{
             clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(TypeScriptNodeClientOptionsProvider.SORT_PARAMS_VALUE));
             times = 1;
+            clientCodegen.setModelPropertyNaming(TypeScriptNodeClientOptionsProvider.MODEL_PROPERTY_NAMING_VALUE);
+            times = 1;
         }};
     }
 }
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptnode/TypeScriptNodeModelTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptnode/TypeScriptNodeModelTest.java
index a932ac2b5ae..81a67e87b87 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptnode/TypeScriptNodeModelTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptnode/TypeScriptNodeModelTest.java
@@ -17,6 +17,7 @@ import com.google.common.collect.Sets;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+@SuppressWarnings("static-method")
 public class TypeScriptNodeModelTest {
 
     @Test(description = "convert a simple TypeScript Node model")
@@ -58,7 +59,7 @@ public class TypeScriptNodeModelTest {
 
         final CodegenProperty property3 = cm.vars.get(2);
         Assert.assertEquals(property3.baseName, "createdAt");
-        Assert.assertEquals(property3.complexType, "Date");
+        Assert.assertEquals(property3.complexType, null);
         Assert.assertEquals(property3.datatype, "Date");
         Assert.assertEquals(property3.name, "createdAt");
         Assert.assertEquals(property3.defaultValue, "null");
diff --git a/modules/swagger-codegen/src/test/resources/2_0/discriminatorTest.json b/modules/swagger-codegen/src/test/resources/2_0/discriminatorTest.json
new file mode 100644
index 00000000000..09182fba661
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/2_0/discriminatorTest.json
@@ -0,0 +1,76 @@
+{
+  "swagger" : "2.0",
+  "info" : {},
+  "basePath" : "/v1",
+  "tags" : [ {
+    "name" : "pets",
+    "description" : "some pets"
+  }],
+  "paths" : {
+    "/pets" : {
+      "get" : {
+        "tags" : [ "pets" ],
+        "summary" : "Get your pets",
+        "description" : "Returns pets of different types",
+        "operationId" : "getPets",
+        "consumes" : [ "application/x-www-form-urlencoded" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/Animal"
+            }
+          },
+          "409" : {
+            "description" : "User already has an account or an account request."
+          },
+          "500" : {
+            "description" : "Error creating the account request"
+          }
+        }
+      }
+    }
+  },
+
+  "definitions" : {
+    "Dog" : {
+      "allOf" : [ {
+        "$ref" : "#/definitions/Animal"
+      }, {
+        "type" : "object",
+        "properties" : {
+          "breed" : {
+            "type" : "string"
+          }
+        }
+      } ]
+    },
+    "Cat" : {
+      "allOf" : [ {
+        "$ref" : "#/definitions/Animal"
+      }, {
+        "type" : "object",
+        "properties" : {
+          "declawed" : {
+            "type" : "boolean"
+          }
+        }
+      } ]
+    },
+    "Animal" : {
+      "type" : "object",
+      "discriminator": "className",
+      "required": [
+        "className"
+      ],
+      "properties" : {
+        "className" : {
+          "type" : "string"
+        }
+      }
+    }
+
+  }
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/test/resources/2_0/petstore.json.orig b/modules/swagger-codegen/src/test/resources/2_0/petstore-orig.json
similarity index 100%
rename from modules/swagger-codegen/src/test/resources/2_0/petstore.json.orig
rename to modules/swagger-codegen/src/test/resources/2_0/petstore-orig.json
diff --git a/modules/swagger-codegen/src/test/resources/2_0/petstore.json b/modules/swagger-codegen/src/test/resources/2_0/petstore.json
index 66762d74b2b..dfd7937242e 100644
--- a/modules/swagger-codegen/src/test/resources/2_0/petstore.json
+++ b/modules/swagger-codegen/src/test/resources/2_0/petstore.json
@@ -19,6 +19,49 @@
     "http"
   ],
   "paths": {
+    "/pet?testing_byte_array=true": {
+      "post": {
+        "tags": [
+          "pet"
+        ],
+        "summary": "Fake endpoint to test byte array in body parameter for adding a new pet to the store",
+        "description": "",
+        "operationId": "addPetUsingByteArray",
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "in": "body",
+            "name": "body",
+            "description": "Pet object in the form of byte array",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "format": "binary"
+            }
+          }
+        ],
+        "responses": {
+          "405": {
+            "description": "Invalid input"
+          }
+        },
+        "security": [
+          {
+            "petstore_auth": [
+              "write:pets",
+              "read:pets"
+            ]
+          }
+        ]
+      }
+    },
     "/pet": {
       "post": {
         "tags": [
@@ -113,7 +156,7 @@
           "pet"
         ],
         "summary": "Finds Pets by status",
-        "description": "Multiple status values can be provided with comma seperated strings",
+        "description": "Multiple status values can be provided with comma separated strings",
         "operationId": "findPetsByStatus",
         "produces": [
           "application/json",
@@ -123,13 +166,23 @@
           {
             "name": "status",
             "in": "query",
-            "description": "Status values that need to be considered for filter",
+            "description": "Status values that need to be considered for query",
             "required": false,
             "type": "array",
             "items": {
-              "type": "string"
+              "type": "string",
+              "enum": [
+                "available",
+                "pending",
+                "sold"
+              ]
             },
             "collectionFormat": "multi",
+            "enum": [
+              "available",
+              "pending",
+              "sold"
+            ],
             "default": "available"
           }
         ],
@@ -206,6 +259,150 @@
         ]
       }
     },
+    "/pet/{petId}?testing_byte_array=true": {
+      "get": {
+        "tags": [
+          "pet"
+        ],
+        "summary": "Fake endpoint to test byte array return by 'Find pet by ID'",
+        "description": "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions",
+        "operationId": "",
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "name": "petId",
+            "in": "path",
+            "description": "ID of pet that needs to be fetched",
+            "required": true,
+            "type": "integer",
+            "format": "int64"
+          }
+        ],
+        "responses": {
+          "404": {
+            "description": "Pet not found"
+          },
+          "200": {
+            "description": "successful operation",
+            "schema": {
+              "type": "string",
+              "format": "binary"
+            }
+          },
+          "400": {
+            "description": "Invalid ID supplied"
+          }
+        },
+        "security": [
+          {
+            "api_key": []
+          },
+          {
+            "petstore_auth": [
+              "write:pets",
+              "read:pets"
+            ]
+          }
+        ]
+      }
+    },
+    "/pet/{petId}?response=inline_arbitrary_object": {
+      "get": {
+        "tags": [
+          "pet"
+        ],
+        "summary": "Fake endpoint to test inline arbitrary object return by 'Find pet by ID'",
+        "description": "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions",
+        "operationId": "getPetByIdInObject",
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "name": "petId",
+            "in": "path",
+            "description": "ID of pet that needs to be fetched",
+            "required": true,
+            "type": "integer",
+            "format": "int64"
+          }
+        ],
+        "responses": {
+          "404": {
+            "description": "Pet not found"
+          },
+          "200": {
+            "description": "successful operation",
+            "schema": {
+              "type": "object",
+              "required": [
+                "id"
+              ],
+              "properties": {
+                "id": {
+                  "type": "integer",
+                  "format": "int64"
+                },
+                "category": {
+                  "type": "object"
+                },
+                "name": {
+                  "type": "string",
+                  "example": "doggie"
+                },
+                "photoUrls": {
+                    "type": "array",
+                    "xml": {
+                        "name": "photoUrl",
+                        "wrapped": true
+                    },
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "tags": {
+                    "type": "array",
+                    "xml": {
+                        "name": "tag",
+                        "wrapped": true
+                    },
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    }
+                },
+                "status": {
+                    "type": "string",
+                    "description": "pet status in the store",
+                    "enum": [
+                        "available",
+                    "pending",
+                    "sold"
+                        ]
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid ID supplied"
+          }
+        },
+        "security": [
+          {
+            "api_key": []
+          },
+          {
+            "petstore_auth": [
+              "write:pets",
+              "read:pets"
+            ]
+          }
+        ]
+      }
+    },
     "/pet/{petId}": {
       "get": {
         "tags": [
@@ -433,6 +630,33 @@
         ]
       }
     },
+    "/store/inventory?response=arbitrary_object": {
+      "get": {
+        "tags": [
+          "store"
+        ],
+        "summary": "Fake endpoint to test arbitrary object return by 'Get inventory'",
+        "description": "Returns an arbitrary object which is actually a map of status codes to quantities",
+        "operationId": "getInventoryInObject",
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "schema": {
+              "type": "object"
+            }
+          }
+        },
+        "security": [
+          {
+            "api_key": []
+          }
+        ]
+      }
+    },
     "/store/order": {
       "post": {
         "tags": [
@@ -466,7 +690,62 @@
           "400": {
             "description": "Invalid Order"
           }
-        }
+        },
+        "security": [
+          {
+            "test_api_client_id": [],
+            "test_api_client_secret": []
+          }
+        ]
+      }
+    },
+     "/store/findByStatus": {
+      "get": {
+        "tags": [
+          "store"
+        ],
+        "summary": "Finds orders by status",
+        "description": "A single status value can be provided as a string",
+        "operationId": "findOrdersByStatus",
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "name": "status",
+            "in": "query",
+            "description": "Status value that needs to be considered for query",
+            "required": false,
+            "type": "string",
+            "enum": [
+              "placed",
+              "approved",
+              "delivered"
+            ],
+            "default": "placed"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/Order"
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid status value"
+          }
+        },
+        "security": [
+          {
+            "test_api_client_id": [],
+            "test_api_client_secret": []
+          }
+        ]
       }
     },
     "/store/order/{orderId}": {
@@ -503,7 +782,15 @@
           "400": {
             "description": "Invalid ID supplied"
           }
-        }
+        },
+        "security": [
+          {
+            "test_api_key_header": []
+          },
+          {
+            "test_api_key_query": []
+          }
+        ]
       },
       "delete": {
         "tags": [
@@ -804,7 +1091,12 @@
           "400": {
             "description": "Invalid username supplied"
           }
-        }
+        },
+        "security": [
+          {
+            "test_http_basic": []
+          }
+        ]
       }
     }
   },
@@ -822,6 +1114,29 @@
         "write:pets": "modify pets in your account",
         "read:pets": "read your pets"
       }
+    },
+    "test_api_client_id": {
+      "type": "apiKey",
+      "name": "x-test_api_client_id",
+      "in": "header"
+    },
+    "test_api_client_secret": {
+      "type": "apiKey",
+      "name": "x-test_api_client_secret",
+      "in": "header"
+    },
+    "test_api_key_header": {
+      "type": "apiKey",
+      "name": "test_api_key_header",
+      "in": "header"
+    },
+    "test_api_key_query": {
+      "type": "apiKey",
+      "name": "test_api_key_query",
+      "in": "query"
+    },
+    "test_http_basic": {
+      "type": "basic"
     }
   },
   "definitions": {
@@ -942,7 +1257,8 @@
       "properties": {
         "id": {
           "type": "integer",
-          "format": "int64"
+          "format": "int64",
+          "readOnly": true
         },
         "petId": {
           "type": "integer",
@@ -972,6 +1288,93 @@
       "xml": {
         "name": "Order"
       }
+    },
+    "$special[model.name]": {
+      "properties": {
+        "$special[property.name]": {
+          "type": "integer",
+          "format": "int64"
+        }
+      },
+      "xml": {
+        "name": "$special[model.name]"
+      }
+    },
+    "Return": {
+      "description": "Model for testing reserved words",
+      "properties": {
+        "return": {
+          "type": "integer",
+          "format": "int32"
+        }
+      },
+      "xml": {
+        "name": "Return"
+      }
+    },
+    "Name": {
+      "description": "Model for testing model name same as property name",
+      "properties": {
+        "name": {
+          "type": "integer",
+          "format": "int32"
+        },
+        "snake_case": {
+          "type": "integer",
+          "format": "int32"
+        }
+      },
+      "xml": {
+        "name": "Name"
+      }
+    },
+    "200_response": {
+      "description": "Model for testing model name starting with number",
+      "properties": {
+        "name": {
+          "type": "integer",
+          "format": "int32"
+        }
+      },
+      "xml": {
+        "name": "Name"
+      }
+    },
+    "Dog" : {
+      "allOf" : [ {
+        "$ref" : "#/definitions/Animal"
+      }, {
+        "type" : "object",
+        "properties" : {
+          "breed" : {
+            "type" : "string"
+          }
+        }
+      } ]
+    },
+    "Cat" : {
+      "allOf" : [ {
+        "$ref" : "#/definitions/Animal"
+      }, {
+        "type" : "object",
+        "properties" : {
+          "declawed" : {
+            "type" : "boolean"
+          }
+        }
+      } ]
+    },
+    "Animal" : {
+      "type" : "object",
+      "discriminator": "className",
+      "required": [
+        "className"
+      ],
+      "properties" : {
+        "className" : {
+          "type" : "string"
+        }
+      }
     }
   }
 }
diff --git a/modules/swagger-codegen/src/test/resources/2_0/petstore.yaml b/modules/swagger-codegen/src/test/resources/2_0/petstore.yaml
new file mode 100644
index 00000000000..cbfae8e4c45
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/2_0/petstore.yaml
@@ -0,0 +1,576 @@
+swagger: "2.0"
+info:
+  description: |
+    This is a sample server Petstore server.
+
+    [Learn about Swagger](http://swagger.io) or join the IRC channel `#swagger` on irc.freenode.net.
+
+    For this sample, you can use the api key `special-key` to test the authorization filters
+  version: "1.0.0"
+  title: Swagger Petstore
+  termsOfService: http://helloreverb.com/terms/
+  contact:
+    name: apiteam@swagger.io
+  license:
+    name: Apache 2.0
+    url: http://www.apache.org/licenses/LICENSE-2.0.html
+host: petstore.swagger.io
+basePath: /v2
+schemes:
+  - http
+paths:
+  /pets:
+    post:
+      tags:
+        - pet
+      summary: Add a new pet to the store
+      description: ""
+      operationId: addPet
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      parameters:
+        - in: body
+          name: body
+          description: Pet object that needs to be added to the store
+          required: false
+          schema:
+            $ref: "#/definitions/Pet"
+      responses:
+        "405":
+          description: Invalid input
+      security:
+        - petstore_auth:
+          - write_pets
+          - read_pets
+    put:
+      tags:
+        - pet
+      summary: Update an existing pet
+      description: ""
+      operationId: updatePet
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      parameters:
+        - in: body
+          name: body
+          description: Pet object that needs to be added to the store
+          required: false
+          schema:
+            $ref: "#/definitions/Pet"
+      responses:
+        "405":
+          description: Validation exception
+        "404":
+          description: Pet not found
+        "400":
+          description: Invalid ID supplied
+      security:
+        - petstore_auth:
+          - write_pets
+          - read_pets
+  /pets/findByStatus:
+    get:
+      tags:
+        - pet
+      summary: Finds Pets by status
+      description: Multiple status values can be provided with comma seperated strings
+      operationId: findPetsByStatus
+      produces:
+        - application/json
+        - application/xml
+      parameters:
+        - in: query
+          name: status
+          description: Status values that need to be considered for filter
+          required: false
+          type: array
+          items:
+            type: string
+          collectionFormat: multi
+      responses:
+        "200":
+          description: successful operation
+          schema:
+            type: array
+            items:
+              $ref: "#/definitions/Pet"
+        "400":
+          description: Invalid status value
+      security:
+        - petstore_auth:
+          - write_pets
+          - read_pets
+  /pets/findByTags:
+    get:
+      tags:
+        - pet
+      summary: Finds Pets by tags
+      description: Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+      operationId: findPetsByTags
+      produces:
+        - application/json
+        - application/xml
+      parameters:
+        - in: query
+          name: tags
+          description: Tags to filter by
+          required: false
+          type: array
+          items:
+            type: string
+          collectionFormat: multi
+      responses:
+        "200":
+          description: successful operation
+          schema:
+            type: array
+            items:
+              $ref: "#/definitions/Pet"
+        "400":
+          description: Invalid tag value
+      security:
+        - petstore_auth:
+          - write_pets
+          - read_pets
+  /pets/{petId}:
+    get:
+      tags:
+        - pet
+      summary: Find pet by ID
+      description: Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
+      operationId: getPetById
+      produces:
+        - application/json
+        - application/xml
+      parameters:
+        - in: path
+          name: petId
+          description: ID of pet that needs to be fetched
+          required: true
+          type: integer
+          format: int64
+      responses:
+        "404":
+          description: Pet not found
+        "200":
+          description: successful operation
+          schema:
+            $ref: "#/definitions/Pet"
+        "400":
+          description: Invalid ID supplied
+      security:
+        - api_key: []
+        - petstore_auth:
+          - write_pets
+          - read_pets
+    post:
+      tags:
+        - pet
+      summary: Updates a pet in the store with form data
+      description: ""
+      operationId: updatePetWithForm
+      consumes:
+        - application/x-www-form-urlencoded
+      produces:
+        - application/json
+        - application/xml
+      parameters:
+        - in: path
+          name: petId
+          description: ID of pet that needs to be updated
+          required: true
+          type: string
+        - in: formData
+          name: name
+          description: Updated name of the pet
+          required: true
+          type: string
+        - in: formData
+          name: status
+          description: Updated status of the pet
+          required: true
+          type: string
+      responses:
+        "405":
+          description: Invalid input
+      security:
+        - petstore_auth:
+          - write_pets
+          - read_pets
+    delete:
+      tags:
+        - pet
+      summary: Deletes a pet
+      description: ""
+      operationId: deletePet
+      produces:
+        - application/json
+        - application/xml
+      parameters:
+        - in: header
+          name: api_key
+          description: ""
+          required: true
+          type: string
+        - in: path
+          name: petId
+          description: Pet id to delete
+          required: true
+          type: integer
+          format: int64
+      responses:
+        "400":
+          description: Invalid pet value
+      security:
+        - petstore_auth:
+          - write_pets
+          - read_pets
+  /stores/order:
+    post:
+      tags:
+        - store
+      summary: Place an order for a pet
+      description: ""
+      operationId: placeOrder
+      produces:
+        - application/json
+        - application/xml
+      parameters:
+        - in: body
+          name: body
+          description: order placed for purchasing the pet
+          required: false
+          schema:
+            $ref: "#/definitions/Order"
+      responses:
+        "200":
+          description: successful operation
+          schema:
+            $ref: "#/definitions/Order"
+        "400":
+          description: Invalid Order
+  /stores/order/{orderId}:
+    get:
+      tags:
+        - store
+      summary: Find purchase order by ID
+      description: For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+      operationId: getOrderById
+      produces:
+        - application/json
+        - application/xml
+      parameters:
+        - in: path
+          name: orderId
+          description: ID of pet that needs to be fetched
+          required: true
+          type: string
+      responses:
+        "404":
+          description: Order not found
+        "200":
+          description: successful operation
+          schema:
+            $ref: "#/definitions/Order"
+        "400":
+          description: Invalid ID supplied
+    delete:
+      tags:
+        - store
+      summary: Delete purchase order by ID
+      description: For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+      operationId: deleteOrder
+      produces:
+        - application/json
+        - application/xml
+      parameters:
+        - in: path
+          name: orderId
+          description: ID of the order that needs to be deleted
+          required: true
+          type: string
+      responses:
+        "404":
+          description: Order not found
+        "400":
+          description: Invalid ID supplied
+  /users:
+    post:
+      tags:
+        - user
+      summary: Create user
+      description: This can only be done by the logged in user.
+      operationId: createUser
+      produces:
+        - application/json
+        - application/xml
+      parameters:
+        - in: body
+          name: body
+          description: Created user object
+          required: false
+          schema:
+            $ref: "#/definitions/User"
+      responses:
+        default:
+          description: successful operation
+  /users/createWithArray:
+    post:
+      tags:
+        - user
+      summary: Creates list of users with given input array
+      description: ""
+      operationId: createUsersWithArrayInput
+      produces:
+        - application/json
+        - application/xml
+      parameters:
+        - in: body
+          name: body
+          description: List of user object
+          required: false
+          schema:
+            type: array
+            items:
+              $ref: "#/definitions/User"
+      responses:
+        default:
+          description: successful operation
+  /users/createWithList:
+    post:
+      tags:
+        - user
+      summary: Creates list of users with given input array
+      description: ""
+      operationId: createUsersWithListInput
+      produces:
+        - application/json
+        - application/xml
+      parameters:
+        - in: body
+          name: body
+          description: List of user object
+          required: false
+          schema:
+            type: array
+            items:
+              $ref: "#/definitions/User"
+      responses:
+        default:
+          description: successful operation
+  /users/login:
+    get:
+      tags:
+        - user
+      summary: Logs user into the system
+      description: ""
+      operationId: loginUser
+      produces:
+        - application/json
+        - application/xml
+      parameters:
+        - in: query
+          name: username
+          description: The user name for login
+          required: false
+          type: string
+        - in: query
+          name: password
+          description: The password for login in clear text
+          required: false
+          type: string
+      responses:
+        "200":
+          description: successful operation
+          schema:
+            type: string
+        "400":
+          description: Invalid username/password supplied
+  /users/logout:
+    get:
+      tags:
+        - user
+      summary: Logs out current logged in user session
+      description: ""
+      operationId: logoutUser
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        default:
+          description: successful operation
+  /users/{username}:
+    get:
+      tags:
+        - user
+      summary: Get user by user name
+      description: ""
+      operationId: getUserByName
+      produces:
+        - application/json
+        - application/xml
+      parameters:
+        - in: path
+          name: username
+          description: The name that needs to be fetched. Use user1 for testing.
+          required: true
+          type: string
+      responses:
+        "404":
+          description: User not found
+        "200":
+          description: successful operation
+          schema:
+            $ref: "#/definitions/User"
+        "400":
+          description: Invalid username supplied
+    put:
+      tags:
+        - user
+      summary: Updated user
+      description: This can only be done by the logged in user.
+      operationId: updateUser
+      produces:
+        - application/json
+        - application/xml
+      parameters:
+        - in: path
+          name: username
+          description: name that need to be deleted
+          required: true
+          type: string
+        - in: body
+          name: body
+          description: Updated user object
+          required: false
+          schema:
+            $ref: "#/definitions/User"
+      responses:
+        "404":
+          description: User not found
+        "400":
+          description: Invalid user supplied
+    delete:
+      tags:
+        - user
+      summary: Delete user
+      description: This can only be done by the logged in user.
+      operationId: deleteUser
+      produces:
+        - application/json
+        - application/xml
+      parameters:
+        - in: path
+          name: username
+          description: The name that needs to be deleted
+          required: true
+          type: string
+      responses:
+        "404":
+          description: User not found
+        "400":
+          description: Invalid username supplied
+securityDefinitions:
+  api_key:
+    type: apiKey
+    name: api_key
+    in: header
+  petstore_auth:
+    type: oauth2
+    authorizationUrl: http://petstore.swagger.io/api/oauth/dialog
+    flow: implicit
+    scopes:
+      write_pets: modify pets in your account
+      read_pets: read your pets
+definitions:
+  User:
+    type: object
+    properties:
+      id:
+        type: integer
+        format: int64
+      username:
+        type: string
+      firstName:
+        type: string
+      lastName:
+        type: string
+      email:
+        type: string
+      password:
+        type: string
+      phone:
+        type: string
+      userStatus:
+        type: integer
+        format: int32
+        description: User Status
+  Category:
+    type: object
+    properties:
+      id:
+        type: integer
+        format: int64
+      name:
+        type: string
+  Pet:
+    type: object
+    required:
+      - name
+      - photoUrls
+    properties:
+      id:
+        type: integer
+        format: int64
+      category:
+        $ref: "#/definitions/Category"
+      name:
+        type: string
+        example: doggie
+      photoUrls:
+        type: array
+        items:
+          type: string
+      tags:
+        type: array
+        items:
+          $ref: "#/definitions/Tag"
+      status:
+        type: string
+        description: pet status in the store
+  Tag:
+    type: object
+    properties:
+      id:
+        type: integer
+        format: int64
+      name:
+        type: string
+  Order:
+    type: object
+    properties:
+      id:
+        type: integer
+        format: int64
+      petId:
+        type: integer
+        format: int64
+      quantity:
+        type: integer
+        format: int32
+      shipDate:
+        type: string
+        format: date-time
+      status:
+        type: string
+        description: Order Status
+      complete:
+        type: boolean
\ No newline at end of file
diff --git a/modules/swagger-generator/pom.xml b/modules/swagger-generator/pom.xml
index e893fed1ba3..6210ed77f37 100644
--- a/modules/swagger-generator/pom.xml
+++ b/modules/swagger-generator/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-codegen-project</artifactId>
-        <version>2.1.5</version>
+        <version>2.1.6-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <artifactId>swagger-generator</artifactId>
@@ -218,6 +218,6 @@
         <servlet-api-version>2.5</servlet-api-version>
         <zip-version>1.3.2</zip-version>
         <jetty-version>9.2.9.v20150224</jetty-version>
-        <jersey2-version>2.4.1</jersey2-version>
+        <jersey2-version>2.6</jersey2-version>
     </properties>
 </project>
diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/Bootstrap.java b/modules/swagger-generator/src/main/java/io/swagger/generator/Bootstrap.java
index 7d1c46c4362..c0af8dc56c9 100644
--- a/modules/swagger-generator/src/main/java/io/swagger/generator/Bootstrap.java
+++ b/modules/swagger-generator/src/main/java/io/swagger/generator/Bootstrap.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 SmartBear Software
+ * Copyright 2016 SmartBear Software
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ package io.swagger.generator;
 import org.apache.commons.io.IOUtils;
 
 import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import java.io.IOException;
@@ -30,8 +29,6 @@ public class Bootstrap extends HttpServlet {
 
     @Override
     public void init(ServletConfig config) throws ServletException {
-        ServletContext context = config.getServletContext();
-
         DynamicSwaggerConfig bc = new DynamicSwaggerConfig();
         bc.setBasePath("/api");
         bc.setTitle("Swagger Generator");
diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/DynamicSwaggerConfig.java b/modules/swagger-generator/src/main/java/io/swagger/generator/DynamicSwaggerConfig.java
index 974b938a1aa..cc768bc6d10 100644
--- a/modules/swagger-generator/src/main/java/io/swagger/generator/DynamicSwaggerConfig.java
+++ b/modules/swagger-generator/src/main/java/io/swagger/generator/DynamicSwaggerConfig.java
@@ -11,12 +11,26 @@ import io.swagger.models.parameters.Parameter;
 import io.swagger.models.parameters.PathParameter;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class DynamicSwaggerConfig extends BeanConfig {
     static List<String> clients = new ArrayList<String>();
     static List<String> servers = new ArrayList<String>();
 
+    static {
+        List<CodegenConfig> extensions = Codegen.getExtensions();
+        for (CodegenConfig config : extensions) {
+            if (config.getTag().equals(CodegenType.CLIENT) || config.getTag().equals(CodegenType.DOCUMENTATION)) {
+                clients.add(config.getName());
+            } else if (config.getTag().equals(CodegenType.SERVER)) {
+                servers.add(config.getName());
+            }
+        }
+        Collections.sort(clients, String.CASE_INSENSITIVE_ORDER);
+        Collections.sort(servers, String.CASE_INSENSITIVE_ORDER);
+    }
+
     @Override
     public Swagger configure(Swagger swagger) {
         Path clientPath = swagger.getPaths().get("/gen/clients/{language}");
@@ -62,15 +76,4 @@ public class DynamicSwaggerConfig extends BeanConfig {
                 .host(getHost())
                 .basePath("/api");
     }
-
-    static {
-        List<CodegenConfig> extensions = Codegen.getExtensions();
-        for (CodegenConfig config : extensions) {
-            if (config.getTag().equals(CodegenType.CLIENT) || config.getTag().equals(CodegenType.DOCUMENTATION)) {
-                clients.add(config.getName());
-            } else if (config.getTag().equals(CodegenType.SERVER)) {
-                servers.add(config.getName());
-            }
-        }
-    }
 }
diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/exception/ApiException.java b/modules/swagger-generator/src/main/java/io/swagger/generator/exception/ApiException.java
index fe8b455ecb0..11932b26295 100644
--- a/modules/swagger-generator/src/main/java/io/swagger/generator/exception/ApiException.java
+++ b/modules/swagger-generator/src/main/java/io/swagger/generator/exception/ApiException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 SmartBear Software
+ * Copyright 2016 SmartBear Software
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,4 +24,9 @@ public class ApiException extends Exception {
         super(msg);
         this.code = code;
     }
+
+    public int getCode()
+    {
+        return code;
+    }
 }
diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/exception/BadRequestException.java b/modules/swagger-generator/src/main/java/io/swagger/generator/exception/BadRequestException.java
index 7cab512b58c..2adf97b8bf4 100644
--- a/modules/swagger-generator/src/main/java/io/swagger/generator/exception/BadRequestException.java
+++ b/modules/swagger-generator/src/main/java/io/swagger/generator/exception/BadRequestException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 SmartBear Software
+ * Copyright 2016 SmartBear Software
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,12 @@
 
 package io.swagger.generator.exception;
 
+import org.apache.http.HttpStatus;
+
 public class BadRequestException extends ApiException {
     private static final long serialVersionUID = -5540416398447252055L;
-    private int code;
 
-    public BadRequestException(int code, String msg) {
-        super(code, msg);
-        this.code = code;
+    public BadRequestException(String msg) {
+        super(HttpStatus.SC_BAD_REQUEST, msg);
     }
 }
diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/exception/NotFoundException.java b/modules/swagger-generator/src/main/java/io/swagger/generator/exception/NotFoundException.java
index b84985d51e1..d3747be7d9a 100644
--- a/modules/swagger-generator/src/main/java/io/swagger/generator/exception/NotFoundException.java
+++ b/modules/swagger-generator/src/main/java/io/swagger/generator/exception/NotFoundException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 SmartBear Software
+ * Copyright 2016 SmartBear Software
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,12 @@
 
 package io.swagger.generator.exception;
 
+import org.apache.http.HttpStatus;
+
 public class NotFoundException extends ApiException {
     private static final long serialVersionUID = -1223255119112336573L;
-    private int code;
 
-    public NotFoundException(int code, String msg) {
-        super(code, msg);
-        this.code = code;
+    public NotFoundException(String msg) {
+        super(HttpStatus.SC_NOT_FOUND, msg);
     }
 }
diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/model/ApiResponse.java b/modules/swagger-generator/src/main/java/io/swagger/generator/model/ApiResponse.java
index 8fe9d41fb7e..424b9dd2b0a 100644
--- a/modules/swagger-generator/src/main/java/io/swagger/generator/model/ApiResponse.java
+++ b/modules/swagger-generator/src/main/java/io/swagger/generator/model/ApiResponse.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 SmartBear Software
+ * Copyright 2016 SmartBear Software
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/model/Generated.java b/modules/swagger-generator/src/main/java/io/swagger/generator/model/Generated.java
index 614adcc61bc..f48be6a77da 100644
--- a/modules/swagger-generator/src/main/java/io/swagger/generator/model/Generated.java
+++ b/modules/swagger-generator/src/main/java/io/swagger/generator/model/Generated.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 SmartBear Software
+ * Copyright 2016 SmartBear Software
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/model/GeneratorInput.java b/modules/swagger-generator/src/main/java/io/swagger/generator/model/GeneratorInput.java
index 5175ac3b60a..fabde1e3104 100644
--- a/modules/swagger-generator/src/main/java/io/swagger/generator/model/GeneratorInput.java
+++ b/modules/swagger-generator/src/main/java/io/swagger/generator/model/GeneratorInput.java
@@ -2,6 +2,7 @@ package io.swagger.generator.model;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.AuthorizationValue;
 import io.swagger.models.auth.SecuritySchemeDefinition;
 
 import java.util.Map;
@@ -11,6 +12,15 @@ public class GeneratorInput {
     private Map<String, String> options;
     private String swaggerUrl;
     private SecuritySchemeDefinition auth;
+    private AuthorizationValue authorizationValue;
+
+    public AuthorizationValue getAuthorizationValue() {
+        return authorizationValue;
+    }
+
+    public void setAuthorizationValue(AuthorizationValue authorizationValue) {
+        this.authorizationValue = authorizationValue;
+    }
 
     @ApiModelProperty(dataType = "Object")
     public JsonNode getSpec() {
@@ -38,10 +48,12 @@ public class GeneratorInput {
         this.swaggerUrl = url;
     }
 
+    @Deprecated
     public SecuritySchemeDefinition getSecurityDefinition() {
         return auth;
     }
 
+    @Deprecated
     public void setSecurityDefinition(SecuritySchemeDefinition auth) {
         this.auth = auth;
     }
diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/model/InputOption.java b/modules/swagger-generator/src/main/java/io/swagger/generator/model/InputOption.java
index 45b3b7b7bbf..33df1bc5071 100644
--- a/modules/swagger-generator/src/main/java/io/swagger/generator/model/InputOption.java
+++ b/modules/swagger-generator/src/main/java/io/swagger/generator/model/InputOption.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 SmartBear Software
+ * Copyright 2016 SmartBear Software
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java b/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java
index 9946831640d..fecd5706361 100644
--- a/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java
+++ b/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java
@@ -1,22 +1,16 @@
 package io.swagger.generator.online;
 
 import com.fasterxml.jackson.databind.JsonNode;
-
-import io.swagger.codegen.CliOption;
-import io.swagger.codegen.ClientOptInput;
-import io.swagger.codegen.ClientOpts;
-import io.swagger.codegen.Codegen;
-import io.swagger.codegen.CodegenConfig;
-import io.swagger.codegen.CodegenConfigLoader;
+import io.swagger.codegen.*;
 import io.swagger.generator.exception.ApiException;
 import io.swagger.generator.exception.BadRequestException;
 import io.swagger.generator.model.GeneratorInput;
 import io.swagger.generator.model.InputOption;
 import io.swagger.generator.util.ZipUtil;
 import io.swagger.models.Swagger;
+import io.swagger.models.auth.AuthorizationValue;
 import io.swagger.parser.SwaggerParser;
 import io.swagger.util.Json;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -34,7 +28,7 @@ public class Generator {
         try {
             config = CodegenConfigLoader.forName(language);
         } catch (Exception e) {
-            throw new BadRequestException(400, String.format("Unsupported target %s supplied. %s", language, e));
+            throw new BadRequestException(String.format("Unsupported target %s supplied. %s", language, e));
         }
         Map<String, CliOption> map = new LinkedHashMap<String, CliOption>();
         for (CliOption option : config.cliOptions()) {
@@ -69,7 +63,7 @@ public class Generator {
     private static String generate(String language, GeneratorInput opts, Type type) throws ApiException {
         LOGGER.debug(String.format("generate %s for %s", type.getTypeName(), language));
         if (opts == null) {
-            throw new BadRequestException(400, "No options were supplied");
+            throw new BadRequestException("No options were supplied");
         }
         JsonNode node = opts.getSpec();
         if(node != null && "{}".equals(node.toString())) {
@@ -79,21 +73,43 @@ public class Generator {
         Swagger swagger;
         if (node == null) {
             if (opts.getSwaggerUrl() != null) {
-                swagger = new SwaggerParser().read(opts.getSwaggerUrl());
+                if(opts.getAuthorizationValue() != null) {
+                    List<AuthorizationValue> authorizationValues = new ArrayList<AuthorizationValue>();
+                    authorizationValues.add(opts.getAuthorizationValue());
+
+                    swagger = new SwaggerParser().read(opts.getSwaggerUrl(), authorizationValues, true);
+                }
+                else {
+                    swagger = new SwaggerParser().read(opts.getSwaggerUrl());
+                }
             } else {
-                throw new BadRequestException(400, "No swagger specification was supplied");
+                throw new BadRequestException("No swagger specification was supplied");
             }
-        } else {
+        } else if(opts.getAuthorizationValue() != null) {
+            List<AuthorizationValue> authorizationValues = new ArrayList<AuthorizationValue>();
+            authorizationValues.add(opts.getAuthorizationValue());
+            swagger = new SwaggerParser().read(node, authorizationValues, true);
+        }
+        else {
             swagger = new SwaggerParser().read(node, true);
         }
         if (swagger == null) {
-            throw new BadRequestException(400, "The swagger specification supplied was not valid");
+            throw new BadRequestException("The swagger specification supplied was not valid");
+        }
+
+        String destPath = null;
+
+        if(opts != null && opts.getOptions() != null) {
+            destPath = opts.getOptions().get("outputFolder");
+        }
+        if(destPath == null) {
+            destPath = language + "-"
+                    + type.getTypeName();
         }
 
         ClientOptInput clientOptInput = new ClientOptInput();
         ClientOpts clientOpts = new ClientOpts();
-        String outputFolder = getTmpFolder().getAbsolutePath() + File.separator + language + "-"
-                + type.getTypeName();
+        String outputFolder = getTmpFolder().getAbsolutePath() + File.separator + destPath;
         String outputFilename = outputFolder + "-bundle.zip";
 
         clientOptInput
@@ -104,7 +120,7 @@ public class Generator {
         try {
             codegenConfig = CodegenConfigLoader.forName(language);
         } catch(RuntimeException e) {
-            throw new BadRequestException(400, "Unsupported target " + language + " supplied");
+            throw new BadRequestException("Unsupported target " + language + " supplied");
         }
 
         if (opts.getOptions() != null) {
@@ -122,12 +138,12 @@ public class Generator {
             List<File> files = new Codegen().opts(clientOptInput).generate();
             if (files.size() > 0) {
                 List<File> filesToAdd = new ArrayList<File>();
-                System.out.println("adding to " + outputFolder);
+                LOGGER.debug("adding to " + outputFolder);
                 filesToAdd.add(new File(outputFolder));
                 ZipUtil zip = new ZipUtil();
                 zip.compressFiles(filesToAdd, outputFilename);
             } else {
-                throw new BadRequestException(400, "A target generation was attempted, but no files were created!");
+                throw new BadRequestException("A target generation was attempted, but no files were created!");
             }
             for(File file: files) {
                 try {
@@ -144,16 +160,16 @@ public class Generator {
                 LOGGER.error("unable to delete output folder " + outputFolder);
             }
         } catch (Exception e) {
-            throw new BadRequestException(500, "Unable to build target: " + e.getMessage());
+            throw new BadRequestException("Unable to build target: " + e.getMessage());
         }
         return outputFilename;
     }
 
-    public static InputOption clientOptions(String language) {
+    public static InputOption clientOptions(@SuppressWarnings("unused") String language) {
         return null;
     }
 
-    public static InputOption serverOptions(String language) {
+    public static InputOption serverOptions(@SuppressWarnings("unused") String language) {
         return null;
     }
 
diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java b/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java
index 343692f8385..dc1cff0d320 100644
--- a/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java
+++ b/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java
@@ -24,11 +24,26 @@ import java.util.*;
 
 @Path("/gen")
 @Api(value = "/gen", description = "Resource for generating swagger components")
+@SuppressWarnings("static-method")
 public class SwaggerResource {
     static List<String> clients = new ArrayList<String>();
     static List<String> servers = new ArrayList<String>();
     private static Map<String, Generated> fileMap = new HashMap<String, Generated>();
 
+    static {
+        List<CodegenConfig> extensions = Codegen.getExtensions();
+        for (CodegenConfig config : extensions) {
+            if (config.getTag().equals(CodegenType.CLIENT) || config.getTag().equals(CodegenType.DOCUMENTATION)) {
+                clients.add(config.getName());
+            } else if (config.getTag().equals(CodegenType.SERVER)) {
+                servers.add(config.getName());
+            }
+        }
+
+        Collections.sort(clients, String.CASE_INSENSITIVE_ORDER);
+        Collections.sort(servers, String.CASE_INSENSITIVE_ORDER);
+    }
+
     @GET
     @Path("/download/{fileId}")
     @Produces({MediaType.APPLICATION_OCTET_STREAM})
@@ -110,7 +125,7 @@ public class SwaggerResource {
             responseContainer = "map",
             tags = "clients")
     public Response getClientOptions(
-            @Context HttpServletRequest request,
+            @SuppressWarnings("unused") @Context HttpServletRequest request,
             @ApiParam(value = "The target language for the client library", required = true)
             @PathParam("language") String language) throws Exception {
 
@@ -132,7 +147,7 @@ public class SwaggerResource {
             responseContainer = "map",
             tags = "servers")
     public Response getServerOptions(
-            @Context HttpServletRequest request,
+            @SuppressWarnings("unused") @Context HttpServletRequest request,
             @ApiParam(value = "The target language for the server framework", required = true)
             @PathParam("framework") String framework) throws Exception {
 
@@ -181,7 +196,7 @@ public class SwaggerResource {
             @ApiParam(value = "parameters", required = true) GeneratorInput opts)
             throws Exception {
         if (framework == null) {
-            throw new BadRequestException(400, "Framework is required");
+            throw new BadRequestException("Framework is required");
         }
         String filename = Generator.generateServer(framework, opts);
         System.out.println("generated name: " + filename);
@@ -201,15 +216,4 @@ public class SwaggerResource {
             return Response.status(500).build();
         }
     }
-
-    static {
-        List<CodegenConfig> extensions = Codegen.getExtensions();
-        for (CodegenConfig config : extensions) {
-            if (config.getTag().equals(CodegenType.CLIENT) || config.getTag().equals(CodegenType.DOCUMENTATION)) {
-                clients.add(config.getName());
-            } else if (config.getTag().equals(CodegenType.SERVER)) {
-                servers.add(config.getName());
-            }
-        }
-    }
 }
diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/util/ApiOriginFilter.java b/modules/swagger-generator/src/main/java/io/swagger/generator/util/ApiOriginFilter.java
index 07ee795f588..aca470bd89b 100644
--- a/modules/swagger-generator/src/main/java/io/swagger/generator/util/ApiOriginFilter.java
+++ b/modules/swagger-generator/src/main/java/io/swagger/generator/util/ApiOriginFilter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 SmartBear Software
+ * Copyright 2016 SmartBear Software
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/util/JacksonJsonProvider.java b/modules/swagger-generator/src/main/java/io/swagger/generator/util/JacksonJsonProvider.java
new file mode 100644
index 00000000000..713ee2455c4
--- /dev/null
+++ b/modules/swagger-generator/src/main/java/io/swagger/generator/util/JacksonJsonProvider.java
@@ -0,0 +1,20 @@
+package io.swagger.generator.util;
+
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
+import io.swagger.util.Json;
+
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@Produces({MediaType.APPLICATION_JSON})
+public class JacksonJsonProvider extends JacksonJaxbJsonProvider {
+    private static ObjectMapper commonMapper = Json.mapper();
+
+    public JacksonJsonProvider() {
+        super.setMapper(commonMapper);
+    }
+}
\ No newline at end of file
diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/util/ValidationException.java b/modules/swagger-generator/src/main/java/io/swagger/generator/util/ValidationException.java
index 22ed4ada878..631541f6c01 100644
--- a/modules/swagger-generator/src/main/java/io/swagger/generator/util/ValidationException.java
+++ b/modules/swagger-generator/src/main/java/io/swagger/generator/util/ValidationException.java
@@ -1,12 +1,9 @@
 package io.swagger.generator.util;
 
-import java.util.List;
-
 public class ValidationException extends Exception {
     private static final long serialVersionUID = 6861195361018260380L;
     private int code;
     private String msg;
-    private List<ValidationMessage> errors;
 
     public ValidationException(String msg) {
         super(msg);
diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/util/ZipUtil.java b/modules/swagger-generator/src/main/java/io/swagger/generator/util/ZipUtil.java
index ca0a0e62018..3295be5d898 100644
--- a/modules/swagger-generator/src/main/java/io/swagger/generator/util/ZipUtil.java
+++ b/modules/swagger-generator/src/main/java/io/swagger/generator/util/ZipUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 SmartBear Software
+ * Copyright 2016 SmartBear Software
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -103,20 +103,18 @@ public class ZipUtil {
      * @throws FileNotFoundException
      * @throws IOException
      */
-    private void addFileToZip(File file, ZipOutputStream zos)
+    private static void addFileToZip(File file, ZipOutputStream zos)
             throws FileNotFoundException, IOException {
         zos.putNextEntry(new ZipEntry(file.getName()));
 
         BufferedInputStream bis = new BufferedInputStream(new FileInputStream(
                 file));
 
-        long bytesRead = 0;
         byte[] bytesIn = new byte[BUFFER_SIZE];
         int read = 0;
 
         while ((read = bis.read(bytesIn)) != -1) {
             zos.write(bytesIn, 0, read);
-            bytesRead += read;
         }
 
         zos.closeEntry();
diff --git a/modules/swagger-generator/src/main/webapp/WEB-INF/web.xml b/modules/swagger-generator/src/main/webapp/WEB-INF/web.xml
index a42631cd109..904e0e34fb0 100644
--- a/modules/swagger-generator/src/main/webapp/WEB-INF/web.xml
+++ b/modules/swagger-generator/src/main/webapp/WEB-INF/web.xml
@@ -17,7 +17,8 @@
             <param-name>jersey.config.server.provider.classnames</param-name>
             <param-value>
                 io.swagger.online.ExceptionWriter,
-                io.swagger.jersey.listing.ApiListingResourceJSON,
+                io.swagger.generator.util.JacksonJsonProvider,
+                io.swagger.jaxrs.listing.ApiListingResource,
                 io.swagger.jersey.listing.JerseyApiDeclarationProvider,
                 io.swagger.jersey.listing.JerseyResourceListingProvider
             </param-value>
diff --git a/modules/swagger-generator/src/main/webapp/index.html b/modules/swagger-generator/src/main/webapp/index.html
index 50beb104712..b3c14aacd05 100644
--- a/modules/swagger-generator/src/main/webapp/index.html
+++ b/modules/swagger-generator/src/main/webapp/index.html
@@ -14,7 +14,8 @@
   <script src='lib/jquery.wiggle.min.js' type='text/javascript'></script>
   <script src='lib/jquery.ba-bbq.min.js' type='text/javascript'></script>
   <script src='lib/handlebars-2.0.0.js' type='text/javascript'></script>
-  <script src='lib/underscore-min.js' type='text/javascript'></script>
+  <script src='lib/js-yaml.min.js' type='text/javascript'></script>
+  <script src='lib/lodash.min.js' type='text/javascript'></script>
   <script src='lib/backbone-min.js' type='text/javascript'></script>
   <script src='swagger-ui.js' type='text/javascript'></script>
   <script src='lib/highlight.7.3.pack.js' type='text/javascript'></script>
diff --git a/modules/swagger-generator/src/test/java/io/swagger/generator/GeneratorInputTest.java b/modules/swagger-generator/src/test/java/io/swagger/generator/GeneratorInputTest.java
index c5cc99461f3..6b6b22fd675 100644
--- a/modules/swagger-generator/src/test/java/io/swagger/generator/GeneratorInputTest.java
+++ b/modules/swagger-generator/src/test/java/io/swagger/generator/GeneratorInputTest.java
@@ -4,6 +4,7 @@ import io.swagger.generator.model.GeneratorInput;
 
 import org.testng.annotations.Test;
 
+@SuppressWarnings("static-method")
 public class GeneratorInputTest {
 
     @Test(description = "write an object")
diff --git a/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineGeneratorOptionsTest.java b/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineGeneratorOptionsTest.java
index 55161327b1c..2ae76374adb 100644
--- a/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineGeneratorOptionsTest.java
+++ b/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineGeneratorOptionsTest.java
@@ -1,78 +1,51 @@
 package io.swagger.generator.online;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertNotNull;
-
-import io.swagger.codegen.CliOption;
-import io.swagger.codegen.CodegenConfigLoader;
-import io.swagger.codegen.options.AkkaScalaClientOptionsProvider;
-import io.swagger.codegen.options.AndroidClientOptionsProvider;
-import io.swagger.codegen.options.AsyncScalaClientOptionsProvider;
-import io.swagger.codegen.options.CSharpClientOptionsProvider;
-import io.swagger.codegen.options.CsharpDotNet2ClientOptionsProvider;
-import io.swagger.codegen.options.DartClientOptionsProvider;
-import io.swagger.codegen.options.FlashClienOptionsProvider;
-import io.swagger.codegen.options.JavaInflectorServerOptionsProvider;
-import io.swagger.codegen.options.JavaOptionsProvider;
-import io.swagger.codegen.options.JaxRSServerOptionsProvider;
-import io.swagger.codegen.options.NodeJSServerOptionsProvider;
-import io.swagger.codegen.options.ObjcClientOptionsProvider;
-import io.swagger.codegen.options.OptionsProvider;
-import io.swagger.codegen.options.PerlClientOptionsProvider;
-import io.swagger.codegen.options.PhpClientOptionsProvider;
-import io.swagger.codegen.options.PythonClientOptionsProvider;
-import io.swagger.codegen.options.Qt5CPPOptionsProvider;
-import io.swagger.codegen.options.RubyClientOptionsProvider;
-import io.swagger.codegen.options.ScalaClientOptionsProvider;
-import io.swagger.codegen.options.ScalatraServerOptionsProvider;
-import io.swagger.codegen.options.SilexServerOptionsProvider;
-import io.swagger.codegen.options.SinatraServerOptionsProvider;
-import io.swagger.codegen.options.SlimFrameworkServerOptionsProvider;
-import io.swagger.codegen.options.SpringMVCServerOptionsProvider;
-import io.swagger.codegen.options.StaticDocOptionsProvider;
-import io.swagger.codegen.options.StaticHtmlOptionsProvider;
-import io.swagger.codegen.options.SwaggerOptionsProvider;
-import io.swagger.codegen.options.SwaggerYamlOptionsProvider;
-import io.swagger.codegen.options.SwiftOptionsProvider;
-import io.swagger.codegen.options.TizenClientOptionsProvider;
-import io.swagger.codegen.options.TypeScriptAngularClientOptionsProvider;
-import io.swagger.codegen.options.TypeScriptNodeClientOptionsProvider;
-import io.swagger.generator.exception.ApiException;
-import io.swagger.generator.model.GeneratorInput;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import io.swagger.codegen.CliOption;
+import io.swagger.codegen.CodegenConfigLoader;
+import io.swagger.codegen.CodegenConstants;
+import io.swagger.codegen.languages.JavaClientCodegen;
+import io.swagger.codegen.options.*;
+import io.swagger.generator.exception.ApiException;
+import io.swagger.generator.model.GeneratorInput;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
+import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
-import javax.annotation.Nullable;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotEquals;
 
 public class OnlineGeneratorOptionsTest {
     private static final String OPTIONS_PROVIDER = "optionsProvider";
 
     @DataProvider(name = OPTIONS_PROVIDER)
-    private Object[][] listOptions() {
+    private static Object[][] listOptions() {
         return new Object[][]{{new AkkaScalaClientOptionsProvider()}, {new AndroidClientOptionsProvider()},
                 {new AsyncScalaClientOptionsProvider()}, {new CSharpClientOptionsProvider()},
                 {new CsharpDotNet2ClientOptionsProvider()}, {new DartClientOptionsProvider()},
                 {new FlashClienOptionsProvider()}, {new JavaInflectorServerOptionsProvider()},
-                {new JavaOptionsProvider()}, {new JaxRSServerOptionsProvider()},
+                {
+                        new JavaOptionsProvider(),
+                        new JavaOptionsProvider(ImmutableMap.of(CodegenConstants.LIBRARY, JavaClientCodegen.RETROFIT_2)
+                        ),
+                        new JavaOptionsProvider(ImmutableMap.of(
+                                CodegenConstants.LIBRARY, JavaClientCodegen.RETROFIT_2,
+                                JavaClientCodegen.USE_RX_JAVA, "true")
+                        )
+                },
+                {new JaxRSServerOptionsProvider()},
                 {new NodeJSServerOptionsProvider()}, {new ObjcClientOptionsProvider()},
                 {new PerlClientOptionsProvider()}, {new PhpClientOptionsProvider()},
                 {new PythonClientOptionsProvider()}, {new Qt5CPPOptionsProvider()},
@@ -122,7 +95,7 @@ public class OnlineGeneratorOptionsTest {
         }
     }
 
-    private HashMap<String, InvocationCounter> convertOptions(OptionsProvider provider) {
+    private static HashMap<String, InvocationCounter> convertOptions(OptionsProvider provider) {
         HashMap<String, InvocationCounter> options = new HashMap<String, InvocationCounter>();
         for (Map.Entry<String, String> entry : provider.createOptions().entrySet()) {
             options.put(entry.getKey(), new InvocationCounter(entry.getValue()));
@@ -159,10 +132,10 @@ public class OnlineGeneratorOptionsTest {
     }
 
     @Test(dataProvider = OPTIONS_PROVIDER)
-    public void getOptionsTest(OptionsProvider provider) throws ApiException {
+    public static void getOptionsTest(OptionsProvider provider) throws ApiException {
         final Map<String, CliOption> opts = Generator.getOptions(provider.getLanguage());
 
-        final Function cliOptionWrapper = new Function<CliOption, CliOptionProxy>() {
+        final Function<CliOption, CliOptionProxy> cliOptionWrapper = new Function<CliOption, CliOptionProxy>() {
             @Nullable
             @Override
             public CliOptionProxy apply(@Nullable CliOption option) {
@@ -170,13 +143,13 @@ public class OnlineGeneratorOptionsTest {
             }
         };
 
-        final List<CliOptionProxy> actual = Lists.transform(new ArrayList(opts.values()), cliOptionWrapper);
+        final List<CliOptionProxy> actual = Lists.transform(new ArrayList<CliOption>(opts.values()), cliOptionWrapper);
         final List<CliOptionProxy> expected = Lists.transform(
                 CodegenConfigLoader.forName(provider.getLanguage()).cliOptions(), cliOptionWrapper);
         assertEquals(actual, expected);
     }
 
-    private static class CliOptionProxy {
+    protected static class CliOptionProxy {
         private final CliOption wrapped;
 
         public CliOptionProxy(CliOption wrapped){
diff --git a/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineJavaClientOptionsTest.java b/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineJavaClientOptionsTest.java
index 93277a6a2f9..bca63e37eed 100644
--- a/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineJavaClientOptionsTest.java
+++ b/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineJavaClientOptionsTest.java
@@ -13,6 +13,7 @@ import org.testng.annotations.Test;
 
 import java.util.Map;
 
+@SuppressWarnings("static-method")
 public class OnlineJavaClientOptionsTest {
 
     @Test
diff --git a/pom.xml b/pom.xml
index 4badf5b42d6..df64c3feaff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <artifactId>swagger-codegen-project</artifactId>
     <packaging>pom</packaging>
     <name>swagger-codegen-project</name>
-    <version>2.1.5</version>
+    <version>2.1.6-SNAPSHOT</version>
     <url>https://github.com/swagger-api/swagger-codegen</url>
     <scm>
         <connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
@@ -122,8 +122,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.0</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.7</source>
+                    <target>1.7</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -342,6 +342,18 @@
                 <module>samples/client/petstore/java/retrofit2</module>
             </modules>
         </profile>
+        <profile>
+            <id>java-client-retrofit2-rx</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>java</value>
+                </property>
+            </activation>
+            <modules>
+                <module>samples/client/petstore/java/retrofit2rx</module>
+            </modules>
+        </profile>
         <profile>
             <id>java-client-feign</id>
             <activation>
@@ -387,7 +399,31 @@
                 </property>
             </activation>
             <modules>
-                <module>samples/client/petstore/objc</module>
+                <module>samples/client/petstore/objc/SwaggerClientTests</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>swift-client</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>swift</value>
+                </property>
+            </activation>
+            <modules>
+                <module>samples/client/petstore/swift/SwaggerClientTests</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>jaxrs-resteasy-server</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>java</value>
+                </property>
+            </activation>
+            <modules>
+                <module>samples/server/petstore/jaxrs-resteasy</module>
             </modules>
         </profile>
         <profile>
@@ -438,16 +474,20 @@
                 <module>samples/client/petstore/android/default</module>
                 <module>samples/client/petstore/clojure</module>
                 <module>samples/client/petstore/java/default</module>
+                <module>samples/client/petstore/java/feign</module>
                 <module>samples/client/petstore/java/jersey2</module>
                 <module>samples/client/petstore/java/okhttp-gson</module>
                 <module>samples/client/petstore/java/retrofit</module>
                 <module>samples/client/petstore/java/retrofit2</module>
+                <module>samples/client/petstore/java/retrofit2rx</module>
                 <module>samples/client/petstore/javascript</module>
                 <module>samples/client/petstore/scala</module>
                 <module>samples/server/petstore/spring-mvc</module>
-                <!--module>samples/client/petstore/objc</module-->
                 <module>samples/client/petstore/ruby</module>
                 <module>samples/server/petstore/jaxrs</module>
+                <module>samples/server/petstore/jaxrs-resteasy</module>
+                <!--module>samples/client/petstore/objc/SwaggerClientTests</module-->
+                <!--module>samples/client/petstore/swift/SwaggerClientTests</module-->
             </modules>
         </profile>
     </profiles>
@@ -519,10 +559,10 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-parser-version>1.0.15</swagger-parser-version>
+        <swagger-parser-version>1.0.19-SNAPSHOT</swagger-parser-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>2.3.4</felix-version>
-        <swagger-core-version>1.5.6</swagger-core-version>
+        <swagger-core-version>1.5.8</swagger-core-version>
         <commons-io-version>2.4</commons-io-version>
         <commons-cli-version>1.2</commons-cli-version>
         <junit-version>4.8.1</junit-version>
diff --git a/samples/client/petstore/akka-scala/pom.xml b/samples/client/petstore/akka-scala/pom.xml
index a6e81fb75f4..fa88207507e 100644
--- a/samples/client/petstore/akka-scala/pom.xml
+++ b/samples/client/petstore/akka-scala/pom.xml
@@ -217,7 +217,7 @@
         <akka-version>2.3.9</akka-version>
         <joda-version>1.2</joda-version>
         <joda-time-version>2.2</joda-time-version>
-        <swagger-core-version>1.5.4</swagger-core-version>
+        <swagger-core-version>1.5.7</swagger-core-version>
         <maven-plugin.version>1.0.0</maven-plugin.version>
 
         <junit-version>4.8.1</junit-version>
diff --git a/samples/client/petstore/android/default/.gitignore b/samples/client/petstore/android/default/.gitignore
new file mode 100644
index 00000000000..a8363b06f95
--- /dev/null
+++ b/samples/client/petstore/android/default/.gitignore
@@ -0,0 +1,39 @@
+# Built application files
+*.apk
+*.ap_
+
+# Files for the Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# Intellij
+*.iml
+
+#Keystore files
+*.jks
diff --git a/samples/client/petstore/android/default/build.gradle b/samples/client/petstore/android/default/build.gradle
index 417503cb51e..e48f72b3138 100644
--- a/samples/client/petstore/android/default/build.gradle
+++ b/samples/client/petstore/android/default/build.gradle
@@ -6,9 +6,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
         
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
         
     }
 }
@@ -24,11 +24,12 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion '22.0.0'
+    compileSdkVersion 23
+    buildToolsVersion '23.0.2'
+    useLibrary  'org.apache.http.legacy'
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 22
+        targetSdkVersion 23
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
@@ -51,16 +52,17 @@ android {
 ext {
     swagger_annotations_version = "1.5.0"
     gson_version = "2.3.1"
-    httpclient_version = "4.3.3"
-    junit_version = "4.8.1"
+    httpclient_version = "4.5.2"
+    httpcore_version = "4.4.4"
+    junit_version = "4.12"
 }
 
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "com.google.code.gson:gson:$gson_version"
-    compile "org.apache.httpcomponents:httpcore:$httpclient_version"
+    compile "org.apache.httpcomponents:httpcore:$httpcore_version"
     compile "org.apache.httpcomponents:httpclient:$httpclient_version"
-    compile ("org.apache.httpcomponents:httpcore:$httpclient_version") {
+    compile ("org.apache.httpcomponents:httpcore:$httpcore_version") {
         exclude(group: 'org.apache.httpcomponents', module: 'httpclient')
     }
     compile ("org.apache.httpcomponents:httpmime:$httpclient_version") {
diff --git a/samples/client/petstore/android/default/git_push.sh b/samples/client/petstore/android/default/git_push.sh
new file mode 100644
index 00000000000..1a36388db02
--- /dev/null
+++ b/samples/client/petstore/android/default/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="YOUR_GIT_USR_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="YOUR_GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/ApiInvoker.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/ApiInvoker.java
index 5eddeb6b9e9..ecb787006dd 100644
--- a/samples/client/petstore/android/default/src/main/java/io/swagger/client/ApiInvoker.java
+++ b/samples/client/petstore/android/default/src/main/java/io/swagger/client/ApiInvoker.java
@@ -83,7 +83,7 @@ public class ApiInvoker {
     DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
 
     // Set default User-Agent.
-    setUserAgent("Android-Java-Swagger");
+    setUserAgent("Swagger-Codegen/1.0.0/android");
   }
 
   public static void setUserAgent(String userAgent) {
diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/JsonUtil.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/JsonUtil.java
index 5aa10d3ea82..49ce07a07ae 100644
--- a/samples/client/petstore/android/default/src/main/java/io/swagger/client/JsonUtil.java
+++ b/samples/client/petstore/android/default/src/main/java/io/swagger/client/JsonUtil.java
@@ -35,24 +35,44 @@ public class JsonUtil {
   public static Type getListTypeForDeserialization(Class cls) {
     String className = cls.getSimpleName();
     
-    if ("User".equalsIgnoreCase(className)) {
-      return new TypeToken<List<User>>(){}.getType();
-    }
-    
     if ("Category".equalsIgnoreCase(className)) {
       return new TypeToken<List<Category>>(){}.getType();
     }
     
+    if ("InlineResponse200".equalsIgnoreCase(className)) {
+      return new TypeToken<List<InlineResponse200>>(){}.getType();
+    }
+    
+    if ("Model200Response".equalsIgnoreCase(className)) {
+      return new TypeToken<List<Model200Response>>(){}.getType();
+    }
+    
+    if ("ModelReturn".equalsIgnoreCase(className)) {
+      return new TypeToken<List<ModelReturn>>(){}.getType();
+    }
+    
+    if ("Name".equalsIgnoreCase(className)) {
+      return new TypeToken<List<Name>>(){}.getType();
+    }
+    
+    if ("Order".equalsIgnoreCase(className)) {
+      return new TypeToken<List<Order>>(){}.getType();
+    }
+    
     if ("Pet".equalsIgnoreCase(className)) {
       return new TypeToken<List<Pet>>(){}.getType();
     }
     
+    if ("SpecialModelName".equalsIgnoreCase(className)) {
+      return new TypeToken<List<SpecialModelName>>(){}.getType();
+    }
+    
     if ("Tag".equalsIgnoreCase(className)) {
       return new TypeToken<List<Tag>>(){}.getType();
     }
     
-    if ("Order".equalsIgnoreCase(className)) {
-      return new TypeToken<List<Order>>(){}.getType();
+    if ("User".equalsIgnoreCase(className)) {
+      return new TypeToken<List<User>>(){}.getType();
     }
     
     return new TypeToken<List<Object>>(){}.getType();
@@ -61,26 +81,46 @@ public class JsonUtil {
   public static Type getTypeForDeserialization(Class cls) {
     String className = cls.getSimpleName();
     
-    if ("User".equalsIgnoreCase(className)) {
-      return new TypeToken<User>(){}.getType();
-    }
-    
     if ("Category".equalsIgnoreCase(className)) {
       return new TypeToken<Category>(){}.getType();
     }
     
-    if ("Pet".equalsIgnoreCase(className)) {
-      return new TypeToken<Pet>(){}.getType();
+    if ("InlineResponse200".equalsIgnoreCase(className)) {
+      return new TypeToken<InlineResponse200>(){}.getType();
     }
     
-    if ("Tag".equalsIgnoreCase(className)) {
-      return new TypeToken<Tag>(){}.getType();
+    if ("Model200Response".equalsIgnoreCase(className)) {
+      return new TypeToken<Model200Response>(){}.getType();
+    }
+    
+    if ("ModelReturn".equalsIgnoreCase(className)) {
+      return new TypeToken<ModelReturn>(){}.getType();
+    }
+    
+    if ("Name".equalsIgnoreCase(className)) {
+      return new TypeToken<Name>(){}.getType();
     }
     
     if ("Order".equalsIgnoreCase(className)) {
       return new TypeToken<Order>(){}.getType();
     }
     
+    if ("Pet".equalsIgnoreCase(className)) {
+      return new TypeToken<Pet>(){}.getType();
+    }
+    
+    if ("SpecialModelName".equalsIgnoreCase(className)) {
+      return new TypeToken<SpecialModelName>(){}.getType();
+    }
+    
+    if ("Tag".equalsIgnoreCase(className)) {
+      return new TypeToken<Tag>(){}.getType();
+    }
+    
+    if ("User".equalsIgnoreCase(className)) {
+      return new TypeToken<User>(){}.getType();
+    }
+    
     return new TypeToken<Object>(){}.getType();
   }
 
diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/api/PetApi.java
index f6b6403a342..41dac192d82 100644
--- a/samples/client/petstore/android/default/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/android/default/src/main/java/io/swagger/client/api/PetApi.java
@@ -9,9 +9,9 @@ import io.swagger.client.model.*;
 import java.util.*;
 
 import io.swagger.client.model.Pet;
+import io.swagger.client.model.InlineResponse200;
 import java.io.File;
 
-import org.apache.http.HttpEntity;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
 
 import java.util.Map;
@@ -39,60 +39,6 @@ public class PetApi {
   }
 
   
-  /**
-   * Update an existing pet
-   * 
-   * @param body Pet object that needs to be added to the store
-   * @return void
-   */
-  public void  updatePet (Pet body) throws ApiException {
-    Object postBody = body;
-    
-
-    // create path and map variables
-    String path = "/pet".replaceAll("\\{format\\}","json");
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
-    // form params
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    
-
-    
-
-    String[] contentTypes = {
-      "application/json","application/xml"
-    };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if (contentType.startsWith("multipart/form-data")) {
-      // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-      
-
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
-    } else {
-      // normal form params
-      
-    }
-
-    try {
-      String response = apiInvoker.invokeAPI(basePath, path, "PUT", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
-        return ;
-      }
-      else {
-        return ;
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
-  }
-  
   /**
    * Add a new pet to the store
    * 
@@ -100,43 +46,42 @@ public class PetApi {
    * @return void
    */
   public void  addPet (Pet body) throws ApiException {
-    Object postBody = body;
+    Object localVarPostBody = body;
     
 
     // create path and map variables
-    String path = "/pet".replaceAll("\\{format\\}","json");
+    String localVarPath = "/pet".replaceAll("\\{format\\}","json");
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
     // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     // form params
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, String> localVarFormParams = new HashMap<String, String>();
 
     
 
     
 
-    String[] contentTypes = {
+    String[] localVarContentTypes = {
       "application/json","application/xml"
     };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json";
 
-    if (contentType.startsWith("multipart/form-data")) {
+    if (localVarContentType.startsWith("multipart/form-data")) {
       // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
       
 
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
+      localVarPostBody = localVarBuilder.build();
     } else {
       // normal form params
       
     }
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
+      String localVarResponse = apiInvoker.invokeAPI(basePath, localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarContentType);
+      if(localVarResponse != null){
         return ;
       }
       else {
@@ -148,237 +93,48 @@ public class PetApi {
   }
   
   /**
-   * Finds Pets by status
-   * Multiple status values can be provided with comma seperated strings
-   * @param status Status values that need to be considered for filter
-   * @return List<Pet>
-   */
-  public List<Pet>  findPetsByStatus (List<String> status) throws ApiException {
-    Object postBody = null;
-    
-
-    // create path and map variables
-    String path = "/pet/findByStatus".replaceAll("\\{format\\}","json");
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
-    // form params
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    
-    queryParams.addAll(ApiInvoker.parameterToPairs("multi", "status", status));
-    
-
-    
-
-    String[] contentTypes = {
-      
-    };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if (contentType.startsWith("multipart/form-data")) {
-      // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-      
-
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
-    } else {
-      // normal form params
-      
-    }
-
-    try {
-      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
-        return (List<Pet>) ApiInvoker.deserialize(response, "array", Pet.class);
-      }
-      else {
-        return null;
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
-  }
-  
-  /**
-   * Finds Pets by tags
-   * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-   * @param tags Tags to filter by
-   * @return List<Pet>
-   */
-  public List<Pet>  findPetsByTags (List<String> tags) throws ApiException {
-    Object postBody = null;
-    
-
-    // create path and map variables
-    String path = "/pet/findByTags".replaceAll("\\{format\\}","json");
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
-    // form params
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    
-    queryParams.addAll(ApiInvoker.parameterToPairs("multi", "tags", tags));
-    
-
-    
-
-    String[] contentTypes = {
-      
-    };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if (contentType.startsWith("multipart/form-data")) {
-      // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-      
-
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
-    } else {
-      // normal form params
-      
-    }
-
-    try {
-      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
-        return (List<Pet>) ApiInvoker.deserialize(response, "array", Pet.class);
-      }
-      else {
-        return null;
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
-  }
-  
-  /**
-   * Find pet by ID
-   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-   * @param petId ID of pet that needs to be fetched
-   * @return Pet
-   */
-  public Pet  getPetById (Long petId) throws ApiException {
-    Object postBody = null;
-    
-    // verify the required parameter 'petId' is set
-    if (petId == null) {
-       throw new ApiException(400, "Missing the required parameter 'petId' when calling getPetById");
-    }
-    
-
-    // create path and map variables
-    String path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
-    // form params
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    
-
-    
-
-    String[] contentTypes = {
-      
-    };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if (contentType.startsWith("multipart/form-data")) {
-      // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-      
-
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
-    } else {
-      // normal form params
-      
-    }
-
-    try {
-      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
-        return (Pet) ApiInvoker.deserialize(response, "", Pet.class);
-      }
-      else {
-        return null;
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
-  }
-  
-  /**
-   * Updates a pet in the store with form data
+   * Fake endpoint to test byte array in body parameter for adding a new pet to the store
    * 
-   * @param petId ID of pet that needs to be updated
-   * @param name Updated name of the pet
-   * @param status Updated status of the pet
+   * @param body Pet object in the form of byte array
    * @return void
    */
-  public void  updatePetWithForm (String petId, String name, String status) throws ApiException {
-    Object postBody = null;
-    
-    // verify the required parameter 'petId' is set
-    if (petId == null) {
-       throw new ApiException(400, "Missing the required parameter 'petId' when calling updatePetWithForm");
-    }
+  public void  addPetUsingByteArray (byte[] body) throws ApiException {
+    Object localVarPostBody = body;
     
 
     // create path and map variables
-    String path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
+    String localVarPath = "/pet?testing_byte_array=true".replaceAll("\\{format\\}","json");
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
     // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     // form params
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, String> localVarFormParams = new HashMap<String, String>();
 
     
 
     
 
-    String[] contentTypes = {
-      "application/x-www-form-urlencoded"
+    String[] localVarContentTypes = {
+      "application/json","application/xml"
     };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json";
 
-    if (contentType.startsWith("multipart/form-data")) {
+    if (localVarContentType.startsWith("multipart/form-data")) {
       // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-      
-      if (name != null) {
-        builder.addTextBody("name", ApiInvoker.parameterToString(name), ApiInvoker.TEXT_PLAIN_UTF8);
-      }
-      
-      if (status != null) {
-        builder.addTextBody("status", ApiInvoker.parameterToString(status), ApiInvoker.TEXT_PLAIN_UTF8);
-      }
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
       
 
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
+      localVarPostBody = localVarBuilder.build();
     } else {
       // normal form params
-      formParams.put("name", ApiInvoker.parameterToString(name));
-      formParams.put("status", ApiInvoker.parameterToString(status));
       
     }
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
+      String localVarResponse = apiInvoker.invokeAPI(basePath, localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarContentType);
+      if(localVarResponse != null){
         return ;
       }
       else {
@@ -397,7 +153,7 @@ public class PetApi {
    * @return void
    */
   public void  deletePet (Long petId, String apiKey) throws ApiException {
-    Object postBody = null;
+    Object localVarPostBody = null;
     
     // verify the required parameter 'petId' is set
     if (petId == null) {
@@ -406,41 +162,447 @@ public class PetApi {
     
 
     // create path and map variables
-    String path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
+    String localVarPath = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
     // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     // form params
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, String> localVarFormParams = new HashMap<String, String>();
 
     
 
     
-    headerParams.put("api_key", ApiInvoker.parameterToString(apiKey));
+    localVarHeaderParams.put("api_key", ApiInvoker.parameterToString(apiKey));
     
 
-    String[] contentTypes = {
+    String[] localVarContentTypes = {
       
     };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json";
 
-    if (contentType.startsWith("multipart/form-data")) {
+    if (localVarContentType.startsWith("multipart/form-data")) {
       // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
       
 
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
+      localVarPostBody = localVarBuilder.build();
     } else {
       // normal form params
       
     }
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
+      String localVarResponse = apiInvoker.invokeAPI(basePath, localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarContentType);
+      if(localVarResponse != null){
+        return ;
+      }
+      else {
+        return ;
+      }
+    } catch (ApiException ex) {
+      throw ex;
+    }
+  }
+  
+  /**
+   * Finds Pets by status
+   * Multiple status values can be provided with comma separated strings
+   * @param status Status values that need to be considered for query
+   * @return List<Pet>
+   */
+  public List<Pet>  findPetsByStatus (List<String> status) throws ApiException {
+    Object localVarPostBody = null;
+    
+
+    // create path and map variables
+    String localVarPath = "/pet/findByStatus".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> localVarFormParams = new HashMap<String, String>();
+
+    
+    localVarQueryParams.addAll(ApiInvoker.parameterToPairs("multi", "status", status));
+    
+
+    
+
+    String[] localVarContentTypes = {
+      
+    };
+    String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json";
+
+    if (localVarContentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+
+      localVarPostBody = localVarBuilder.build();
+    } else {
+      // normal form params
+      
+    }
+
+    try {
+      String localVarResponse = apiInvoker.invokeAPI(basePath, localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarContentType);
+      if(localVarResponse != null){
+        return (List<Pet>) ApiInvoker.deserialize(localVarResponse, "array", Pet.class);
+      }
+      else {
+        return null;
+      }
+    } catch (ApiException ex) {
+      throw ex;
+    }
+  }
+  
+  /**
+   * Finds Pets by tags
+   * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+   * @param tags Tags to filter by
+   * @return List<Pet>
+   */
+  public List<Pet>  findPetsByTags (List<String> tags) throws ApiException {
+    Object localVarPostBody = null;
+    
+
+    // create path and map variables
+    String localVarPath = "/pet/findByTags".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> localVarFormParams = new HashMap<String, String>();
+
+    
+    localVarQueryParams.addAll(ApiInvoker.parameterToPairs("multi", "tags", tags));
+    
+
+    
+
+    String[] localVarContentTypes = {
+      
+    };
+    String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json";
+
+    if (localVarContentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+
+      localVarPostBody = localVarBuilder.build();
+    } else {
+      // normal form params
+      
+    }
+
+    try {
+      String localVarResponse = apiInvoker.invokeAPI(basePath, localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarContentType);
+      if(localVarResponse != null){
+        return (List<Pet>) ApiInvoker.deserialize(localVarResponse, "array", Pet.class);
+      }
+      else {
+        return null;
+      }
+    } catch (ApiException ex) {
+      throw ex;
+    }
+  }
+  
+  /**
+   * Find pet by ID
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched
+   * @return Pet
+   */
+  public Pet  getPetById (Long petId) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'petId' is set
+    if (petId == null) {
+       throw new ApiException(400, "Missing the required parameter 'petId' when calling getPetById");
+    }
+    
+
+    // create path and map variables
+    String localVarPath = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> localVarFormParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] localVarContentTypes = {
+      
+    };
+    String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json";
+
+    if (localVarContentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+
+      localVarPostBody = localVarBuilder.build();
+    } else {
+      // normal form params
+      
+    }
+
+    try {
+      String localVarResponse = apiInvoker.invokeAPI(basePath, localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarContentType);
+      if(localVarResponse != null){
+        return (Pet) ApiInvoker.deserialize(localVarResponse, "", Pet.class);
+      }
+      else {
+        return null;
+      }
+    } catch (ApiException ex) {
+      throw ex;
+    }
+  }
+  
+  /**
+   * Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched
+   * @return InlineResponse200
+   */
+  public InlineResponse200  getPetByIdInObject (Long petId) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'petId' is set
+    if (petId == null) {
+       throw new ApiException(400, "Missing the required parameter 'petId' when calling getPetByIdInObject");
+    }
+    
+
+    // create path and map variables
+    String localVarPath = "/pet/{petId}?response=inline_arbitrary_object".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> localVarFormParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] localVarContentTypes = {
+      
+    };
+    String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json";
+
+    if (localVarContentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+
+      localVarPostBody = localVarBuilder.build();
+    } else {
+      // normal form params
+      
+    }
+
+    try {
+      String localVarResponse = apiInvoker.invokeAPI(basePath, localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarContentType);
+      if(localVarResponse != null){
+        return (InlineResponse200) ApiInvoker.deserialize(localVarResponse, "", InlineResponse200.class);
+      }
+      else {
+        return null;
+      }
+    } catch (ApiException ex) {
+      throw ex;
+    }
+  }
+  
+  /**
+   * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched
+   * @return byte[]
+   */
+  public byte[]  petPetIdtestingByteArraytrueGet (Long petId) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'petId' is set
+    if (petId == null) {
+       throw new ApiException(400, "Missing the required parameter 'petId' when calling petPetIdtestingByteArraytrueGet");
+    }
+    
+
+    // create path and map variables
+    String localVarPath = "/pet/{petId}?testing_byte_array=true".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> localVarFormParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] localVarContentTypes = {
+      
+    };
+    String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json";
+
+    if (localVarContentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+
+      localVarPostBody = localVarBuilder.build();
+    } else {
+      // normal form params
+      
+    }
+
+    try {
+      String localVarResponse = apiInvoker.invokeAPI(basePath, localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarContentType);
+      if(localVarResponse != null){
+        return (byte[]) ApiInvoker.deserialize(localVarResponse, "", byte[].class);
+      }
+      else {
+        return null;
+      }
+    } catch (ApiException ex) {
+      throw ex;
+    }
+  }
+  
+  /**
+   * Update an existing pet
+   * 
+   * @param body Pet object that needs to be added to the store
+   * @return void
+   */
+  public void  updatePet (Pet body) throws ApiException {
+    Object localVarPostBody = body;
+    
+
+    // create path and map variables
+    String localVarPath = "/pet".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> localVarFormParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] localVarContentTypes = {
+      "application/json","application/xml"
+    };
+    String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json";
+
+    if (localVarContentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+
+      localVarPostBody = localVarBuilder.build();
+    } else {
+      // normal form params
+      
+    }
+
+    try {
+      String localVarResponse = apiInvoker.invokeAPI(basePath, localVarPath, "PUT", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarContentType);
+      if(localVarResponse != null){
+        return ;
+      }
+      else {
+        return ;
+      }
+    } catch (ApiException ex) {
+      throw ex;
+    }
+  }
+  
+  /**
+   * Updates a pet in the store with form data
+   * 
+   * @param petId ID of pet that needs to be updated
+   * @param name Updated name of the pet
+   * @param status Updated status of the pet
+   * @return void
+   */
+  public void  updatePetWithForm (String petId, String name, String status) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'petId' is set
+    if (petId == null) {
+       throw new ApiException(400, "Missing the required parameter 'petId' when calling updatePetWithForm");
+    }
+    
+
+    // create path and map variables
+    String localVarPath = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> localVarFormParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] localVarContentTypes = {
+      "application/x-www-form-urlencoded"
+    };
+    String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json";
+
+    if (localVarContentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+      if (name != null) {
+        localVarBuilder.addTextBody("name", ApiInvoker.parameterToString(name), ApiInvoker.TEXT_PLAIN_UTF8);
+      }
+      
+      if (status != null) {
+        localVarBuilder.addTextBody("status", ApiInvoker.parameterToString(status), ApiInvoker.TEXT_PLAIN_UTF8);
+      }
+      
+
+      localVarPostBody = localVarBuilder.build();
+    } else {
+      // normal form params
+      localVarFormParams.put("name", ApiInvoker.parameterToString(name));
+      localVarFormParams.put("status", ApiInvoker.parameterToString(status));
+      
+    }
+
+    try {
+      String localVarResponse = apiInvoker.invokeAPI(basePath, localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarContentType);
+      if(localVarResponse != null){
         return ;
       }
       else {
@@ -460,7 +622,7 @@ public class PetApi {
    * @return void
    */
   public void  uploadFile (Long petId, String additionalMetadata, File file) throws ApiException {
-    Object postBody = null;
+    Object localVarPostBody = null;
     
     // verify the required parameter 'petId' is set
     if (petId == null) {
@@ -469,49 +631,48 @@ public class PetApi {
     
 
     // create path and map variables
-    String path = "/pet/{petId}/uploadImage".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
+    String localVarPath = "/pet/{petId}/uploadImage".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
     // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     // form params
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, String> localVarFormParams = new HashMap<String, String>();
 
     
 
     
 
-    String[] contentTypes = {
+    String[] localVarContentTypes = {
       "multipart/form-data"
     };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json";
 
-    if (contentType.startsWith("multipart/form-data")) {
+    if (localVarContentType.startsWith("multipart/form-data")) {
       // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
       
       if (additionalMetadata != null) {
-        builder.addTextBody("additionalMetadata", ApiInvoker.parameterToString(additionalMetadata), ApiInvoker.TEXT_PLAIN_UTF8);
+        localVarBuilder.addTextBody("additionalMetadata", ApiInvoker.parameterToString(additionalMetadata), ApiInvoker.TEXT_PLAIN_UTF8);
       }
       
       if (file != null) {
-        builder.addBinaryBody("file", file);
+        localVarBuilder.addBinaryBody("file", file);
       }
       
 
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
+      localVarPostBody = localVarBuilder.build();
     } else {
       // normal form params
-      formParams.put("additionalMetadata", ApiInvoker.parameterToString(additionalMetadata));
+      localVarFormParams.put("additionalMetadata", ApiInvoker.parameterToString(additionalMetadata));
       
       
     }
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
+      String localVarResponse = apiInvoker.invokeAPI(basePath, localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarContentType);
+      if(localVarResponse != null){
         return ;
       }
       else {
diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/api/StoreApi.java
index 49a3ac4aa9a..d5ecbca1ab3 100644
--- a/samples/client/petstore/android/default/src/main/java/io/swagger/client/api/StoreApi.java
+++ b/samples/client/petstore/android/default/src/main/java/io/swagger/client/api/StoreApi.java
@@ -8,10 +8,9 @@ import io.swagger.client.model.*;
 
 import java.util.*;
 
-import java.util.Map;
 import io.swagger.client.model.Order;
+import java.util.Map;
 
-import org.apache.http.HttpEntity;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
 
 import java.util.Map;
@@ -40,49 +39,109 @@ public class StoreApi {
 
   
   /**
-   * Returns pet inventories by status
-   * Returns a map of status codes to quantities
-   * @return Map<String, Integer>
+   * Delete purchase order by ID
+   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+   * @param orderId ID of the order that needs to be deleted
+   * @return void
    */
-  public Map<String, Integer>  getInventory () throws ApiException {
-    Object postBody = null;
+  public void  deleteOrder (String orderId) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'orderId' is set
+    if (orderId == null) {
+       throw new ApiException(400, "Missing the required parameter 'orderId' when calling deleteOrder");
+    }
     
 
     // create path and map variables
-    String path = "/store/inventory".replaceAll("\\{format\\}","json");
+    String localVarPath = "/store/order/{orderId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "orderId" + "\\}", apiInvoker.escapeString(orderId.toString()));
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
     // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     // form params
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, String> localVarFormParams = new HashMap<String, String>();
 
     
 
     
 
-    String[] contentTypes = {
+    String[] localVarContentTypes = {
       
     };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json";
 
-    if (contentType.startsWith("multipart/form-data")) {
+    if (localVarContentType.startsWith("multipart/form-data")) {
       // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
       
 
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
+      localVarPostBody = localVarBuilder.build();
     } else {
       // normal form params
       
     }
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
-        return (Map<String, Integer>) ApiInvoker.deserialize(response, "map", Map.class);
+      String localVarResponse = apiInvoker.invokeAPI(basePath, localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarContentType);
+      if(localVarResponse != null){
+        return ;
+      }
+      else {
+        return ;
+      }
+    } catch (ApiException ex) {
+      throw ex;
+    }
+  }
+  
+  /**
+   * Finds orders by status
+   * A single status value can be provided as a string
+   * @param status Status value that needs to be considered for query
+   * @return List<Order>
+   */
+  public List<Order>  findOrdersByStatus (String status) throws ApiException {
+    Object localVarPostBody = null;
+    
+
+    // create path and map variables
+    String localVarPath = "/store/findByStatus".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> localVarFormParams = new HashMap<String, String>();
+
+    
+    localVarQueryParams.addAll(ApiInvoker.parameterToPairs("", "status", status));
+    
+
+    
+
+    String[] localVarContentTypes = {
+      
+    };
+    String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json";
+
+    if (localVarContentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+
+      localVarPostBody = localVarBuilder.build();
+    } else {
+      // normal form params
+      
+    }
+
+    try {
+      String localVarResponse = apiInvoker.invokeAPI(basePath, localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarContentType);
+      if(localVarResponse != null){
+        return (List<Order>) ApiInvoker.deserialize(localVarResponse, "array", Order.class);
       }
       else {
         return null;
@@ -93,50 +152,100 @@ public class StoreApi {
   }
   
   /**
-   * Place an order for a pet
-   * 
-   * @param body order placed for purchasing the pet
-   * @return Order
+   * Returns pet inventories by status
+   * Returns a map of status codes to quantities
+   * @return Map<String, Integer>
    */
-  public Order  placeOrder (Order body) throws ApiException {
-    Object postBody = body;
+  public Map<String, Integer>  getInventory () throws ApiException {
+    Object localVarPostBody = null;
     
 
     // create path and map variables
-    String path = "/store/order".replaceAll("\\{format\\}","json");
+    String localVarPath = "/store/inventory".replaceAll("\\{format\\}","json");
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
     // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     // form params
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, String> localVarFormParams = new HashMap<String, String>();
 
     
 
     
 
-    String[] contentTypes = {
+    String[] localVarContentTypes = {
       
     };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json";
 
-    if (contentType.startsWith("multipart/form-data")) {
+    if (localVarContentType.startsWith("multipart/form-data")) {
       // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
       
 
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
+      localVarPostBody = localVarBuilder.build();
     } else {
       // normal form params
       
     }
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
-        return (Order) ApiInvoker.deserialize(response, "", Order.class);
+      String localVarResponse = apiInvoker.invokeAPI(basePath, localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarContentType);
+      if(localVarResponse != null){
+        return (Map<String, Integer>) ApiInvoker.deserialize(localVarResponse, "map", Map.class);
+      }
+      else {
+        return null;
+      }
+    } catch (ApiException ex) {
+      throw ex;
+    }
+  }
+  
+  /**
+   * Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+   * Returns an arbitrary object which is actually a map of status codes to quantities
+   * @return Object
+   */
+  public Object  getInventoryInObject () throws ApiException {
+    Object localVarPostBody = null;
+    
+
+    // create path and map variables
+    String localVarPath = "/store/inventory?response=arbitrary_object".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> localVarFormParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] localVarContentTypes = {
+      
+    };
+    String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json";
+
+    if (localVarContentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+
+      localVarPostBody = localVarBuilder.build();
+    } else {
+      // normal form params
+      
+    }
+
+    try {
+      String localVarResponse = apiInvoker.invokeAPI(basePath, localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarContentType);
+      if(localVarResponse != null){
+        return (Object) ApiInvoker.deserialize(localVarResponse, "", Object.class);
       }
       else {
         return null;
@@ -153,7 +262,7 @@ public class StoreApi {
    * @return Order
    */
   public Order  getOrderById (String orderId) throws ApiException {
-    Object postBody = null;
+    Object localVarPostBody = null;
     
     // verify the required parameter 'orderId' is set
     if (orderId == null) {
@@ -162,40 +271,39 @@ public class StoreApi {
     
 
     // create path and map variables
-    String path = "/store/order/{orderId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "orderId" + "\\}", apiInvoker.escapeString(orderId.toString()));
+    String localVarPath = "/store/order/{orderId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "orderId" + "\\}", apiInvoker.escapeString(orderId.toString()));
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
     // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     // form params
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, String> localVarFormParams = new HashMap<String, String>();
 
     
 
     
 
-    String[] contentTypes = {
+    String[] localVarContentTypes = {
       
     };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json";
 
-    if (contentType.startsWith("multipart/form-data")) {
+    if (localVarContentType.startsWith("multipart/form-data")) {
       // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
       
 
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
+      localVarPostBody = localVarBuilder.build();
     } else {
       // normal form params
       
     }
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
-        return (Order) ApiInvoker.deserialize(response, "", Order.class);
+      String localVarResponse = apiInvoker.invokeAPI(basePath, localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarContentType);
+      if(localVarResponse != null){
+        return (Order) ApiInvoker.deserialize(localVarResponse, "", Order.class);
       }
       else {
         return null;
@@ -206,58 +314,52 @@ public class StoreApi {
   }
   
   /**
-   * Delete purchase order by ID
-   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-   * @param orderId ID of the order that needs to be deleted
-   * @return void
+   * Place an order for a pet
+   * 
+   * @param body order placed for purchasing the pet
+   * @return Order
    */
-  public void  deleteOrder (String orderId) throws ApiException {
-    Object postBody = null;
-    
-    // verify the required parameter 'orderId' is set
-    if (orderId == null) {
-       throw new ApiException(400, "Missing the required parameter 'orderId' when calling deleteOrder");
-    }
+  public Order  placeOrder (Order body) throws ApiException {
+    Object localVarPostBody = body;
     
 
     // create path and map variables
-    String path = "/store/order/{orderId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "orderId" + "\\}", apiInvoker.escapeString(orderId.toString()));
+    String localVarPath = "/store/order".replaceAll("\\{format\\}","json");
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
     // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     // form params
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, String> localVarFormParams = new HashMap<String, String>();
 
     
 
     
 
-    String[] contentTypes = {
+    String[] localVarContentTypes = {
       
     };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json";
 
-    if (contentType.startsWith("multipart/form-data")) {
+    if (localVarContentType.startsWith("multipart/form-data")) {
       // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
       
 
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
+      localVarPostBody = localVarBuilder.build();
     } else {
       // normal form params
       
     }
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
-        return ;
+      String localVarResponse = apiInvoker.invokeAPI(basePath, localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarContentType);
+      if(localVarResponse != null){
+        return (Order) ApiInvoker.deserialize(localVarResponse, "", Order.class);
       }
       else {
-        return ;
+        return null;
       }
     } catch (ApiException ex) {
       throw ex;
diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/api/UserApi.java
index 4c1bf7b1a3d..a28410fd0a9 100644
--- a/samples/client/petstore/android/default/src/main/java/io/swagger/client/api/UserApi.java
+++ b/samples/client/petstore/android/default/src/main/java/io/swagger/client/api/UserApi.java
@@ -11,7 +11,6 @@ import java.util.*;
 import io.swagger.client.model.User;
 import java.util.*;
 
-import org.apache.http.HttpEntity;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
 
 import java.util.Map;
@@ -46,43 +45,42 @@ public class UserApi {
    * @return void
    */
   public void  createUser (User body) throws ApiException {
-    Object postBody = body;
+    Object localVarPostBody = body;
     
 
     // create path and map variables
-    String path = "/user".replaceAll("\\{format\\}","json");
+    String localVarPath = "/user".replaceAll("\\{format\\}","json");
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
     // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     // form params
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, String> localVarFormParams = new HashMap<String, String>();
 
     
 
     
 
-    String[] contentTypes = {
+    String[] localVarContentTypes = {
       
     };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json";
 
-    if (contentType.startsWith("multipart/form-data")) {
+    if (localVarContentType.startsWith("multipart/form-data")) {
       // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
       
 
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
+      localVarPostBody = localVarBuilder.build();
     } else {
       // normal form params
       
     }
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
+      String localVarResponse = apiInvoker.invokeAPI(basePath, localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarContentType);
+      if(localVarResponse != null){
         return ;
       }
       else {
@@ -100,43 +98,42 @@ public class UserApi {
    * @return void
    */
   public void  createUsersWithArrayInput (List<User> body) throws ApiException {
-    Object postBody = body;
+    Object localVarPostBody = body;
     
 
     // create path and map variables
-    String path = "/user/createWithArray".replaceAll("\\{format\\}","json");
+    String localVarPath = "/user/createWithArray".replaceAll("\\{format\\}","json");
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
     // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     // form params
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, String> localVarFormParams = new HashMap<String, String>();
 
     
 
     
 
-    String[] contentTypes = {
+    String[] localVarContentTypes = {
       
     };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json";
 
-    if (contentType.startsWith("multipart/form-data")) {
+    if (localVarContentType.startsWith("multipart/form-data")) {
       // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
       
 
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
+      localVarPostBody = localVarBuilder.build();
     } else {
       // normal form params
       
     }
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
+      String localVarResponse = apiInvoker.invokeAPI(basePath, localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarContentType);
+      if(localVarResponse != null){
         return ;
       }
       else {
@@ -154,274 +151,42 @@ public class UserApi {
    * @return void
    */
   public void  createUsersWithListInput (List<User> body) throws ApiException {
-    Object postBody = body;
+    Object localVarPostBody = body;
     
 
     // create path and map variables
-    String path = "/user/createWithList".replaceAll("\\{format\\}","json");
+    String localVarPath = "/user/createWithList".replaceAll("\\{format\\}","json");
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
     // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     // form params
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, String> localVarFormParams = new HashMap<String, String>();
 
     
 
     
 
-    String[] contentTypes = {
+    String[] localVarContentTypes = {
       
     };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json";
 
-    if (contentType.startsWith("multipart/form-data")) {
+    if (localVarContentType.startsWith("multipart/form-data")) {
       // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
       
 
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
+      localVarPostBody = localVarBuilder.build();
     } else {
       // normal form params
       
     }
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
-        return ;
-      }
-      else {
-        return ;
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
-  }
-  
-  /**
-   * Logs user into the system
-   * 
-   * @param username The user name for login
-   * @param password The password for login in clear text
-   * @return String
-   */
-  public String  loginUser (String username, String password) throws ApiException {
-    Object postBody = null;
-    
-
-    // create path and map variables
-    String path = "/user/login".replaceAll("\\{format\\}","json");
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
-    // form params
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    
-    queryParams.addAll(ApiInvoker.parameterToPairs("", "username", username));
-    
-    queryParams.addAll(ApiInvoker.parameterToPairs("", "password", password));
-    
-
-    
-
-    String[] contentTypes = {
-      
-    };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if (contentType.startsWith("multipart/form-data")) {
-      // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-      
-
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
-    } else {
-      // normal form params
-      
-    }
-
-    try {
-      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
-        return (String) ApiInvoker.deserialize(response, "", String.class);
-      }
-      else {
-        return null;
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
-  }
-  
-  /**
-   * Logs out current logged in user session
-   * 
-   * @return void
-   */
-  public void  logoutUser () throws ApiException {
-    Object postBody = null;
-    
-
-    // create path and map variables
-    String path = "/user/logout".replaceAll("\\{format\\}","json");
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
-    // form params
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    
-
-    
-
-    String[] contentTypes = {
-      
-    };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if (contentType.startsWith("multipart/form-data")) {
-      // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-      
-
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
-    } else {
-      // normal form params
-      
-    }
-
-    try {
-      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
-        return ;
-      }
-      else {
-        return ;
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
-  }
-  
-  /**
-   * Get user by user name
-   * 
-   * @param username The name that needs to be fetched. Use user1 for testing.
-   * @return User
-   */
-  public User  getUserByName (String username) throws ApiException {
-    Object postBody = null;
-    
-    // verify the required parameter 'username' is set
-    if (username == null) {
-       throw new ApiException(400, "Missing the required parameter 'username' when calling getUserByName");
-    }
-    
-
-    // create path and map variables
-    String path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
-    // form params
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    
-
-    
-
-    String[] contentTypes = {
-      
-    };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if (contentType.startsWith("multipart/form-data")) {
-      // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-      
-
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
-    } else {
-      // normal form params
-      
-    }
-
-    try {
-      String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
-        return (User) ApiInvoker.deserialize(response, "", User.class);
-      }
-      else {
-        return null;
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
-  }
-  
-  /**
-   * Updated user
-   * This can only be done by the logged in user.
-   * @param username name that need to be deleted
-   * @param body Updated user object
-   * @return void
-   */
-  public void  updateUser (String username, User body) throws ApiException {
-    Object postBody = body;
-    
-    // verify the required parameter 'username' is set
-    if (username == null) {
-       throw new ApiException(400, "Missing the required parameter 'username' when calling updateUser");
-    }
-    
-
-    // create path and map variables
-    String path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
-    // form params
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    
-
-    
-
-    String[] contentTypes = {
-      
-    };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if (contentType.startsWith("multipart/form-data")) {
-      // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-      
-
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
-    } else {
-      // normal form params
-      
-    }
-
-    try {
-      String response = apiInvoker.invokeAPI(basePath, path, "PUT", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
+      String localVarResponse = apiInvoker.invokeAPI(basePath, localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarContentType);
+      if(localVarResponse != null){
         return ;
       }
       else {
@@ -439,7 +204,7 @@ public class UserApi {
    * @return void
    */
   public void  deleteUser (String username) throws ApiException {
-    Object postBody = null;
+    Object localVarPostBody = null;
     
     // verify the required parameter 'username' is set
     if (username == null) {
@@ -448,39 +213,265 @@ public class UserApi {
     
 
     // create path and map variables
-    String path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
+    String localVarPath = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
     // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     // form params
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, String> localVarFormParams = new HashMap<String, String>();
 
     
 
     
 
-    String[] contentTypes = {
+    String[] localVarContentTypes = {
       
     };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json";
 
-    if (contentType.startsWith("multipart/form-data")) {
+    if (localVarContentType.startsWith("multipart/form-data")) {
       // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
       
 
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
+      localVarPostBody = localVarBuilder.build();
     } else {
       // normal form params
       
     }
 
     try {
-      String response = apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, postBody, headerParams, formParams, contentType);
-      if(response != null){
+      String localVarResponse = apiInvoker.invokeAPI(basePath, localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarContentType);
+      if(localVarResponse != null){
+        return ;
+      }
+      else {
+        return ;
+      }
+    } catch (ApiException ex) {
+      throw ex;
+    }
+  }
+  
+  /**
+   * Get user by user name
+   * 
+   * @param username The name that needs to be fetched. Use user1 for testing.
+   * @return User
+   */
+  public User  getUserByName (String username) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'username' is set
+    if (username == null) {
+       throw new ApiException(400, "Missing the required parameter 'username' when calling getUserByName");
+    }
+    
+
+    // create path and map variables
+    String localVarPath = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> localVarFormParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] localVarContentTypes = {
+      
+    };
+    String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json";
+
+    if (localVarContentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+
+      localVarPostBody = localVarBuilder.build();
+    } else {
+      // normal form params
+      
+    }
+
+    try {
+      String localVarResponse = apiInvoker.invokeAPI(basePath, localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarContentType);
+      if(localVarResponse != null){
+        return (User) ApiInvoker.deserialize(localVarResponse, "", User.class);
+      }
+      else {
+        return null;
+      }
+    } catch (ApiException ex) {
+      throw ex;
+    }
+  }
+  
+  /**
+   * Logs user into the system
+   * 
+   * @param username The user name for login
+   * @param password The password for login in clear text
+   * @return String
+   */
+  public String  loginUser (String username, String password) throws ApiException {
+    Object localVarPostBody = null;
+    
+
+    // create path and map variables
+    String localVarPath = "/user/login".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> localVarFormParams = new HashMap<String, String>();
+
+    
+    localVarQueryParams.addAll(ApiInvoker.parameterToPairs("", "username", username));
+    
+    localVarQueryParams.addAll(ApiInvoker.parameterToPairs("", "password", password));
+    
+
+    
+
+    String[] localVarContentTypes = {
+      
+    };
+    String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json";
+
+    if (localVarContentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+
+      localVarPostBody = localVarBuilder.build();
+    } else {
+      // normal form params
+      
+    }
+
+    try {
+      String localVarResponse = apiInvoker.invokeAPI(basePath, localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarContentType);
+      if(localVarResponse != null){
+        return (String) ApiInvoker.deserialize(localVarResponse, "", String.class);
+      }
+      else {
+        return null;
+      }
+    } catch (ApiException ex) {
+      throw ex;
+    }
+  }
+  
+  /**
+   * Logs out current logged in user session
+   * 
+   * @return void
+   */
+  public void  logoutUser () throws ApiException {
+    Object localVarPostBody = null;
+    
+
+    // create path and map variables
+    String localVarPath = "/user/logout".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> localVarFormParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] localVarContentTypes = {
+      
+    };
+    String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json";
+
+    if (localVarContentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+
+      localVarPostBody = localVarBuilder.build();
+    } else {
+      // normal form params
+      
+    }
+
+    try {
+      String localVarResponse = apiInvoker.invokeAPI(basePath, localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarContentType);
+      if(localVarResponse != null){
+        return ;
+      }
+      else {
+        return ;
+      }
+    } catch (ApiException ex) {
+      throw ex;
+    }
+  }
+  
+  /**
+   * Updated user
+   * This can only be done by the logged in user.
+   * @param username name that need to be deleted
+   * @param body Updated user object
+   * @return void
+   */
+  public void  updateUser (String username, User body) throws ApiException {
+    Object localVarPostBody = body;
+    
+    // verify the required parameter 'username' is set
+    if (username == null) {
+       throw new ApiException(400, "Missing the required parameter 'username' when calling updateUser");
+    }
+    
+
+    // create path and map variables
+    String localVarPath = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> localVarFormParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] localVarContentTypes = {
+      
+    };
+    String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json";
+
+    if (localVarContentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+
+      localVarPostBody = localVarBuilder.build();
+    } else {
+      // normal form params
+      
+    }
+
+    try {
+      String localVarResponse = apiInvoker.invokeAPI(basePath, localVarPath, "PUT", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarContentType);
+      if(localVarResponse != null){
         return ;
       }
       else {
diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/InlineResponse200.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/InlineResponse200.java
new file mode 100644
index 00000000000..c4fd8ce357d
--- /dev/null
+++ b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/InlineResponse200.java
@@ -0,0 +1,112 @@
+package io.swagger.client.model;
+
+import io.swagger.client.model.Tag;
+import java.util.*;
+
+import io.swagger.annotations.*;
+import com.google.gson.annotations.SerializedName;
+
+
+@ApiModel(description = "")
+public class InlineResponse200  {
+  
+  @SerializedName("tags")
+  private List<Tag> tags = null;
+  @SerializedName("id")
+  private Long id = null;
+  @SerializedName("category")
+  private Object category = null;
+  public enum StatusEnum {
+     available,  pending,  sold, 
+  };
+  @SerializedName("status")
+  private StatusEnum status = null;
+  @SerializedName("name")
+  private String name = null;
+  @SerializedName("photoUrls")
+  private List<String> photoUrls = null;
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<Tag> getTags() {
+    return tags;
+  }
+  public void setTags(List<Tag> tags) {
+    this.tags = tags;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Object getCategory() {
+    return category;
+  }
+  public void setCategory(Object category) {
+    this.category = category;
+  }
+
+  
+  /**
+   * pet status in the store
+   **/
+  @ApiModelProperty(value = "pet status in the store")
+  public StatusEnum getStatus() {
+    return status;
+  }
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<String> getPhotoUrls() {
+    return photoUrls;
+  }
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
+  
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class InlineResponse200 {\n");
+    
+    sb.append("  tags: ").append(tags).append("\n");
+    sb.append("  id: ").append(id).append("\n");
+    sb.append("  category: ").append(category).append("\n");
+    sb.append("  status: ").append(status).append("\n");
+    sb.append("  name: ").append(name).append("\n");
+    sb.append("  photoUrls: ").append(photoUrls).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Model200Response.java
new file mode 100644
index 00000000000..4a6e58b2a5e
--- /dev/null
+++ b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Model200Response.java
@@ -0,0 +1,36 @@
+package io.swagger.client.model;
+
+
+import io.swagger.annotations.*;
+import com.google.gson.annotations.SerializedName;
+
+
+@ApiModel(description = "")
+public class Model200Response  {
+  
+  @SerializedName("name")
+  private Integer name = null;
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getName() {
+    return name;
+  }
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+  
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Model200Response {\n");
+    
+    sb.append("  name: ").append(name).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/ModelReturn.java
new file mode 100644
index 00000000000..24763f3acb4
--- /dev/null
+++ b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -0,0 +1,36 @@
+package io.swagger.client.model;
+
+
+import io.swagger.annotations.*;
+import com.google.gson.annotations.SerializedName;
+
+
+@ApiModel(description = "")
+public class ModelReturn  {
+  
+  @SerializedName("return")
+  private Integer _return = null;
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getReturn() {
+    return _return;
+  }
+  public void setReturn(Integer _return) {
+    this._return = _return;
+  }
+
+  
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ModelReturn {\n");
+    
+    sb.append("  _return: ").append(_return).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Name.java
new file mode 100644
index 00000000000..9763aca7b34
--- /dev/null
+++ b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Name.java
@@ -0,0 +1,50 @@
+package io.swagger.client.model;
+
+
+import io.swagger.annotations.*;
+import com.google.gson.annotations.SerializedName;
+
+
+@ApiModel(description = "")
+public class Name  {
+  
+  @SerializedName("name")
+  private Integer name = null;
+  @SerializedName("snake_case")
+  private Integer snakeCase = null;
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getName() {
+    return name;
+  }
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getSnakeCase() {
+    return snakeCase;
+  }
+  public void setSnakeCase(Integer snakeCase) {
+    this.snakeCase = snakeCase;
+  }
+
+  
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Name {\n");
+    
+    sb.append("  name: ").append(name).append("\n");
+    sb.append("  snakeCase: ").append(snakeCase).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/SpecialModelName.java
new file mode 100644
index 00000000000..d804bdd8765
--- /dev/null
+++ b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -0,0 +1,36 @@
+package io.swagger.client.model;
+
+
+import io.swagger.annotations.*;
+import com.google.gson.annotations.SerializedName;
+
+
+@ApiModel(description = "")
+public class SpecialModelName  {
+  
+  @SerializedName("$special[property.name]")
+  private Long specialPropertyName = null;
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Long getSpecialPropertyName() {
+    return specialPropertyName;
+  }
+  public void setSpecialPropertyName(Long specialPropertyName) {
+    this.specialPropertyName = specialPropertyName;
+  }
+
+  
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class SpecialModelName {\n");
+    
+    sb.append("  specialPropertyName: ").append(specialPropertyName).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/client/petstore/android/default/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/android/default/src/test/java/io/swagger/petstore/test/PetApiTest.java
index ca868d2ea22..75039a9fa39 100644
--- a/samples/client/petstore/android/default/src/test/java/io/swagger/petstore/test/PetApiTest.java
+++ b/samples/client/petstore/android/default/src/test/java/io/swagger/petstore/test/PetApiTest.java
@@ -72,6 +72,11 @@ public class PetApiTest {
     }
 
     @Test
+    @Ignore
+    /* ignoring the findPetByTags test below as it's very similar to
+     * testFindPetsByStatus and testFindPetsByTags sometimes got 500
+     * due to server issue, which makes the test unstable.
+     */
     public void testFindPetsByTags() throws Exception {
         Pet pet = createRandomPet();
         pet.setName("monster");
diff --git a/samples/client/petstore/android/volley/build.gradle b/samples/client/petstore/android/volley/build.gradle
index eab8603b5e6..e678620cb00 100644
--- a/samples/client/petstore/android/volley/build.gradle
+++ b/samples/client/petstore/android/volley/build.gradle
@@ -6,9 +6,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
+        classpath 'com.android.tools.build:gradle:1.5.0'
         
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
         
     }
 }
@@ -24,11 +24,11 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion '22.0.0'
+    compileSdkVersion 23
+    buildToolsVersion '23.0.2'
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 22
+        targetSdkVersion 23
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
@@ -45,6 +45,10 @@ android {
             }
         }
     }
+
+    testOptions {
+        unitTests.returnDefaultValues = true
+    }
 }
 
 
@@ -54,6 +58,8 @@ ext {
     httpclient_version = "4.3.3"
     volley_version = "1.0.19"
     junit_version = "4.8.1"
+    robolectric_version = "3.0"
+    concurrent_unit_version = "0.4.2"
 }
 
 dependencies {
@@ -63,6 +69,8 @@ dependencies {
     compile "org.apache.httpcomponents:httpmime:$httpclient_version"
     compile "com.mcxiaoke.volley:library:${volley_version}@aar"
     testCompile "junit:junit:$junit_version"
+    testCompile "org.robolectric:robolectric:${robolectric_version}"
+    testCompile "net.jodah:concurrentunit:${concurrent_unit_version}"
 }
 
 afterEvaluate {
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/ApiInvoker.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/ApiInvoker.java
index 5aa102b2bb0..21ee5f36286 100644
--- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/ApiInvoker.java
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/ApiInvoker.java
@@ -1,10 +1,16 @@
 package io.swagger.client;
 
-import android.content.Context;
-
+import com.android.volley.Cache;
+import com.android.volley.Network;
+import com.android.volley.Request;
 import com.android.volley.RequestQueue;
 import com.android.volley.Response;
-import com.android.volley.toolbox.Volley;
+import com.android.volley.ResponseDelivery;
+import com.android.volley.toolbox.BasicNetwork;
+import com.android.volley.toolbox.HttpStack;
+import com.android.volley.toolbox.HurlStack;
+import com.android.volley.toolbox.NoCache;
+import com.android.volley.toolbox.RequestFuture;
 import com.google.gson.JsonParseException;
 
 import org.apache.http.Consts;
@@ -22,6 +28,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 import io.swagger.client.auth.Authentication;
 import io.swagger.client.auth.ApiKeyAuth;
@@ -36,11 +45,12 @@ public class ApiInvoker {
   private static ApiInvoker INSTANCE;
   private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
 
-  private Context context;
   private RequestQueue mRequestQueue;
 
   private Map<String, Authentication> authentications;
 
+  private int connectionTimeout;
+
   /** Content type "text/plain" with UTF-8 encoding. */
   public static final ContentType TEXT_PLAIN_UTF8 = ContentType.create("text/plain", Consts.UTF_8);
 
@@ -165,14 +175,25 @@ public class ApiInvoker {
     return params;
   }
 
-  public static void initializeInstance(Context context) {
-     INSTANCE = new ApiInvoker(context);
-     setUserAgent("Android-Volley-Swagger");
+  public static void initializeInstance() {
+     initializeInstance(null);
+  }
+
+  public static void initializeInstance(Cache cache) {
+     initializeInstance(cache, null, 0, null, 30);
+  }
+
+  public static void initializeInstance(Cache cache, Network network, int threadPoolSize, ResponseDelivery delivery, int connectionTimeout) {
+     INSTANCE = new ApiInvoker(cache, network, threadPoolSize, delivery, connectionTimeout);
+     setUserAgent("Swagger-Codegen/1.0.0/android");
 
      // Setup authentications (key: authentication name, value: authentication).
      INSTANCE.authentications = new HashMap<String, Authentication>();
      
      
+     INSTANCE.authentications.put("test_api_key_header", new ApiKeyAuth("header", "test_api_key_header"));
+     
+     
      
      
      
@@ -180,16 +201,55 @@ public class ApiInvoker {
      
      
      
+     
+     
+     
+     INSTANCE.authentications.put("test_http_basic", new HttpBasicAuth());
+     
+     
+     
+     
+     INSTANCE.authentications.put("test_api_client_secret", new ApiKeyAuth("header", "x-test_api_client_secret"));
+     
+     
+     
+     
+     
+     INSTANCE.authentications.put("test_api_client_id", new ApiKeyAuth("header", "x-test_api_client_id"));
+     
+     
+     
+     
+     
+     INSTANCE.authentications.put("test_api_key_query", new ApiKeyAuth("query", "test_api_key_query"));
+     
+     
+     
+     
+     
+     
+     
+     // TODO: comment out below as OAuth does not exist
+     //INSTANCE.authentications.put("petstore_auth", new OAuth());
+     
+     
      // Prevent the authentications from being modified.
      INSTANCE.authentications = Collections.unmodifiableMap(INSTANCE.authentications);
   }
-  private ApiInvoker(Context context) {
-     this.context = context;
-     initConnectionManager();
-  }
 
-  public ApiInvoker() {
-    initConnectionManager();
+  private ApiInvoker(Cache cache, Network network, int threadPoolSize, ResponseDelivery delivery, int connectionTimeout) {
+     if(cache == null) cache = new NoCache();
+     if(network == null) {
+        HttpStack stack = new HurlStack();
+        network = new BasicNetwork(stack);
+     }
+
+     if(delivery == null) {
+        initConnectionRequest(cache, network);
+     } else {
+        initConnectionRequest(cache, network, threadPoolSize, delivery);
+     }
+     this.connectionTimeout = connectionTimeout;
   }
 
   public static ApiInvoker getInstance() {
@@ -305,6 +365,14 @@ public class ApiInvoker {
     throw new RuntimeException("No API key authentication configured!");
   }
 
+  public void setConnectionTimeout(int connectionTimeout){
+     this.connectionTimeout = connectionTimeout;
+  }
+
+  public int getConnectionTimeout() {
+     return connectionTimeout;
+  }
+
   /**
   * Update query and header parameters based on authentication settings.
   *
@@ -318,7 +386,21 @@ public class ApiInvoker {
     }
   }
 
+  public String invokeAPI(String host, String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, String> formParams, String contentType, String[] authNames) throws ApiException, InterruptedException, ExecutionException, TimeoutException {
+     RequestFuture<String> future = RequestFuture.newFuture();
+     Request request = createRequest(host, path, method, queryParams, body, headerParams, formParams, contentType, authNames, future, future);
+     if(request != null) {
+        mRequestQueue.add(request);
+        return future.get(connectionTimeout, TimeUnit.SECONDS);
+     } else return "no data";
+  }
+
   public void invokeAPI(String host, String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, String> formParams, String contentType, String[] authNames, Response.Listener<String> stringRequest, Response.ErrorListener errorListener) throws ApiException {
+     Request request = createRequest(host, path, method, queryParams, body, headerParams, formParams, contentType, authNames, stringRequest, errorListener);
+     if (request != null) mRequestQueue.add(request);
+  }
+
+  public Request<String> createRequest(String host, String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, String> formParams, String contentType, String[] authNames, Response.Listener<String> stringRequest, Response.ErrorListener errorListener) throws ApiException {
     StringBuilder b = new StringBuilder();
     b.append("?");
 
@@ -375,13 +457,13 @@ public class ApiInvoker {
       }
       formParamStr = formParamBuilder.toString();
     }
+    Request request = null;
 
     if ("GET".equals(method)) {
-      GetRequest request = new GetRequest(url, headers, null, stringRequest, errorListener);
-      mRequestQueue.add(request);
+      request = new GetRequest(url, headers, null, stringRequest, errorListener);
     }
     else if ("POST".equals(method)) {
-       PostRequest request = null;
+       request = null;
        if (formParamStr != null) {
           request = new PostRequest(url, headers, contentType, new StringEntity(formParamStr, "UTF-8"), stringRequest, errorListener);
        } else if (body != null) {
@@ -390,11 +472,12 @@ public class ApiInvoker {
           } else {
              request = new PostRequest(url, headers, contentType, new StringEntity(serialize(body), "UTF-8"), stringRequest, errorListener);
           }
+       } else {
+         request = new PostRequest(url, headers, null, null, stringRequest, errorListener);
        }
-       if(request != null) mRequestQueue.add(request);
     }
     else if ("PUT".equals(method)) {
-       PutRequest request = null;
+       request = null;
        if (formParamStr != null) {
           request = new PutRequest(url, headers, contentType, new StringEntity(formParamStr, "UTF-8"), stringRequest, errorListener);
        } else if (body != null) {
@@ -403,11 +486,12 @@ public class ApiInvoker {
           } else {
              request = new PutRequest(url, headers, contentType, new StringEntity(serialize(body), "UTF-8"), stringRequest, errorListener);
           }
+       } else {
+          request = new PutRequest(url, headers, null, null, stringRequest, errorListener);
        }
-       if(request != null) mRequestQueue.add(request);
     }
     else if ("DELETE".equals(method)) {
-       DeleteRequest request = null;
+       request = null;
           if (formParamStr != null) {
            request = new DeleteRequest(url, headers, contentType, new StringEntity(formParamStr, "UTF-8"), stringRequest, errorListener);
           } else if (body != null) {
@@ -416,11 +500,12 @@ public class ApiInvoker {
           } else {
              request = new DeleteRequest(url, headers, contentType, new StringEntity(serialize(body), "UTF-8"), stringRequest, errorListener);
           }
+       } else {
+          request = new DeleteRequest(url, headers, null, null, stringRequest, errorListener);
        }
-       if(request != null) mRequestQueue.add(request);
     }
     else if ("PATCH".equals(method)) {
-                PatchRequest request = null;
+       request = null;
           if (formParamStr != null) {
              request = new PatchRequest(url, headers, contentType, new StringEntity(formParamStr, "UTF-8"), stringRequest, errorListener);
           } else if (body != null) {
@@ -429,12 +514,24 @@ public class ApiInvoker {
              } else {
                 request = new PatchRequest(url, headers, contentType, new StringEntity(serialize(body), "UTF-8"), stringRequest, errorListener);
              }
-             }
-          if(request != null) mRequestQueue.add(request);
+          } else {
+             request = new PatchRequest(url, headers, null, null, stringRequest, errorListener);
+          }
        }
+    return request;
   }
 
-  private void initConnectionManager() {
-    mRequestQueue = Volley.newRequestQueue(context);
+  private void initConnectionRequest(Cache cache, Network network) {
+     mRequestQueue = new RequestQueue(cache, network);
+     mRequestQueue.start();
+  }
+
+  private void initConnectionRequest(Cache cache, Network network, int threadPoolSize, ResponseDelivery delivery) {
+     mRequestQueue = new RequestQueue(cache, network, threadPoolSize, delivery);
+     mRequestQueue.start();
+  }
+
+  public void stopQueue() {
+     mRequestQueue.stop();
   }
 }
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/JsonUtil.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/JsonUtil.java
index 5aa10d3ea82..49ce07a07ae 100644
--- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/JsonUtil.java
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/JsonUtil.java
@@ -35,24 +35,44 @@ public class JsonUtil {
   public static Type getListTypeForDeserialization(Class cls) {
     String className = cls.getSimpleName();
     
-    if ("User".equalsIgnoreCase(className)) {
-      return new TypeToken<List<User>>(){}.getType();
-    }
-    
     if ("Category".equalsIgnoreCase(className)) {
       return new TypeToken<List<Category>>(){}.getType();
     }
     
+    if ("InlineResponse200".equalsIgnoreCase(className)) {
+      return new TypeToken<List<InlineResponse200>>(){}.getType();
+    }
+    
+    if ("Model200Response".equalsIgnoreCase(className)) {
+      return new TypeToken<List<Model200Response>>(){}.getType();
+    }
+    
+    if ("ModelReturn".equalsIgnoreCase(className)) {
+      return new TypeToken<List<ModelReturn>>(){}.getType();
+    }
+    
+    if ("Name".equalsIgnoreCase(className)) {
+      return new TypeToken<List<Name>>(){}.getType();
+    }
+    
+    if ("Order".equalsIgnoreCase(className)) {
+      return new TypeToken<List<Order>>(){}.getType();
+    }
+    
     if ("Pet".equalsIgnoreCase(className)) {
       return new TypeToken<List<Pet>>(){}.getType();
     }
     
+    if ("SpecialModelName".equalsIgnoreCase(className)) {
+      return new TypeToken<List<SpecialModelName>>(){}.getType();
+    }
+    
     if ("Tag".equalsIgnoreCase(className)) {
       return new TypeToken<List<Tag>>(){}.getType();
     }
     
-    if ("Order".equalsIgnoreCase(className)) {
-      return new TypeToken<List<Order>>(){}.getType();
+    if ("User".equalsIgnoreCase(className)) {
+      return new TypeToken<List<User>>(){}.getType();
     }
     
     return new TypeToken<List<Object>>(){}.getType();
@@ -61,26 +81,46 @@ public class JsonUtil {
   public static Type getTypeForDeserialization(Class cls) {
     String className = cls.getSimpleName();
     
-    if ("User".equalsIgnoreCase(className)) {
-      return new TypeToken<User>(){}.getType();
-    }
-    
     if ("Category".equalsIgnoreCase(className)) {
       return new TypeToken<Category>(){}.getType();
     }
     
-    if ("Pet".equalsIgnoreCase(className)) {
-      return new TypeToken<Pet>(){}.getType();
+    if ("InlineResponse200".equalsIgnoreCase(className)) {
+      return new TypeToken<InlineResponse200>(){}.getType();
     }
     
-    if ("Tag".equalsIgnoreCase(className)) {
-      return new TypeToken<Tag>(){}.getType();
+    if ("Model200Response".equalsIgnoreCase(className)) {
+      return new TypeToken<Model200Response>(){}.getType();
+    }
+    
+    if ("ModelReturn".equalsIgnoreCase(className)) {
+      return new TypeToken<ModelReturn>(){}.getType();
+    }
+    
+    if ("Name".equalsIgnoreCase(className)) {
+      return new TypeToken<Name>(){}.getType();
     }
     
     if ("Order".equalsIgnoreCase(className)) {
       return new TypeToken<Order>(){}.getType();
     }
     
+    if ("Pet".equalsIgnoreCase(className)) {
+      return new TypeToken<Pet>(){}.getType();
+    }
+    
+    if ("SpecialModelName".equalsIgnoreCase(className)) {
+      return new TypeToken<SpecialModelName>(){}.getType();
+    }
+    
+    if ("Tag".equalsIgnoreCase(className)) {
+      return new TypeToken<Tag>(){}.getType();
+    }
+    
+    if ("User".equalsIgnoreCase(className)) {
+      return new TypeToken<User>(){}.getType();
+    }
+    
     return new TypeToken<Object>(){}.getType();
   }
 
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/PetApi.java
index 248704b21c1..b0a72ab7d8a 100644
--- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/PetApi.java
@@ -1,6 +1,5 @@
 package io.swagger.client.api;
 
-import io.swagger.client.Responses;
 import io.swagger.client.ApiInvoker;
 import io.swagger.client.ApiException;
 import io.swagger.client.Pair;
@@ -13,14 +12,18 @@ import com.android.volley.Response;
 import com.android.volley.VolleyError;
 
 import io.swagger.client.model.Pet;
+import io.swagger.client.model.InlineResponse200;
 import java.io.File;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
 
-import java.util.Map;
+import java.util.ArrayList;
 import java.util.HashMap;
-import java.io.File;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
 
 public class PetApi {
   String basePath = "http://petstore.swagger.io/v2";
@@ -44,78 +47,75 @@ public class PetApi {
 
   
   /**
-   * Update an existing pet
-   * 
+  * Add a new pet to the store
+  * 
    * @param body Pet object that needs to be added to the store
    * @return void
-   */
-  public void updatePet (Pet body, final Responses.StringResponse responseListener, final Response.ErrorListener errorListener) {
-    Object postBody = body;
+  */
+  public void addPet (Pet body) throws TimeoutException, ExecutionException, InterruptedException, ApiException {
+     Object postBody = body;
+  
+
+  // create path and map variables
+  String path = "/pet".replaceAll("\\{format\\}","json");
+
+  // query params
+  List<Pair> queryParams = new ArrayList<Pair>();
+      // header params
+      Map<String, String> headerParams = new HashMap<String, String>();
+      // form params
+      Map<String, String> formParams = new HashMap<String, String>();
 
   
 
-    // create path and map variables
-    String path = "/pet".replaceAll("\\{format\\}","json");
+  
 
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
-    // form params
-    Map<String, String> formParams = new HashMap<String, String>();
+      String[] contentTypes = {
+  "application/json","application/xml"
+      };
+      String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
 
-    
-
-    
-
-    String[] contentTypes = {
-      "application/json","application/xml"
-    };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if (contentType.startsWith("multipart/form-data")) {
+      if (contentType.startsWith("multipart/form-data")) {
       // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-      
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+  
 
-      HttpEntity httpEntity = builder.build();
+      HttpEntity httpEntity = localVarBuilder.build();
       postBody = httpEntity;
-    } else {
+      } else {
       // normal form params
-      
-    }
+  
+      }
 
       String[] authNames = new String[] { "petstore_auth" };
 
-    try {
-      apiInvoker.invokeAPI(basePath, path, "PUT", queryParams, postBody, headerParams, formParams, contentType, authNames,
-        new Response.Listener<String>() {
-          @Override
-          public void onResponse(String response) {
-            
-              
-              responseListener.onResponse(response);
-              
-            
-          }
-      }, new Response.ErrorListener() {
-          @Override
-          public void onErrorResponse(VolleyError error) {
-            errorListener.onErrorResponse(error);
-          }
-      });
-    } catch (ApiException ex) {
-      errorListener.onErrorResponse(new VolleyError(ex));
-    }
+      try {
+        String localVarResponse = apiInvoker.invokeAPI (basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType, authNames);
+        if(localVarResponse != null){
+           return ;
+        } else {
+           return ;
+        }
+      } catch (ApiException ex) {
+         throw ex;
+      } catch (InterruptedException ex) {
+         throw ex;
+      } catch (ExecutionException ex) {
+         if(ex.getCause() instanceof VolleyError) {
+            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+         }
+         throw ex;
+      } catch (TimeoutException ex) {
+         throw ex;
+      }
   }
-  
-  /**
+
+      /**
    * Add a new pet to the store
    * 
    * @param body Pet object that needs to be added to the store
-   * @return void
-   */
-  public void addPet (Pet body, final Responses.StringResponse responseListener, final Response.ErrorListener errorListener) {
+  */
+  public void addPet (Pet body, final Response.Listener<String> responseListener, final Response.ErrorListener errorListener) {
     Object postBody = body;
 
   
@@ -141,10 +141,10 @@ public class PetApi {
 
     if (contentType.startsWith("multipart/form-data")) {
       // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
       
 
-      HttpEntity httpEntity = builder.build();
+      HttpEntity httpEntity = localVarBuilder.build();
       postBody = httpEntity;
     } else {
       // normal form params
@@ -157,10 +157,10 @@ public class PetApi {
       apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType, authNames,
         new Response.Listener<String>() {
           @Override
-          public void onResponse(String response) {
+          public void onResponse(String localVarResponse) {
             
               
-              responseListener.onResponse(response);
+              responseListener.onResponse(localVarResponse);
               
             
           }
@@ -176,249 +176,81 @@ public class PetApi {
   }
   
   /**
-   * Finds Pets by status
-   * Multiple status values can be provided with comma seperated strings
-   * @param status Status values that need to be considered for filter
-   * @return List<Pet>
-   */
-  public void findPetsByStatus (List<String> status, final Responses.PetListResponse responseListener, final Response.ErrorListener errorListener) {
-    Object postBody = null;
-
-  
-
-    // create path and map variables
-    String path = "/pet/findByStatus".replaceAll("\\{format\\}","json");
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
-    // form params
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    
-    queryParams.addAll(ApiInvoker.parameterToPairs("multi", "status", status));
-    
-
-    
-
-    String[] contentTypes = {
-      
-    };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if (contentType.startsWith("multipart/form-data")) {
-      // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-      
-
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
-    } else {
-      // normal form params
-      
-    }
-
-      String[] authNames = new String[] { "petstore_auth" };
-
-    try {
-      apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames,
-        new Response.Listener<String>() {
-          @Override
-          public void onResponse(String response) {
-            
-            try {
-              responseListener.onResponse((List<Pet>) ApiInvoker.deserialize(response,  "array", Pet.class));
-              
-              
-            
-            } catch (ApiException exception) {
-               errorListener.onErrorResponse(new VolleyError(exception));
-            }
-            
-          }
-      }, new Response.ErrorListener() {
-          @Override
-          public void onErrorResponse(VolleyError error) {
-            errorListener.onErrorResponse(error);
-          }
-      });
-    } catch (ApiException ex) {
-      errorListener.onErrorResponse(new VolleyError(ex));
-    }
-  }
-  
-  /**
-   * Finds Pets by tags
-   * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-   * @param tags Tags to filter by
-   * @return List<Pet>
-   */
-  public void findPetsByTags (List<String> tags, final Responses.PetListResponse responseListener, final Response.ErrorListener errorListener) {
-    Object postBody = null;
-
-  
-
-    // create path and map variables
-    String path = "/pet/findByTags".replaceAll("\\{format\\}","json");
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
-    // form params
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    
-    queryParams.addAll(ApiInvoker.parameterToPairs("multi", "tags", tags));
-    
-
-    
-
-    String[] contentTypes = {
-      
-    };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if (contentType.startsWith("multipart/form-data")) {
-      // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-      
-
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
-    } else {
-      // normal form params
-      
-    }
-
-      String[] authNames = new String[] { "petstore_auth" };
-
-    try {
-      apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames,
-        new Response.Listener<String>() {
-          @Override
-          public void onResponse(String response) {
-            
-            try {
-              responseListener.onResponse((List<Pet>) ApiInvoker.deserialize(response,  "array", Pet.class));
-              
-              
-            
-            } catch (ApiException exception) {
-               errorListener.onErrorResponse(new VolleyError(exception));
-            }
-            
-          }
-      }, new Response.ErrorListener() {
-          @Override
-          public void onErrorResponse(VolleyError error) {
-            errorListener.onErrorResponse(error);
-          }
-      });
-    } catch (ApiException ex) {
-      errorListener.onErrorResponse(new VolleyError(ex));
-    }
-  }
-  
-  /**
-   * Find pet by ID
-   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-   * @param petId ID of pet that needs to be fetched
-   * @return Pet
-   */
-  public void getPetById (Long petId, final Responses.PetResponse responseListener, final Response.ErrorListener errorListener) {
-    Object postBody = null;
-
-  
-    // verify the required parameter 'petId' is set
-    if (petId == null) {
-       VolleyError error = new VolleyError("Missing the required parameter 'petId' when calling getPetById",
-         new ApiException(400, "Missing the required parameter 'petId' when calling getPetById"));
-    }
-    
-
-    // create path and map variables
-    String path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
-    // form params
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    
-
-    
-
-    String[] contentTypes = {
-      
-    };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if (contentType.startsWith("multipart/form-data")) {
-      // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-      
-
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
-    } else {
-      // normal form params
-      
-    }
-
-      String[] authNames = new String[] { "api_key" };
-
-    try {
-      apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames,
-        new Response.Listener<String>() {
-          @Override
-          public void onResponse(String response) {
-            
-            try {
-              responseListener.onResponse((Pet) ApiInvoker.deserialize(response,  "", Pet.class));
-              
-              
-            
-            } catch (ApiException exception) {
-               errorListener.onErrorResponse(new VolleyError(exception));
-            }
-            
-          }
-      }, new Response.ErrorListener() {
-          @Override
-          public void onErrorResponse(VolleyError error) {
-            errorListener.onErrorResponse(error);
-          }
-      });
-    } catch (ApiException ex) {
-      errorListener.onErrorResponse(new VolleyError(ex));
-    }
-  }
-  
-  /**
-   * Updates a pet in the store with form data
-   * 
-   * @param petId ID of pet that needs to be updated
-   * @param name Updated name of the pet
-   * @param status Updated status of the pet
+  * Fake endpoint to test byte array in body parameter for adding a new pet to the store
+  * 
+   * @param body Pet object in the form of byte array
    * @return void
-   */
-  public void updatePetWithForm (String petId, String name, String status, final Responses.StringResponse responseListener, final Response.ErrorListener errorListener) {
-    Object postBody = null;
+  */
+  public void addPetUsingByteArray (byte[] body) throws TimeoutException, ExecutionException, InterruptedException, ApiException {
+     Object postBody = body;
+  
+
+  // create path and map variables
+  String path = "/pet?testing_byte_array=true".replaceAll("\\{format\\}","json");
+
+  // query params
+  List<Pair> queryParams = new ArrayList<Pair>();
+      // header params
+      Map<String, String> headerParams = new HashMap<String, String>();
+      // form params
+      Map<String, String> formParams = new HashMap<String, String>();
+
+  
+
+  
+
+      String[] contentTypes = {
+  "application/json","application/xml"
+      };
+      String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+      if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+  
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+      } else {
+      // normal form params
+  
+      }
+
+      String[] authNames = new String[] { "petstore_auth" };
+
+      try {
+        String localVarResponse = apiInvoker.invokeAPI (basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType, authNames);
+        if(localVarResponse != null){
+           return ;
+        } else {
+           return ;
+        }
+      } catch (ApiException ex) {
+         throw ex;
+      } catch (InterruptedException ex) {
+         throw ex;
+      } catch (ExecutionException ex) {
+         if(ex.getCause() instanceof VolleyError) {
+            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+         }
+         throw ex;
+      } catch (TimeoutException ex) {
+         throw ex;
+      }
+  }
+
+      /**
+   * Fake endpoint to test byte array in body parameter for adding a new pet to the store
+   * 
+   * @param body Pet object in the form of byte array
+  */
+  public void addPetUsingByteArray (byte[] body, final Response.Listener<String> responseListener, final Response.ErrorListener errorListener) {
+    Object postBody = body;
 
   
-    // verify the required parameter 'petId' is set
-    if (petId == null) {
-       VolleyError error = new VolleyError("Missing the required parameter 'petId' when calling updatePetWithForm",
-         new ApiException(400, "Missing the required parameter 'petId' when calling updatePetWithForm"));
-    }
-    
 
     // create path and map variables
-    String path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
+    String path = "/pet?testing_byte_array=true".replaceAll("\\{format\\}","json");
 
     // query params
     List<Pair> queryParams = new ArrayList<Pair>();
@@ -432,29 +264,19 @@ public class PetApi {
     
 
     String[] contentTypes = {
-      "application/x-www-form-urlencoded"
+      "application/json","application/xml"
     };
     String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
 
     if (contentType.startsWith("multipart/form-data")) {
       // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-      
-      if (name != null) {
-        builder.addTextBody("name", ApiInvoker.parameterToString(name), ApiInvoker.TEXT_PLAIN_UTF8);
-      }
-      
-      if (status != null) {
-        builder.addTextBody("status", ApiInvoker.parameterToString(status), ApiInvoker.TEXT_PLAIN_UTF8);
-      }
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
       
 
-      HttpEntity httpEntity = builder.build();
+      HttpEntity httpEntity = localVarBuilder.build();
       postBody = httpEntity;
     } else {
       // normal form params
-      formParams.put("name", ApiInvoker.parameterToString(name));
-      formParams.put("status", ApiInvoker.parameterToString(status));
       
     }
 
@@ -464,10 +286,10 @@ public class PetApi {
       apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType, authNames,
         new Response.Listener<String>() {
           @Override
-          public void onResponse(String response) {
+          public void onResponse(String localVarResponse) {
             
               
-              responseListener.onResponse(response);
+              responseListener.onResponse(localVarResponse);
               
             
           }
@@ -483,13 +305,84 @@ public class PetApi {
   }
   
   /**
-   * Deletes a pet
-   * 
+  * Deletes a pet
+  * 
    * @param petId Pet id to delete
    * @param apiKey 
    * @return void
-   */
-  public void deletePet (Long petId, String apiKey, final Responses.StringResponse responseListener, final Response.ErrorListener errorListener) {
+  */
+  public void deletePet (Long petId, String apiKey) throws TimeoutException, ExecutionException, InterruptedException, ApiException {
+     Object postBody = null;
+  
+      // verify the required parameter 'petId' is set
+      if (petId == null) {
+      VolleyError error = new VolleyError("Missing the required parameter 'petId' when calling deletePet",
+      new ApiException(400, "Missing the required parameter 'petId' when calling deletePet"));
+      }
+  
+
+  // create path and map variables
+  String path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
+
+  // query params
+  List<Pair> queryParams = new ArrayList<Pair>();
+      // header params
+      Map<String, String> headerParams = new HashMap<String, String>();
+      // form params
+      Map<String, String> formParams = new HashMap<String, String>();
+
+  
+
+  
+          headerParams.put("api_key", ApiInvoker.parameterToString(apiKey));
+  
+
+      String[] contentTypes = {
+  
+      };
+      String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+      if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+  
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+      } else {
+      // normal form params
+  
+      }
+
+      String[] authNames = new String[] { "petstore_auth" };
+
+      try {
+        String localVarResponse = apiInvoker.invokeAPI (basePath, path, "DELETE", queryParams, postBody, headerParams, formParams, contentType, authNames);
+        if(localVarResponse != null){
+           return ;
+        } else {
+           return ;
+        }
+      } catch (ApiException ex) {
+         throw ex;
+      } catch (InterruptedException ex) {
+         throw ex;
+      } catch (ExecutionException ex) {
+         if(ex.getCause() instanceof VolleyError) {
+            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+         }
+         throw ex;
+      } catch (TimeoutException ex) {
+         throw ex;
+      }
+  }
+
+      /**
+   * Deletes a pet
+   * 
+   * @param petId Pet id to delete   * @param apiKey 
+  */
+  public void deletePet (Long petId, String apiKey, final Response.Listener<String> responseListener, final Response.ErrorListener errorListener) {
     Object postBody = null;
 
   
@@ -523,10 +416,10 @@ public class PetApi {
 
     if (contentType.startsWith("multipart/form-data")) {
       // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
       
 
-      HttpEntity httpEntity = builder.build();
+      HttpEntity httpEntity = localVarBuilder.build();
       postBody = httpEntity;
     } else {
       // normal form params
@@ -539,10 +432,10 @@ public class PetApi {
       apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, postBody, headerParams, formParams, contentType, authNames,
         new Response.Listener<String>() {
           @Override
-          public void onResponse(String response) {
+          public void onResponse(String localVarResponse) {
             
               
-              responseListener.onResponse(response);
+              responseListener.onResponse(localVarResponse);
               
             
           }
@@ -558,14 +451,1099 @@ public class PetApi {
   }
   
   /**
-   * uploads an image
+  * Finds Pets by status
+  * Multiple status values can be provided with comma separated strings
+   * @param status Status values that need to be considered for query
+   * @return List<Pet>
+  */
+  public List<Pet> findPetsByStatus (List<String> status) throws TimeoutException, ExecutionException, InterruptedException, ApiException {
+     Object postBody = null;
+  
+
+  // create path and map variables
+  String path = "/pet/findByStatus".replaceAll("\\{format\\}","json");
+
+  // query params
+  List<Pair> queryParams = new ArrayList<Pair>();
+      // header params
+      Map<String, String> headerParams = new HashMap<String, String>();
+      // form params
+      Map<String, String> formParams = new HashMap<String, String>();
+
+  
+          queryParams.addAll(ApiInvoker.parameterToPairs("multi", "status", status));
+  
+
+  
+
+      String[] contentTypes = {
+  
+      };
+      String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+      if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+  
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+      } else {
+      // normal form params
+  
+      }
+
+      String[] authNames = new String[] { "petstore_auth" };
+
+      try {
+        String localVarResponse = apiInvoker.invokeAPI (basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames);
+        if(localVarResponse != null){
+           return (List<Pet>) ApiInvoker.deserialize(localVarResponse, "array", Pet.class);
+        } else {
+           return null;
+        }
+      } catch (ApiException ex) {
+         throw ex;
+      } catch (InterruptedException ex) {
+         throw ex;
+      } catch (ExecutionException ex) {
+         if(ex.getCause() instanceof VolleyError) {
+            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+         }
+         throw ex;
+      } catch (TimeoutException ex) {
+         throw ex;
+      }
+  }
+
+      /**
+   * Finds Pets by status
+   * Multiple status values can be provided with comma separated strings
+   * @param status Status values that need to be considered for query
+  */
+  public void findPetsByStatus (List<String> status, final Response.Listener<List<Pet>> responseListener, final Response.ErrorListener errorListener) {
+    Object postBody = null;
+
+  
+
+    // create path and map variables
+    String path = "/pet/findByStatus".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> queryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> headerParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> formParams = new HashMap<String, String>();
+
+    
+    queryParams.addAll(ApiInvoker.parameterToPairs("multi", "status", status));
+    
+
+    
+
+    String[] contentTypes = {
+      
+    };
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+    if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+    } else {
+      // normal form params
+      
+    }
+
+      String[] authNames = new String[] { "petstore_auth" };
+
+    try {
+      apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames,
+        new Response.Listener<String>() {
+          @Override
+          public void onResponse(String localVarResponse) {
+            
+            try {
+              responseListener.onResponse((List<Pet>) ApiInvoker.deserialize(localVarResponse,  "array", Pet.class));
+              
+              
+            
+            } catch (ApiException exception) {
+               errorListener.onErrorResponse(new VolleyError(exception));
+            }
+            
+          }
+      }, new Response.ErrorListener() {
+          @Override
+          public void onErrorResponse(VolleyError error) {
+            errorListener.onErrorResponse(error);
+          }
+      });
+    } catch (ApiException ex) {
+      errorListener.onErrorResponse(new VolleyError(ex));
+    }
+  }
+  
+  /**
+  * Finds Pets by tags
+  * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+   * @param tags Tags to filter by
+   * @return List<Pet>
+  */
+  public List<Pet> findPetsByTags (List<String> tags) throws TimeoutException, ExecutionException, InterruptedException, ApiException {
+     Object postBody = null;
+  
+
+  // create path and map variables
+  String path = "/pet/findByTags".replaceAll("\\{format\\}","json");
+
+  // query params
+  List<Pair> queryParams = new ArrayList<Pair>();
+      // header params
+      Map<String, String> headerParams = new HashMap<String, String>();
+      // form params
+      Map<String, String> formParams = new HashMap<String, String>();
+
+  
+          queryParams.addAll(ApiInvoker.parameterToPairs("multi", "tags", tags));
+  
+
+  
+
+      String[] contentTypes = {
+  
+      };
+      String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+      if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+  
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+      } else {
+      // normal form params
+  
+      }
+
+      String[] authNames = new String[] { "petstore_auth" };
+
+      try {
+        String localVarResponse = apiInvoker.invokeAPI (basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames);
+        if(localVarResponse != null){
+           return (List<Pet>) ApiInvoker.deserialize(localVarResponse, "array", Pet.class);
+        } else {
+           return null;
+        }
+      } catch (ApiException ex) {
+         throw ex;
+      } catch (InterruptedException ex) {
+         throw ex;
+      } catch (ExecutionException ex) {
+         if(ex.getCause() instanceof VolleyError) {
+            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+         }
+         throw ex;
+      } catch (TimeoutException ex) {
+         throw ex;
+      }
+  }
+
+      /**
+   * Finds Pets by tags
+   * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+   * @param tags Tags to filter by
+  */
+  public void findPetsByTags (List<String> tags, final Response.Listener<List<Pet>> responseListener, final Response.ErrorListener errorListener) {
+    Object postBody = null;
+
+  
+
+    // create path and map variables
+    String path = "/pet/findByTags".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> queryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> headerParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> formParams = new HashMap<String, String>();
+
+    
+    queryParams.addAll(ApiInvoker.parameterToPairs("multi", "tags", tags));
+    
+
+    
+
+    String[] contentTypes = {
+      
+    };
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+    if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+    } else {
+      // normal form params
+      
+    }
+
+      String[] authNames = new String[] { "petstore_auth" };
+
+    try {
+      apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames,
+        new Response.Listener<String>() {
+          @Override
+          public void onResponse(String localVarResponse) {
+            
+            try {
+              responseListener.onResponse((List<Pet>) ApiInvoker.deserialize(localVarResponse,  "array", Pet.class));
+              
+              
+            
+            } catch (ApiException exception) {
+               errorListener.onErrorResponse(new VolleyError(exception));
+            }
+            
+          }
+      }, new Response.ErrorListener() {
+          @Override
+          public void onErrorResponse(VolleyError error) {
+            errorListener.onErrorResponse(error);
+          }
+      });
+    } catch (ApiException ex) {
+      errorListener.onErrorResponse(new VolleyError(ex));
+    }
+  }
+  
+  /**
+  * Find pet by ID
+  * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched
+   * @return Pet
+  */
+  public Pet getPetById (Long petId) throws TimeoutException, ExecutionException, InterruptedException, ApiException {
+     Object postBody = null;
+  
+      // verify the required parameter 'petId' is set
+      if (petId == null) {
+      VolleyError error = new VolleyError("Missing the required parameter 'petId' when calling getPetById",
+      new ApiException(400, "Missing the required parameter 'petId' when calling getPetById"));
+      }
+  
+
+  // create path and map variables
+  String path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
+
+  // query params
+  List<Pair> queryParams = new ArrayList<Pair>();
+      // header params
+      Map<String, String> headerParams = new HashMap<String, String>();
+      // form params
+      Map<String, String> formParams = new HashMap<String, String>();
+
+  
+
+  
+
+      String[] contentTypes = {
+  
+      };
+      String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+      if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+  
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+      } else {
+      // normal form params
+  
+      }
+
+      String[] authNames = new String[] { "api_key", "petstore_auth" };
+
+      try {
+        String localVarResponse = apiInvoker.invokeAPI (basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames);
+        if(localVarResponse != null){
+           return (Pet) ApiInvoker.deserialize(localVarResponse, "", Pet.class);
+        } else {
+           return null;
+        }
+      } catch (ApiException ex) {
+         throw ex;
+      } catch (InterruptedException ex) {
+         throw ex;
+      } catch (ExecutionException ex) {
+         if(ex.getCause() instanceof VolleyError) {
+            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+         }
+         throw ex;
+      } catch (TimeoutException ex) {
+         throw ex;
+      }
+  }
+
+      /**
+   * Find pet by ID
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched
+  */
+  public void getPetById (Long petId, final Response.Listener<Pet> responseListener, final Response.ErrorListener errorListener) {
+    Object postBody = null;
+
+  
+    // verify the required parameter 'petId' is set
+    if (petId == null) {
+       VolleyError error = new VolleyError("Missing the required parameter 'petId' when calling getPetById",
+         new ApiException(400, "Missing the required parameter 'petId' when calling getPetById"));
+    }
+    
+
+    // create path and map variables
+    String path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
+
+    // query params
+    List<Pair> queryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> headerParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> formParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] contentTypes = {
+      
+    };
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+    if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+    } else {
+      // normal form params
+      
+    }
+
+      String[] authNames = new String[] { "api_key", "petstore_auth" };
+
+    try {
+      apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames,
+        new Response.Listener<String>() {
+          @Override
+          public void onResponse(String localVarResponse) {
+            
+            try {
+              responseListener.onResponse((Pet) ApiInvoker.deserialize(localVarResponse,  "", Pet.class));
+              
+              
+            
+            } catch (ApiException exception) {
+               errorListener.onErrorResponse(new VolleyError(exception));
+            }
+            
+          }
+      }, new Response.ErrorListener() {
+          @Override
+          public void onErrorResponse(VolleyError error) {
+            errorListener.onErrorResponse(error);
+          }
+      });
+    } catch (ApiException ex) {
+      errorListener.onErrorResponse(new VolleyError(ex));
+    }
+  }
+  
+  /**
+  * Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+  * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched
+   * @return InlineResponse200
+  */
+  public InlineResponse200 getPetByIdInObject (Long petId) throws TimeoutException, ExecutionException, InterruptedException, ApiException {
+     Object postBody = null;
+  
+      // verify the required parameter 'petId' is set
+      if (petId == null) {
+      VolleyError error = new VolleyError("Missing the required parameter 'petId' when calling getPetByIdInObject",
+      new ApiException(400, "Missing the required parameter 'petId' when calling getPetByIdInObject"));
+      }
+  
+
+  // create path and map variables
+  String path = "/pet/{petId}?response=inline_arbitrary_object".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
+
+  // query params
+  List<Pair> queryParams = new ArrayList<Pair>();
+      // header params
+      Map<String, String> headerParams = new HashMap<String, String>();
+      // form params
+      Map<String, String> formParams = new HashMap<String, String>();
+
+  
+
+  
+
+      String[] contentTypes = {
+  
+      };
+      String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+      if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+  
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+      } else {
+      // normal form params
+  
+      }
+
+      String[] authNames = new String[] { "api_key", "petstore_auth" };
+
+      try {
+        String localVarResponse = apiInvoker.invokeAPI (basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames);
+        if(localVarResponse != null){
+           return (InlineResponse200) ApiInvoker.deserialize(localVarResponse, "", InlineResponse200.class);
+        } else {
+           return null;
+        }
+      } catch (ApiException ex) {
+         throw ex;
+      } catch (InterruptedException ex) {
+         throw ex;
+      } catch (ExecutionException ex) {
+         if(ex.getCause() instanceof VolleyError) {
+            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+         }
+         throw ex;
+      } catch (TimeoutException ex) {
+         throw ex;
+      }
+  }
+
+      /**
+   * Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched
+  */
+  public void getPetByIdInObject (Long petId, final Response.Listener<InlineResponse200> responseListener, final Response.ErrorListener errorListener) {
+    Object postBody = null;
+
+  
+    // verify the required parameter 'petId' is set
+    if (petId == null) {
+       VolleyError error = new VolleyError("Missing the required parameter 'petId' when calling getPetByIdInObject",
+         new ApiException(400, "Missing the required parameter 'petId' when calling getPetByIdInObject"));
+    }
+    
+
+    // create path and map variables
+    String path = "/pet/{petId}?response=inline_arbitrary_object".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
+
+    // query params
+    List<Pair> queryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> headerParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> formParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] contentTypes = {
+      
+    };
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+    if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+    } else {
+      // normal form params
+      
+    }
+
+      String[] authNames = new String[] { "api_key", "petstore_auth" };
+
+    try {
+      apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames,
+        new Response.Listener<String>() {
+          @Override
+          public void onResponse(String localVarResponse) {
+            
+            try {
+              responseListener.onResponse((InlineResponse200) ApiInvoker.deserialize(localVarResponse,  "", InlineResponse200.class));
+              
+              
+            
+            } catch (ApiException exception) {
+               errorListener.onErrorResponse(new VolleyError(exception));
+            }
+            
+          }
+      }, new Response.ErrorListener() {
+          @Override
+          public void onErrorResponse(VolleyError error) {
+            errorListener.onErrorResponse(error);
+          }
+      });
+    } catch (ApiException ex) {
+      errorListener.onErrorResponse(new VolleyError(ex));
+    }
+  }
+  
+  /**
+  * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+  * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched
+   * @return byte[]
+  */
+  public byte[] petPetIdtestingByteArraytrueGet (Long petId) throws TimeoutException, ExecutionException, InterruptedException, ApiException {
+     Object postBody = null;
+  
+      // verify the required parameter 'petId' is set
+      if (petId == null) {
+      VolleyError error = new VolleyError("Missing the required parameter 'petId' when calling petPetIdtestingByteArraytrueGet",
+      new ApiException(400, "Missing the required parameter 'petId' when calling petPetIdtestingByteArraytrueGet"));
+      }
+  
+
+  // create path and map variables
+  String path = "/pet/{petId}?testing_byte_array=true".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
+
+  // query params
+  List<Pair> queryParams = new ArrayList<Pair>();
+      // header params
+      Map<String, String> headerParams = new HashMap<String, String>();
+      // form params
+      Map<String, String> formParams = new HashMap<String, String>();
+
+  
+
+  
+
+      String[] contentTypes = {
+  
+      };
+      String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+      if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+  
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+      } else {
+      // normal form params
+  
+      }
+
+      String[] authNames = new String[] { "api_key", "petstore_auth" };
+
+      try {
+        String localVarResponse = apiInvoker.invokeAPI (basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames);
+        if(localVarResponse != null){
+           return (byte[]) ApiInvoker.deserialize(localVarResponse, "", byte[].class);
+        } else {
+           return null;
+        }
+      } catch (ApiException ex) {
+         throw ex;
+      } catch (InterruptedException ex) {
+         throw ex;
+      } catch (ExecutionException ex) {
+         if(ex.getCause() instanceof VolleyError) {
+            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+         }
+         throw ex;
+      } catch (TimeoutException ex) {
+         throw ex;
+      }
+  }
+
+      /**
+   * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched
+  */
+  public void petPetIdtestingByteArraytrueGet (Long petId, final Response.Listener<byte[]> responseListener, final Response.ErrorListener errorListener) {
+    Object postBody = null;
+
+  
+    // verify the required parameter 'petId' is set
+    if (petId == null) {
+       VolleyError error = new VolleyError("Missing the required parameter 'petId' when calling petPetIdtestingByteArraytrueGet",
+         new ApiException(400, "Missing the required parameter 'petId' when calling petPetIdtestingByteArraytrueGet"));
+    }
+    
+
+    // create path and map variables
+    String path = "/pet/{petId}?testing_byte_array=true".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
+
+    // query params
+    List<Pair> queryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> headerParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> formParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] contentTypes = {
+      
+    };
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+    if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+    } else {
+      // normal form params
+      
+    }
+
+      String[] authNames = new String[] { "api_key", "petstore_auth" };
+
+    try {
+      apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames,
+        new Response.Listener<String>() {
+          @Override
+          public void onResponse(String localVarResponse) {
+            
+            try {
+              responseListener.onResponse((byte[]) ApiInvoker.deserialize(localVarResponse,  "", byte[].class));
+              
+              
+            
+            } catch (ApiException exception) {
+               errorListener.onErrorResponse(new VolleyError(exception));
+            }
+            
+          }
+      }, new Response.ErrorListener() {
+          @Override
+          public void onErrorResponse(VolleyError error) {
+            errorListener.onErrorResponse(error);
+          }
+      });
+    } catch (ApiException ex) {
+      errorListener.onErrorResponse(new VolleyError(ex));
+    }
+  }
+  
+  /**
+  * Update an existing pet
+  * 
+   * @param body Pet object that needs to be added to the store
+   * @return void
+  */
+  public void updatePet (Pet body) throws TimeoutException, ExecutionException, InterruptedException, ApiException {
+     Object postBody = body;
+  
+
+  // create path and map variables
+  String path = "/pet".replaceAll("\\{format\\}","json");
+
+  // query params
+  List<Pair> queryParams = new ArrayList<Pair>();
+      // header params
+      Map<String, String> headerParams = new HashMap<String, String>();
+      // form params
+      Map<String, String> formParams = new HashMap<String, String>();
+
+  
+
+  
+
+      String[] contentTypes = {
+  "application/json","application/xml"
+      };
+      String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+      if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+  
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+      } else {
+      // normal form params
+  
+      }
+
+      String[] authNames = new String[] { "petstore_auth" };
+
+      try {
+        String localVarResponse = apiInvoker.invokeAPI (basePath, path, "PUT", queryParams, postBody, headerParams, formParams, contentType, authNames);
+        if(localVarResponse != null){
+           return ;
+        } else {
+           return ;
+        }
+      } catch (ApiException ex) {
+         throw ex;
+      } catch (InterruptedException ex) {
+         throw ex;
+      } catch (ExecutionException ex) {
+         if(ex.getCause() instanceof VolleyError) {
+            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+         }
+         throw ex;
+      } catch (TimeoutException ex) {
+         throw ex;
+      }
+  }
+
+      /**
+   * Update an existing pet
    * 
+   * @param body Pet object that needs to be added to the store
+  */
+  public void updatePet (Pet body, final Response.Listener<String> responseListener, final Response.ErrorListener errorListener) {
+    Object postBody = body;
+
+  
+
+    // create path and map variables
+    String path = "/pet".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> queryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> headerParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> formParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] contentTypes = {
+      "application/json","application/xml"
+    };
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+    if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+    } else {
+      // normal form params
+      
+    }
+
+      String[] authNames = new String[] { "petstore_auth" };
+
+    try {
+      apiInvoker.invokeAPI(basePath, path, "PUT", queryParams, postBody, headerParams, formParams, contentType, authNames,
+        new Response.Listener<String>() {
+          @Override
+          public void onResponse(String localVarResponse) {
+            
+              
+              responseListener.onResponse(localVarResponse);
+              
+            
+          }
+      }, new Response.ErrorListener() {
+          @Override
+          public void onErrorResponse(VolleyError error) {
+            errorListener.onErrorResponse(error);
+          }
+      });
+    } catch (ApiException ex) {
+      errorListener.onErrorResponse(new VolleyError(ex));
+    }
+  }
+  
+  /**
+  * Updates a pet in the store with form data
+  * 
+   * @param petId ID of pet that needs to be updated
+   * @param name Updated name of the pet
+   * @param status Updated status of the pet
+   * @return void
+  */
+  public void updatePetWithForm (String petId, String name, String status) throws TimeoutException, ExecutionException, InterruptedException, ApiException {
+     Object postBody = null;
+  
+      // verify the required parameter 'petId' is set
+      if (petId == null) {
+      VolleyError error = new VolleyError("Missing the required parameter 'petId' when calling updatePetWithForm",
+      new ApiException(400, "Missing the required parameter 'petId' when calling updatePetWithForm"));
+      }
+  
+
+  // create path and map variables
+  String path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
+
+  // query params
+  List<Pair> queryParams = new ArrayList<Pair>();
+      // header params
+      Map<String, String> headerParams = new HashMap<String, String>();
+      // form params
+      Map<String, String> formParams = new HashMap<String, String>();
+
+  
+
+  
+
+      String[] contentTypes = {
+  "application/x-www-form-urlencoded"
+      };
+      String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+      if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+  
+          if (name != null) {
+          localVarBuilder.addTextBody("name", ApiInvoker.parameterToString(name), ApiInvoker.TEXT_PLAIN_UTF8);
+          }
+  
+          if (status != null) {
+          localVarBuilder.addTextBody("status", ApiInvoker.parameterToString(status), ApiInvoker.TEXT_PLAIN_UTF8);
+          }
+  
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+      } else {
+      // normal form params
+  formParams.put("name", ApiInvoker.parameterToString(name));
+  formParams.put("status", ApiInvoker.parameterToString(status));
+  
+      }
+
+      String[] authNames = new String[] { "petstore_auth" };
+
+      try {
+        String localVarResponse = apiInvoker.invokeAPI (basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType, authNames);
+        if(localVarResponse != null){
+           return ;
+        } else {
+           return ;
+        }
+      } catch (ApiException ex) {
+         throw ex;
+      } catch (InterruptedException ex) {
+         throw ex;
+      } catch (ExecutionException ex) {
+         if(ex.getCause() instanceof VolleyError) {
+            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+         }
+         throw ex;
+      } catch (TimeoutException ex) {
+         throw ex;
+      }
+  }
+
+      /**
+   * Updates a pet in the store with form data
+   * 
+   * @param petId ID of pet that needs to be updated   * @param name Updated name of the pet   * @param status Updated status of the pet
+  */
+  public void updatePetWithForm (String petId, String name, String status, final Response.Listener<String> responseListener, final Response.ErrorListener errorListener) {
+    Object postBody = null;
+
+  
+    // verify the required parameter 'petId' is set
+    if (petId == null) {
+       VolleyError error = new VolleyError("Missing the required parameter 'petId' when calling updatePetWithForm",
+         new ApiException(400, "Missing the required parameter 'petId' when calling updatePetWithForm"));
+    }
+    
+
+    // create path and map variables
+    String path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
+
+    // query params
+    List<Pair> queryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> headerParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> formParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] contentTypes = {
+      "application/x-www-form-urlencoded"
+    };
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+    if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+      if (name != null) {
+        localVarBuilder.addTextBody("name", ApiInvoker.parameterToString(name), ApiInvoker.TEXT_PLAIN_UTF8);
+      }
+      
+      if (status != null) {
+        localVarBuilder.addTextBody("status", ApiInvoker.parameterToString(status), ApiInvoker.TEXT_PLAIN_UTF8);
+      }
+      
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+    } else {
+      // normal form params
+      formParams.put("name", ApiInvoker.parameterToString(name));
+      formParams.put("status", ApiInvoker.parameterToString(status));
+      
+    }
+
+      String[] authNames = new String[] { "petstore_auth" };
+
+    try {
+      apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType, authNames,
+        new Response.Listener<String>() {
+          @Override
+          public void onResponse(String localVarResponse) {
+            
+              
+              responseListener.onResponse(localVarResponse);
+              
+            
+          }
+      }, new Response.ErrorListener() {
+          @Override
+          public void onErrorResponse(VolleyError error) {
+            errorListener.onErrorResponse(error);
+          }
+      });
+    } catch (ApiException ex) {
+      errorListener.onErrorResponse(new VolleyError(ex));
+    }
+  }
+  
+  /**
+  * uploads an image
+  * 
    * @param petId ID of pet to update
    * @param additionalMetadata Additional data to pass to server
    * @param file file to upload
    * @return void
-   */
-  public void uploadFile (Long petId, String additionalMetadata, File file, final Responses.StringResponse responseListener, final Response.ErrorListener errorListener) {
+  */
+  public void uploadFile (Long petId, String additionalMetadata, File file) throws TimeoutException, ExecutionException, InterruptedException, ApiException {
+     Object postBody = null;
+  
+      // verify the required parameter 'petId' is set
+      if (petId == null) {
+      VolleyError error = new VolleyError("Missing the required parameter 'petId' when calling uploadFile",
+      new ApiException(400, "Missing the required parameter 'petId' when calling uploadFile"));
+      }
+  
+
+  // create path and map variables
+  String path = "/pet/{petId}/uploadImage".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
+
+  // query params
+  List<Pair> queryParams = new ArrayList<Pair>();
+      // header params
+      Map<String, String> headerParams = new HashMap<String, String>();
+      // form params
+      Map<String, String> formParams = new HashMap<String, String>();
+
+  
+
+  
+
+      String[] contentTypes = {
+  "multipart/form-data"
+      };
+      String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+      if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+  
+          if (additionalMetadata != null) {
+          localVarBuilder.addTextBody("additionalMetadata", ApiInvoker.parameterToString(additionalMetadata), ApiInvoker.TEXT_PLAIN_UTF8);
+          }
+  
+          if (file != null) {
+          localVarBuilder.addBinaryBody("file", file);
+          }
+  
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+      } else {
+      // normal form params
+  formParams.put("additionalMetadata", ApiInvoker.parameterToString(additionalMetadata));
+  
+  
+      }
+
+      String[] authNames = new String[] { "petstore_auth" };
+
+      try {
+        String localVarResponse = apiInvoker.invokeAPI (basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType, authNames);
+        if(localVarResponse != null){
+           return ;
+        } else {
+           return ;
+        }
+      } catch (ApiException ex) {
+         throw ex;
+      } catch (InterruptedException ex) {
+         throw ex;
+      } catch (ExecutionException ex) {
+         if(ex.getCause() instanceof VolleyError) {
+            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+         }
+         throw ex;
+      } catch (TimeoutException ex) {
+         throw ex;
+      }
+  }
+
+      /**
+   * uploads an image
+   * 
+   * @param petId ID of pet to update   * @param additionalMetadata Additional data to pass to server   * @param file file to upload
+  */
+  public void uploadFile (Long petId, String additionalMetadata, File file, final Response.Listener<String> responseListener, final Response.ErrorListener errorListener) {
     Object postBody = null;
 
   
@@ -597,18 +1575,18 @@ public class PetApi {
 
     if (contentType.startsWith("multipart/form-data")) {
       // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
       
       if (additionalMetadata != null) {
-        builder.addTextBody("additionalMetadata", ApiInvoker.parameterToString(additionalMetadata), ApiInvoker.TEXT_PLAIN_UTF8);
+        localVarBuilder.addTextBody("additionalMetadata", ApiInvoker.parameterToString(additionalMetadata), ApiInvoker.TEXT_PLAIN_UTF8);
       }
       
       if (file != null) {
-        builder.addBinaryBody("file", file);
+        localVarBuilder.addBinaryBody("file", file);
       }
       
 
-      HttpEntity httpEntity = builder.build();
+      HttpEntity httpEntity = localVarBuilder.build();
       postBody = httpEntity;
     } else {
       // normal form params
@@ -623,10 +1601,10 @@ public class PetApi {
       apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType, authNames,
         new Response.Listener<String>() {
           @Override
-          public void onResponse(String response) {
+          public void onResponse(String localVarResponse) {
             
               
-              responseListener.onResponse(response);
+              responseListener.onResponse(localVarResponse);
               
             
           }
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/StoreApi.java
index 09ea8be7b3a..e0aa403200a 100644
--- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/StoreApi.java
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/StoreApi.java
@@ -1,6 +1,5 @@
 package io.swagger.client.api;
 
-import io.swagger.client.Responses;
 import io.swagger.client.ApiInvoker;
 import io.swagger.client.ApiException;
 import io.swagger.client.Pair;
@@ -12,15 +11,18 @@ import java.util.*;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
 
-import java.util.Map;
 import io.swagger.client.model.Order;
+import java.util.Map;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
 
-import java.util.Map;
+import java.util.ArrayList;
 import java.util.HashMap;
-import java.io.File;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
 
 public class StoreApi {
   String basePath = "http://petstore.swagger.io/v2";
@@ -44,230 +46,81 @@ public class StoreApi {
 
   
   /**
-   * Returns pet inventories by status
-   * Returns a map of status codes to quantities
-   * @return Map<String, Integer>
-   */
-  public void getInventory (final Responses.MapResponse responseListener, final Response.ErrorListener errorListener) {
-    Object postBody = null;
+  * Delete purchase order by ID
+  * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+   * @param orderId ID of the order that needs to be deleted
+   * @return void
+  */
+  public void deleteOrder (String orderId) throws TimeoutException, ExecutionException, InterruptedException, ApiException {
+     Object postBody = null;
+  
+      // verify the required parameter 'orderId' is set
+      if (orderId == null) {
+      VolleyError error = new VolleyError("Missing the required parameter 'orderId' when calling deleteOrder",
+      new ApiException(400, "Missing the required parameter 'orderId' when calling deleteOrder"));
+      }
+  
+
+  // create path and map variables
+  String path = "/store/order/{orderId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "orderId" + "\\}", apiInvoker.escapeString(orderId.toString()));
+
+  // query params
+  List<Pair> queryParams = new ArrayList<Pair>();
+      // header params
+      Map<String, String> headerParams = new HashMap<String, String>();
+      // form params
+      Map<String, String> formParams = new HashMap<String, String>();
 
   
 
-    // create path and map variables
-    String path = "/store/inventory".replaceAll("\\{format\\}","json");
+  
 
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
-    // form params
-    Map<String, String> formParams = new HashMap<String, String>();
+      String[] contentTypes = {
+  
+      };
+      String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
 
-    
-
-    
-
-    String[] contentTypes = {
-      
-    };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if (contentType.startsWith("multipart/form-data")) {
+      if (contentType.startsWith("multipart/form-data")) {
       // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-      
-
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
-    } else {
-      // normal form params
-      
-    }
-
-      String[] authNames = new String[] { "api_key" };
-
-    try {
-      apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames,
-        new Response.Listener<String>() {
-          @Override
-          public void onResponse(String response) {
-            
-            try {
-              responseListener.onResponse((Map<String, Integer>) ApiInvoker.deserialize(response,  "map", Map.class));
-              
-              
-            
-            } catch (ApiException exception) {
-               errorListener.onErrorResponse(new VolleyError(exception));
-            }
-            
-          }
-      }, new Response.ErrorListener() {
-          @Override
-          public void onErrorResponse(VolleyError error) {
-            errorListener.onErrorResponse(error);
-          }
-      });
-    } catch (ApiException ex) {
-      errorListener.onErrorResponse(new VolleyError(ex));
-    }
-  }
-  
-  /**
-   * Place an order for a pet
-   * 
-   * @param body order placed for purchasing the pet
-   * @return Order
-   */
-  public void placeOrder (Order body, final Responses.OrderResponse responseListener, final Response.ErrorListener errorListener) {
-    Object postBody = body;
-
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
   
 
-    // create path and map variables
-    String path = "/store/order".replaceAll("\\{format\\}","json");
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
-    // form params
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    
-
-    
-
-    String[] contentTypes = {
-      
-    };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if (contentType.startsWith("multipart/form-data")) {
-      // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-      
-
-      HttpEntity httpEntity = builder.build();
+      HttpEntity httpEntity = localVarBuilder.build();
       postBody = httpEntity;
-    } else {
+      } else {
       // normal form params
-      
-    }
+  
+      }
 
       String[] authNames = new String[] {  };
 
-    try {
-      apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType, authNames,
-        new Response.Listener<String>() {
-          @Override
-          public void onResponse(String response) {
-            
-            try {
-              responseListener.onResponse((Order) ApiInvoker.deserialize(response,  "", Order.class));
-              
-              
-            
-            } catch (ApiException exception) {
-               errorListener.onErrorResponse(new VolleyError(exception));
-            }
-            
-          }
-      }, new Response.ErrorListener() {
-          @Override
-          public void onErrorResponse(VolleyError error) {
-            errorListener.onErrorResponse(error);
-          }
-      });
-    } catch (ApiException ex) {
-      errorListener.onErrorResponse(new VolleyError(ex));
-    }
+      try {
+        String localVarResponse = apiInvoker.invokeAPI (basePath, path, "DELETE", queryParams, postBody, headerParams, formParams, contentType, authNames);
+        if(localVarResponse != null){
+           return ;
+        } else {
+           return ;
+        }
+      } catch (ApiException ex) {
+         throw ex;
+      } catch (InterruptedException ex) {
+         throw ex;
+      } catch (ExecutionException ex) {
+         if(ex.getCause() instanceof VolleyError) {
+            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+         }
+         throw ex;
+      } catch (TimeoutException ex) {
+         throw ex;
+      }
   }
-  
-  /**
-   * Find purchase order by ID
-   * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-   * @param orderId ID of pet that needs to be fetched
-   * @return Order
-   */
-  public void getOrderById (String orderId, final Responses.OrderResponse responseListener, final Response.ErrorListener errorListener) {
-    Object postBody = null;
 
-  
-    // verify the required parameter 'orderId' is set
-    if (orderId == null) {
-       VolleyError error = new VolleyError("Missing the required parameter 'orderId' when calling getOrderById",
-         new ApiException(400, "Missing the required parameter 'orderId' when calling getOrderById"));
-    }
-    
-
-    // create path and map variables
-    String path = "/store/order/{orderId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "orderId" + "\\}", apiInvoker.escapeString(orderId.toString()));
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
-    // form params
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    
-
-    
-
-    String[] contentTypes = {
-      
-    };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if (contentType.startsWith("multipart/form-data")) {
-      // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-      
-
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
-    } else {
-      // normal form params
-      
-    }
-
-      String[] authNames = new String[] {  };
-
-    try {
-      apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames,
-        new Response.Listener<String>() {
-          @Override
-          public void onResponse(String response) {
-            
-            try {
-              responseListener.onResponse((Order) ApiInvoker.deserialize(response,  "", Order.class));
-              
-              
-            
-            } catch (ApiException exception) {
-               errorListener.onErrorResponse(new VolleyError(exception));
-            }
-            
-          }
-      }, new Response.ErrorListener() {
-          @Override
-          public void onErrorResponse(VolleyError error) {
-            errorListener.onErrorResponse(error);
-          }
-      });
-    } catch (ApiException ex) {
-      errorListener.onErrorResponse(new VolleyError(ex));
-    }
-  }
-  
-  /**
+      /**
    * Delete purchase order by ID
    * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
    * @param orderId ID of the order that needs to be deleted
-   * @return void
-   */
-  public void deleteOrder (String orderId, final Responses.StringResponse responseListener, final Response.ErrorListener errorListener) {
+  */
+  public void deleteOrder (String orderId, final Response.Listener<String> responseListener, final Response.ErrorListener errorListener) {
     Object postBody = null;
 
   
@@ -299,10 +152,10 @@ public class StoreApi {
 
     if (contentType.startsWith("multipart/form-data")) {
       // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
       
 
-      HttpEntity httpEntity = builder.build();
+      HttpEntity httpEntity = localVarBuilder.build();
       postBody = httpEntity;
     } else {
       // normal form params
@@ -315,10 +168,10 @@ public class StoreApi {
       apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, postBody, headerParams, formParams, contentType, authNames,
         new Response.Listener<String>() {
           @Override
-          public void onResponse(String response) {
+          public void onResponse(String localVarResponse) {
             
               
-              responseListener.onResponse(response);
+              responseListener.onResponse(localVarResponse);
               
             
           }
@@ -333,4 +186,688 @@ public class StoreApi {
     }
   }
   
+  /**
+  * Finds orders by status
+  * A single status value can be provided as a string
+   * @param status Status value that needs to be considered for query
+   * @return List<Order>
+  */
+  public List<Order> findOrdersByStatus (String status) throws TimeoutException, ExecutionException, InterruptedException, ApiException {
+     Object postBody = null;
+  
+
+  // create path and map variables
+  String path = "/store/findByStatus".replaceAll("\\{format\\}","json");
+
+  // query params
+  List<Pair> queryParams = new ArrayList<Pair>();
+      // header params
+      Map<String, String> headerParams = new HashMap<String, String>();
+      // form params
+      Map<String, String> formParams = new HashMap<String, String>();
+
+  
+          queryParams.addAll(ApiInvoker.parameterToPairs("", "status", status));
+  
+
+  
+
+      String[] contentTypes = {
+  
+      };
+      String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+      if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+  
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+      } else {
+      // normal form params
+  
+      }
+
+      String[] authNames = new String[] { "test_api_client_id", "test_api_client_secret" };
+
+      try {
+        String localVarResponse = apiInvoker.invokeAPI (basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames);
+        if(localVarResponse != null){
+           return (List<Order>) ApiInvoker.deserialize(localVarResponse, "array", Order.class);
+        } else {
+           return null;
+        }
+      } catch (ApiException ex) {
+         throw ex;
+      } catch (InterruptedException ex) {
+         throw ex;
+      } catch (ExecutionException ex) {
+         if(ex.getCause() instanceof VolleyError) {
+            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+         }
+         throw ex;
+      } catch (TimeoutException ex) {
+         throw ex;
+      }
+  }
+
+      /**
+   * Finds orders by status
+   * A single status value can be provided as a string
+   * @param status Status value that needs to be considered for query
+  */
+  public void findOrdersByStatus (String status, final Response.Listener<List<Order>> responseListener, final Response.ErrorListener errorListener) {
+    Object postBody = null;
+
+  
+
+    // create path and map variables
+    String path = "/store/findByStatus".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> queryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> headerParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> formParams = new HashMap<String, String>();
+
+    
+    queryParams.addAll(ApiInvoker.parameterToPairs("", "status", status));
+    
+
+    
+
+    String[] contentTypes = {
+      
+    };
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+    if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+    } else {
+      // normal form params
+      
+    }
+
+      String[] authNames = new String[] { "test_api_client_id", "test_api_client_secret" };
+
+    try {
+      apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames,
+        new Response.Listener<String>() {
+          @Override
+          public void onResponse(String localVarResponse) {
+            
+            try {
+              responseListener.onResponse((List<Order>) ApiInvoker.deserialize(localVarResponse,  "array", Order.class));
+              
+              
+            
+            } catch (ApiException exception) {
+               errorListener.onErrorResponse(new VolleyError(exception));
+            }
+            
+          }
+      }, new Response.ErrorListener() {
+          @Override
+          public void onErrorResponse(VolleyError error) {
+            errorListener.onErrorResponse(error);
+          }
+      });
+    } catch (ApiException ex) {
+      errorListener.onErrorResponse(new VolleyError(ex));
+    }
+  }
+  
+  /**
+  * Returns pet inventories by status
+  * Returns a map of status codes to quantities
+   * @return Map<String, Integer>
+  */
+  public Map<String, Integer> getInventory () throws TimeoutException, ExecutionException, InterruptedException, ApiException {
+     Object postBody = null;
+  
+
+  // create path and map variables
+  String path = "/store/inventory".replaceAll("\\{format\\}","json");
+
+  // query params
+  List<Pair> queryParams = new ArrayList<Pair>();
+      // header params
+      Map<String, String> headerParams = new HashMap<String, String>();
+      // form params
+      Map<String, String> formParams = new HashMap<String, String>();
+
+  
+
+  
+
+      String[] contentTypes = {
+  
+      };
+      String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+      if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+  
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+      } else {
+      // normal form params
+  
+      }
+
+      String[] authNames = new String[] { "api_key" };
+
+      try {
+        String localVarResponse = apiInvoker.invokeAPI (basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames);
+        if(localVarResponse != null){
+           return (Map<String, Integer>) ApiInvoker.deserialize(localVarResponse, "map", Map.class);
+        } else {
+           return null;
+        }
+      } catch (ApiException ex) {
+         throw ex;
+      } catch (InterruptedException ex) {
+         throw ex;
+      } catch (ExecutionException ex) {
+         if(ex.getCause() instanceof VolleyError) {
+            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+         }
+         throw ex;
+      } catch (TimeoutException ex) {
+         throw ex;
+      }
+  }
+
+      /**
+   * Returns pet inventories by status
+   * Returns a map of status codes to quantities
+
+  */
+  public void getInventory (final Response.Listener<Map<String, Integer>> responseListener, final Response.ErrorListener errorListener) {
+    Object postBody = null;
+
+  
+
+    // create path and map variables
+    String path = "/store/inventory".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> queryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> headerParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> formParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] contentTypes = {
+      
+    };
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+    if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+    } else {
+      // normal form params
+      
+    }
+
+      String[] authNames = new String[] { "api_key" };
+
+    try {
+      apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames,
+        new Response.Listener<String>() {
+          @Override
+          public void onResponse(String localVarResponse) {
+            
+            try {
+              responseListener.onResponse((Map<String, Integer>) ApiInvoker.deserialize(localVarResponse,  "map", Map.class));
+              
+              
+            
+            } catch (ApiException exception) {
+               errorListener.onErrorResponse(new VolleyError(exception));
+            }
+            
+          }
+      }, new Response.ErrorListener() {
+          @Override
+          public void onErrorResponse(VolleyError error) {
+            errorListener.onErrorResponse(error);
+          }
+      });
+    } catch (ApiException ex) {
+      errorListener.onErrorResponse(new VolleyError(ex));
+    }
+  }
+  
+  /**
+  * Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+  * Returns an arbitrary object which is actually a map of status codes to quantities
+   * @return Object
+  */
+  public Object getInventoryInObject () throws TimeoutException, ExecutionException, InterruptedException, ApiException {
+     Object postBody = null;
+  
+
+  // create path and map variables
+  String path = "/store/inventory?response=arbitrary_object".replaceAll("\\{format\\}","json");
+
+  // query params
+  List<Pair> queryParams = new ArrayList<Pair>();
+      // header params
+      Map<String, String> headerParams = new HashMap<String, String>();
+      // form params
+      Map<String, String> formParams = new HashMap<String, String>();
+
+  
+
+  
+
+      String[] contentTypes = {
+  
+      };
+      String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+      if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+  
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+      } else {
+      // normal form params
+  
+      }
+
+      String[] authNames = new String[] { "api_key" };
+
+      try {
+        String localVarResponse = apiInvoker.invokeAPI (basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames);
+        if(localVarResponse != null){
+           return (Object) ApiInvoker.deserialize(localVarResponse, "", Object.class);
+        } else {
+           return null;
+        }
+      } catch (ApiException ex) {
+         throw ex;
+      } catch (InterruptedException ex) {
+         throw ex;
+      } catch (ExecutionException ex) {
+         if(ex.getCause() instanceof VolleyError) {
+            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+         }
+         throw ex;
+      } catch (TimeoutException ex) {
+         throw ex;
+      }
+  }
+
+      /**
+   * Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+   * Returns an arbitrary object which is actually a map of status codes to quantities
+
+  */
+  public void getInventoryInObject (final Response.Listener<Object> responseListener, final Response.ErrorListener errorListener) {
+    Object postBody = null;
+
+  
+
+    // create path and map variables
+    String path = "/store/inventory?response=arbitrary_object".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> queryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> headerParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> formParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] contentTypes = {
+      
+    };
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+    if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+    } else {
+      // normal form params
+      
+    }
+
+      String[] authNames = new String[] { "api_key" };
+
+    try {
+      apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames,
+        new Response.Listener<String>() {
+          @Override
+          public void onResponse(String localVarResponse) {
+            
+            try {
+              responseListener.onResponse((Object) ApiInvoker.deserialize(localVarResponse,  "", Object.class));
+              
+              
+            
+            } catch (ApiException exception) {
+               errorListener.onErrorResponse(new VolleyError(exception));
+            }
+            
+          }
+      }, new Response.ErrorListener() {
+          @Override
+          public void onErrorResponse(VolleyError error) {
+            errorListener.onErrorResponse(error);
+          }
+      });
+    } catch (ApiException ex) {
+      errorListener.onErrorResponse(new VolleyError(ex));
+    }
+  }
+  
+  /**
+  * Find purchase order by ID
+  * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+   * @param orderId ID of pet that needs to be fetched
+   * @return Order
+  */
+  public Order getOrderById (String orderId) throws TimeoutException, ExecutionException, InterruptedException, ApiException {
+     Object postBody = null;
+  
+      // verify the required parameter 'orderId' is set
+      if (orderId == null) {
+      VolleyError error = new VolleyError("Missing the required parameter 'orderId' when calling getOrderById",
+      new ApiException(400, "Missing the required parameter 'orderId' when calling getOrderById"));
+      }
+  
+
+  // create path and map variables
+  String path = "/store/order/{orderId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "orderId" + "\\}", apiInvoker.escapeString(orderId.toString()));
+
+  // query params
+  List<Pair> queryParams = new ArrayList<Pair>();
+      // header params
+      Map<String, String> headerParams = new HashMap<String, String>();
+      // form params
+      Map<String, String> formParams = new HashMap<String, String>();
+
+  
+
+  
+
+      String[] contentTypes = {
+  
+      };
+      String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+      if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+  
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+      } else {
+      // normal form params
+  
+      }
+
+      String[] authNames = new String[] { "test_api_key_header", "test_api_key_query" };
+
+      try {
+        String localVarResponse = apiInvoker.invokeAPI (basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames);
+        if(localVarResponse != null){
+           return (Order) ApiInvoker.deserialize(localVarResponse, "", Order.class);
+        } else {
+           return null;
+        }
+      } catch (ApiException ex) {
+         throw ex;
+      } catch (InterruptedException ex) {
+         throw ex;
+      } catch (ExecutionException ex) {
+         if(ex.getCause() instanceof VolleyError) {
+            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+         }
+         throw ex;
+      } catch (TimeoutException ex) {
+         throw ex;
+      }
+  }
+
+      /**
+   * Find purchase order by ID
+   * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+   * @param orderId ID of pet that needs to be fetched
+  */
+  public void getOrderById (String orderId, final Response.Listener<Order> responseListener, final Response.ErrorListener errorListener) {
+    Object postBody = null;
+
+  
+    // verify the required parameter 'orderId' is set
+    if (orderId == null) {
+       VolleyError error = new VolleyError("Missing the required parameter 'orderId' when calling getOrderById",
+         new ApiException(400, "Missing the required parameter 'orderId' when calling getOrderById"));
+    }
+    
+
+    // create path and map variables
+    String path = "/store/order/{orderId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "orderId" + "\\}", apiInvoker.escapeString(orderId.toString()));
+
+    // query params
+    List<Pair> queryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> headerParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> formParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] contentTypes = {
+      
+    };
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+    if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+    } else {
+      // normal form params
+      
+    }
+
+      String[] authNames = new String[] { "test_api_key_header", "test_api_key_query" };
+
+    try {
+      apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames,
+        new Response.Listener<String>() {
+          @Override
+          public void onResponse(String localVarResponse) {
+            
+            try {
+              responseListener.onResponse((Order) ApiInvoker.deserialize(localVarResponse,  "", Order.class));
+              
+              
+            
+            } catch (ApiException exception) {
+               errorListener.onErrorResponse(new VolleyError(exception));
+            }
+            
+          }
+      }, new Response.ErrorListener() {
+          @Override
+          public void onErrorResponse(VolleyError error) {
+            errorListener.onErrorResponse(error);
+          }
+      });
+    } catch (ApiException ex) {
+      errorListener.onErrorResponse(new VolleyError(ex));
+    }
+  }
+  
+  /**
+  * Place an order for a pet
+  * 
+   * @param body order placed for purchasing the pet
+   * @return Order
+  */
+  public Order placeOrder (Order body) throws TimeoutException, ExecutionException, InterruptedException, ApiException {
+     Object postBody = body;
+  
+
+  // create path and map variables
+  String path = "/store/order".replaceAll("\\{format\\}","json");
+
+  // query params
+  List<Pair> queryParams = new ArrayList<Pair>();
+      // header params
+      Map<String, String> headerParams = new HashMap<String, String>();
+      // form params
+      Map<String, String> formParams = new HashMap<String, String>();
+
+  
+
+  
+
+      String[] contentTypes = {
+  
+      };
+      String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+      if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+  
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+      } else {
+      // normal form params
+  
+      }
+
+      String[] authNames = new String[] { "test_api_client_id", "test_api_client_secret" };
+
+      try {
+        String localVarResponse = apiInvoker.invokeAPI (basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType, authNames);
+        if(localVarResponse != null){
+           return (Order) ApiInvoker.deserialize(localVarResponse, "", Order.class);
+        } else {
+           return null;
+        }
+      } catch (ApiException ex) {
+         throw ex;
+      } catch (InterruptedException ex) {
+         throw ex;
+      } catch (ExecutionException ex) {
+         if(ex.getCause() instanceof VolleyError) {
+            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+         }
+         throw ex;
+      } catch (TimeoutException ex) {
+         throw ex;
+      }
+  }
+
+      /**
+   * Place an order for a pet
+   * 
+   * @param body order placed for purchasing the pet
+  */
+  public void placeOrder (Order body, final Response.Listener<Order> responseListener, final Response.ErrorListener errorListener) {
+    Object postBody = body;
+
+  
+
+    // create path and map variables
+    String path = "/store/order".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> queryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> headerParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> formParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] contentTypes = {
+      
+    };
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+    if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+    } else {
+      // normal form params
+      
+    }
+
+      String[] authNames = new String[] { "test_api_client_id", "test_api_client_secret" };
+
+    try {
+      apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType, authNames,
+        new Response.Listener<String>() {
+          @Override
+          public void onResponse(String localVarResponse) {
+            
+            try {
+              responseListener.onResponse((Order) ApiInvoker.deserialize(localVarResponse,  "", Order.class));
+              
+              
+            
+            } catch (ApiException exception) {
+               errorListener.onErrorResponse(new VolleyError(exception));
+            }
+            
+          }
+      }, new Response.ErrorListener() {
+          @Override
+          public void onErrorResponse(VolleyError error) {
+            errorListener.onErrorResponse(error);
+          }
+      });
+    } catch (ApiException ex) {
+      errorListener.onErrorResponse(new VolleyError(ex));
+    }
+  }
+  
 }
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/UserApi.java
index 5730a282ad9..0938e600dd2 100644
--- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/UserApi.java
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/UserApi.java
@@ -1,6 +1,5 @@
 package io.swagger.client.api;
 
-import io.swagger.client.Responses;
 import io.swagger.client.ApiInvoker;
 import io.swagger.client.ApiException;
 import io.swagger.client.Pair;
@@ -18,9 +17,12 @@ import java.util.*;
 import org.apache.http.HttpEntity;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
 
-import java.util.Map;
+import java.util.ArrayList;
 import java.util.HashMap;
-import java.io.File;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
 
 public class UserApi {
   String basePath = "http://petstore.swagger.io/v2";
@@ -44,12 +46,75 @@ public class UserApi {
 
   
   /**
+  * Create user
+  * This can only be done by the logged in user.
+   * @param body Created user object
+   * @return void
+  */
+  public void createUser (User body) throws TimeoutException, ExecutionException, InterruptedException, ApiException {
+     Object postBody = body;
+  
+
+  // create path and map variables
+  String path = "/user".replaceAll("\\{format\\}","json");
+
+  // query params
+  List<Pair> queryParams = new ArrayList<Pair>();
+      // header params
+      Map<String, String> headerParams = new HashMap<String, String>();
+      // form params
+      Map<String, String> formParams = new HashMap<String, String>();
+
+  
+
+  
+
+      String[] contentTypes = {
+  
+      };
+      String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+      if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+  
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+      } else {
+      // normal form params
+  
+      }
+
+      String[] authNames = new String[] {  };
+
+      try {
+        String localVarResponse = apiInvoker.invokeAPI (basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType, authNames);
+        if(localVarResponse != null){
+           return ;
+        } else {
+           return ;
+        }
+      } catch (ApiException ex) {
+         throw ex;
+      } catch (InterruptedException ex) {
+         throw ex;
+      } catch (ExecutionException ex) {
+         if(ex.getCause() instanceof VolleyError) {
+            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+         }
+         throw ex;
+      } catch (TimeoutException ex) {
+         throw ex;
+      }
+  }
+
+      /**
    * Create user
    * This can only be done by the logged in user.
    * @param body Created user object
-   * @return void
-   */
-  public void createUser (User body, final Responses.StringResponse responseListener, final Response.ErrorListener errorListener) {
+  */
+  public void createUser (User body, final Response.Listener<String> responseListener, final Response.ErrorListener errorListener) {
     Object postBody = body;
 
   
@@ -75,10 +140,10 @@ public class UserApi {
 
     if (contentType.startsWith("multipart/form-data")) {
       // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
       
 
-      HttpEntity httpEntity = builder.build();
+      HttpEntity httpEntity = localVarBuilder.build();
       postBody = httpEntity;
     } else {
       // normal form params
@@ -91,10 +156,10 @@ public class UserApi {
       apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType, authNames,
         new Response.Listener<String>() {
           @Override
-          public void onResponse(String response) {
+          public void onResponse(String localVarResponse) {
             
               
-              responseListener.onResponse(response);
+              responseListener.onResponse(localVarResponse);
               
             
           }
@@ -110,12 +175,75 @@ public class UserApi {
   }
   
   /**
+  * Creates list of users with given input array
+  * 
+   * @param body List of user object
+   * @return void
+  */
+  public void createUsersWithArrayInput (List<User> body) throws TimeoutException, ExecutionException, InterruptedException, ApiException {
+     Object postBody = body;
+  
+
+  // create path and map variables
+  String path = "/user/createWithArray".replaceAll("\\{format\\}","json");
+
+  // query params
+  List<Pair> queryParams = new ArrayList<Pair>();
+      // header params
+      Map<String, String> headerParams = new HashMap<String, String>();
+      // form params
+      Map<String, String> formParams = new HashMap<String, String>();
+
+  
+
+  
+
+      String[] contentTypes = {
+  
+      };
+      String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+      if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+  
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+      } else {
+      // normal form params
+  
+      }
+
+      String[] authNames = new String[] {  };
+
+      try {
+        String localVarResponse = apiInvoker.invokeAPI (basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType, authNames);
+        if(localVarResponse != null){
+           return ;
+        } else {
+           return ;
+        }
+      } catch (ApiException ex) {
+         throw ex;
+      } catch (InterruptedException ex) {
+         throw ex;
+      } catch (ExecutionException ex) {
+         if(ex.getCause() instanceof VolleyError) {
+            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+         }
+         throw ex;
+      } catch (TimeoutException ex) {
+         throw ex;
+      }
+  }
+
+      /**
    * Creates list of users with given input array
    * 
    * @param body List of user object
-   * @return void
-   */
-  public void createUsersWithArrayInput (List<User> body, final Responses.StringResponse responseListener, final Response.ErrorListener errorListener) {
+  */
+  public void createUsersWithArrayInput (List<User> body, final Response.Listener<String> responseListener, final Response.ErrorListener errorListener) {
     Object postBody = body;
 
   
@@ -141,10 +269,10 @@ public class UserApi {
 
     if (contentType.startsWith("multipart/form-data")) {
       // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
       
 
-      HttpEntity httpEntity = builder.build();
+      HttpEntity httpEntity = localVarBuilder.build();
       postBody = httpEntity;
     } else {
       // normal form params
@@ -157,10 +285,10 @@ public class UserApi {
       apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType, authNames,
         new Response.Listener<String>() {
           @Override
-          public void onResponse(String response) {
+          public void onResponse(String localVarResponse) {
             
               
-              responseListener.onResponse(response);
+              responseListener.onResponse(localVarResponse);
               
             
           }
@@ -176,12 +304,75 @@ public class UserApi {
   }
   
   /**
+  * Creates list of users with given input array
+  * 
+   * @param body List of user object
+   * @return void
+  */
+  public void createUsersWithListInput (List<User> body) throws TimeoutException, ExecutionException, InterruptedException, ApiException {
+     Object postBody = body;
+  
+
+  // create path and map variables
+  String path = "/user/createWithList".replaceAll("\\{format\\}","json");
+
+  // query params
+  List<Pair> queryParams = new ArrayList<Pair>();
+      // header params
+      Map<String, String> headerParams = new HashMap<String, String>();
+      // form params
+      Map<String, String> formParams = new HashMap<String, String>();
+
+  
+
+  
+
+      String[] contentTypes = {
+  
+      };
+      String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+      if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+  
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+      } else {
+      // normal form params
+  
+      }
+
+      String[] authNames = new String[] {  };
+
+      try {
+        String localVarResponse = apiInvoker.invokeAPI (basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType, authNames);
+        if(localVarResponse != null){
+           return ;
+        } else {
+           return ;
+        }
+      } catch (ApiException ex) {
+         throw ex;
+      } catch (InterruptedException ex) {
+         throw ex;
+      } catch (ExecutionException ex) {
+         if(ex.getCause() instanceof VolleyError) {
+            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+         }
+         throw ex;
+      } catch (TimeoutException ex) {
+         throw ex;
+      }
+  }
+
+      /**
    * Creates list of users with given input array
    * 
    * @param body List of user object
-   * @return void
-   */
-  public void createUsersWithListInput (List<User> body, final Responses.StringResponse responseListener, final Response.ErrorListener errorListener) {
+  */
+  public void createUsersWithListInput (List<User> body, final Response.Listener<String> responseListener, final Response.ErrorListener errorListener) {
     Object postBody = body;
 
   
@@ -207,10 +398,10 @@ public class UserApi {
 
     if (contentType.startsWith("multipart/form-data")) {
       // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
       
 
-      HttpEntity httpEntity = builder.build();
+      HttpEntity httpEntity = localVarBuilder.build();
       postBody = httpEntity;
     } else {
       // normal form params
@@ -223,10 +414,10 @@ public class UserApi {
       apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType, authNames,
         new Response.Listener<String>() {
           @Override
-          public void onResponse(String response) {
+          public void onResponse(String localVarResponse) {
             
               
-              responseListener.onResponse(response);
+              responseListener.onResponse(localVarResponse);
               
             
           }
@@ -242,303 +433,81 @@ public class UserApi {
   }
   
   /**
-   * Logs user into the system
-   * 
-   * @param username The user name for login
-   * @param password The password for login in clear text
-   * @return String
-   */
-  public void loginUser (String username, String password, final Responses.StringResponse responseListener, final Response.ErrorListener errorListener) {
-    Object postBody = null;
-
-  
-
-    // create path and map variables
-    String path = "/user/login".replaceAll("\\{format\\}","json");
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
-    // form params
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    
-    queryParams.addAll(ApiInvoker.parameterToPairs("", "username", username));
-    
-    queryParams.addAll(ApiInvoker.parameterToPairs("", "password", password));
-    
-
-    
-
-    String[] contentTypes = {
-      
-    };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if (contentType.startsWith("multipart/form-data")) {
-      // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-      
-
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
-    } else {
-      // normal form params
-      
-    }
-
-      String[] authNames = new String[] {  };
-
-    try {
-      apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames,
-        new Response.Listener<String>() {
-          @Override
-          public void onResponse(String response) {
-            
-            try {
-              responseListener.onResponse((String) ApiInvoker.deserialize(response,  "", String.class));
-              
-              
-            
-            } catch (ApiException exception) {
-               errorListener.onErrorResponse(new VolleyError(exception));
-            }
-            
-          }
-      }, new Response.ErrorListener() {
-          @Override
-          public void onErrorResponse(VolleyError error) {
-            errorListener.onErrorResponse(error);
-          }
-      });
-    } catch (ApiException ex) {
-      errorListener.onErrorResponse(new VolleyError(ex));
-    }
-  }
-  
-  /**
-   * Logs out current logged in user session
-   * 
+  * Delete user
+  * This can only be done by the logged in user.
+   * @param username The name that needs to be deleted
    * @return void
-   */
-  public void logoutUser (final Responses.StringResponse responseListener, final Response.ErrorListener errorListener) {
-    Object postBody = null;
+  */
+  public void deleteUser (String username) throws TimeoutException, ExecutionException, InterruptedException, ApiException {
+     Object postBody = null;
+  
+      // verify the required parameter 'username' is set
+      if (username == null) {
+      VolleyError error = new VolleyError("Missing the required parameter 'username' when calling deleteUser",
+      new ApiException(400, "Missing the required parameter 'username' when calling deleteUser"));
+      }
+  
+
+  // create path and map variables
+  String path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
+
+  // query params
+  List<Pair> queryParams = new ArrayList<Pair>();
+      // header params
+      Map<String, String> headerParams = new HashMap<String, String>();
+      // form params
+      Map<String, String> formParams = new HashMap<String, String>();
 
   
 
-    // create path and map variables
-    String path = "/user/logout".replaceAll("\\{format\\}","json");
+  
 
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
-    // form params
-    Map<String, String> formParams = new HashMap<String, String>();
+      String[] contentTypes = {
+  
+      };
+      String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
 
-    
-
-    
-
-    String[] contentTypes = {
-      
-    };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if (contentType.startsWith("multipart/form-data")) {
+      if (contentType.startsWith("multipart/form-data")) {
       // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-      
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+  
 
-      HttpEntity httpEntity = builder.build();
+      HttpEntity httpEntity = localVarBuilder.build();
       postBody = httpEntity;
-    } else {
+      } else {
       // normal form params
-      
-    }
+  
+      }
 
-      String[] authNames = new String[] {  };
+      String[] authNames = new String[] { "test_http_basic" };
 
-    try {
-      apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames,
-        new Response.Listener<String>() {
-          @Override
-          public void onResponse(String response) {
-            
-              
-              responseListener.onResponse(response);
-              
-            
-          }
-      }, new Response.ErrorListener() {
-          @Override
-          public void onErrorResponse(VolleyError error) {
-            errorListener.onErrorResponse(error);
-          }
-      });
-    } catch (ApiException ex) {
-      errorListener.onErrorResponse(new VolleyError(ex));
-    }
+      try {
+        String localVarResponse = apiInvoker.invokeAPI (basePath, path, "DELETE", queryParams, postBody, headerParams, formParams, contentType, authNames);
+        if(localVarResponse != null){
+           return ;
+        } else {
+           return ;
+        }
+      } catch (ApiException ex) {
+         throw ex;
+      } catch (InterruptedException ex) {
+         throw ex;
+      } catch (ExecutionException ex) {
+         if(ex.getCause() instanceof VolleyError) {
+            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+         }
+         throw ex;
+      } catch (TimeoutException ex) {
+         throw ex;
+      }
   }
-  
-  /**
-   * Get user by user name
-   * 
-   * @param username The name that needs to be fetched. Use user1 for testing.
-   * @return User
-   */
-  public void getUserByName (String username, final Responses.UserResponse responseListener, final Response.ErrorListener errorListener) {
-    Object postBody = null;
 
-  
-    // verify the required parameter 'username' is set
-    if (username == null) {
-       VolleyError error = new VolleyError("Missing the required parameter 'username' when calling getUserByName",
-         new ApiException(400, "Missing the required parameter 'username' when calling getUserByName"));
-    }
-    
-
-    // create path and map variables
-    String path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
-    // form params
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    
-
-    
-
-    String[] contentTypes = {
-      
-    };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if (contentType.startsWith("multipart/form-data")) {
-      // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-      
-
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
-    } else {
-      // normal form params
-      
-    }
-
-      String[] authNames = new String[] {  };
-
-    try {
-      apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames,
-        new Response.Listener<String>() {
-          @Override
-          public void onResponse(String response) {
-            
-            try {
-              responseListener.onResponse((User) ApiInvoker.deserialize(response,  "", User.class));
-              
-              
-            
-            } catch (ApiException exception) {
-               errorListener.onErrorResponse(new VolleyError(exception));
-            }
-            
-          }
-      }, new Response.ErrorListener() {
-          @Override
-          public void onErrorResponse(VolleyError error) {
-            errorListener.onErrorResponse(error);
-          }
-      });
-    } catch (ApiException ex) {
-      errorListener.onErrorResponse(new VolleyError(ex));
-    }
-  }
-  
-  /**
-   * Updated user
-   * This can only be done by the logged in user.
-   * @param username name that need to be deleted
-   * @param body Updated user object
-   * @return void
-   */
-  public void updateUser (String username, User body, final Responses.StringResponse responseListener, final Response.ErrorListener errorListener) {
-    Object postBody = body;
-
-  
-    // verify the required parameter 'username' is set
-    if (username == null) {
-       VolleyError error = new VolleyError("Missing the required parameter 'username' when calling updateUser",
-         new ApiException(400, "Missing the required parameter 'username' when calling updateUser"));
-    }
-    
-
-    // create path and map variables
-    String path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    // header params
-    Map<String, String> headerParams = new HashMap<String, String>();
-    // form params
-    Map<String, String> formParams = new HashMap<String, String>();
-
-    
-
-    
-
-    String[] contentTypes = {
-      
-    };
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-    if (contentType.startsWith("multipart/form-data")) {
-      // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-      
-
-      HttpEntity httpEntity = builder.build();
-      postBody = httpEntity;
-    } else {
-      // normal form params
-      
-    }
-
-      String[] authNames = new String[] {  };
-
-    try {
-      apiInvoker.invokeAPI(basePath, path, "PUT", queryParams, postBody, headerParams, formParams, contentType, authNames,
-        new Response.Listener<String>() {
-          @Override
-          public void onResponse(String response) {
-            
-              
-              responseListener.onResponse(response);
-              
-            
-          }
-      }, new Response.ErrorListener() {
-          @Override
-          public void onErrorResponse(VolleyError error) {
-            errorListener.onErrorResponse(error);
-          }
-      });
-    } catch (ApiException ex) {
-      errorListener.onErrorResponse(new VolleyError(ex));
-    }
-  }
-  
-  /**
+      /**
    * Delete user
    * This can only be done by the logged in user.
    * @param username The name that needs to be deleted
-   * @return void
-   */
-  public void deleteUser (String username, final Responses.StringResponse responseListener, final Response.ErrorListener errorListener) {
+  */
+  public void deleteUser (String username, final Response.Listener<String> responseListener, final Response.ErrorListener errorListener) {
     Object postBody = null;
 
   
@@ -570,10 +539,151 @@ public class UserApi {
 
     if (contentType.startsWith("multipart/form-data")) {
       // file uploading
-      MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
       
 
-      HttpEntity httpEntity = builder.build();
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+    } else {
+      // normal form params
+      
+    }
+
+      String[] authNames = new String[] { "test_http_basic" };
+
+    try {
+      apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, postBody, headerParams, formParams, contentType, authNames,
+        new Response.Listener<String>() {
+          @Override
+          public void onResponse(String localVarResponse) {
+            
+              
+              responseListener.onResponse(localVarResponse);
+              
+            
+          }
+      }, new Response.ErrorListener() {
+          @Override
+          public void onErrorResponse(VolleyError error) {
+            errorListener.onErrorResponse(error);
+          }
+      });
+    } catch (ApiException ex) {
+      errorListener.onErrorResponse(new VolleyError(ex));
+    }
+  }
+  
+  /**
+  * Get user by user name
+  * 
+   * @param username The name that needs to be fetched. Use user1 for testing.
+   * @return User
+  */
+  public User getUserByName (String username) throws TimeoutException, ExecutionException, InterruptedException, ApiException {
+     Object postBody = null;
+  
+      // verify the required parameter 'username' is set
+      if (username == null) {
+      VolleyError error = new VolleyError("Missing the required parameter 'username' when calling getUserByName",
+      new ApiException(400, "Missing the required parameter 'username' when calling getUserByName"));
+      }
+  
+
+  // create path and map variables
+  String path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
+
+  // query params
+  List<Pair> queryParams = new ArrayList<Pair>();
+      // header params
+      Map<String, String> headerParams = new HashMap<String, String>();
+      // form params
+      Map<String, String> formParams = new HashMap<String, String>();
+
+  
+
+  
+
+      String[] contentTypes = {
+  
+      };
+      String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+      if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+  
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+      } else {
+      // normal form params
+  
+      }
+
+      String[] authNames = new String[] {  };
+
+      try {
+        String localVarResponse = apiInvoker.invokeAPI (basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames);
+        if(localVarResponse != null){
+           return (User) ApiInvoker.deserialize(localVarResponse, "", User.class);
+        } else {
+           return null;
+        }
+      } catch (ApiException ex) {
+         throw ex;
+      } catch (InterruptedException ex) {
+         throw ex;
+      } catch (ExecutionException ex) {
+         if(ex.getCause() instanceof VolleyError) {
+            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+         }
+         throw ex;
+      } catch (TimeoutException ex) {
+         throw ex;
+      }
+  }
+
+      /**
+   * Get user by user name
+   * 
+   * @param username The name that needs to be fetched. Use user1 for testing.
+  */
+  public void getUserByName (String username, final Response.Listener<User> responseListener, final Response.ErrorListener errorListener) {
+    Object postBody = null;
+
+  
+    // verify the required parameter 'username' is set
+    if (username == null) {
+       VolleyError error = new VolleyError("Missing the required parameter 'username' when calling getUserByName",
+         new ApiException(400, "Missing the required parameter 'username' when calling getUserByName"));
+    }
+    
+
+    // create path and map variables
+    String path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
+
+    // query params
+    List<Pair> queryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> headerParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> formParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] contentTypes = {
+      
+    };
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+    if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+
+      HttpEntity httpEntity = localVarBuilder.build();
       postBody = httpEntity;
     } else {
       // normal form params
@@ -583,13 +693,431 @@ public class UserApi {
       String[] authNames = new String[] {  };
 
     try {
-      apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, postBody, headerParams, formParams, contentType, authNames,
+      apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames,
         new Response.Listener<String>() {
           @Override
-          public void onResponse(String response) {
+          public void onResponse(String localVarResponse) {
+            
+            try {
+              responseListener.onResponse((User) ApiInvoker.deserialize(localVarResponse,  "", User.class));
+              
+              
+            
+            } catch (ApiException exception) {
+               errorListener.onErrorResponse(new VolleyError(exception));
+            }
+            
+          }
+      }, new Response.ErrorListener() {
+          @Override
+          public void onErrorResponse(VolleyError error) {
+            errorListener.onErrorResponse(error);
+          }
+      });
+    } catch (ApiException ex) {
+      errorListener.onErrorResponse(new VolleyError(ex));
+    }
+  }
+  
+  /**
+  * Logs user into the system
+  * 
+   * @param username The user name for login
+   * @param password The password for login in clear text
+   * @return String
+  */
+  public String loginUser (String username, String password) throws TimeoutException, ExecutionException, InterruptedException, ApiException {
+     Object postBody = null;
+  
+
+  // create path and map variables
+  String path = "/user/login".replaceAll("\\{format\\}","json");
+
+  // query params
+  List<Pair> queryParams = new ArrayList<Pair>();
+      // header params
+      Map<String, String> headerParams = new HashMap<String, String>();
+      // form params
+      Map<String, String> formParams = new HashMap<String, String>();
+
+  
+          queryParams.addAll(ApiInvoker.parameterToPairs("", "username", username));
+  
+          queryParams.addAll(ApiInvoker.parameterToPairs("", "password", password));
+  
+
+  
+
+      String[] contentTypes = {
+  
+      };
+      String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+      if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+  
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+      } else {
+      // normal form params
+  
+      }
+
+      String[] authNames = new String[] {  };
+
+      try {
+        String localVarResponse = apiInvoker.invokeAPI (basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames);
+        if(localVarResponse != null){
+           return (String) ApiInvoker.deserialize(localVarResponse, "", String.class);
+        } else {
+           return null;
+        }
+      } catch (ApiException ex) {
+         throw ex;
+      } catch (InterruptedException ex) {
+         throw ex;
+      } catch (ExecutionException ex) {
+         if(ex.getCause() instanceof VolleyError) {
+            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+         }
+         throw ex;
+      } catch (TimeoutException ex) {
+         throw ex;
+      }
+  }
+
+      /**
+   * Logs user into the system
+   * 
+   * @param username The user name for login   * @param password The password for login in clear text
+  */
+  public void loginUser (String username, String password, final Response.Listener<String> responseListener, final Response.ErrorListener errorListener) {
+    Object postBody = null;
+
+  
+
+    // create path and map variables
+    String path = "/user/login".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> queryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> headerParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> formParams = new HashMap<String, String>();
+
+    
+    queryParams.addAll(ApiInvoker.parameterToPairs("", "username", username));
+    
+    queryParams.addAll(ApiInvoker.parameterToPairs("", "password", password));
+    
+
+    
+
+    String[] contentTypes = {
+      
+    };
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+    if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+    } else {
+      // normal form params
+      
+    }
+
+      String[] authNames = new String[] {  };
+
+    try {
+      apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames,
+        new Response.Listener<String>() {
+          @Override
+          public void onResponse(String localVarResponse) {
+            
+            try {
+              responseListener.onResponse((String) ApiInvoker.deserialize(localVarResponse,  "", String.class));
+              
+              
+            
+            } catch (ApiException exception) {
+               errorListener.onErrorResponse(new VolleyError(exception));
+            }
+            
+          }
+      }, new Response.ErrorListener() {
+          @Override
+          public void onErrorResponse(VolleyError error) {
+            errorListener.onErrorResponse(error);
+          }
+      });
+    } catch (ApiException ex) {
+      errorListener.onErrorResponse(new VolleyError(ex));
+    }
+  }
+  
+  /**
+  * Logs out current logged in user session
+  * 
+   * @return void
+  */
+  public void logoutUser () throws TimeoutException, ExecutionException, InterruptedException, ApiException {
+     Object postBody = null;
+  
+
+  // create path and map variables
+  String path = "/user/logout".replaceAll("\\{format\\}","json");
+
+  // query params
+  List<Pair> queryParams = new ArrayList<Pair>();
+      // header params
+      Map<String, String> headerParams = new HashMap<String, String>();
+      // form params
+      Map<String, String> formParams = new HashMap<String, String>();
+
+  
+
+  
+
+      String[] contentTypes = {
+  
+      };
+      String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+      if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+  
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+      } else {
+      // normal form params
+  
+      }
+
+      String[] authNames = new String[] {  };
+
+      try {
+        String localVarResponse = apiInvoker.invokeAPI (basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames);
+        if(localVarResponse != null){
+           return ;
+        } else {
+           return ;
+        }
+      } catch (ApiException ex) {
+         throw ex;
+      } catch (InterruptedException ex) {
+         throw ex;
+      } catch (ExecutionException ex) {
+         if(ex.getCause() instanceof VolleyError) {
+            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+         }
+         throw ex;
+      } catch (TimeoutException ex) {
+         throw ex;
+      }
+  }
+
+      /**
+   * Logs out current logged in user session
+   * 
+
+  */
+  public void logoutUser (final Response.Listener<String> responseListener, final Response.ErrorListener errorListener) {
+    Object postBody = null;
+
+  
+
+    // create path and map variables
+    String path = "/user/logout".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> queryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> headerParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> formParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] contentTypes = {
+      
+    };
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+    if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+    } else {
+      // normal form params
+      
+    }
+
+      String[] authNames = new String[] {  };
+
+    try {
+      apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames,
+        new Response.Listener<String>() {
+          @Override
+          public void onResponse(String localVarResponse) {
             
               
-              responseListener.onResponse(response);
+              responseListener.onResponse(localVarResponse);
+              
+            
+          }
+      }, new Response.ErrorListener() {
+          @Override
+          public void onErrorResponse(VolleyError error) {
+            errorListener.onErrorResponse(error);
+          }
+      });
+    } catch (ApiException ex) {
+      errorListener.onErrorResponse(new VolleyError(ex));
+    }
+  }
+  
+  /**
+  * Updated user
+  * This can only be done by the logged in user.
+   * @param username name that need to be deleted
+   * @param body Updated user object
+   * @return void
+  */
+  public void updateUser (String username, User body) throws TimeoutException, ExecutionException, InterruptedException, ApiException {
+     Object postBody = body;
+  
+      // verify the required parameter 'username' is set
+      if (username == null) {
+      VolleyError error = new VolleyError("Missing the required parameter 'username' when calling updateUser",
+      new ApiException(400, "Missing the required parameter 'username' when calling updateUser"));
+      }
+  
+
+  // create path and map variables
+  String path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
+
+  // query params
+  List<Pair> queryParams = new ArrayList<Pair>();
+      // header params
+      Map<String, String> headerParams = new HashMap<String, String>();
+      // form params
+      Map<String, String> formParams = new HashMap<String, String>();
+
+  
+
+  
+
+      String[] contentTypes = {
+  
+      };
+      String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+      if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+  
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+      } else {
+      // normal form params
+  
+      }
+
+      String[] authNames = new String[] {  };
+
+      try {
+        String localVarResponse = apiInvoker.invokeAPI (basePath, path, "PUT", queryParams, postBody, headerParams, formParams, contentType, authNames);
+        if(localVarResponse != null){
+           return ;
+        } else {
+           return ;
+        }
+      } catch (ApiException ex) {
+         throw ex;
+      } catch (InterruptedException ex) {
+         throw ex;
+      } catch (ExecutionException ex) {
+         if(ex.getCause() instanceof VolleyError) {
+            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+         }
+         throw ex;
+      } catch (TimeoutException ex) {
+         throw ex;
+      }
+  }
+
+      /**
+   * Updated user
+   * This can only be done by the logged in user.
+   * @param username name that need to be deleted   * @param body Updated user object
+  */
+  public void updateUser (String username, User body, final Response.Listener<String> responseListener, final Response.ErrorListener errorListener) {
+    Object postBody = body;
+
+  
+    // verify the required parameter 'username' is set
+    if (username == null) {
+       VolleyError error = new VolleyError("Missing the required parameter 'username' when calling updateUser",
+         new ApiException(400, "Missing the required parameter 'username' when calling updateUser"));
+    }
+    
+
+    // create path and map variables
+    String path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
+
+    // query params
+    List<Pair> queryParams = new ArrayList<Pair>();
+    // header params
+    Map<String, String> headerParams = new HashMap<String, String>();
+    // form params
+    Map<String, String> formParams = new HashMap<String, String>();
+
+    
+
+    
+
+    String[] contentTypes = {
+      
+    };
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+
+    if (contentType.startsWith("multipart/form-data")) {
+      // file uploading
+      MultipartEntityBuilder localVarBuilder = MultipartEntityBuilder.create();
+      
+
+      HttpEntity httpEntity = localVarBuilder.build();
+      postBody = httpEntity;
+    } else {
+      // normal form params
+      
+    }
+
+      String[] authNames = new String[] {  };
+
+    try {
+      apiInvoker.invokeAPI(basePath, path, "PUT", queryParams, postBody, headerParams, formParams, contentType, authNames,
+        new Response.Listener<String>() {
+          @Override
+          public void onResponse(String localVarResponse) {
+            
+              
+              responseListener.onResponse(localVarResponse);
               
             
           }
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
index 0e5ca9c7c53..28f59159d4d 100644
--- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
@@ -44,6 +44,9 @@ public class ApiKeyAuth implements Authentication {
   @Override
   public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {
     String value;
+    if (apiKey == null) {
+        return;
+    }
     if (apiKeyPrefix != null) {
       value = apiKeyPrefix + " " + apiKey;
     } else {
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/InlineResponse200.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/InlineResponse200.java
new file mode 100644
index 00000000000..c4fd8ce357d
--- /dev/null
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/InlineResponse200.java
@@ -0,0 +1,112 @@
+package io.swagger.client.model;
+
+import io.swagger.client.model.Tag;
+import java.util.*;
+
+import io.swagger.annotations.*;
+import com.google.gson.annotations.SerializedName;
+
+
+@ApiModel(description = "")
+public class InlineResponse200  {
+  
+  @SerializedName("tags")
+  private List<Tag> tags = null;
+  @SerializedName("id")
+  private Long id = null;
+  @SerializedName("category")
+  private Object category = null;
+  public enum StatusEnum {
+     available,  pending,  sold, 
+  };
+  @SerializedName("status")
+  private StatusEnum status = null;
+  @SerializedName("name")
+  private String name = null;
+  @SerializedName("photoUrls")
+  private List<String> photoUrls = null;
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<Tag> getTags() {
+    return tags;
+  }
+  public void setTags(List<Tag> tags) {
+    this.tags = tags;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Object getCategory() {
+    return category;
+  }
+  public void setCategory(Object category) {
+    this.category = category;
+  }
+
+  
+  /**
+   * pet status in the store
+   **/
+  @ApiModelProperty(value = "pet status in the store")
+  public StatusEnum getStatus() {
+    return status;
+  }
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<String> getPhotoUrls() {
+    return photoUrls;
+  }
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
+  
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class InlineResponse200 {\n");
+    
+    sb.append("  tags: ").append(tags).append("\n");
+    sb.append("  id: ").append(id).append("\n");
+    sb.append("  category: ").append(category).append("\n");
+    sb.append("  status: ").append(status).append("\n");
+    sb.append("  name: ").append(name).append("\n");
+    sb.append("  photoUrls: ").append(photoUrls).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Model200Response.java
new file mode 100644
index 00000000000..4a6e58b2a5e
--- /dev/null
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Model200Response.java
@@ -0,0 +1,36 @@
+package io.swagger.client.model;
+
+
+import io.swagger.annotations.*;
+import com.google.gson.annotations.SerializedName;
+
+
+@ApiModel(description = "")
+public class Model200Response  {
+  
+  @SerializedName("name")
+  private Integer name = null;
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getName() {
+    return name;
+  }
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+  
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Model200Response {\n");
+    
+    sb.append("  name: ").append(name).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/ModelReturn.java
new file mode 100644
index 00000000000..24763f3acb4
--- /dev/null
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -0,0 +1,36 @@
+package io.swagger.client.model;
+
+
+import io.swagger.annotations.*;
+import com.google.gson.annotations.SerializedName;
+
+
+@ApiModel(description = "")
+public class ModelReturn  {
+  
+  @SerializedName("return")
+  private Integer _return = null;
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getReturn() {
+    return _return;
+  }
+  public void setReturn(Integer _return) {
+    this._return = _return;
+  }
+
+  
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ModelReturn {\n");
+    
+    sb.append("  _return: ").append(_return).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Name.java
new file mode 100644
index 00000000000..9763aca7b34
--- /dev/null
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Name.java
@@ -0,0 +1,50 @@
+package io.swagger.client.model;
+
+
+import io.swagger.annotations.*;
+import com.google.gson.annotations.SerializedName;
+
+
+@ApiModel(description = "")
+public class Name  {
+  
+  @SerializedName("name")
+  private Integer name = null;
+  @SerializedName("snake_case")
+  private Integer snakeCase = null;
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getName() {
+    return name;
+  }
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getSnakeCase() {
+    return snakeCase;
+  }
+  public void setSnakeCase(Integer snakeCase) {
+    this.snakeCase = snakeCase;
+  }
+
+  
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Name {\n");
+    
+    sb.append("  name: ").append(name).append("\n");
+    sb.append("  snakeCase: ").append(snakeCase).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/SpecialModelName.java
new file mode 100644
index 00000000000..d804bdd8765
--- /dev/null
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -0,0 +1,36 @@
+package io.swagger.client.model;
+
+
+import io.swagger.annotations.*;
+import com.google.gson.annotations.SerializedName;
+
+
+@ApiModel(description = "")
+public class SpecialModelName  {
+  
+  @SerializedName("$special[property.name]")
+  private Long specialPropertyName = null;
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Long getSpecialPropertyName() {
+    return specialPropertyName;
+  }
+  public void setSpecialPropertyName(Long specialPropertyName) {
+    this.specialPropertyName = specialPropertyName;
+  }
+
+  
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class SpecialModelName {\n");
+    
+    sb.append("  specialPropertyName: ").append(specialPropertyName).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/client/petstore/android/volley/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/android/volley/src/test/java/io/swagger/petstore/test/PetApiTest.java
new file mode 100644
index 00000000000..92812f80506
--- /dev/null
+++ b/samples/client/petstore/android/volley/src/test/java/io/swagger/petstore/test/PetApiTest.java
@@ -0,0 +1,394 @@
+package es.shyri.swagger.android.volley.petstore.full;
+
+import com.android.volley.ExecutorDelivery;
+import com.android.volley.Network;
+import com.android.volley.Response;
+import com.android.volley.VolleyError;
+import com.android.volley.toolbox.BasicNetwork;
+import com.android.volley.toolbox.HttpStack;
+import com.android.volley.toolbox.HurlStack;
+import com.android.volley.toolbox.NoCache;
+
+import net.jodah.concurrentunit.Waiter;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.Executors;
+
+import io.swagger.client.ApiException;
+import io.swagger.client.ApiInvoker;
+import io.swagger.client.api.PetApi;
+import io.swagger.client.model.Category;
+import io.swagger.client.model.Pet;
+
+import static com.ibm.icu.impl.Assert.fail;
+import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+
+@RunWith(RobolectricTestRunner.class)
+public class PetApiTest {
+    PetApi api = null;
+
+    @Before
+    public void setup() {
+        HttpStack stack = new HurlStack();
+        Network network = new BasicNetwork(stack);
+        ApiInvoker.initializeInstance(new NoCache(), network, 4, new ExecutorDelivery(Executors.newSingleThreadExecutor()), 30);
+        api = new PetApi();
+    }
+
+    @Test
+    public void testCreateAndGetPet() throws Exception {
+        final Waiter waiter = new Waiter();
+        final Pet pet = createRandomPet();
+        api.addPet(pet, new Response.Listener<String>() {
+            @Override
+            public void onResponse(String response) {
+                waiter.resume();
+            }
+        }, createErrorListener(waiter));
+
+        waiter.await();
+
+        api.getPetById(pet.getId(), new Response.Listener<Pet>() {
+            @Override
+            public void onResponse(Pet response) {
+                Pet fetched = response;
+                waiter.assertNotNull(fetched);
+                waiter.assertEquals(pet.getId(), fetched.getId());
+                waiter.assertNotNull(fetched.getCategory());
+                waiter.assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
+                waiter.resume();
+            }
+        }, createErrorListener(waiter));
+
+        waiter.await();
+    }
+
+    @Test
+    public void testUpdatePet() throws Exception {
+        final Waiter waiter = new Waiter();
+
+        final Pet pet = createRandomPet();
+        pet.setName("programmer");
+
+        api.updatePet(pet, new Response.Listener<String>() {
+            @Override
+            public void onResponse(String response) {
+                waiter.resume();
+            }
+        }, createErrorListener(waiter));
+
+        waiter.await();
+
+        api.getPetById(pet.getId(), new Response.Listener<Pet>() {
+            @Override
+            public void onResponse(Pet fetched) {
+                waiter.assertNotNull(fetched);
+                waiter.assertEquals(pet.getId(), fetched.getId());
+                waiter.assertNotNull(fetched.getCategory());
+                waiter.assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
+                waiter.resume();
+            }
+        }, createErrorListener(waiter));
+
+        waiter.await();
+    }
+
+    @Test
+    public void testFindPetsByStatus() throws Exception {
+        final Waiter waiter = new Waiter();
+        final Pet pet = createRandomPet();
+        pet.setName("programmer");
+        pet.setStatus(Pet.StatusEnum.available);
+
+        api.updatePet(pet, new Response.Listener<String>() {
+            @Override
+            public void onResponse(String response) {
+                waiter.resume();
+            }
+        }, createErrorListener(waiter));
+
+        waiter.await();
+
+        api.findPetsByStatus(Arrays.asList(new String[]{"available"}), new Response.Listener<List<Pet>>() {
+            @Override
+            public void onResponse(List<Pet> pets) {
+                waiter.assertNotNull(pets);
+
+                boolean found = false;
+                for (Pet fetched : pets) {
+                    if (fetched.getId().equals(pet.getId())) {
+                        found = true;
+                        break;
+                    }
+                }
+
+                waiter.assertTrue(found);
+                waiter.resume();
+            }
+        }, createErrorListener(waiter));
+
+        waiter.await();
+    }
+
+    @Test
+    public void testUpdatePetWithForm() throws Exception {
+        final Waiter waiter = new Waiter();
+        final Pet pet = createRandomPet();
+        pet.setName("frank");
+
+        api.addPet(pet, new Response.Listener<String>() {
+            @Override
+            public void onResponse(String response) {
+                waiter.resume();
+            }
+        }, createErrorListener(waiter));
+
+        waiter.await();
+
+        final Pet[] fetched = new Pet[1];
+
+        api.getPetById(pet.getId(), new Response.Listener<Pet>() {
+            @Override
+            public void onResponse(Pet petResponse) {
+                fetched[0] = petResponse;
+                waiter.assertEquals("frank", fetched[0].getName());
+                waiter.resume();
+            }
+        }, createErrorListener(waiter));
+
+        waiter.await();
+
+        api.updatePetWithForm(String.valueOf(fetched[0].getId()), "furt", null, new Response.Listener<String>() {
+            @Override
+            public void onResponse(String response) {
+                waiter.resume();
+            }
+        }, createErrorListener(waiter));
+
+        waiter.await();
+
+        api.getPetById(fetched[0].getId(), new Response.Listener<Pet>() {
+            @Override
+            public void onResponse(Pet updated) {
+                waiter.assertEquals("furt", updated.getName());
+                waiter.resume();
+            }
+        }, createErrorListener(waiter));
+
+        waiter.await();
+
+    }
+
+    @Test
+    public void testDeletePet() throws Exception {
+        final Waiter waiter = new Waiter();
+
+        Pet pet = createRandomPet();
+        api.addPet(pet, new Response.Listener<String>() {
+            @Override
+            public void onResponse(String response) {
+                waiter.resume();
+            }
+        }, createErrorListener(waiter));
+
+        waiter.await();
+
+        final Pet[] fetched = new Pet[1];
+
+        api.getPetById(pet.getId(), new Response.Listener<Pet>() {
+            @Override
+            public void onResponse(Pet response) {
+                fetched[0] = response;
+                waiter.resume();
+            }
+        }, createErrorListener(waiter));
+
+        waiter.await();
+
+        api.deletePet(fetched[0].getId(), "special-key", new Response.Listener<String>() {
+            @Override
+            public void onResponse(String response) {
+                waiter.resume();
+            }
+        }, createErrorListener(waiter));
+
+        waiter.await();
+
+
+        api.getPetById(fetched[0].getId(), new Response.Listener<Pet>() {
+            @Override
+            public void onResponse(Pet response) {
+                waiter.fail("expected an error");
+                waiter.resume();
+            }
+        }, new Response.ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError error) {
+                waiter.assertEquals(404, error.networkResponse.statusCode);
+                waiter.resume();
+            }
+        });
+        waiter.await();
+    }
+
+
+
+    @Test
+    public void testUploadFile() throws Exception {
+        final Waiter waiter = new Waiter();
+
+        Pet pet = createRandomPet();
+        api.addPet(pet, new Response.Listener<String>() {
+            @Override
+            public void onResponse(String response) {
+                waiter.resume();
+            }
+        }, createErrorListener(waiter));
+
+        waiter.await();
+
+        File file = new File("hello.txt");
+        BufferedWriter writer = new BufferedWriter(new FileWriter(file));
+        writer.write("Hello world!");
+        writer.close();
+
+        api.uploadFile(pet.getId(), "a test file", new File(file.getAbsolutePath()), new Response.Listener<String>() {
+            @Override
+            public void onResponse(String response) {
+                waiter.resume();
+            }
+        }, createErrorListener(waiter));
+
+        waiter.await();
+    }
+
+    @Test
+    public void testCreateAndGetPetSync() throws Exception {
+        Pet pet = createRandomPet();
+        api.addPet(pet);
+
+        Pet fetched = api.getPetById(pet.getId());
+        assertNotNull(fetched);
+        assertEquals(pet.getId(), fetched.getId());
+        assertNotNull(fetched.getCategory());
+        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
+    }
+
+    @Test
+    public void testUpdatePetSync() throws Exception {
+        Pet pet = createRandomPet();
+        pet.setName("programmer");
+
+        api.updatePet(pet);
+
+        Pet fetched = api.getPetById(pet.getId());
+        assertNotNull(fetched);
+        assertEquals(pet.getId(), fetched.getId());
+        assertNotNull(fetched.getCategory());
+        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
+    }
+
+    @Test
+    public void testFindPetsByStatusSync() throws Exception {
+        Pet pet = createRandomPet();
+        pet.setName("programmer");
+        pet.setStatus(Pet.StatusEnum.available);
+
+        api.updatePet(pet);
+
+        List<Pet> pets = api.findPetsByStatus(Arrays.asList(new String[]{"available"}));
+        assertNotNull(pets);
+
+        boolean found = false;
+        for (Pet fetched : pets) {
+            if (fetched.getId().equals(pet.getId())) {
+                found = true;
+                break;
+            }
+        }
+
+        assertTrue(found);
+    }
+
+    @Test
+    public void testUpdatePetWithFormSync() throws Exception {
+        Pet pet = createRandomPet();
+        pet.setName("frank");
+        api.addPet(pet);
+
+        Pet fetched = api.getPetById(pet.getId());
+        assertEquals("frank", fetched.getName());
+
+        api.updatePetWithForm(String.valueOf(fetched.getId()), "furt", null);
+        Pet updated = api.getPetById(fetched.getId());
+        assertEquals("furt", updated.getName());
+    }
+
+    @Test
+    public void testDeletePetSync() throws Exception {
+        Pet pet = createRandomPet();
+        api.addPet(pet);
+
+        Pet fetched = api.getPetById(pet.getId());
+        api.deletePet(fetched.getId(), null);
+
+        try {
+            fetched = api.getPetById(fetched.getId());
+            fail("expected an error");
+        } catch (ApiException e) {
+            assertEquals(404, e.getCode());
+        }
+    }
+
+    @Test
+    public void testUploadFileSync() throws Exception {
+        Pet pet = createRandomPet();
+        api.addPet(pet);
+
+        File file = new File("hello.txt");
+        BufferedWriter writer = new BufferedWriter(new FileWriter(file));
+        writer.write("Hello world!");
+        writer.close();
+
+        api.uploadFile(pet.getId(), "a test file", new File(file.getAbsolutePath()));
+    }
+
+    private Pet createRandomPet() {
+        Pet pet = new Pet();
+        pet.setId(System.currentTimeMillis());
+        pet.setName("gorilla");
+
+        Category category = new Category();
+        category.setName("really-happy");
+
+        pet.setCategory(category);
+        pet.setStatus(Pet.StatusEnum.available);
+        List<String> photos = Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"});
+        pet.setPhotoUrls(photos);
+
+        return pet;
+    }
+
+    private Response.ErrorListener createErrorListener(final Waiter waiter) {
+        return new Response.ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError error) {
+                error.printStackTrace();
+                waiter.fail(error.getMessage());
+                waiter.resume();
+            }
+        };
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/clojure/.gitignore b/samples/client/petstore/clojure/.gitignore
index 055b6ac4772..47fed6c20d9 100644
--- a/samples/client/petstore/clojure/.gitignore
+++ b/samples/client/petstore/clojure/.gitignore
@@ -1,10 +1,12 @@
-/target
-/classes
-/checkouts
+pom.xml
 pom.xml.asc
-*.jar
-*.class
-/.lein-*
-/.nrepl-port
-.hgignore
-.hg/
+*jar
+/lib/
+/classes/
+/target/
+/checkouts/
+.lein-deps-sum
+.lein-repl-history
+.lein-plugins/
+.lein-failures
+.nrepl-port
diff --git a/samples/client/petstore/clojure/git_push.sh b/samples/client/petstore/clojure/git_push.sh
new file mode 100644
index 00000000000..1a36388db02
--- /dev/null
+++ b/samples/client/petstore/clojure/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="YOUR_GIT_USR_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="YOUR_GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/client/petstore/clojure/src/swagger_petstore/api/pet.clj b/samples/client/petstore/clojure/src/swagger_petstore/api/pet.clj
index 36bdefeffcd..a455838c8fc 100644
--- a/samples/client/petstore/clojure/src/swagger_petstore/api/pet.clj
+++ b/samples/client/petstore/clojure/src/swagger_petstore/api/pet.clj
@@ -2,28 +2,6 @@
   (:require [swagger-petstore.core :refer [call-api check-required-params with-collection-format]])
   (:import (java.io File)))
 
-(defn update-pet-with-http-info
-  "Update an existing pet
-  "
-  ([] (update-pet-with-http-info nil))
-  ([{:keys [body ]}]
-   (call-api "/pet" :put
-             {:path-params   {}
-              :header-params {}
-              :query-params  {}
-              :form-params   {}
-              :body-param    body
-              :content-types ["application/json" "application/xml"]
-              :accepts       ["application/json" "application/xml"]
-              :auth-names    ["petstore_auth"]})))
-
-(defn update-pet
-  "Update an existing pet
-  "
-  ([] (update-pet nil))
-  ([optional-params]
-   (:data (update-pet-with-http-info optional-params))))
-
 (defn add-pet-with-http-info
   "Add a new pet to the store
   "
@@ -46,9 +24,52 @@
   ([optional-params]
    (:data (add-pet-with-http-info optional-params))))
 
+(defn add-pet-using-byte-array-with-http-info
+  "Fake endpoint to test byte array in body parameter for adding a new pet to the store
+  "
+  ([] (add-pet-using-byte-array-with-http-info nil))
+  ([{:keys [body ]}]
+   (call-api "/pet?testing_byte_array=true" :post
+             {:path-params   {}
+              :header-params {}
+              :query-params  {}
+              :form-params   {}
+              :body-param    body
+              :content-types ["application/json" "application/xml"]
+              :accepts       ["application/json" "application/xml"]
+              :auth-names    ["petstore_auth"]})))
+
+(defn add-pet-using-byte-array
+  "Fake endpoint to test byte array in body parameter for adding a new pet to the store
+  "
+  ([] (add-pet-using-byte-array nil))
+  ([optional-params]
+   (:data (add-pet-using-byte-array-with-http-info optional-params))))
+
+(defn delete-pet-with-http-info
+  "Deletes a pet
+  "
+  ([pet-id ] (delete-pet-with-http-info pet-id nil))
+  ([pet-id {:keys [api-key ]}]
+   (call-api "/pet/{petId}" :delete
+             {:path-params   {"petId" pet-id }
+              :header-params {"api_key" api-key }
+              :query-params  {}
+              :form-params   {}
+              :content-types []
+              :accepts       ["application/json" "application/xml"]
+              :auth-names    ["petstore_auth"]})))
+
+(defn delete-pet
+  "Deletes a pet
+  "
+  ([pet-id ] (delete-pet pet-id nil))
+  ([pet-id optional-params]
+   (:data (delete-pet-with-http-info pet-id optional-params))))
+
 (defn find-pets-by-status-with-http-info
   "Finds Pets by status
-  Multiple status values can be provided with comma seperated strings"
+  Multiple status values can be provided with comma separated strings"
   ([] (find-pets-by-status-with-http-info nil))
   ([{:keys [status ]}]
    (call-api "/pet/findByStatus" :get
@@ -62,7 +83,7 @@
 
 (defn find-pets-by-status
   "Finds Pets by status
-  Multiple status values can be provided with comma seperated strings"
+  Multiple status values can be provided with comma separated strings"
   ([] (find-pets-by-status nil))
   ([optional-params]
    (:data (find-pets-by-status-with-http-info optional-params))))
@@ -99,7 +120,7 @@
              :form-params   {}
              :content-types []
              :accepts       ["application/json" "application/xml"]
-             :auth-names    ["api_key"]}))
+             :auth-names    ["api_key" "petstore_auth"]}))
 
 (defn get-pet-by-id
   "Find pet by ID
@@ -107,6 +128,66 @@
   [pet-id ]
   (:data (get-pet-by-id-with-http-info pet-id)))
 
+(defn get-pet-by-id-in-object-with-http-info
+  "Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
+  Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions"
+  [pet-id ]
+  (call-api "/pet/{petId}?response=inline_arbitrary_object" :get
+            {:path-params   {"petId" pet-id }
+             :header-params {}
+             :query-params  {}
+             :form-params   {}
+             :content-types []
+             :accepts       ["application/json" "application/xml"]
+             :auth-names    ["api_key" "petstore_auth"]}))
+
+(defn get-pet-by-id-in-object
+  "Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
+  Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions"
+  [pet-id ]
+  (:data (get-pet-by-id-in-object-with-http-info pet-id)))
+
+(defn pet-pet-idtesting-byte-arraytrue-get-with-http-info
+  "Fake endpoint to test byte array return by 'Find pet by ID'
+  Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions"
+  [pet-id ]
+  (call-api "/pet/{petId}?testing_byte_array=true" :get
+            {:path-params   {"petId" pet-id }
+             :header-params {}
+             :query-params  {}
+             :form-params   {}
+             :content-types []
+             :accepts       ["application/json" "application/xml"]
+             :auth-names    ["api_key" "petstore_auth"]}))
+
+(defn pet-pet-idtesting-byte-arraytrue-get
+  "Fake endpoint to test byte array return by 'Find pet by ID'
+  Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions"
+  [pet-id ]
+  (:data (pet-pet-idtesting-byte-arraytrue-get-with-http-info pet-id)))
+
+(defn update-pet-with-http-info
+  "Update an existing pet
+  "
+  ([] (update-pet-with-http-info nil))
+  ([{:keys [body ]}]
+   (call-api "/pet" :put
+             {:path-params   {}
+              :header-params {}
+              :query-params  {}
+              :form-params   {}
+              :body-param    body
+              :content-types ["application/json" "application/xml"]
+              :accepts       ["application/json" "application/xml"]
+              :auth-names    ["petstore_auth"]})))
+
+(defn update-pet
+  "Update an existing pet
+  "
+  ([] (update-pet nil))
+  ([optional-params]
+   (:data (update-pet-with-http-info optional-params))))
+
 (defn update-pet-with-form-with-http-info
   "Updates a pet in the store with form data
   "
@@ -128,27 +209,6 @@
   ([pet-id optional-params]
    (:data (update-pet-with-form-with-http-info pet-id optional-params))))
 
-(defn delete-pet-with-http-info
-  "Deletes a pet
-  "
-  ([pet-id ] (delete-pet-with-http-info pet-id nil))
-  ([pet-id {:keys [api-key ]}]
-   (call-api "/pet/{petId}" :delete
-             {:path-params   {"petId" pet-id }
-              :header-params {"api_key" api-key }
-              :query-params  {}
-              :form-params   {}
-              :content-types []
-              :accepts       ["application/json" "application/xml"]
-              :auth-names    ["petstore_auth"]})))
-
-(defn delete-pet
-  "Deletes a pet
-  "
-  ([pet-id ] (delete-pet pet-id nil))
-  ([pet-id optional-params]
-   (:data (delete-pet-with-http-info pet-id optional-params))))
-
 (defn upload-file-with-http-info
   "uploads an image
   "
diff --git a/samples/client/petstore/clojure/src/swagger_petstore/api/store.clj b/samples/client/petstore/clojure/src/swagger_petstore/api/store.clj
index d3877e5887b..1e3cc25e4a6 100644
--- a/samples/client/petstore/clojure/src/swagger_petstore/api/store.clj
+++ b/samples/client/petstore/clojure/src/swagger_petstore/api/store.clj
@@ -2,6 +2,46 @@
   (:require [swagger-petstore.core :refer [call-api check-required-params with-collection-format]])
   (:import (java.io File)))
 
+(defn delete-order-with-http-info
+  "Delete purchase order by ID
+  For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors"
+  [order-id ]
+  (call-api "/store/order/{orderId}" :delete
+            {:path-params   {"orderId" order-id }
+             :header-params {}
+             :query-params  {}
+             :form-params   {}
+             :content-types []
+             :accepts       ["application/json" "application/xml"]
+             :auth-names    []}))
+
+(defn delete-order
+  "Delete purchase order by ID
+  For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors"
+  [order-id ]
+  (:data (delete-order-with-http-info order-id)))
+
+(defn find-orders-by-status-with-http-info
+  "Finds orders by status
+  A single status value can be provided as a string"
+  ([] (find-orders-by-status-with-http-info nil))
+  ([{:keys [status ]}]
+   (call-api "/store/findByStatus" :get
+             {:path-params   {}
+              :header-params {}
+              :query-params  {"status" status }
+              :form-params   {}
+              :content-types []
+              :accepts       ["application/json" "application/xml"]
+              :auth-names    ["test_api_client_id" "test_api_client_secret"]})))
+
+(defn find-orders-by-status
+  "Finds orders by status
+  A single status value can be provided as a string"
+  ([] (find-orders-by-status nil))
+  ([optional-params]
+   (:data (find-orders-by-status-with-http-info optional-params))))
+
 (defn get-inventory-with-http-info
   "Returns pet inventories by status
   Returns a map of status codes to quantities"
@@ -21,6 +61,44 @@
   []
   (:data (get-inventory-with-http-info)))
 
+(defn get-inventory-in-object-with-http-info
+  "Fake endpoint to test arbitrary object return by 'Get inventory'
+  Returns an arbitrary object which is actually a map of status codes to quantities"
+  []
+  (call-api "/store/inventory?response=arbitrary_object" :get
+            {:path-params   {}
+             :header-params {}
+             :query-params  {}
+             :form-params   {}
+             :content-types []
+             :accepts       ["application/json" "application/xml"]
+             :auth-names    ["api_key"]}))
+
+(defn get-inventory-in-object
+  "Fake endpoint to test arbitrary object return by 'Get inventory'
+  Returns an arbitrary object which is actually a map of status codes to quantities"
+  []
+  (:data (get-inventory-in-object-with-http-info)))
+
+(defn get-order-by-id-with-http-info
+  "Find purchase order by ID
+  For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions"
+  [order-id ]
+  (call-api "/store/order/{orderId}" :get
+            {:path-params   {"orderId" order-id }
+             :header-params {}
+             :query-params  {}
+             :form-params   {}
+             :content-types []
+             :accepts       ["application/json" "application/xml"]
+             :auth-names    ["test_api_key_header" "test_api_key_query"]}))
+
+(defn get-order-by-id
+  "Find purchase order by ID
+  For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions"
+  [order-id ]
+  (:data (get-order-by-id-with-http-info order-id)))
+
 (defn place-order-with-http-info
   "Place an order for a pet
   "
@@ -34,7 +112,7 @@
               :body-param    body
               :content-types []
               :accepts       ["application/json" "application/xml"]
-              :auth-names    []})))
+              :auth-names    ["test_api_client_id" "test_api_client_secret"]})))
 
 (defn place-order
   "Place an order for a pet
@@ -42,41 +120,3 @@
   ([] (place-order nil))
   ([optional-params]
    (:data (place-order-with-http-info optional-params))))
-
-(defn get-order-by-id-with-http-info
-  "Find purchase order by ID
-  For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions"
-  [order-id ]
-  (call-api "/store/order/{orderId}" :get
-            {:path-params   {"orderId" order-id }
-             :header-params {}
-             :query-params  {}
-             :form-params   {}
-             :content-types []
-             :accepts       ["application/json" "application/xml"]
-             :auth-names    []}))
-
-(defn get-order-by-id
-  "Find purchase order by ID
-  For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions"
-  [order-id ]
-  (:data (get-order-by-id-with-http-info order-id)))
-
-(defn delete-order-with-http-info
-  "Delete purchase order by ID
-  For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors"
-  [order-id ]
-  (call-api "/store/order/{orderId}" :delete
-            {:path-params   {"orderId" order-id }
-             :header-params {}
-             :query-params  {}
-             :form-params   {}
-             :content-types []
-             :accepts       ["application/json" "application/xml"]
-             :auth-names    []}))
-
-(defn delete-order
-  "Delete purchase order by ID
-  For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors"
-  [order-id ]
-  (:data (delete-order-with-http-info order-id)))
diff --git a/samples/client/petstore/clojure/src/swagger_petstore/api/user.clj b/samples/client/petstore/clojure/src/swagger_petstore/api/user.clj
index c25d97aa7c4..07b016d641a 100644
--- a/samples/client/petstore/clojure/src/swagger_petstore/api/user.clj
+++ b/samples/client/petstore/clojure/src/swagger_petstore/api/user.clj
@@ -68,6 +68,44 @@
   ([optional-params]
    (:data (create-users-with-list-input-with-http-info optional-params))))
 
+(defn delete-user-with-http-info
+  "Delete user
+  This can only be done by the logged in user."
+  [username ]
+  (call-api "/user/{username}" :delete
+            {:path-params   {"username" username }
+             :header-params {}
+             :query-params  {}
+             :form-params   {}
+             :content-types []
+             :accepts       ["application/json" "application/xml"]
+             :auth-names    []}))
+
+(defn delete-user
+  "Delete user
+  This can only be done by the logged in user."
+  [username ]
+  (:data (delete-user-with-http-info username)))
+
+(defn get-user-by-name-with-http-info
+  "Get user by user name
+  "
+  [username ]
+  (call-api "/user/{username}" :get
+            {:path-params   {"username" username }
+             :header-params {}
+             :query-params  {}
+             :form-params   {}
+             :content-types []
+             :accepts       ["application/json" "application/xml"]
+             :auth-names    []}))
+
+(defn get-user-by-name
+  "Get user by user name
+  "
+  [username ]
+  (:data (get-user-by-name-with-http-info username)))
+
 (defn login-user-with-http-info
   "Logs user into the system
   "
@@ -108,25 +146,6 @@
   []
   (:data (logout-user-with-http-info)))
 
-(defn get-user-by-name-with-http-info
-  "Get user by user name
-  "
-  [username ]
-  (call-api "/user/{username}" :get
-            {:path-params   {"username" username }
-             :header-params {}
-             :query-params  {}
-             :form-params   {}
-             :content-types []
-             :accepts       ["application/json" "application/xml"]
-             :auth-names    []}))
-
-(defn get-user-by-name
-  "Get user by user name
-  "
-  [username ]
-  (:data (get-user-by-name-with-http-info username)))
-
 (defn update-user-with-http-info
   "Updated user
   This can only be done by the logged in user."
@@ -148,22 +167,3 @@
   ([username ] (update-user username nil))
   ([username optional-params]
    (:data (update-user-with-http-info username optional-params))))
-
-(defn delete-user-with-http-info
-  "Delete user
-  This can only be done by the logged in user."
-  [username ]
-  (call-api "/user/{username}" :delete
-            {:path-params   {"username" username }
-             :header-params {}
-             :query-params  {}
-             :form-params   {}
-             :content-types []
-             :accepts       ["application/json" "application/xml"]
-             :auth-names    []}))
-
-(defn delete-user
-  "Delete user
-  This can only be done by the logged in user."
-  [username ]
-  (:data (delete-user-with-http-info username)))
diff --git a/samples/client/petstore/clojure/src/swagger_petstore/core.clj b/samples/client/petstore/clojure/src/swagger_petstore/core.clj
index 665adfbc775..f01f3061e0d 100644
--- a/samples/client/petstore/clojure/src/swagger_petstore/core.clj
+++ b/samples/client/petstore/clojure/src/swagger_petstore/core.clj
@@ -8,8 +8,12 @@
            (java.text SimpleDateFormat)))
 
 (def auth-definitions
-  {"petstore_auth" {:type :oauth2}
-   "api_key" {:type :api-key :in :header :param-name "api_key"}})
+  {"test_api_key_header" {:type :api-key :in :header :param-name "test_api_key_header"}
+   "api_key" {:type :api-key :in :header :param-name "api_key"}
+   "test_api_client_secret" {:type :api-key :in :header :param-name "x-test_api_client_secret"}
+   "test_api_client_id" {:type :api-key :in :header :param-name "x-test_api_client_id"}
+   "test_api_key_query" {:type :api-key :in :query :param-name "test_api_key_query"}
+   "petstore_auth" {:type :oauth2}})
 
 (def default-api-context
   "Default API context."
@@ -17,8 +21,12 @@
    :date-format     "yyyy-MM-dd"
    :datetime-format "yyyy-MM-dd'T'HH:mm:ss.SSSXXX"
    :debug           false
-   :auths           {"petstore_auth" nil
-                     "api_key" nil}})
+   :auths           {"test_api_key_header" nil
+                     "api_key" nil
+                     "test_api_client_secret" nil
+                     "test_api_client_id" nil
+                     "test_api_key_query" nil
+                     "petstore_auth" nil}})
 
 (def ^:dynamic *api-context*
   "Dynamic API context to be applied in API calls."
diff --git a/samples/client/petstore/clojure/test/swagger_petstore/core_test.clj b/samples/client/petstore/clojure/test/swagger_petstore/core_test.clj
index 87ac0a8b73d..220afbf9d62 100644
--- a/samples/client/petstore/clojure/test/swagger_petstore/core_test.clj
+++ b/samples/client/petstore/clojure/test/swagger_petstore/core_test.clj
@@ -11,7 +11,11 @@
             :datetime-format "yyyy-MM-dd'T'HH:mm:ss.SSSXXX"
             :debug           false
             :auths           {"api_key"       nil
-                              "petstore_auth" nil}}
+                              "petstore_auth" nil
+                              "test_api_client_id" nil
+                              "test_api_client_secret" nil
+                              "test_api_key_query" nil
+                              "test_api_key_header" nil}}
            default-api-context
            *api-context*
            (with-api-context {}
@@ -25,8 +29,9 @@
               :date-format     "yyyy-MM-dd"
               :datetime-format "yyyy-MM-dd'T'HH:mm:ss.SSSXXX"
               :debug           true
-              :auths           {"api_key"       "key1"
-                                "petstore_auth" "token1"}}
+              :auths           (merge (:auths default-api-context)
+                                      {"api_key"       "key1"
+                                       "petstore_auth" "token1"})}
              *api-context*))
       ;; nested with-api-context inherits values from the outer api context
       (with-api-context {:datetime-format "yyyy-MM-dd HH:mm:ss"
@@ -35,8 +40,9 @@
                 :date-format     "yyyy-MM-dd"
                 :datetime-format "yyyy-MM-dd HH:mm:ss"
                 :debug           true
-                :auths           {"api_key"       "key2"
-                                  "petstore_auth" "token1"}}
+                :auths           (merge (:auths default-api-context)
+                                        {"api_key"       "key2"
+                                         "petstore_auth" "token1"})}
                *api-context*))))
     ;; back to default api context
     (is (= {:base-url        "http://petstore.swagger.io/v2"
@@ -44,7 +50,11 @@
             :datetime-format "yyyy-MM-dd'T'HH:mm:ss.SSSXXX"
             :debug           false
             :auths           {"api_key"       nil
-                              "petstore_auth" nil}}
+                              "petstore_auth" nil
+                              "test_api_client_id" nil
+                              "test_api_client_secret" nil
+                              "test_api_key_query" nil
+                              "test_api_key_header" nil}}
            default-api-context
            *api-context*))))
 
diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/compile-mono.sh b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/compile-mono.sh
index bc4e0989945..352274186d2 100644
--- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/compile-mono.sh
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/compile-mono.sh
@@ -7,6 +7,6 @@ vendor/RestSharp.Net2.1.1.11/lib/net20/RestSharp.Net2.dll,\
 System.Runtime.Serialization.dll \
 -target:library \
 -out:bin/IO.Swagger.dll \
--recurse:src/*.cs \
+-recurse:'src/*.cs' \
 -doc:bin/IO.Swagger.xml \
--platform:anycpu
\ No newline at end of file
+-platform:anycpu
diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Api/PetApi.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Api/PetApi.cs
index 7db0f993846..b09b31264c3 100644
--- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Api/PetApi.cs
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Api/PetApi.cs
@@ -8,6 +8,9 @@ using IO.Swagger.Model;
 namespace IO.Swagger.Api
 {
     
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
     public interface IPetApi
     {
         
@@ -29,14 +32,14 @@ namespace IO.Swagger.Api
         /// Finds Pets by status Multiple status values can be provided with comma seperated strings
         /// </summary>
         /// <param name="status">Status values that need to be considered for filter</param>
-        /// <returns>List<Pet></returns>
+        /// <returns>List&lt;Pet&gt;</returns>
         List<Pet> FindPetsByStatus (List<string> status);
         
         /// <summary>
         /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
         /// </summary>
         /// <param name="tags">Tags to filter by</param>
-        /// <returns>List<Pet></returns>
+        /// <returns>List&lt;Pet&gt;</returns>
         List<Pet> FindPetsByTags (List<string> tags);
         
         /// <summary>
@@ -124,7 +127,7 @@ namespace IO.Swagger.Api
         /// <summary>
         /// Gets or sets the API client.
         /// </summary>
-        /// <value>An instance of the ApiClient</param>
+        /// <value>An instance of the ApiClient</value>
         public ApiClient ApiClient {get; set;}
     
         
@@ -212,7 +215,7 @@ namespace IO.Swagger.Api
         /// Finds Pets by status Multiple status values can be provided with comma seperated strings
         /// </summary>
         /// <param name="status">Status values that need to be considered for filter</param> 
-        /// <returns>List<Pet></returns>            
+        /// <returns>List&lt;Pet&gt;</returns>            
         public List<Pet> FindPetsByStatus (List<string> status)
         {
             
@@ -252,7 +255,7 @@ namespace IO.Swagger.Api
         /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
         /// </summary>
         /// <param name="tags">Tags to filter by</param> 
-        /// <returns>List<Pet></returns>            
+        /// <returns>List&lt;Pet&gt;</returns>            
         public List<Pet> FindPetsByTags (List<string> tags)
         {
             
diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Api/StoreApi.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Api/StoreApi.cs
index c6c90631bef..ba269cc2b0c 100644
--- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Api/StoreApi.cs
@@ -8,13 +8,16 @@ using IO.Swagger.Model;
 namespace IO.Swagger.Api
 {
     
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
     public interface IStoreApi
     {
         
         /// <summary>
         /// Returns pet inventories by status Returns a map of status codes to quantities
         /// </summary>
-        /// <returns>Dictionary<String, int?></returns>
+        /// <returns>Dictionary&lt;String, int?&gt;</returns>
         Dictionary<String, int?> GetInventory ();
         
         /// <summary>
@@ -90,14 +93,14 @@ namespace IO.Swagger.Api
         /// <summary>
         /// Gets or sets the API client.
         /// </summary>
-        /// <value>An instance of the ApiClient</param>
+        /// <value>An instance of the ApiClient</value>
         public ApiClient ApiClient {get; set;}
     
         
         /// <summary>
         /// Returns pet inventories by status Returns a map of status codes to quantities
         /// </summary>
-        /// <returns>Dictionary<String, int?></returns>            
+        /// <returns>Dictionary&lt;String, int?&gt;</returns>            
         public Dictionary<String, int?> GetInventory ()
         {
             
diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Api/UserApi.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Api/UserApi.cs
index 3e3c8869d04..1374556698e 100644
--- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Api/UserApi.cs
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Api/UserApi.cs
@@ -8,6 +8,9 @@ using IO.Swagger.Model;
 namespace IO.Swagger.Api
 {
     
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
     public interface IUserApi
     {
         
@@ -120,7 +123,7 @@ namespace IO.Swagger.Api
         /// <summary>
         /// Gets or sets the API client.
         /// </summary>
-        /// <value>An instance of the ApiClient</param>
+        /// <value>An instance of the ApiClient</value>
         public ApiClient ApiClient {get; set;}
     
         
diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Client/ApiClient.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Client/ApiClient.cs
index 56331e606a9..3041cde567e 100644
--- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Client/ApiClient.cs
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Client/ApiClient.cs
@@ -159,6 +159,7 @@ namespace IO.Swagger.Client
         /// </summary>
         /// <param name="content">HTTP body (e.g. string, JSON).</param>
         /// <param name="type">Object type.</param>
+        /// <param name="headers">HTTP headers.</param>
         /// <returns>Object representation of the JSON string.</returns>
         public object Deserialize(string content, Type type, IList<Parameter> headers=null)
         {
diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Client/ApiException.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Client/ApiException.cs
index ff0b4be791e..dfc5fd9fc03 100644
--- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Client/ApiException.cs
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Client/ApiException.cs
@@ -20,7 +20,6 @@ namespace IO.Swagger.Client {
       /// <summary>
       /// Initializes a new instance of the <see cref="ApiException"/> class.
       /// </summary>
-      /// <param name="basePath">The base path.</param>
       public ApiException() {}
 
       /// <summary>
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/CategoryTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/CategoryTests.cs
new file mode 100644
index 00000000000..e0216f3fb0f
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/CategoryTests.cs
@@ -0,0 +1,75 @@
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using IO.Swagger.Api;
+using IO.Swagger.Model;
+using IO.Swagger.Client;
+using System.Reflection;
+
+namespace IO.Swagger.Test
+{
+    /// <summary>
+    ///  Class for testing Category
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by Swagger Codegen.
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class CategoryTests
+    {
+        private Category instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            instance = new Category();
+        }
+    
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }   
+
+        /// <summary>
+        /// Test an instance of Category
+        /// </summary>
+        [Test]
+        public void CategoryInstanceTest()
+        {
+            Assert.IsInstanceOf<Category> (instance, "instance is a Category");
+        }
+
+        
+        /// <summary>
+        /// Test the property 'Id' 
+        /// </summary>
+        [Test]
+        public void IdTest()
+        {
+            // TODO: unit test for the property 'Id' 
+        }
+        
+        /// <summary>
+        /// Test the property 'Name' 
+        /// </summary>
+        [Test]
+        public void NameTest()
+        {
+            // TODO: unit test for the property 'Name' 
+        }
+        
+
+    }
+
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/InlineResponse200Tests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/InlineResponse200Tests.cs
new file mode 100644
index 00000000000..34cd5b1beb5
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/InlineResponse200Tests.cs
@@ -0,0 +1,111 @@
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using IO.Swagger.Api;
+using IO.Swagger.Model;
+using IO.Swagger.Client;
+using System.Reflection;
+
+namespace IO.Swagger.Test
+{
+    /// <summary>
+    ///  Class for testing InlineResponse200
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by Swagger Codegen.
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class InlineResponse200Tests
+    {
+        private InlineResponse200 instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            instance = new InlineResponse200();
+        }
+    
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }   
+
+        /// <summary>
+        /// Test an instance of InlineResponse200
+        /// </summary>
+        [Test]
+        public void InlineResponse200InstanceTest()
+        {
+            Assert.IsInstanceOf<InlineResponse200> (instance, "instance is a InlineResponse200");
+        }
+
+        
+        /// <summary>
+        /// Test the property 'Tags' 
+        /// </summary>
+        [Test]
+        public void TagsTest()
+        {
+            // TODO: unit test for the property 'Tags' 
+        }
+        
+        /// <summary>
+        /// Test the property 'Id' 
+        /// </summary>
+        [Test]
+        public void IdTest()
+        {
+            // TODO: unit test for the property 'Id' 
+        }
+        
+        /// <summary>
+        /// Test the property 'Category' 
+        /// </summary>
+        [Test]
+        public void CategoryTest()
+        {
+            // TODO: unit test for the property 'Category' 
+        }
+        
+        /// <summary>
+        /// Test the property 'Status' 
+        /// </summary>
+        [Test]
+        public void StatusTest()
+        {
+            // TODO: unit test for the property 'Status' 
+        }
+        
+        /// <summary>
+        /// Test the property 'Name' 
+        /// </summary>
+        [Test]
+        public void NameTest()
+        {
+            // TODO: unit test for the property 'Name' 
+        }
+        
+        /// <summary>
+        /// Test the property 'PhotoUrls' 
+        /// </summary>
+        [Test]
+        public void PhotoUrlsTest()
+        {
+            // TODO: unit test for the property 'PhotoUrls' 
+        }
+        
+
+    }
+
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/Model200ResponseTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/Model200ResponseTests.cs
new file mode 100644
index 00000000000..00c583ec019
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/Model200ResponseTests.cs
@@ -0,0 +1,66 @@
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using IO.Swagger.Api;
+using IO.Swagger.Model;
+using IO.Swagger.Client;
+using System.Reflection;
+
+namespace IO.Swagger.Test
+{
+    /// <summary>
+    ///  Class for testing Model200Response
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by Swagger Codegen.
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class Model200ResponseTests
+    {
+        private Model200Response instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            instance = new Model200Response();
+        }
+    
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }   
+
+        /// <summary>
+        /// Test an instance of Model200Response
+        /// </summary>
+        [Test]
+        public void Model200ResponseInstanceTest()
+        {
+            Assert.IsInstanceOf<Model200Response> (instance, "instance is a Model200Response");
+        }
+
+        
+        /// <summary>
+        /// Test the property 'Name' 
+        /// </summary>
+        [Test]
+        public void NameTest()
+        {
+            // TODO: unit test for the property 'Name' 
+        }
+        
+
+    }
+
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/ModelReturnTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/ModelReturnTests.cs
new file mode 100644
index 00000000000..ed64fa0d8c8
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/ModelReturnTests.cs
@@ -0,0 +1,66 @@
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using IO.Swagger.Api;
+using IO.Swagger.Model;
+using IO.Swagger.Client;
+using System.Reflection;
+
+namespace IO.Swagger.Test
+{
+    /// <summary>
+    ///  Class for testing ModelReturn
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by Swagger Codegen.
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class ModelReturnTests
+    {
+        private ModelReturn instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            instance = new ModelReturn();
+        }
+    
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }   
+
+        /// <summary>
+        /// Test an instance of ModelReturn
+        /// </summary>
+        [Test]
+        public void ModelReturnInstanceTest()
+        {
+            Assert.IsInstanceOf<ModelReturn> (instance, "instance is a ModelReturn");
+        }
+
+        
+        /// <summary>
+        /// Test the property '_Return' 
+        /// </summary>
+        [Test]
+        public void _ReturnTest()
+        {
+            // TODO: unit test for the property '_Return' 
+        }
+        
+
+    }
+
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/NameTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/NameTests.cs
new file mode 100644
index 00000000000..561197ab9f1
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/NameTests.cs
@@ -0,0 +1,75 @@
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using IO.Swagger.Api;
+using IO.Swagger.Model;
+using IO.Swagger.Client;
+using System.Reflection;
+
+namespace IO.Swagger.Test
+{
+    /// <summary>
+    ///  Class for testing Name
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by Swagger Codegen.
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class NameTests
+    {
+        private Name instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            instance = new Name();
+        }
+    
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }   
+
+        /// <summary>
+        /// Test an instance of Name
+        /// </summary>
+        [Test]
+        public void NameInstanceTest()
+        {
+            Assert.IsInstanceOf<Name> (instance, "instance is a Name");
+        }
+
+        
+        /// <summary>
+        /// Test the property '_Name' 
+        /// </summary>
+        [Test]
+        public void _NameTest()
+        {
+            // TODO: unit test for the property '_Name' 
+        }
+        
+        /// <summary>
+        /// Test the property 'SnakeCase' 
+        /// </summary>
+        [Test]
+        public void SnakeCaseTest()
+        {
+            // TODO: unit test for the property 'SnakeCase' 
+        }
+        
+
+    }
+
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/OrderTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/OrderTests.cs
new file mode 100644
index 00000000000..b9540112766
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/OrderTests.cs
@@ -0,0 +1,111 @@
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using IO.Swagger.Api;
+using IO.Swagger.Model;
+using IO.Swagger.Client;
+using System.Reflection;
+
+namespace IO.Swagger.Test
+{
+    /// <summary>
+    ///  Class for testing Order
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by Swagger Codegen.
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class OrderTests
+    {
+        private Order instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            instance = new Order();
+        }
+    
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }   
+
+        /// <summary>
+        /// Test an instance of Order
+        /// </summary>
+        [Test]
+        public void OrderInstanceTest()
+        {
+            Assert.IsInstanceOf<Order> (instance, "instance is a Order");
+        }
+
+        
+        /// <summary>
+        /// Test the property 'Id' 
+        /// </summary>
+        [Test]
+        public void IdTest()
+        {
+            // TODO: unit test for the property 'Id' 
+        }
+        
+        /// <summary>
+        /// Test the property 'PetId' 
+        /// </summary>
+        [Test]
+        public void PetIdTest()
+        {
+            // TODO: unit test for the property 'PetId' 
+        }
+        
+        /// <summary>
+        /// Test the property 'Quantity' 
+        /// </summary>
+        [Test]
+        public void QuantityTest()
+        {
+            // TODO: unit test for the property 'Quantity' 
+        }
+        
+        /// <summary>
+        /// Test the property 'ShipDate' 
+        /// </summary>
+        [Test]
+        public void ShipDateTest()
+        {
+            // TODO: unit test for the property 'ShipDate' 
+        }
+        
+        /// <summary>
+        /// Test the property 'Status' 
+        /// </summary>
+        [Test]
+        public void StatusTest()
+        {
+            // TODO: unit test for the property 'Status' 
+        }
+        
+        /// <summary>
+        /// Test the property 'Complete' 
+        /// </summary>
+        [Test]
+        public void CompleteTest()
+        {
+            // TODO: unit test for the property 'Complete' 
+        }
+        
+
+    }
+
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/PetApiTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/PetApiTests.cs
new file mode 100644
index 00000000000..081e046118f
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/PetApiTests.cs
@@ -0,0 +1,206 @@
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reflection;
+using RestSharp;
+using NUnit.Framework;
+
+using IO.Swagger.Client;
+using IO.Swagger.Api;
+using IO.Swagger.Model;
+
+namespace IO.Swagger.Test
+{
+    /// <summary>
+    ///  Class for testing PetApi
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by Swagger Codegen.
+    /// Please update the test case below to test the API endpoint.
+    /// </remarks>
+    [TestFixture]
+    public class PetApiTests
+    {
+        private PetApi instance;
+
+        /// <summary>
+        /// Setup before each unit test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+           instance = new PetApi();
+        }
+
+        /// <summary>
+        /// Clean up after each unit test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of PetApi
+        /// </summary>
+        [Test]
+        public void InstanceTest()
+        {
+            Assert.IsInstanceOf<PetApi> (instance, "instance is a PetApi");
+        }
+
+        
+        /// <summary>
+        /// Test AddPet
+        /// </summary>
+        [Test]
+        public void AddPetTest()
+        {
+            // TODO: add unit test for the method 'AddPet'
+            Pet body = null; // TODO: replace null with proper value
+            
+            instance.AddPet(body);
+             
+        }
+        
+        /// <summary>
+        /// Test AddPetUsingByteArray
+        /// </summary>
+        [Test]
+        public void AddPetUsingByteArrayTest()
+        {
+            // TODO: add unit test for the method 'AddPetUsingByteArray'
+            byte[] body = null; // TODO: replace null with proper value
+            
+            instance.AddPetUsingByteArray(body);
+             
+        }
+        
+        /// <summary>
+        /// Test DeletePet
+        /// </summary>
+        [Test]
+        public void DeletePetTest()
+        {
+            // TODO: add unit test for the method 'DeletePet'
+            long? petId = null; // TODO: replace null with proper value
+            string apiKey = null; // TODO: replace null with proper value
+            
+            instance.DeletePet(petId, apiKey);
+             
+        }
+        
+        /// <summary>
+        /// Test FindPetsByStatus
+        /// </summary>
+        [Test]
+        public void FindPetsByStatusTest()
+        {
+            // TODO: add unit test for the method 'FindPetsByStatus'
+            List<string> status = null; // TODO: replace null with proper value
+            
+            var response = instance.FindPetsByStatus(status);
+            Assert.IsInstanceOf<List<Pet>> (response, "response is List<Pet>"); 
+        }
+        
+        /// <summary>
+        /// Test FindPetsByTags
+        /// </summary>
+        [Test]
+        public void FindPetsByTagsTest()
+        {
+            // TODO: add unit test for the method 'FindPetsByTags'
+            List<string> tags = null; // TODO: replace null with proper value
+            
+            var response = instance.FindPetsByTags(tags);
+            Assert.IsInstanceOf<List<Pet>> (response, "response is List<Pet>"); 
+        }
+        
+        /// <summary>
+        /// Test GetPetById
+        /// </summary>
+        [Test]
+        public void GetPetByIdTest()
+        {
+            // TODO: add unit test for the method 'GetPetById'
+            long? petId = null; // TODO: replace null with proper value
+            
+            var response = instance.GetPetById(petId);
+            Assert.IsInstanceOf<Pet> (response, "response is Pet"); 
+        }
+        
+        /// <summary>
+        /// Test GetPetByIdInObject
+        /// </summary>
+        [Test]
+        public void GetPetByIdInObjectTest()
+        {
+            // TODO: add unit test for the method 'GetPetByIdInObject'
+            long? petId = null; // TODO: replace null with proper value
+            
+            var response = instance.GetPetByIdInObject(petId);
+            Assert.IsInstanceOf<InlineResponse200> (response, "response is InlineResponse200"); 
+        }
+        
+        /// <summary>
+        /// Test PetPetIdtestingByteArraytrueGet
+        /// </summary>
+        [Test]
+        public void PetPetIdtestingByteArraytrueGetTest()
+        {
+            // TODO: add unit test for the method 'PetPetIdtestingByteArraytrueGet'
+            long? petId = null; // TODO: replace null with proper value
+            
+            var response = instance.PetPetIdtestingByteArraytrueGet(petId);
+            Assert.IsInstanceOf<byte[]> (response, "response is byte[]"); 
+        }
+        
+        /// <summary>
+        /// Test UpdatePet
+        /// </summary>
+        [Test]
+        public void UpdatePetTest()
+        {
+            // TODO: add unit test for the method 'UpdatePet'
+            Pet body = null; // TODO: replace null with proper value
+            
+            instance.UpdatePet(body);
+             
+        }
+        
+        /// <summary>
+        /// Test UpdatePetWithForm
+        /// </summary>
+        [Test]
+        public void UpdatePetWithFormTest()
+        {
+            // TODO: add unit test for the method 'UpdatePetWithForm'
+            string petId = null; // TODO: replace null with proper value
+            string name = null; // TODO: replace null with proper value
+            string status = null; // TODO: replace null with proper value
+            
+            instance.UpdatePetWithForm(petId, name, status);
+             
+        }
+        
+        /// <summary>
+        /// Test UploadFile
+        /// </summary>
+        [Test]
+        public void UploadFileTest()
+        {
+            // TODO: add unit test for the method 'UploadFile'
+            long? petId = null; // TODO: replace null with proper value
+            string additionalMetadata = null; // TODO: replace null with proper value
+            Stream file = null; // TODO: replace null with proper value
+            
+            instance.UploadFile(petId, additionalMetadata, file);
+             
+        }
+        
+    }
+
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/PetTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/PetTests.cs
new file mode 100644
index 00000000000..ebbf7476264
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/PetTests.cs
@@ -0,0 +1,111 @@
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using IO.Swagger.Api;
+using IO.Swagger.Model;
+using IO.Swagger.Client;
+using System.Reflection;
+
+namespace IO.Swagger.Test
+{
+    /// <summary>
+    ///  Class for testing Pet
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by Swagger Codegen.
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class PetTests
+    {
+        private Pet instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            instance = new Pet();
+        }
+    
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }   
+
+        /// <summary>
+        /// Test an instance of Pet
+        /// </summary>
+        [Test]
+        public void PetInstanceTest()
+        {
+            Assert.IsInstanceOf<Pet> (instance, "instance is a Pet");
+        }
+
+        
+        /// <summary>
+        /// Test the property 'Id' 
+        /// </summary>
+        [Test]
+        public void IdTest()
+        {
+            // TODO: unit test for the property 'Id' 
+        }
+        
+        /// <summary>
+        /// Test the property 'Category' 
+        /// </summary>
+        [Test]
+        public void CategoryTest()
+        {
+            // TODO: unit test for the property 'Category' 
+        }
+        
+        /// <summary>
+        /// Test the property 'Name' 
+        /// </summary>
+        [Test]
+        public void NameTest()
+        {
+            // TODO: unit test for the property 'Name' 
+        }
+        
+        /// <summary>
+        /// Test the property 'PhotoUrls' 
+        /// </summary>
+        [Test]
+        public void PhotoUrlsTest()
+        {
+            // TODO: unit test for the property 'PhotoUrls' 
+        }
+        
+        /// <summary>
+        /// Test the property 'Tags' 
+        /// </summary>
+        [Test]
+        public void TagsTest()
+        {
+            // TODO: unit test for the property 'Tags' 
+        }
+        
+        /// <summary>
+        /// Test the property 'Status' 
+        /// </summary>
+        [Test]
+        public void StatusTest()
+        {
+            // TODO: unit test for the property 'Status' 
+        }
+        
+
+    }
+
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/SpecialModelNameTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/SpecialModelNameTests.cs
new file mode 100644
index 00000000000..92acadc9404
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/SpecialModelNameTests.cs
@@ -0,0 +1,66 @@
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using IO.Swagger.Api;
+using IO.Swagger.Model;
+using IO.Swagger.Client;
+using System.Reflection;
+
+namespace IO.Swagger.Test
+{
+    /// <summary>
+    ///  Class for testing SpecialModelName
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by Swagger Codegen.
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class SpecialModelNameTests
+    {
+        private SpecialModelName instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            instance = new SpecialModelName();
+        }
+    
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }   
+
+        /// <summary>
+        /// Test an instance of SpecialModelName
+        /// </summary>
+        [Test]
+        public void SpecialModelNameInstanceTest()
+        {
+            Assert.IsInstanceOf<SpecialModelName> (instance, "instance is a SpecialModelName");
+        }
+
+        
+        /// <summary>
+        /// Test the property 'SpecialPropertyName' 
+        /// </summary>
+        [Test]
+        public void SpecialPropertyNameTest()
+        {
+            // TODO: unit test for the property 'SpecialPropertyName' 
+        }
+        
+
+    }
+
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/StoreApiTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/StoreApiTests.cs
new file mode 100644
index 00000000000..435da36ef02
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/StoreApiTests.cs
@@ -0,0 +1,134 @@
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reflection;
+using RestSharp;
+using NUnit.Framework;
+
+using IO.Swagger.Client;
+using IO.Swagger.Api;
+using IO.Swagger.Model;
+
+namespace IO.Swagger.Test
+{
+    /// <summary>
+    ///  Class for testing StoreApi
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by Swagger Codegen.
+    /// Please update the test case below to test the API endpoint.
+    /// </remarks>
+    [TestFixture]
+    public class StoreApiTests
+    {
+        private StoreApi instance;
+
+        /// <summary>
+        /// Setup before each unit test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+           instance = new StoreApi();
+        }
+
+        /// <summary>
+        /// Clean up after each unit test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of StoreApi
+        /// </summary>
+        [Test]
+        public void InstanceTest()
+        {
+            Assert.IsInstanceOf<StoreApi> (instance, "instance is a StoreApi");
+        }
+
+        
+        /// <summary>
+        /// Test DeleteOrder
+        /// </summary>
+        [Test]
+        public void DeleteOrderTest()
+        {
+            // TODO: add unit test for the method 'DeleteOrder'
+            string orderId = null; // TODO: replace null with proper value
+            
+            instance.DeleteOrder(orderId);
+             
+        }
+        
+        /// <summary>
+        /// Test FindOrdersByStatus
+        /// </summary>
+        [Test]
+        public void FindOrdersByStatusTest()
+        {
+            // TODO: add unit test for the method 'FindOrdersByStatus'
+            string status = null; // TODO: replace null with proper value
+            
+            var response = instance.FindOrdersByStatus(status);
+            Assert.IsInstanceOf<List<Order>> (response, "response is List<Order>"); 
+        }
+        
+        /// <summary>
+        /// Test GetInventory
+        /// </summary>
+        [Test]
+        public void GetInventoryTest()
+        {
+            // TODO: add unit test for the method 'GetInventory'
+            
+            var response = instance.GetInventory();
+            Assert.IsInstanceOf<Dictionary<string, int?>> (response, "response is Dictionary<string, int?>"); 
+        }
+        
+        /// <summary>
+        /// Test GetInventoryInObject
+        /// </summary>
+        [Test]
+        public void GetInventoryInObjectTest()
+        {
+            // TODO: add unit test for the method 'GetInventoryInObject'
+            
+            var response = instance.GetInventoryInObject();
+            Assert.IsInstanceOf<Object> (response, "response is Object"); 
+        }
+        
+        /// <summary>
+        /// Test GetOrderById
+        /// </summary>
+        [Test]
+        public void GetOrderByIdTest()
+        {
+            // TODO: add unit test for the method 'GetOrderById'
+            string orderId = null; // TODO: replace null with proper value
+            
+            var response = instance.GetOrderById(orderId);
+            Assert.IsInstanceOf<Order> (response, "response is Order"); 
+        }
+        
+        /// <summary>
+        /// Test PlaceOrder
+        /// </summary>
+        [Test]
+        public void PlaceOrderTest()
+        {
+            // TODO: add unit test for the method 'PlaceOrder'
+            Order body = null; // TODO: replace null with proper value
+            
+            var response = instance.PlaceOrder(body);
+            Assert.IsInstanceOf<Order> (response, "response is Order"); 
+        }
+        
+    }
+
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/TagTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/TagTests.cs
new file mode 100644
index 00000000000..36ca5b5c0c9
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/TagTests.cs
@@ -0,0 +1,75 @@
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using IO.Swagger.Api;
+using IO.Swagger.Model;
+using IO.Swagger.Client;
+using System.Reflection;
+
+namespace IO.Swagger.Test
+{
+    /// <summary>
+    ///  Class for testing Tag
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by Swagger Codegen.
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class TagTests
+    {
+        private Tag instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            instance = new Tag();
+        }
+    
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }   
+
+        /// <summary>
+        /// Test an instance of Tag
+        /// </summary>
+        [Test]
+        public void TagInstanceTest()
+        {
+            Assert.IsInstanceOf<Tag> (instance, "instance is a Tag");
+        }
+
+        
+        /// <summary>
+        /// Test the property 'Id' 
+        /// </summary>
+        [Test]
+        public void IdTest()
+        {
+            // TODO: unit test for the property 'Id' 
+        }
+        
+        /// <summary>
+        /// Test the property 'Name' 
+        /// </summary>
+        [Test]
+        public void NameTest()
+        {
+            // TODO: unit test for the property 'Name' 
+        }
+        
+
+    }
+
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/UserApiTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/UserApiTests.cs
new file mode 100644
index 00000000000..46ff75386d7
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/UserApiTests.cs
@@ -0,0 +1,163 @@
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reflection;
+using RestSharp;
+using NUnit.Framework;
+
+using IO.Swagger.Client;
+using IO.Swagger.Api;
+using IO.Swagger.Model;
+
+namespace IO.Swagger.Test
+{
+    /// <summary>
+    ///  Class for testing UserApi
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by Swagger Codegen.
+    /// Please update the test case below to test the API endpoint.
+    /// </remarks>
+    [TestFixture]
+    public class UserApiTests
+    {
+        private UserApi instance;
+
+        /// <summary>
+        /// Setup before each unit test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+           instance = new UserApi();
+        }
+
+        /// <summary>
+        /// Clean up after each unit test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of UserApi
+        /// </summary>
+        [Test]
+        public void InstanceTest()
+        {
+            Assert.IsInstanceOf<UserApi> (instance, "instance is a UserApi");
+        }
+
+        
+        /// <summary>
+        /// Test CreateUser
+        /// </summary>
+        [Test]
+        public void CreateUserTest()
+        {
+            // TODO: add unit test for the method 'CreateUser'
+            User body = null; // TODO: replace null with proper value
+            
+            instance.CreateUser(body);
+             
+        }
+        
+        /// <summary>
+        /// Test CreateUsersWithArrayInput
+        /// </summary>
+        [Test]
+        public void CreateUsersWithArrayInputTest()
+        {
+            // TODO: add unit test for the method 'CreateUsersWithArrayInput'
+            List<User> body = null; // TODO: replace null with proper value
+            
+            instance.CreateUsersWithArrayInput(body);
+             
+        }
+        
+        /// <summary>
+        /// Test CreateUsersWithListInput
+        /// </summary>
+        [Test]
+        public void CreateUsersWithListInputTest()
+        {
+            // TODO: add unit test for the method 'CreateUsersWithListInput'
+            List<User> body = null; // TODO: replace null with proper value
+            
+            instance.CreateUsersWithListInput(body);
+             
+        }
+        
+        /// <summary>
+        /// Test DeleteUser
+        /// </summary>
+        [Test]
+        public void DeleteUserTest()
+        {
+            // TODO: add unit test for the method 'DeleteUser'
+            string username = null; // TODO: replace null with proper value
+            
+            instance.DeleteUser(username);
+             
+        }
+        
+        /// <summary>
+        /// Test GetUserByName
+        /// </summary>
+        [Test]
+        public void GetUserByNameTest()
+        {
+            // TODO: add unit test for the method 'GetUserByName'
+            string username = null; // TODO: replace null with proper value
+            
+            var response = instance.GetUserByName(username);
+            Assert.IsInstanceOf<User> (response, "response is User"); 
+        }
+        
+        /// <summary>
+        /// Test LoginUser
+        /// </summary>
+        [Test]
+        public void LoginUserTest()
+        {
+            // TODO: add unit test for the method 'LoginUser'
+            string username = null; // TODO: replace null with proper value
+            string password = null; // TODO: replace null with proper value
+            
+            var response = instance.LoginUser(username, password);
+            Assert.IsInstanceOf<string> (response, "response is string"); 
+        }
+        
+        /// <summary>
+        /// Test LogoutUser
+        /// </summary>
+        [Test]
+        public void LogoutUserTest()
+        {
+            // TODO: add unit test for the method 'LogoutUser'
+            
+            instance.LogoutUser();
+             
+        }
+        
+        /// <summary>
+        /// Test UpdateUser
+        /// </summary>
+        [Test]
+        public void UpdateUserTest()
+        {
+            // TODO: add unit test for the method 'UpdateUser'
+            string username = null; // TODO: replace null with proper value
+            User body = null; // TODO: replace null with proper value
+            
+            instance.UpdateUser(username, body);
+             
+        }
+        
+    }
+
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/UserTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/UserTests.cs
new file mode 100644
index 00000000000..645a4a9c69c
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/UserTests.cs
@@ -0,0 +1,129 @@
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using IO.Swagger.Api;
+using IO.Swagger.Model;
+using IO.Swagger.Client;
+using System.Reflection;
+
+namespace IO.Swagger.Test
+{
+    /// <summary>
+    ///  Class for testing User
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by Swagger Codegen.
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class UserTests
+    {
+        private User instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            instance = new User();
+        }
+    
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }   
+
+        /// <summary>
+        /// Test an instance of User
+        /// </summary>
+        [Test]
+        public void UserInstanceTest()
+        {
+            Assert.IsInstanceOf<User> (instance, "instance is a User");
+        }
+
+        
+        /// <summary>
+        /// Test the property 'Id' 
+        /// </summary>
+        [Test]
+        public void IdTest()
+        {
+            // TODO: unit test for the property 'Id' 
+        }
+        
+        /// <summary>
+        /// Test the property 'Username' 
+        /// </summary>
+        [Test]
+        public void UsernameTest()
+        {
+            // TODO: unit test for the property 'Username' 
+        }
+        
+        /// <summary>
+        /// Test the property 'FirstName' 
+        /// </summary>
+        [Test]
+        public void FirstNameTest()
+        {
+            // TODO: unit test for the property 'FirstName' 
+        }
+        
+        /// <summary>
+        /// Test the property 'LastName' 
+        /// </summary>
+        [Test]
+        public void LastNameTest()
+        {
+            // TODO: unit test for the property 'LastName' 
+        }
+        
+        /// <summary>
+        /// Test the property 'Email' 
+        /// </summary>
+        [Test]
+        public void EmailTest()
+        {
+            // TODO: unit test for the property 'Email' 
+        }
+        
+        /// <summary>
+        /// Test the property 'Password' 
+        /// </summary>
+        [Test]
+        public void PasswordTest()
+        {
+            // TODO: unit test for the property 'Password' 
+        }
+        
+        /// <summary>
+        /// Test the property 'Phone' 
+        /// </summary>
+        [Test]
+        public void PhoneTest()
+        {
+            // TODO: unit test for the property 'Phone' 
+        }
+        
+        /// <summary>
+        /// Test the property 'UserStatus' 
+        /// </summary>
+        [Test]
+        public void UserStatusTest()
+        {
+            // TODO: unit test for the property 'UserStatus' 
+        }
+        
+
+    }
+
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/.gitignore b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/.gitignore
new file mode 100644
index 00000000000..754beb8bedc
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/.gitignore
@@ -0,0 +1,185 @@
+# Ref: https://gist.github.com/kmorcinek/2710267
+# Download this file using PowerShell v3 under Windows with the following comand
+# Invoke-WebRequest https://gist.githubusercontent.com/kmorcinek/2710267/raw/ -OutFile .gitignore
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+
+[Dd]ebug/
+[Rr]elease/
+x64/
+build/
+[Bb]in/
+[Oo]bj/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.log
+*.scc
+
+# OS generated files #
+.DS_Store*
+ehthumbs.db
+Icon?
+Thumbs.db
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.Publish.xml
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql/
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.[Pp]ublish.xml
+*.pfx
+*.publishsettings
+modulesbin/
+tempbin/
+
+# EPiServer Site file (VPP)
+AppData/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# vim
+*.txt~
+*.swp
+*.swo
+ 
+ # svn
+ .svn
+
+ # SQL Server files
+ **/App_Data/*.mdf
+ **/App_Data/*.ldf
+ **/App_Data/*.sdf
+
+
+ #LightSwitch generated files
+ GeneratedArtifacts/
+ _Pvt_Extensions/
+ ModelManifest.xml
+
+ # =========================
+ # Windows detritus
+ # =========================
+
+ # Windows image file caches
+ Thumbs.db
+ ehthumbs.db
+
+ # Folder config file
+ Desktop.ini
+
+ # Recycle Bin used on file shares
+ $RECYCLE.BIN/
+
+ # Mac desktop service store files
+ .DS_Store
+
+ # SASS Compiler cache
+ .sass-cache
+
+ # Visual Studio 2014 CTP
+ **/*.sln.ide
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/README.md b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/README.md
index bbab203d23f..794a7c49b1b 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/README.md
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/README.md
@@ -1,15 +1,22 @@
 ## Frameworks supported
-- .NET 3.5 or later
+- .NET 4.0 or later
 - Windows Phone 7.1 (Mango)
 
 ## Dependencies
-- [RestSharp] (https://www.nuget.org/packages/RestSharp)
-- [Json.NET] (https://www.nuget.org/packages/Newtonsoft.Json/)
+- [RestSharp] (https://www.nuget.org/packages/RestSharp) - 105.1.0 or later
+- [Json.NET] (https://www.nuget.org/packages/Newtonsoft.Json/) - 7.0.0 or later 
 
-
-NOTE: The DLLs included in the package may not be the latest version. We recommned using [NuGet] (https://docs.nuget.org/consume/installing-nuget) to obtain the latest version of the packages:
+The DLLs included in the package may not be the latest version. We recommned using [NuGet] (https://docs.nuget.org/consume/installing-nuget) to obtain the latest version of the packages:
 ```
 Install-Package RestSharp
 Install-Package Newtonsoft.Json
-``` 
+```
 
+NOTE: RestSharp versions greater than 105.1.0 have a bug which causes file uploads to fail. See [RestSharp#742](https://github.com/restsharp/RestSharp/issues/742)
+
+## Installation
+Run the following command to generate the DLL
+- [Mac/Linux] compile-mono.sh
+- [Windows] compile.bat
+
+Then include the DLL (under the `bin` folder) in the C# project
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/bin/Newtonsoft.Json.dll b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/bin/Newtonsoft.Json.dll
index ae725c4b598..4d42dd9c5fe 100644
Binary files a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/bin/Newtonsoft.Json.dll and b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/bin/Newtonsoft.Json.dll differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/bin/RestSharp.dll b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/bin/RestSharp.dll
index a7331ed6e23..59d82f94198 100644
Binary files a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/bin/RestSharp.dll and b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/bin/RestSharp.dll differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/compile-mono.sh b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/compile-mono.sh
new file mode 100755
index 00000000000..d768c892f31
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/compile-mono.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+frameworkVersion=net45
+netfx=${frameworkVersion#net}
+
+wget -nc https://nuget.org/nuget.exe;
+mozroots --import --sync
+mono nuget.exe install vendor/packages.config -o vendor;
+mkdir -p bin;
+
+cp vendor/Newtonsoft.Json.8.0.2/lib/net45/Newtonsoft.Json.dll bin/Newtonsoft.Json.dll;
+cp vendor/RestSharp.105.1.0/lib/net45/RestSharp.dll bin/RestSharp.dll;
+
+mcs -sdk:${netfx} -r:bin/Newtonsoft.Json.dll,\
+bin/RestSharp.dll,\
+System.Runtime.Serialization.dll \
+-target:library \
+-out:bin/IO.Swagger.dll \
+-recurse:'src/*.cs' \
+-doc:bin/IO.Swagger.xml \
+-platform:anycpu
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/compile.bat b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/compile.bat
index 90963356690..7f52a604af8 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/compile.bat
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/compile.bat
@@ -1,3 +1,14 @@
-SET CSCPATH=%SYSTEMROOT%\Microsoft.NET\Framework\v4.0.30319
-%CSCPATH%\csc /reference:bin/Newtonsoft.Json.dll;bin/RestSharp.dll /target:library /out:bin/IO.Swagger.dll /recurse:src\*.cs /doc:bin/IO.Swagger.xml
+@echo off
 
+SET CSCPATH=%SYSTEMROOT%\Microsoft.NET\Framework\v4.0.30319
+
+
+if not exist ".\nuget.exe" powershell -Command "(new-object System.Net.WebClient).DownloadFile('https://nuget.org/nuget.exe', '.\nuget.exe')"
+.\nuget.exe install vendor/packages.config -o vendor
+
+if not exist ".\bin" mkdir bin
+
+copy vendor\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll bin\Newtonsoft.Json.dll
+copy vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll bin\RestSharp.dll
+
+%CSCPATH%\csc /reference:bin\Newtonsoft.Json.dll;bin\RestSharp.dll /target:library /out:bin\IO.Swagger.dll /recurse:src\*.cs /doc:bin\IO.Swagger.xml
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/git_push.sh b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/git_push.sh
new file mode 100644
index 00000000000..1a36388db02
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="YOUR_GIT_USR_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="YOUR_GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs
index ba58eeac9e0..4c061a02d95 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using RestSharp;
 using IO.Swagger.Client;
@@ -14,46 +15,7 @@ namespace IO.Swagger.Api
     /// </summary>
     public interface IPetApi
     {
-        
-        /// <summary>
-        /// Update an existing pet
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="body">Pet object that needs to be added to the store</param>
-        /// <returns></returns>
-        void UpdatePet (Pet body = null);
-  
-        /// <summary>
-        /// Update an existing pet
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="body">Pet object that needs to be added to the store</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> UpdatePetWithHttpInfo (Pet body = null);
-
-        /// <summary>
-        /// Update an existing pet
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="body">Pet object that needs to be added to the store</param>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task UpdatePetAsync (Pet body = null);
-
-        /// <summary>
-        /// Update an existing pet
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="body">Pet object that needs to be added to the store</param>
-        /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> UpdatePetAsyncWithHttpInfo (Pet body = null);
+        #region Synchronous Operations
         
         /// <summary>
         /// Add a new pet to the store
@@ -61,7 +23,8 @@ namespace IO.Swagger.Api
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="body">Pet object that needs to be added to the store</param>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Pet object that needs to be added to the store (optional)</param>
         /// <returns></returns>
         void AddPet (Pet body = null);
   
@@ -71,37 +34,65 @@ namespace IO.Swagger.Api
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="body">Pet object that needs to be added to the store</param>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Pet object that needs to be added to the store (optional)</param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> AddPetWithHttpInfo (Pet body = null);
-
+        
         /// <summary>
-        /// Add a new pet to the store
+        /// Fake endpoint to test byte array in body parameter for adding a new pet to the store
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="body">Pet object that needs to be added to the store</param>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task AddPetAsync (Pet body = null);
-
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Pet object in the form of byte array (optional)</param>
+        /// <returns></returns>
+        void AddPetUsingByteArray (byte[] body = null);
+  
         /// <summary>
-        /// Add a new pet to the store
+        /// Fake endpoint to test byte array in body parameter for adding a new pet to the store
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="body">Pet object that needs to be added to the store</param>
-        /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> AddPetAsyncWithHttpInfo (Pet body = null);
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Pet object in the form of byte array (optional)</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> AddPetUsingByteArrayWithHttpInfo (byte[] body = null);
+        
+        /// <summary>
+        /// Deletes a pet
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">Pet id to delete</param>
+        /// <param name="apiKey"> (optional)</param>
+        /// <returns></returns>
+        void DeletePet (long? petId, string apiKey = null);
+  
+        /// <summary>
+        /// Deletes a pet
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">Pet id to delete</param>
+        /// <param name="apiKey"> (optional)</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> DeletePetWithHttpInfo (long? petId, string apiKey = null);
         
         /// <summary>
         /// Finds Pets by status
         /// </summary>
         /// <remarks>
-        /// Multiple status values can be provided with comma seperated strings
+        /// Multiple status values can be provided with comma separated strings
         /// </remarks>
-        /// <param name="status">Status values that need to be considered for filter</param>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="status">Status values that need to be considered for query (optional, default to available)</param>
         /// <returns>List&lt;Pet&gt;</returns>
         List<Pet> FindPetsByStatus (List<string> status = null);
   
@@ -109,31 +100,12 @@ namespace IO.Swagger.Api
         /// Finds Pets by status
         /// </summary>
         /// <remarks>
-        /// Multiple status values can be provided with comma seperated strings
+        /// Multiple status values can be provided with comma separated strings
         /// </remarks>
-        /// <param name="status">Status values that need to be considered for filter</param>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="status">Status values that need to be considered for query (optional, default to available)</param>
         /// <returns>ApiResponse of List&lt;Pet&gt;</returns>
         ApiResponse<List<Pet>> FindPetsByStatusWithHttpInfo (List<string> status = null);
-
-        /// <summary>
-        /// Finds Pets by status
-        /// </summary>
-        /// <remarks>
-        /// Multiple status values can be provided with comma seperated strings
-        /// </remarks>
-        /// <param name="status">Status values that need to be considered for filter</param>
-        /// <returns>Task of List&lt;Pet&gt;</returns>
-        System.Threading.Tasks.Task<List<Pet>> FindPetsByStatusAsync (List<string> status = null);
-
-        /// <summary>
-        /// Finds Pets by status
-        /// </summary>
-        /// <remarks>
-        /// Multiple status values can be provided with comma seperated strings
-        /// </remarks>
-        /// <param name="status">Status values that need to be considered for filter</param>
-        /// <returns>Task of ApiResponse (List&lt;Pet&gt;)</returns>
-        System.Threading.Tasks.Task<ApiResponse<List<Pet>>> FindPetsByStatusAsyncWithHttpInfo (List<string> status = null);
         
         /// <summary>
         /// Finds Pets by tags
@@ -141,7 +113,8 @@ namespace IO.Swagger.Api
         /// <remarks>
         /// Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
         /// </remarks>
-        /// <param name="tags">Tags to filter by</param>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="tags">Tags to filter by (optional)</param>
         /// <returns>List&lt;Pet&gt;</returns>
         List<Pet> FindPetsByTags (List<string> tags = null);
   
@@ -151,29 +124,10 @@ namespace IO.Swagger.Api
         /// <remarks>
         /// Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
         /// </remarks>
-        /// <param name="tags">Tags to filter by</param>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="tags">Tags to filter by (optional)</param>
         /// <returns>ApiResponse of List&lt;Pet&gt;</returns>
         ApiResponse<List<Pet>> FindPetsByTagsWithHttpInfo (List<string> tags = null);
-
-        /// <summary>
-        /// Finds Pets by tags
-        /// </summary>
-        /// <remarks>
-        /// Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-        /// </remarks>
-        /// <param name="tags">Tags to filter by</param>
-        /// <returns>Task of List&lt;Pet&gt;</returns>
-        System.Threading.Tasks.Task<List<Pet>> FindPetsByTagsAsync (List<string> tags = null);
-
-        /// <summary>
-        /// Finds Pets by tags
-        /// </summary>
-        /// <remarks>
-        /// Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-        /// </remarks>
-        /// <param name="tags">Tags to filter by</param>
-        /// <returns>Task of ApiResponse (List&lt;Pet&gt;)</returns>
-        System.Threading.Tasks.Task<ApiResponse<List<Pet>>> FindPetsByTagsAsyncWithHttpInfo (List<string> tags = null);
         
         /// <summary>
         /// Find pet by ID
@@ -181,6 +135,7 @@ namespace IO.Swagger.Api
         /// <remarks>
         /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
         /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet that needs to be fetched</param>
         /// <returns>Pet</returns>
         Pet GetPetById (long? petId);
@@ -191,16 +146,252 @@ namespace IO.Swagger.Api
         /// <remarks>
         /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
         /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet that needs to be fetched</param>
         /// <returns>ApiResponse of Pet</returns>
         ApiResponse<Pet> GetPetByIdWithHttpInfo (long? petId);
+        
+        /// <summary>
+        /// Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+        /// </summary>
+        /// <remarks>
+        /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <returns>InlineResponse200</returns>
+        InlineResponse200 GetPetByIdInObject (long? petId);
+  
+        /// <summary>
+        /// Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+        /// </summary>
+        /// <remarks>
+        /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <returns>ApiResponse of InlineResponse200</returns>
+        ApiResponse<InlineResponse200> GetPetByIdInObjectWithHttpInfo (long? petId);
+        
+        /// <summary>
+        /// Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+        /// </summary>
+        /// <remarks>
+        /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <returns>byte[]</returns>
+        byte[] PetPetIdtestingByteArraytrueGet (long? petId);
+  
+        /// <summary>
+        /// Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+        /// </summary>
+        /// <remarks>
+        /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <returns>ApiResponse of byte[]</returns>
+        ApiResponse<byte[]> PetPetIdtestingByteArraytrueGetWithHttpInfo (long? petId);
+        
+        /// <summary>
+        /// Update an existing pet
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Pet object that needs to be added to the store (optional)</param>
+        /// <returns></returns>
+        void UpdatePet (Pet body = null);
+  
+        /// <summary>
+        /// Update an existing pet
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Pet object that needs to be added to the store (optional)</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> UpdatePetWithHttpInfo (Pet body = null);
+        
+        /// <summary>
+        /// Updates a pet in the store with form data
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet that needs to be updated</param>
+        /// <param name="name">Updated name of the pet (optional)</param>
+        /// <param name="status">Updated status of the pet (optional)</param>
+        /// <returns></returns>
+        void UpdatePetWithForm (string petId, string name = null, string status = null);
+  
+        /// <summary>
+        /// Updates a pet in the store with form data
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet that needs to be updated</param>
+        /// <param name="name">Updated name of the pet (optional)</param>
+        /// <param name="status">Updated status of the pet (optional)</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> UpdatePetWithFormWithHttpInfo (string petId, string name = null, string status = null);
+        
+        /// <summary>
+        /// uploads an image
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet to update</param>
+        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
+        /// <returns></returns>
+        void UploadFile (long? petId, string additionalMetadata = null, Stream file = null);
+  
+        /// <summary>
+        /// uploads an image
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet to update</param>
+        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> UploadFileWithHttpInfo (long? petId, string additionalMetadata = null, Stream file = null);
+        
+        #endregion Synchronous Operations
+        
+        #region Asynchronous Operations
+        
+        /// <summary>
+        /// Add a new pet to the store
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Pet object that needs to be added to the store (optional)</param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task AddPetAsync (Pet body = null);
 
+        /// <summary>
+        /// Add a new pet to the store
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Pet object that needs to be added to the store (optional)</param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> AddPetAsyncWithHttpInfo (Pet body = null);
+        
+        /// <summary>
+        /// Fake endpoint to test byte array in body parameter for adding a new pet to the store
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Pet object in the form of byte array (optional)</param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task AddPetUsingByteArrayAsync (byte[] body = null);
+
+        /// <summary>
+        /// Fake endpoint to test byte array in body parameter for adding a new pet to the store
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Pet object in the form of byte array (optional)</param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> AddPetUsingByteArrayAsyncWithHttpInfo (byte[] body = null);
+        
+        /// <summary>
+        /// Deletes a pet
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">Pet id to delete</param>
+        /// <param name="apiKey"> (optional)</param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task DeletePetAsync (long? petId, string apiKey = null);
+
+        /// <summary>
+        /// Deletes a pet
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">Pet id to delete</param>
+        /// <param name="apiKey"> (optional)</param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> DeletePetAsyncWithHttpInfo (long? petId, string apiKey = null);
+        
+        /// <summary>
+        /// Finds Pets by status
+        /// </summary>
+        /// <remarks>
+        /// Multiple status values can be provided with comma separated strings
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="status">Status values that need to be considered for query (optional, default to available)</param>
+        /// <returns>Task of List&lt;Pet&gt;</returns>
+        System.Threading.Tasks.Task<List<Pet>> FindPetsByStatusAsync (List<string> status = null);
+
+        /// <summary>
+        /// Finds Pets by status
+        /// </summary>
+        /// <remarks>
+        /// Multiple status values can be provided with comma separated strings
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="status">Status values that need to be considered for query (optional, default to available)</param>
+        /// <returns>Task of ApiResponse (List&lt;Pet&gt;)</returns>
+        System.Threading.Tasks.Task<ApiResponse<List<Pet>>> FindPetsByStatusAsyncWithHttpInfo (List<string> status = null);
+        
+        /// <summary>
+        /// Finds Pets by tags
+        /// </summary>
+        /// <remarks>
+        /// Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="tags">Tags to filter by (optional)</param>
+        /// <returns>Task of List&lt;Pet&gt;</returns>
+        System.Threading.Tasks.Task<List<Pet>> FindPetsByTagsAsync (List<string> tags = null);
+
+        /// <summary>
+        /// Finds Pets by tags
+        /// </summary>
+        /// <remarks>
+        /// Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="tags">Tags to filter by (optional)</param>
+        /// <returns>Task of ApiResponse (List&lt;Pet&gt;)</returns>
+        System.Threading.Tasks.Task<ApiResponse<List<Pet>>> FindPetsByTagsAsyncWithHttpInfo (List<string> tags = null);
+        
         /// <summary>
         /// Find pet by ID
         /// </summary>
         /// <remarks>
         /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
         /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet that needs to be fetched</param>
         /// <returns>Task of Pet</returns>
         System.Threading.Tasks.Task<Pet> GetPetByIdAsync (long? petId);
@@ -211,43 +402,87 @@ namespace IO.Swagger.Api
         /// <remarks>
         /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
         /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet that needs to be fetched</param>
         /// <returns>Task of ApiResponse (Pet)</returns>
         System.Threading.Tasks.Task<ApiResponse<Pet>> GetPetByIdAsyncWithHttpInfo (long? petId);
         
+        /// <summary>
+        /// Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+        /// </summary>
+        /// <remarks>
+        /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <returns>Task of InlineResponse200</returns>
+        System.Threading.Tasks.Task<InlineResponse200> GetPetByIdInObjectAsync (long? petId);
+
+        /// <summary>
+        /// Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+        /// </summary>
+        /// <remarks>
+        /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <returns>Task of ApiResponse (InlineResponse200)</returns>
+        System.Threading.Tasks.Task<ApiResponse<InlineResponse200>> GetPetByIdInObjectAsyncWithHttpInfo (long? petId);
+        
+        /// <summary>
+        /// Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+        /// </summary>
+        /// <remarks>
+        /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <returns>Task of byte[]</returns>
+        System.Threading.Tasks.Task<byte[]> PetPetIdtestingByteArraytrueGetAsync (long? petId);
+
+        /// <summary>
+        /// Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+        /// </summary>
+        /// <remarks>
+        /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <returns>Task of ApiResponse (byte[])</returns>
+        System.Threading.Tasks.Task<ApiResponse<byte[]>> PetPetIdtestingByteArraytrueGetAsyncWithHttpInfo (long? petId);
+        
+        /// <summary>
+        /// Update an existing pet
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Pet object that needs to be added to the store (optional)</param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task UpdatePetAsync (Pet body = null);
+
+        /// <summary>
+        /// Update an existing pet
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Pet object that needs to be added to the store (optional)</param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> UpdatePetAsyncWithHttpInfo (Pet body = null);
+        
         /// <summary>
         /// Updates a pet in the store with form data
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet that needs to be updated</param>
-        /// <param name="name">Updated name of the pet</param>
-        /// <param name="status">Updated status of the pet</param>
-        /// <returns></returns>
-        void UpdatePetWithForm (string petId, string name = null, string status = null);
-  
-        /// <summary>
-        /// Updates a pet in the store with form data
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="petId">ID of pet that needs to be updated</param>
-        /// <param name="name">Updated name of the pet</param>
-        /// <param name="status">Updated status of the pet</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> UpdatePetWithFormWithHttpInfo (string petId, string name = null, string status = null);
-
-        /// <summary>
-        /// Updates a pet in the store with form data
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="petId">ID of pet that needs to be updated</param>
-        /// <param name="name">Updated name of the pet</param>
-        /// <param name="status">Updated status of the pet</param>
+        /// <param name="name">Updated name of the pet (optional)</param>
+        /// <param name="status">Updated status of the pet (optional)</param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task UpdatePetWithFormAsync (string petId, string name = null, string status = null);
 
@@ -257,89 +492,23 @@ namespace IO.Swagger.Api
         /// <remarks>
         /// 
         /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet that needs to be updated</param>
-        /// <param name="name">Updated name of the pet</param>
-        /// <param name="status">Updated status of the pet</param>
+        /// <param name="name">Updated name of the pet (optional)</param>
+        /// <param name="status">Updated status of the pet (optional)</param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> UpdatePetWithFormAsyncWithHttpInfo (string petId, string name = null, string status = null);
         
-        /// <summary>
-        /// Deletes a pet
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="petId">Pet id to delete</param>
-        /// <param name="apiKey"></param>
-        /// <returns></returns>
-        void DeletePet (long? petId, string apiKey = null);
-  
-        /// <summary>
-        /// Deletes a pet
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="petId">Pet id to delete</param>
-        /// <param name="apiKey"></param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> DeletePetWithHttpInfo (long? petId, string apiKey = null);
-
-        /// <summary>
-        /// Deletes a pet
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="petId">Pet id to delete</param>
-        /// <param name="apiKey"></param>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task DeletePetAsync (long? petId, string apiKey = null);
-
-        /// <summary>
-        /// Deletes a pet
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="petId">Pet id to delete</param>
-        /// <param name="apiKey"></param>
-        /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> DeletePetAsyncWithHttpInfo (long? petId, string apiKey = null);
-        
         /// <summary>
         /// uploads an image
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="additionalMetadata">Additional data to pass to server</param>
-        /// <param name="file">file to upload</param>
-        /// <returns></returns>
-        void UploadFile (long? petId, string additionalMetadata = null, Stream file = null);
-  
-        /// <summary>
-        /// uploads an image
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="petId">ID of pet to update</param>
-        /// <param name="additionalMetadata">Additional data to pass to server</param>
-        /// <param name="file">file to upload</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> UploadFileWithHttpInfo (long? petId, string additionalMetadata = null, Stream file = null);
-
-        /// <summary>
-        /// uploads an image
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="petId">ID of pet to update</param>
-        /// <param name="additionalMetadata">Additional data to pass to server</param>
-        /// <param name="file">file to upload</param>
+        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task UploadFileAsync (long? petId, string additionalMetadata = null, Stream file = null);
 
@@ -349,12 +518,15 @@ namespace IO.Swagger.Api
         /// <remarks>
         /// 
         /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="additionalMetadata">Additional data to pass to server</param>
-        /// <param name="file">file to upload</param>
+        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> UploadFileAsyncWithHttpInfo (long? petId, string additionalMetadata = null, Stream file = null);
         
+        #endregion Asynchronous Operations
+        
     }
   
     /// <summary>
@@ -369,6 +541,12 @@ namespace IO.Swagger.Api
         public PetApi(String basePath)
         {
             this.Configuration = new Configuration(new ApiClient(basePath));
+
+            // ensure API client has configuration ready
+            if (Configuration.ApiClient.Configuration == null)
+            {
+                this.Configuration.ApiClient.Configuration = this.Configuration;
+            }
         }
     
         /// <summary>
@@ -383,6 +561,12 @@ namespace IO.Swagger.Api
                 this.Configuration = Configuration.Default; 
             else
                 this.Configuration = configuration;
+
+            // ensure API client has configuration ready
+            if (Configuration.ApiClient.Configuration == null)
+            {
+                this.Configuration.ApiClient.Configuration = this.Configuration;
+            }
         }
 
         /// <summary>
@@ -433,155 +617,11 @@ namespace IO.Swagger.Api
         }
    
         
-        /// <summary>
-        /// Update an existing pet 
-        /// </summary>
-        /// <param name="body">Pet object that needs to be added to the store</param> 
-        /// <returns></returns>
-        public void UpdatePet (Pet body = null)
-        {
-             UpdatePetWithHttpInfo(body);
-        }
-
-        /// <summary>
-        /// Update an existing pet 
-        /// </summary>
-        /// <param name="body">Pet object that needs to be added to the store</param> 
-        /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> UpdatePetWithHttpInfo (Pet body = null)
-        {
-            
-    
-            var path_ = "/pet";
-    
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
-
-            // to determine the Accept header
-            String[] http_header_accepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            
-            
-            
-            
-            postBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
-            
-
-            
-            // authentication (petstore_auth) required
-            
-            // oauth required
-            if (!String.IsNullOrEmpty(Configuration.AccessToken))
-            {
-                headerParams["Authorization"] = "Bearer " + Configuration.AccessToken;
-            }
-            
-    
-            // make the HTTP request
-            IRestResponse response = (IRestResponse) Configuration.ApiClient.CallApi(path_, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
-
-            int statusCode = (int) response.StatusCode;
-    
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling UpdatePet: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling UpdatePet: " + response.ErrorMessage, response.ErrorMessage);
-    
-            
-            return new ApiResponse<Object>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
-        }
-    
-        /// <summary>
-        /// Update an existing pet 
-        /// </summary>
-        /// <param name="body">Pet object that needs to be added to the store</param>
-        /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task UpdatePetAsync (Pet body = null)
-        {
-             await UpdatePetAsyncWithHttpInfo(body);
-
-        }
-
-        /// <summary>
-        /// Update an existing pet 
-        /// </summary>
-        /// <param name="body">Pet object that needs to be added to the store</param>
-        /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdatePetAsyncWithHttpInfo (Pet body = null)
-        {
-            
-    
-            var path_ = "/pet";
-    
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>();
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
-
-            // to determine the Accept header
-            String[] http_header_accepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            
-            
-            
-            
-            postBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
-            
-
-            
-            // authentication (petstore_auth) required
-            
-            // oauth required
-            if (!String.IsNullOrEmpty(Configuration.AccessToken))
-            {
-                headerParams["Authorization"] = "Bearer " + Configuration.AccessToken;
-            }
-            
-
-            // make the HTTP request
-            IRestResponse response = (IRestResponse) await Configuration.ApiClient.CallApiAsync(path_, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
-
-            int statusCode = (int) response.StatusCode;
- 
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling UpdatePet: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling UpdatePet: " + response.ErrorMessage, response.ErrorMessage);
-
-            
-            return new ApiResponse<Object>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
-        }
-        
         /// <summary>
         /// Add a new pet to the store 
         /// </summary>
-        /// <param name="body">Pet object that needs to be added to the store</param> 
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Pet object that needs to be added to the store (optional)</param> 
         /// <returns></returns>
         public void AddPet (Pet body = null)
         {
@@ -591,69 +631,85 @@ namespace IO.Swagger.Api
         /// <summary>
         /// Add a new pet to the store 
         /// </summary>
-        /// <param name="body">Pet object that needs to be added to the store</param> 
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Pet object that needs to be added to the store (optional)</param> 
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> AddPetWithHttpInfo (Pet body = null)
         {
             
     
-            var path_ = "/pet";
+            var localVarPath = "/pet";
     
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
 
-            // to determine the Accept header
-            String[] http_header_accepts = new String[] {
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
                 "application/json", "application/xml"
             };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
+            localVarPathParams.Add("format", "json");
             
             
             
             
-            postBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
-            
+            if (body.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = body; // byte array
+            }
 
-            
             // authentication (petstore_auth) required
             
             // oauth required
             if (!String.IsNullOrEmpty(Configuration.AccessToken))
             {
-                headerParams["Authorization"] = "Bearer " + Configuration.AccessToken;
+                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
             }
             
     
             // make the HTTP request
-            IRestResponse response = (IRestResponse) Configuration.ApiClient.CallApi(path_, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
+            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath, 
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
 
-            int statusCode = (int) response.StatusCode;
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
     
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling AddPet: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling AddPet: " + response.ErrorMessage, response.ErrorMessage);
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling AddPet: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling AddPet: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
     
             
-            return new ApiResponse<Object>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
-    
+
+        
         /// <summary>
         /// Add a new pet to the store 
         /// </summary>
-        /// <param name="body">Pet object that needs to be added to the store</param>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Pet object that needs to be added to the store (optional)</param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task AddPetAsync (Pet body = null)
         {
@@ -664,38 +720,51 @@ namespace IO.Swagger.Api
         /// <summary>
         /// Add a new pet to the store 
         /// </summary>
-        /// <param name="body">Pet object that needs to be added to the store</param>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Pet object that needs to be added to the store (optional)</param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> AddPetAsyncWithHttpInfo (Pet body = null)
         {
             
     
-            var path_ = "/pet";
+            var localVarPath = "/pet";
     
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>();
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
 
-            // to determine the Accept header
-            String[] http_header_accepts = new String[] {
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
                 "application/json", "application/xml"
             };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
+            localVarPathParams.Add("format", "json");
             
             
             
             
-            postBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
-            
+            if (body.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = body; // byte array
+            }
 
             
             // authentication (petstore_auth) required
@@ -703,607 +772,176 @@ namespace IO.Swagger.Api
             // oauth required
             if (!String.IsNullOrEmpty(Configuration.AccessToken))
             {
-                headerParams["Authorization"] = "Bearer " + Configuration.AccessToken;
+                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
             }
             
 
             // make the HTTP request
-            IRestResponse response = (IRestResponse) await Configuration.ApiClient.CallApiAsync(path_, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
+            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath, 
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams, 
+                localVarPathParams, localVarHttpContentType);
 
-            int statusCode = (int) response.StatusCode;
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
  
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling AddPet: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling AddPet: " + response.ErrorMessage, response.ErrorMessage);
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling AddPet: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling AddPet: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
 
             
-            return new ApiResponse<Object>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
         
         /// <summary>
-        /// Finds Pets by status Multiple status values can be provided with comma seperated strings
+        /// Fake endpoint to test byte array in body parameter for adding a new pet to the store 
         /// </summary>
-        /// <param name="status">Status values that need to be considered for filter</param> 
-        /// <returns>List&lt;Pet&gt;</returns>
-        public List<Pet> FindPetsByStatus (List<string> status = null)
-        {
-             ApiResponse<List<Pet>> response = FindPetsByStatusWithHttpInfo(status);
-             return response.Data;
-        }
-
-        /// <summary>
-        /// Finds Pets by status Multiple status values can be provided with comma seperated strings
-        /// </summary>
-        /// <param name="status">Status values that need to be considered for filter</param> 
-        /// <returns>ApiResponse of List&lt;Pet&gt;</returns>
-        public ApiResponse< List<Pet> > FindPetsByStatusWithHttpInfo (List<string> status = null)
-        {
-            
-    
-            var path_ = "/pet/findByStatus";
-    
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
-
-            // to determine the Accept header
-            String[] http_header_accepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            
-            if (status != null) queryParams.Add("status", Configuration.ApiClient.ParameterToString(status)); // query parameter
-            
-            
-            
-            
-
-            
-            // authentication (petstore_auth) required
-            
-            // oauth required
-            if (!String.IsNullOrEmpty(Configuration.AccessToken))
-            {
-                headerParams["Authorization"] = "Bearer " + Configuration.AccessToken;
-            }
-            
-    
-            // make the HTTP request
-            IRestResponse response = (IRestResponse) Configuration.ApiClient.CallApi(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
-
-            int statusCode = (int) response.StatusCode;
-    
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling FindPetsByStatus: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling FindPetsByStatus: " + response.ErrorMessage, response.ErrorMessage);
-    
-            return new ApiResponse<List<Pet>>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (List<Pet>) Configuration.ApiClient.Deserialize(response, typeof(List<Pet>)));
-            
-        }
-    
-        /// <summary>
-        /// Finds Pets by status Multiple status values can be provided with comma seperated strings
-        /// </summary>
-        /// <param name="status">Status values that need to be considered for filter</param>
-        /// <returns>Task of List&lt;Pet&gt;</returns>
-        public async System.Threading.Tasks.Task<List<Pet>> FindPetsByStatusAsync (List<string> status = null)
-        {
-             ApiResponse<List<Pet>> response = await FindPetsByStatusAsyncWithHttpInfo(status);
-             return response.Data;
-
-        }
-
-        /// <summary>
-        /// Finds Pets by status Multiple status values can be provided with comma seperated strings
-        /// </summary>
-        /// <param name="status">Status values that need to be considered for filter</param>
-        /// <returns>Task of ApiResponse (List&lt;Pet&gt;)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<List<Pet>>> FindPetsByStatusAsyncWithHttpInfo (List<string> status = null)
-        {
-            
-    
-            var path_ = "/pet/findByStatus";
-    
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>();
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
-
-            // to determine the Accept header
-            String[] http_header_accepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            
-            if (status != null) queryParams.Add("status", Configuration.ApiClient.ParameterToString(status)); // query parameter
-            
-            
-            
-            
-
-            
-            // authentication (petstore_auth) required
-            
-            // oauth required
-            if (!String.IsNullOrEmpty(Configuration.AccessToken))
-            {
-                headerParams["Authorization"] = "Bearer " + Configuration.AccessToken;
-            }
-            
-
-            // make the HTTP request
-            IRestResponse response = (IRestResponse) await Configuration.ApiClient.CallApiAsync(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
-
-            int statusCode = (int) response.StatusCode;
- 
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling FindPetsByStatus: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling FindPetsByStatus: " + response.ErrorMessage, response.ErrorMessage);
-
-            return new ApiResponse<List<Pet>>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (List<Pet>) Configuration.ApiClient.Deserialize(response, typeof(List<Pet>)));
-            
-        }
-        
-        /// <summary>
-        /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-        /// </summary>
-        /// <param name="tags">Tags to filter by</param> 
-        /// <returns>List&lt;Pet&gt;</returns>
-        public List<Pet> FindPetsByTags (List<string> tags = null)
-        {
-             ApiResponse<List<Pet>> response = FindPetsByTagsWithHttpInfo(tags);
-             return response.Data;
-        }
-
-        /// <summary>
-        /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-        /// </summary>
-        /// <param name="tags">Tags to filter by</param> 
-        /// <returns>ApiResponse of List&lt;Pet&gt;</returns>
-        public ApiResponse< List<Pet> > FindPetsByTagsWithHttpInfo (List<string> tags = null)
-        {
-            
-    
-            var path_ = "/pet/findByTags";
-    
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
-
-            // to determine the Accept header
-            String[] http_header_accepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            
-            if (tags != null) queryParams.Add("tags", Configuration.ApiClient.ParameterToString(tags)); // query parameter
-            
-            
-            
-            
-
-            
-            // authentication (petstore_auth) required
-            
-            // oauth required
-            if (!String.IsNullOrEmpty(Configuration.AccessToken))
-            {
-                headerParams["Authorization"] = "Bearer " + Configuration.AccessToken;
-            }
-            
-    
-            // make the HTTP request
-            IRestResponse response = (IRestResponse) Configuration.ApiClient.CallApi(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
-
-            int statusCode = (int) response.StatusCode;
-    
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling FindPetsByTags: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling FindPetsByTags: " + response.ErrorMessage, response.ErrorMessage);
-    
-            return new ApiResponse<List<Pet>>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (List<Pet>) Configuration.ApiClient.Deserialize(response, typeof(List<Pet>)));
-            
-        }
-    
-        /// <summary>
-        /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-        /// </summary>
-        /// <param name="tags">Tags to filter by</param>
-        /// <returns>Task of List&lt;Pet&gt;</returns>
-        public async System.Threading.Tasks.Task<List<Pet>> FindPetsByTagsAsync (List<string> tags = null)
-        {
-             ApiResponse<List<Pet>> response = await FindPetsByTagsAsyncWithHttpInfo(tags);
-             return response.Data;
-
-        }
-
-        /// <summary>
-        /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-        /// </summary>
-        /// <param name="tags">Tags to filter by</param>
-        /// <returns>Task of ApiResponse (List&lt;Pet&gt;)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<List<Pet>>> FindPetsByTagsAsyncWithHttpInfo (List<string> tags = null)
-        {
-            
-    
-            var path_ = "/pet/findByTags";
-    
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>();
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
-
-            // to determine the Accept header
-            String[] http_header_accepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            
-            if (tags != null) queryParams.Add("tags", Configuration.ApiClient.ParameterToString(tags)); // query parameter
-            
-            
-            
-            
-
-            
-            // authentication (petstore_auth) required
-            
-            // oauth required
-            if (!String.IsNullOrEmpty(Configuration.AccessToken))
-            {
-                headerParams["Authorization"] = "Bearer " + Configuration.AccessToken;
-            }
-            
-
-            // make the HTTP request
-            IRestResponse response = (IRestResponse) await Configuration.ApiClient.CallApiAsync(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
-
-            int statusCode = (int) response.StatusCode;
- 
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling FindPetsByTags: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling FindPetsByTags: " + response.ErrorMessage, response.ErrorMessage);
-
-            return new ApiResponse<List<Pet>>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (List<Pet>) Configuration.ApiClient.Deserialize(response, typeof(List<Pet>)));
-            
-        }
-        
-        /// <summary>
-        /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-        /// </summary>
-        /// <param name="petId">ID of pet that needs to be fetched</param> 
-        /// <returns>Pet</returns>
-        public Pet GetPetById (long? petId)
-        {
-             ApiResponse<Pet> response = GetPetByIdWithHttpInfo(petId);
-             return response.Data;
-        }
-
-        /// <summary>
-        /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-        /// </summary>
-        /// <param name="petId">ID of pet that needs to be fetched</param> 
-        /// <returns>ApiResponse of Pet</returns>
-        public ApiResponse< Pet > GetPetByIdWithHttpInfo (long? petId)
-        {
-            
-            // verify the required parameter 'petId' is set
-            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling GetPetById");
-            
-    
-            var path_ = "/pet/{petId}";
-    
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
-
-            // to determine the Accept header
-            String[] http_header_accepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            if (petId != null) pathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
-            
-            
-            
-            
-            
-
-            
-            // authentication (api_key) required
-            
-            var apiKeyValue = Configuration.GetApiKeyWithPrefix("api_key");
-            if (!String.IsNullOrEmpty(apiKeyValue))
-            {
-                headerParams["api_key"] = apiKeyValue;
-            }
-            
-    
-            // make the HTTP request
-            IRestResponse response = (IRestResponse) Configuration.ApiClient.CallApi(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
-
-            int statusCode = (int) response.StatusCode;
-    
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling GetPetById: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling GetPetById: " + response.ErrorMessage, response.ErrorMessage);
-    
-            return new ApiResponse<Pet>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (Pet) Configuration.ApiClient.Deserialize(response, typeof(Pet)));
-            
-        }
-    
-        /// <summary>
-        /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-        /// </summary>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
-        /// <returns>Task of Pet</returns>
-        public async System.Threading.Tasks.Task<Pet> GetPetByIdAsync (long? petId)
-        {
-             ApiResponse<Pet> response = await GetPetByIdAsyncWithHttpInfo(petId);
-             return response.Data;
-
-        }
-
-        /// <summary>
-        /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-        /// </summary>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
-        /// <returns>Task of ApiResponse (Pet)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Pet>> GetPetByIdAsyncWithHttpInfo (long? petId)
-        {
-            // verify the required parameter 'petId' is set
-            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling GetPetById");
-            
-    
-            var path_ = "/pet/{petId}";
-    
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>();
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
-
-            // to determine the Accept header
-            String[] http_header_accepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            if (petId != null) pathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
-            
-            
-            
-            
-            
-
-            
-            // authentication (api_key) required
-            
-            var apiKeyValue = Configuration.GetApiKeyWithPrefix("api_key");
-            if (!String.IsNullOrEmpty(apiKeyValue))
-            {
-                headerParams["api_key"] = apiKeyValue;
-            }
-            
-
-            // make the HTTP request
-            IRestResponse response = (IRestResponse) await Configuration.ApiClient.CallApiAsync(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
-
-            int statusCode = (int) response.StatusCode;
- 
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling GetPetById: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling GetPetById: " + response.ErrorMessage, response.ErrorMessage);
-
-            return new ApiResponse<Pet>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (Pet) Configuration.ApiClient.Deserialize(response, typeof(Pet)));
-            
-        }
-        
-        /// <summary>
-        /// Updates a pet in the store with form data 
-        /// </summary>
-        /// <param name="petId">ID of pet that needs to be updated</param> 
-        /// <param name="name">Updated name of the pet</param> 
-        /// <param name="status">Updated status of the pet</param> 
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Pet object in the form of byte array (optional)</param> 
         /// <returns></returns>
-        public void UpdatePetWithForm (string petId, string name = null, string status = null)
+        public void AddPetUsingByteArray (byte[] body = null)
         {
-             UpdatePetWithFormWithHttpInfo(petId, name, status);
+             AddPetUsingByteArrayWithHttpInfo(body);
         }
 
         /// <summary>
-        /// Updates a pet in the store with form data 
+        /// Fake endpoint to test byte array in body parameter for adding a new pet to the store 
         /// </summary>
-        /// <param name="petId">ID of pet that needs to be updated</param> 
-        /// <param name="name">Updated name of the pet</param> 
-        /// <param name="status">Updated status of the pet</param> 
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Pet object in the form of byte array (optional)</param> 
         /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> UpdatePetWithFormWithHttpInfo (string petId, string name = null, string status = null)
+        public ApiResponse<Object> AddPetUsingByteArrayWithHttpInfo (byte[] body = null)
         {
             
-            // verify the required parameter 'petId' is set
-            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UpdatePetWithForm");
-            
     
-            var path_ = "/pet/{petId}";
+            var localVarPath = "/pet?testing_byte_array=true";
     
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
 
-            // to determine the Accept header
-            String[] http_header_accepts = new String[] {
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
                 "application/json", "application/xml"
             };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            if (petId != null) pathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
+            localVarPathParams.Add("format", "json");
             
             
             
-            if (name != null) formParams.Add("name", Configuration.ApiClient.ParameterToString(name)); // form parameter
-            if (status != null) formParams.Add("status", Configuration.ApiClient.ParameterToString(status)); // form parameter
-            
             
+            if (body.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = body; // byte array
+            }
 
-            
             // authentication (petstore_auth) required
             
             // oauth required
             if (!String.IsNullOrEmpty(Configuration.AccessToken))
             {
-                headerParams["Authorization"] = "Bearer " + Configuration.AccessToken;
+                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
             }
             
     
             // make the HTTP request
-            IRestResponse response = (IRestResponse) Configuration.ApiClient.CallApi(path_, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
+            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath, 
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
 
-            int statusCode = (int) response.StatusCode;
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
     
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling UpdatePetWithForm: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling UpdatePetWithForm: " + response.ErrorMessage, response.ErrorMessage);
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling AddPetUsingByteArray: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling AddPetUsingByteArray: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
     
             
-            return new ApiResponse<Object>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
-    
+
+        
         /// <summary>
-        /// Updates a pet in the store with form data 
+        /// Fake endpoint to test byte array in body parameter for adding a new pet to the store 
         /// </summary>
-        /// <param name="petId">ID of pet that needs to be updated</param>
-        /// <param name="name">Updated name of the pet</param>
-        /// <param name="status">Updated status of the pet</param>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Pet object in the form of byte array (optional)</param>
         /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task UpdatePetWithFormAsync (string petId, string name = null, string status = null)
+        public async System.Threading.Tasks.Task AddPetUsingByteArrayAsync (byte[] body = null)
         {
-             await UpdatePetWithFormAsyncWithHttpInfo(petId, name, status);
+             await AddPetUsingByteArrayAsyncWithHttpInfo(body);
 
         }
 
         /// <summary>
-        /// Updates a pet in the store with form data 
+        /// Fake endpoint to test byte array in body parameter for adding a new pet to the store 
         /// </summary>
-        /// <param name="petId">ID of pet that needs to be updated</param>
-        /// <param name="name">Updated name of the pet</param>
-        /// <param name="status">Updated status of the pet</param>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Pet object in the form of byte array (optional)</param>
         /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdatePetWithFormAsyncWithHttpInfo (string petId, string name = null, string status = null)
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> AddPetUsingByteArrayAsyncWithHttpInfo (byte[] body = null)
         {
-            // verify the required parameter 'petId' is set
-            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UpdatePetWithForm");
             
     
-            var path_ = "/pet/{petId}";
+            var localVarPath = "/pet?testing_byte_array=true";
     
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>();
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
 
-            // to determine the Accept header
-            String[] http_header_accepts = new String[] {
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
                 "application/json", "application/xml"
             };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            if (petId != null) pathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
+            localVarPathParams.Add("format", "json");
             
             
             
-            if (name != null) formParams.Add("name", Configuration.ApiClient.ParameterToString(name)); // form parameter
-            if (status != null) formParams.Add("status", Configuration.ApiClient.ParameterToString(status)); // form parameter
-            
             
+            if (body.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = body; // byte array
+            }
 
             
             // authentication (petstore_auth) required
@@ -1311,31 +949,34 @@ namespace IO.Swagger.Api
             // oauth required
             if (!String.IsNullOrEmpty(Configuration.AccessToken))
             {
-                headerParams["Authorization"] = "Bearer " + Configuration.AccessToken;
+                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
             }
             
 
             // make the HTTP request
-            IRestResponse response = (IRestResponse) await Configuration.ApiClient.CallApiAsync(path_, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
+            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath, 
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams, 
+                localVarPathParams, localVarHttpContentType);
 
-            int statusCode = (int) response.StatusCode;
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
  
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling UpdatePetWithForm: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling UpdatePetWithForm: " + response.ErrorMessage, response.ErrorMessage);
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling AddPetUsingByteArray: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling AddPetUsingByteArray: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
 
             
-            return new ApiResponse<Object>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
         
         /// <summary>
         /// Deletes a pet 
         /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">Pet id to delete</param> 
-        /// <param name="apiKey"></param> 
+        /// <param name="apiKey"> (optional)</param> 
         /// <returns></returns>
         public void DeletePet (long? petId, string apiKey = null)
         {
@@ -1345,75 +986,86 @@ namespace IO.Swagger.Api
         /// <summary>
         /// Deletes a pet 
         /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">Pet id to delete</param> 
-        /// <param name="apiKey"></param> 
+        /// <param name="apiKey"> (optional)</param> 
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> DeletePetWithHttpInfo (long? petId, string apiKey = null)
         {
             
             // verify the required parameter 'petId' is set
-            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling DeletePet");
+            if (petId == null)
+                throw new ApiException(400, "Missing required parameter 'petId' when calling PetApi->DeletePet");
             
     
-            var path_ = "/pet/{petId}";
+            var localVarPath = "/pet/{petId}";
     
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
-            String[] http_header_accepts = new String[] {
+            String[] localVarHttpHeaderAccepts = new String[] {
                 "application/json", "application/xml"
             };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            if (petId != null) pathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
+            localVarPathParams.Add("format", "json");
+            if (petId != null) localVarPathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
             
             
-            if (apiKey != null) headerParams.Add("api_key", Configuration.ApiClient.ParameterToString(apiKey)); // header parameter
+            if (apiKey != null) localVarHeaderParams.Add("api_key", Configuration.ApiClient.ParameterToString(apiKey)); // header parameter
             
             
             
 
-            
             // authentication (petstore_auth) required
             
             // oauth required
             if (!String.IsNullOrEmpty(Configuration.AccessToken))
             {
-                headerParams["Authorization"] = "Bearer " + Configuration.AccessToken;
+                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
             }
             
     
             // make the HTTP request
-            IRestResponse response = (IRestResponse) Configuration.ApiClient.CallApi(path_, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
+            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath, 
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
 
-            int statusCode = (int) response.StatusCode;
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
     
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling DeletePet: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling DeletePet: " + response.ErrorMessage, response.ErrorMessage);
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling DeletePet: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling DeletePet: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
     
             
-            return new ApiResponse<Object>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
-    
+
+        
         /// <summary>
         /// Deletes a pet 
         /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">Pet id to delete</param>
-        /// <param name="apiKey"></param>
+        /// <param name="apiKey"> (optional)</param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task DeletePetAsync (long? petId, string apiKey = null)
         {
@@ -1424,8 +1076,9 @@ namespace IO.Swagger.Api
         /// <summary>
         /// Deletes a pet 
         /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">Pet id to delete</param>
-        /// <param name="apiKey"></param>
+        /// <param name="apiKey"> (optional)</param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> DeletePetAsyncWithHttpInfo (long? petId, string apiKey = null)
         {
@@ -1433,30 +1086,36 @@ namespace IO.Swagger.Api
             if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling DeletePet");
             
     
-            var path_ = "/pet/{petId}";
+            var localVarPath = "/pet/{petId}";
     
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>();
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
-            String[] http_header_accepts = new String[] {
+            String[] localVarHttpHeaderAccepts = new String[] {
                 "application/json", "application/xml"
             };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            if (petId != null) pathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
+            localVarPathParams.Add("format", "json");
+            if (petId != null) localVarPathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
             
             
-            if (apiKey != null) headerParams.Add("api_key", Configuration.ApiClient.ParameterToString(apiKey)); // header parameter
+            if (apiKey != null) localVarHeaderParams.Add("api_key", Configuration.ApiClient.ParameterToString(apiKey)); // header parameter
             
             
             
@@ -1467,32 +1126,1287 @@ namespace IO.Swagger.Api
             // oauth required
             if (!String.IsNullOrEmpty(Configuration.AccessToken))
             {
-                headerParams["Authorization"] = "Bearer " + Configuration.AccessToken;
+                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
             }
             
 
             // make the HTTP request
-            IRestResponse response = (IRestResponse) await Configuration.ApiClient.CallApiAsync(path_, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
+            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath, 
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams, 
+                localVarPathParams, localVarHttpContentType);
 
-            int statusCode = (int) response.StatusCode;
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
  
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling DeletePet: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling DeletePet: " + response.ErrorMessage, response.ErrorMessage);
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling DeletePet: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling DeletePet: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
 
             
-            return new ApiResponse<Object>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+        
+        /// <summary>
+        /// Finds Pets by status Multiple status values can be provided with comma separated strings
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="status">Status values that need to be considered for query (optional, default to available)</param> 
+        /// <returns>List&lt;Pet&gt;</returns>
+        public List<Pet> FindPetsByStatus (List<string> status = null)
+        {
+             ApiResponse<List<Pet>> localVarResponse = FindPetsByStatusWithHttpInfo(status);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        /// Finds Pets by status Multiple status values can be provided with comma separated strings
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="status">Status values that need to be considered for query (optional, default to available)</param> 
+        /// <returns>ApiResponse of List&lt;Pet&gt;</returns>
+        public ApiResponse< List<Pet> > FindPetsByStatusWithHttpInfo (List<string> status = null)
+        {
+            
+    
+            var localVarPath = "/pet/findByStatus";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            
+            if (status != null) localVarQueryParams.Add("status", Configuration.ApiClient.ParameterToString(status)); // query parameter
+            
+            
+            
+            
+
+            // authentication (petstore_auth) required
+            
+            // oauth required
+            if (!String.IsNullOrEmpty(Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
+            }
+            
+    
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath, 
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+    
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling FindPetsByStatus: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling FindPetsByStatus: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+    
+            return new ApiResponse<List<Pet>>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (List<Pet>) Configuration.ApiClient.Deserialize(localVarResponse, typeof(List<Pet>)));
+            
+        }
+
+        
+        /// <summary>
+        /// Finds Pets by status Multiple status values can be provided with comma separated strings
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="status">Status values that need to be considered for query (optional, default to available)</param>
+        /// <returns>Task of List&lt;Pet&gt;</returns>
+        public async System.Threading.Tasks.Task<List<Pet>> FindPetsByStatusAsync (List<string> status = null)
+        {
+             ApiResponse<List<Pet>> localVarResponse = await FindPetsByStatusAsyncWithHttpInfo(status);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        /// Finds Pets by status Multiple status values can be provided with comma separated strings
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="status">Status values that need to be considered for query (optional, default to available)</param>
+        /// <returns>Task of ApiResponse (List&lt;Pet&gt;)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<List<Pet>>> FindPetsByStatusAsyncWithHttpInfo (List<string> status = null)
+        {
+            
+    
+            var localVarPath = "/pet/findByStatus";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            
+            if (status != null) localVarQueryParams.Add("status", Configuration.ApiClient.ParameterToString(status)); // query parameter
+            
+            
+            
+            
+
+            
+            // authentication (petstore_auth) required
+            
+            // oauth required
+            if (!String.IsNullOrEmpty(Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
+            }
+            
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath, 
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams, 
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+ 
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling FindPetsByStatus: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling FindPetsByStatus: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+
+            return new ApiResponse<List<Pet>>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (List<Pet>) Configuration.ApiClient.Deserialize(localVarResponse, typeof(List<Pet>)));
+            
+        }
+        
+        /// <summary>
+        /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="tags">Tags to filter by (optional)</param> 
+        /// <returns>List&lt;Pet&gt;</returns>
+        public List<Pet> FindPetsByTags (List<string> tags = null)
+        {
+             ApiResponse<List<Pet>> localVarResponse = FindPetsByTagsWithHttpInfo(tags);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="tags">Tags to filter by (optional)</param> 
+        /// <returns>ApiResponse of List&lt;Pet&gt;</returns>
+        public ApiResponse< List<Pet> > FindPetsByTagsWithHttpInfo (List<string> tags = null)
+        {
+            
+    
+            var localVarPath = "/pet/findByTags";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            
+            if (tags != null) localVarQueryParams.Add("tags", Configuration.ApiClient.ParameterToString(tags)); // query parameter
+            
+            
+            
+            
+
+            // authentication (petstore_auth) required
+            
+            // oauth required
+            if (!String.IsNullOrEmpty(Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
+            }
+            
+    
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath, 
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+    
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling FindPetsByTags: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling FindPetsByTags: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+    
+            return new ApiResponse<List<Pet>>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (List<Pet>) Configuration.ApiClient.Deserialize(localVarResponse, typeof(List<Pet>)));
+            
+        }
+
+        
+        /// <summary>
+        /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="tags">Tags to filter by (optional)</param>
+        /// <returns>Task of List&lt;Pet&gt;</returns>
+        public async System.Threading.Tasks.Task<List<Pet>> FindPetsByTagsAsync (List<string> tags = null)
+        {
+             ApiResponse<List<Pet>> localVarResponse = await FindPetsByTagsAsyncWithHttpInfo(tags);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="tags">Tags to filter by (optional)</param>
+        /// <returns>Task of ApiResponse (List&lt;Pet&gt;)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<List<Pet>>> FindPetsByTagsAsyncWithHttpInfo (List<string> tags = null)
+        {
+            
+    
+            var localVarPath = "/pet/findByTags";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            
+            if (tags != null) localVarQueryParams.Add("tags", Configuration.ApiClient.ParameterToString(tags)); // query parameter
+            
+            
+            
+            
+
+            
+            // authentication (petstore_auth) required
+            
+            // oauth required
+            if (!String.IsNullOrEmpty(Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
+            }
+            
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath, 
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams, 
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+ 
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling FindPetsByTags: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling FindPetsByTags: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+
+            return new ApiResponse<List<Pet>>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (List<Pet>) Configuration.ApiClient.Deserialize(localVarResponse, typeof(List<Pet>)));
+            
+        }
+        
+        /// <summary>
+        /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet that needs to be fetched</param> 
+        /// <returns>Pet</returns>
+        public Pet GetPetById (long? petId)
+        {
+             ApiResponse<Pet> localVarResponse = GetPetByIdWithHttpInfo(petId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet that needs to be fetched</param> 
+        /// <returns>ApiResponse of Pet</returns>
+        public ApiResponse< Pet > GetPetByIdWithHttpInfo (long? petId)
+        {
+            
+            // verify the required parameter 'petId' is set
+            if (petId == null)
+                throw new ApiException(400, "Missing required parameter 'petId' when calling PetApi->GetPetById");
+            
+    
+            var localVarPath = "/pet/{petId}";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            if (petId != null) localVarPathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
+            
+            
+            
+            
+            
+
+            // authentication (api_key) required
+            
+            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("api_key")))
+            {
+                localVarHeaderParams["api_key"] = Configuration.GetApiKeyWithPrefix("api_key");
+            }
+            // authentication (petstore_auth) required
+            
+            // oauth required
+            if (!String.IsNullOrEmpty(Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
+            }
+            
+    
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath, 
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+    
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling GetPetById: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling GetPetById: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+    
+            return new ApiResponse<Pet>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (Pet) Configuration.ApiClient.Deserialize(localVarResponse, typeof(Pet)));
+            
+        }
+
+        
+        /// <summary>
+        /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <returns>Task of Pet</returns>
+        public async System.Threading.Tasks.Task<Pet> GetPetByIdAsync (long? petId)
+        {
+             ApiResponse<Pet> localVarResponse = await GetPetByIdAsyncWithHttpInfo(petId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <returns>Task of ApiResponse (Pet)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Pet>> GetPetByIdAsyncWithHttpInfo (long? petId)
+        {
+            // verify the required parameter 'petId' is set
+            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling GetPetById");
+            
+    
+            var localVarPath = "/pet/{petId}";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            if (petId != null) localVarPathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
+            
+            
+            
+            
+            
+
+            
+            // authentication (api_key) required
+            
+            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("api_key")))
+            {
+                localVarHeaderParams["api_key"] = Configuration.GetApiKeyWithPrefix("api_key");
+            }
+            
+            // authentication (petstore_auth) required
+            
+            // oauth required
+            if (!String.IsNullOrEmpty(Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
+            }
+            
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath, 
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams, 
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+ 
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling GetPetById: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling GetPetById: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+
+            return new ApiResponse<Pet>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (Pet) Configuration.ApiClient.Deserialize(localVarResponse, typeof(Pet)));
+            
+        }
+        
+        /// <summary>
+        /// Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39; Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet that needs to be fetched</param> 
+        /// <returns>InlineResponse200</returns>
+        public InlineResponse200 GetPetByIdInObject (long? petId)
+        {
+             ApiResponse<InlineResponse200> localVarResponse = GetPetByIdInObjectWithHttpInfo(petId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        /// Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39; Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet that needs to be fetched</param> 
+        /// <returns>ApiResponse of InlineResponse200</returns>
+        public ApiResponse< InlineResponse200 > GetPetByIdInObjectWithHttpInfo (long? petId)
+        {
+            
+            // verify the required parameter 'petId' is set
+            if (petId == null)
+                throw new ApiException(400, "Missing required parameter 'petId' when calling PetApi->GetPetByIdInObject");
+            
+    
+            var localVarPath = "/pet/{petId}?response=inline_arbitrary_object";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            if (petId != null) localVarPathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
+            
+            
+            
+            
+            
+
+            // authentication (api_key) required
+            
+            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("api_key")))
+            {
+                localVarHeaderParams["api_key"] = Configuration.GetApiKeyWithPrefix("api_key");
+            }
+            // authentication (petstore_auth) required
+            
+            // oauth required
+            if (!String.IsNullOrEmpty(Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
+            }
+            
+    
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath, 
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+    
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling GetPetByIdInObject: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling GetPetByIdInObject: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+    
+            return new ApiResponse<InlineResponse200>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (InlineResponse200) Configuration.ApiClient.Deserialize(localVarResponse, typeof(InlineResponse200)));
+            
+        }
+
+        
+        /// <summary>
+        /// Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39; Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <returns>Task of InlineResponse200</returns>
+        public async System.Threading.Tasks.Task<InlineResponse200> GetPetByIdInObjectAsync (long? petId)
+        {
+             ApiResponse<InlineResponse200> localVarResponse = await GetPetByIdInObjectAsyncWithHttpInfo(petId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        /// Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39; Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <returns>Task of ApiResponse (InlineResponse200)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<InlineResponse200>> GetPetByIdInObjectAsyncWithHttpInfo (long? petId)
+        {
+            // verify the required parameter 'petId' is set
+            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling GetPetByIdInObject");
+            
+    
+            var localVarPath = "/pet/{petId}?response=inline_arbitrary_object";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            if (petId != null) localVarPathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
+            
+            
+            
+            
+            
+
+            
+            // authentication (api_key) required
+            
+            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("api_key")))
+            {
+                localVarHeaderParams["api_key"] = Configuration.GetApiKeyWithPrefix("api_key");
+            }
+            
+            // authentication (petstore_auth) required
+            
+            // oauth required
+            if (!String.IsNullOrEmpty(Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
+            }
+            
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath, 
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams, 
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+ 
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling GetPetByIdInObject: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling GetPetByIdInObject: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+
+            return new ApiResponse<InlineResponse200>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (InlineResponse200) Configuration.ApiClient.Deserialize(localVarResponse, typeof(InlineResponse200)));
+            
+        }
+        
+        /// <summary>
+        /// Fake endpoint to test byte array return by &#39;Find pet by ID&#39; Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet that needs to be fetched</param> 
+        /// <returns>byte[]</returns>
+        public byte[] PetPetIdtestingByteArraytrueGet (long? petId)
+        {
+             ApiResponse<byte[]> localVarResponse = PetPetIdtestingByteArraytrueGetWithHttpInfo(petId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        /// Fake endpoint to test byte array return by &#39;Find pet by ID&#39; Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet that needs to be fetched</param> 
+        /// <returns>ApiResponse of byte[]</returns>
+        public ApiResponse< byte[] > PetPetIdtestingByteArraytrueGetWithHttpInfo (long? petId)
+        {
+            
+            // verify the required parameter 'petId' is set
+            if (petId == null)
+                throw new ApiException(400, "Missing required parameter 'petId' when calling PetApi->PetPetIdtestingByteArraytrueGet");
+            
+    
+            var localVarPath = "/pet/{petId}?testing_byte_array=true";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            if (petId != null) localVarPathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
+            
+            
+            
+            
+            
+
+            // authentication (api_key) required
+            
+            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("api_key")))
+            {
+                localVarHeaderParams["api_key"] = Configuration.GetApiKeyWithPrefix("api_key");
+            }
+            // authentication (petstore_auth) required
+            
+            // oauth required
+            if (!String.IsNullOrEmpty(Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
+            }
+            
+    
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath, 
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+    
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling PetPetIdtestingByteArraytrueGet: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling PetPetIdtestingByteArraytrueGet: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+    
+            return new ApiResponse<byte[]>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (byte[]) Configuration.ApiClient.Deserialize(localVarResponse, typeof(byte[])));
+            
+        }
+
+        
+        /// <summary>
+        /// Fake endpoint to test byte array return by &#39;Find pet by ID&#39; Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <returns>Task of byte[]</returns>
+        public async System.Threading.Tasks.Task<byte[]> PetPetIdtestingByteArraytrueGetAsync (long? petId)
+        {
+             ApiResponse<byte[]> localVarResponse = await PetPetIdtestingByteArraytrueGetAsyncWithHttpInfo(petId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        /// Fake endpoint to test byte array return by &#39;Find pet by ID&#39; Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <returns>Task of ApiResponse (byte[])</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<byte[]>> PetPetIdtestingByteArraytrueGetAsyncWithHttpInfo (long? petId)
+        {
+            // verify the required parameter 'petId' is set
+            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling PetPetIdtestingByteArraytrueGet");
+            
+    
+            var localVarPath = "/pet/{petId}?testing_byte_array=true";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            if (petId != null) localVarPathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
+            
+            
+            
+            
+            
+
+            
+            // authentication (api_key) required
+            
+            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("api_key")))
+            {
+                localVarHeaderParams["api_key"] = Configuration.GetApiKeyWithPrefix("api_key");
+            }
+            
+            // authentication (petstore_auth) required
+            
+            // oauth required
+            if (!String.IsNullOrEmpty(Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
+            }
+            
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath, 
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams, 
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+ 
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling PetPetIdtestingByteArraytrueGet: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling PetPetIdtestingByteArraytrueGet: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+
+            return new ApiResponse<byte[]>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (byte[]) Configuration.ApiClient.Deserialize(localVarResponse, typeof(byte[])));
+            
+        }
+        
+        /// <summary>
+        /// Update an existing pet 
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Pet object that needs to be added to the store (optional)</param> 
+        /// <returns></returns>
+        public void UpdatePet (Pet body = null)
+        {
+             UpdatePetWithHttpInfo(body);
+        }
+
+        /// <summary>
+        /// Update an existing pet 
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Pet object that needs to be added to the store (optional)</param> 
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> UpdatePetWithHttpInfo (Pet body = null)
+        {
+            
+    
+            var localVarPath = "/pet";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            
+            
+            
+            
+            if (body.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = body; // byte array
+            }
+
+            // authentication (petstore_auth) required
+            
+            // oauth required
+            if (!String.IsNullOrEmpty(Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
+            }
+            
+    
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath, 
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+    
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling UpdatePet: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling UpdatePet: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+    
+            
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        
+        /// <summary>
+        /// Update an existing pet 
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Pet object that needs to be added to the store (optional)</param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task UpdatePetAsync (Pet body = null)
+        {
+             await UpdatePetAsyncWithHttpInfo(body);
+
+        }
+
+        /// <summary>
+        /// Update an existing pet 
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Pet object that needs to be added to the store (optional)</param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdatePetAsyncWithHttpInfo (Pet body = null)
+        {
+            
+    
+            var localVarPath = "/pet";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            
+            
+            
+            
+            if (body.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = body; // byte array
+            }
+
+            
+            // authentication (petstore_auth) required
+            
+            // oauth required
+            if (!String.IsNullOrEmpty(Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
+            }
+            
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath, 
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams, 
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+ 
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling UpdatePet: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling UpdatePet: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+
+            
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+        
+        /// <summary>
+        /// Updates a pet in the store with form data 
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet that needs to be updated</param> 
+        /// <param name="name">Updated name of the pet (optional)</param> 
+        /// <param name="status">Updated status of the pet (optional)</param> 
+        /// <returns></returns>
+        public void UpdatePetWithForm (string petId, string name = null, string status = null)
+        {
+             UpdatePetWithFormWithHttpInfo(petId, name, status);
+        }
+
+        /// <summary>
+        /// Updates a pet in the store with form data 
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet that needs to be updated</param> 
+        /// <param name="name">Updated name of the pet (optional)</param> 
+        /// <param name="status">Updated status of the pet (optional)</param> 
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> UpdatePetWithFormWithHttpInfo (string petId, string name = null, string status = null)
+        {
+            
+            // verify the required parameter 'petId' is set
+            if (petId == null)
+                throw new ApiException(400, "Missing required parameter 'petId' when calling PetApi->UpdatePetWithForm");
+            
+    
+            var localVarPath = "/pet/{petId}";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            if (petId != null) localVarPathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
+            
+            
+            
+            if (name != null) localVarFormParams.Add("name", Configuration.ApiClient.ParameterToString(name)); // form parameter
+            if (status != null) localVarFormParams.Add("status", Configuration.ApiClient.ParameterToString(status)); // form parameter
+            
+            
+
+            // authentication (petstore_auth) required
+            
+            // oauth required
+            if (!String.IsNullOrEmpty(Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
+            }
+            
+    
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath, 
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+    
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling UpdatePetWithForm: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling UpdatePetWithForm: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+    
+            
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        
+        /// <summary>
+        /// Updates a pet in the store with form data 
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet that needs to be updated</param>
+        /// <param name="name">Updated name of the pet (optional)</param>
+        /// <param name="status">Updated status of the pet (optional)</param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task UpdatePetWithFormAsync (string petId, string name = null, string status = null)
+        {
+             await UpdatePetWithFormAsyncWithHttpInfo(petId, name, status);
+
+        }
+
+        /// <summary>
+        /// Updates a pet in the store with form data 
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet that needs to be updated</param>
+        /// <param name="name">Updated name of the pet (optional)</param>
+        /// <param name="status">Updated status of the pet (optional)</param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdatePetWithFormAsyncWithHttpInfo (string petId, string name = null, string status = null)
+        {
+            // verify the required parameter 'petId' is set
+            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UpdatePetWithForm");
+            
+    
+            var localVarPath = "/pet/{petId}";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            if (petId != null) localVarPathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
+            
+            
+            
+            if (name != null) localVarFormParams.Add("name", Configuration.ApiClient.ParameterToString(name)); // form parameter
+            if (status != null) localVarFormParams.Add("status", Configuration.ApiClient.ParameterToString(status)); // form parameter
+            
+            
+
+            
+            // authentication (petstore_auth) required
+            
+            // oauth required
+            if (!String.IsNullOrEmpty(Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
+            }
+            
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath, 
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams, 
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+ 
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling UpdatePetWithForm: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling UpdatePetWithForm: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+
+            
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
         
         /// <summary>
         /// uploads an image 
         /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param> 
-        /// <param name="additionalMetadata">Additional data to pass to server</param> 
-        /// <param name="file">file to upload</param> 
+        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param> 
+        /// <param name="file">file to upload (optional)</param> 
         /// <returns></returns>
         public void UploadFile (long? petId, string additionalMetadata = null, Stream file = null)
         {
@@ -1502,78 +2416,89 @@ namespace IO.Swagger.Api
         /// <summary>
         /// uploads an image 
         /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param> 
-        /// <param name="additionalMetadata">Additional data to pass to server</param> 
-        /// <param name="file">file to upload</param> 
+        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param> 
+        /// <param name="file">file to upload (optional)</param> 
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> UploadFileWithHttpInfo (long? petId, string additionalMetadata = null, Stream file = null)
         {
             
             // verify the required parameter 'petId' is set
-            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UploadFile");
+            if (petId == null)
+                throw new ApiException(400, "Missing required parameter 'petId' when calling PetApi->UploadFile");
             
     
-            var path_ = "/pet/{petId}/uploadImage";
+            var localVarPath = "/pet/{petId}/uploadImage";
     
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "multipart/form-data"
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
-            String[] http_header_accepts = new String[] {
+            String[] localVarHttpHeaderAccepts = new String[] {
                 "application/json", "application/xml"
             };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            if (petId != null) pathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
+            localVarPathParams.Add("format", "json");
+            if (petId != null) localVarPathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
             
             
             
-            if (additionalMetadata != null) formParams.Add("additionalMetadata", Configuration.ApiClient.ParameterToString(additionalMetadata)); // form parameter
-            if (file != null) fileParams.Add("file", Configuration.ApiClient.ParameterToFile("file", file));
+            if (additionalMetadata != null) localVarFormParams.Add("additionalMetadata", Configuration.ApiClient.ParameterToString(additionalMetadata)); // form parameter
+            if (file != null) localVarFileParams.Add("file", Configuration.ApiClient.ParameterToFile("file", file));
             
             
 
-            
             // authentication (petstore_auth) required
             
             // oauth required
             if (!String.IsNullOrEmpty(Configuration.AccessToken))
             {
-                headerParams["Authorization"] = "Bearer " + Configuration.AccessToken;
+                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
             }
             
     
             // make the HTTP request
-            IRestResponse response = (IRestResponse) Configuration.ApiClient.CallApi(path_, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
+            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath, 
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
 
-            int statusCode = (int) response.StatusCode;
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
     
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling UploadFile: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling UploadFile: " + response.ErrorMessage, response.ErrorMessage);
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling UploadFile: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling UploadFile: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
     
             
-            return new ApiResponse<Object>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
-    
+
+        
         /// <summary>
         /// uploads an image 
         /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="additionalMetadata">Additional data to pass to server</param>
-        /// <param name="file">file to upload</param>
+        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task UploadFileAsync (long? petId, string additionalMetadata = null, Stream file = null)
         {
@@ -1584,9 +2509,10 @@ namespace IO.Swagger.Api
         /// <summary>
         /// uploads an image 
         /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="additionalMetadata">Additional data to pass to server</param>
-        /// <param name="file">file to upload</param>
+        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> UploadFileAsyncWithHttpInfo (long? petId, string additionalMetadata = null, Stream file = null)
         {
@@ -1594,32 +2520,38 @@ namespace IO.Swagger.Api
             if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UploadFile");
             
     
-            var path_ = "/pet/{petId}/uploadImage";
+            var localVarPath = "/pet/{petId}/uploadImage";
     
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>();
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "multipart/form-data"
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
-            String[] http_header_accepts = new String[] {
+            String[] localVarHttpHeaderAccepts = new String[] {
                 "application/json", "application/xml"
             };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            if (petId != null) pathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
+            localVarPathParams.Add("format", "json");
+            if (petId != null) localVarPathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
             
             
             
-            if (additionalMetadata != null) formParams.Add("additionalMetadata", Configuration.ApiClient.ParameterToString(additionalMetadata)); // form parameter
-            if (file != null) fileParams.Add("file", Configuration.ApiClient.ParameterToFile("file", file));
+            if (additionalMetadata != null) localVarFormParams.Add("additionalMetadata", Configuration.ApiClient.ParameterToString(additionalMetadata)); // form parameter
+            if (file != null) localVarFileParams.Add("file", Configuration.ApiClient.ParameterToFile("file", file));
             
             
 
@@ -1629,23 +2561,25 @@ namespace IO.Swagger.Api
             // oauth required
             if (!String.IsNullOrEmpty(Configuration.AccessToken))
             {
-                headerParams["Authorization"] = "Bearer " + Configuration.AccessToken;
+                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
             }
             
 
             // make the HTTP request
-            IRestResponse response = (IRestResponse) await Configuration.ApiClient.CallApiAsync(path_, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
+            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath, 
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams, 
+                localVarPathParams, localVarHttpContentType);
 
-            int statusCode = (int) response.StatusCode;
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
  
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling UploadFile: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling UploadFile: " + response.ErrorMessage, response.ErrorMessage);
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling UploadFile: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling UploadFile: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
 
             
-            return new ApiResponse<Object>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
         
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs
index a9e9d6e9b74..580adc1322c 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using RestSharp;
 using IO.Swagger.Client;
@@ -14,122 +15,7 @@ namespace IO.Swagger.Api
     /// </summary>
     public interface IStoreApi
     {
-        
-        /// <summary>
-        /// Returns pet inventories by status
-        /// </summary>
-        /// <remarks>
-        /// Returns a map of status codes to quantities
-        /// </remarks>
-        /// <returns>Dictionary&lt;string, int?&gt;</returns>
-        Dictionary<string, int?> GetInventory ();
-  
-        /// <summary>
-        /// Returns pet inventories by status
-        /// </summary>
-        /// <remarks>
-        /// Returns a map of status codes to quantities
-        /// </remarks>
-        /// <returns>ApiResponse of Dictionary&lt;string, int?&gt;</returns>
-        ApiResponse<Dictionary<string, int?>> GetInventoryWithHttpInfo ();
-
-        /// <summary>
-        /// Returns pet inventories by status
-        /// </summary>
-        /// <remarks>
-        /// Returns a map of status codes to quantities
-        /// </remarks>
-        /// <returns>Task of Dictionary&lt;string, int?&gt;</returns>
-        System.Threading.Tasks.Task<Dictionary<string, int?>> GetInventoryAsync ();
-
-        /// <summary>
-        /// Returns pet inventories by status
-        /// </summary>
-        /// <remarks>
-        /// Returns a map of status codes to quantities
-        /// </remarks>
-        /// <returns>Task of ApiResponse (Dictionary&lt;string, int?&gt;)</returns>
-        System.Threading.Tasks.Task<ApiResponse<Dictionary<string, int?>>> GetInventoryAsyncWithHttpInfo ();
-        
-        /// <summary>
-        /// Place an order for a pet
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="body">order placed for purchasing the pet</param>
-        /// <returns>Order</returns>
-        Order PlaceOrder (Order body = null);
-  
-        /// <summary>
-        /// Place an order for a pet
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="body">order placed for purchasing the pet</param>
-        /// <returns>ApiResponse of Order</returns>
-        ApiResponse<Order> PlaceOrderWithHttpInfo (Order body = null);
-
-        /// <summary>
-        /// Place an order for a pet
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="body">order placed for purchasing the pet</param>
-        /// <returns>Task of Order</returns>
-        System.Threading.Tasks.Task<Order> PlaceOrderAsync (Order body = null);
-
-        /// <summary>
-        /// Place an order for a pet
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="body">order placed for purchasing the pet</param>
-        /// <returns>Task of ApiResponse (Order)</returns>
-        System.Threading.Tasks.Task<ApiResponse<Order>> PlaceOrderAsyncWithHttpInfo (Order body = null);
-        
-        /// <summary>
-        /// Find purchase order by ID
-        /// </summary>
-        /// <remarks>
-        /// For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-        /// </remarks>
-        /// <param name="orderId">ID of pet that needs to be fetched</param>
-        /// <returns>Order</returns>
-        Order GetOrderById (string orderId);
-  
-        /// <summary>
-        /// Find purchase order by ID
-        /// </summary>
-        /// <remarks>
-        /// For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-        /// </remarks>
-        /// <param name="orderId">ID of pet that needs to be fetched</param>
-        /// <returns>ApiResponse of Order</returns>
-        ApiResponse<Order> GetOrderByIdWithHttpInfo (string orderId);
-
-        /// <summary>
-        /// Find purchase order by ID
-        /// </summary>
-        /// <remarks>
-        /// For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-        /// </remarks>
-        /// <param name="orderId">ID of pet that needs to be fetched</param>
-        /// <returns>Task of Order</returns>
-        System.Threading.Tasks.Task<Order> GetOrderByIdAsync (string orderId);
-
-        /// <summary>
-        /// Find purchase order by ID
-        /// </summary>
-        /// <remarks>
-        /// For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-        /// </remarks>
-        /// <param name="orderId">ID of pet that needs to be fetched</param>
-        /// <returns>Task of ApiResponse (Order)</returns>
-        System.Threading.Tasks.Task<ApiResponse<Order>> GetOrderByIdAsyncWithHttpInfo (string orderId);
+        #region Synchronous Operations
         
         /// <summary>
         /// Delete purchase order by ID
@@ -137,6 +23,7 @@ namespace IO.Swagger.Api
         /// <remarks>
         /// For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
         /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <returns></returns>
         void DeleteOrder (string orderId);
@@ -147,16 +34,128 @@ namespace IO.Swagger.Api
         /// <remarks>
         /// For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
         /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> DeleteOrderWithHttpInfo (string orderId);
-
+        
+        /// <summary>
+        /// Finds orders by status
+        /// </summary>
+        /// <remarks>
+        /// A single status value can be provided as a string
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="status">Status value that needs to be considered for query (optional, default to placed)</param>
+        /// <returns>List&lt;Order&gt;</returns>
+        List<Order> FindOrdersByStatus (string status = null);
+  
+        /// <summary>
+        /// Finds orders by status
+        /// </summary>
+        /// <remarks>
+        /// A single status value can be provided as a string
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="status">Status value that needs to be considered for query (optional, default to placed)</param>
+        /// <returns>ApiResponse of List&lt;Order&gt;</returns>
+        ApiResponse<List<Order>> FindOrdersByStatusWithHttpInfo (string status = null);
+        
+        /// <summary>
+        /// Returns pet inventories by status
+        /// </summary>
+        /// <remarks>
+        /// Returns a map of status codes to quantities
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Dictionary&lt;string, int?&gt;</returns>
+        Dictionary<string, int?> GetInventory ();
+  
+        /// <summary>
+        /// Returns pet inventories by status
+        /// </summary>
+        /// <remarks>
+        /// Returns a map of status codes to quantities
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>ApiResponse of Dictionary&lt;string, int?&gt;</returns>
+        ApiResponse<Dictionary<string, int?>> GetInventoryWithHttpInfo ();
+        
+        /// <summary>
+        /// Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+        /// </summary>
+        /// <remarks>
+        /// Returns an arbitrary object which is actually a map of status codes to quantities
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Object</returns>
+        Object GetInventoryInObject ();
+  
+        /// <summary>
+        /// Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+        /// </summary>
+        /// <remarks>
+        /// Returns an arbitrary object which is actually a map of status codes to quantities
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> GetInventoryInObjectWithHttpInfo ();
+        
+        /// <summary>
+        /// Find purchase order by ID
+        /// </summary>
+        /// <remarks>
+        /// For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orderId">ID of pet that needs to be fetched</param>
+        /// <returns>Order</returns>
+        Order GetOrderById (string orderId);
+  
+        /// <summary>
+        /// Find purchase order by ID
+        /// </summary>
+        /// <remarks>
+        /// For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orderId">ID of pet that needs to be fetched</param>
+        /// <returns>ApiResponse of Order</returns>
+        ApiResponse<Order> GetOrderByIdWithHttpInfo (string orderId);
+        
+        /// <summary>
+        /// Place an order for a pet
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">order placed for purchasing the pet (optional)</param>
+        /// <returns>Order</returns>
+        Order PlaceOrder (Order body = null);
+  
+        /// <summary>
+        /// Place an order for a pet
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">order placed for purchasing the pet (optional)</param>
+        /// <returns>ApiResponse of Order</returns>
+        ApiResponse<Order> PlaceOrderWithHttpInfo (Order body = null);
+        
+        #endregion Synchronous Operations
+        
+        #region Asynchronous Operations
+        
         /// <summary>
         /// Delete purchase order by ID
         /// </summary>
         /// <remarks>
         /// For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
         /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task DeleteOrderAsync (string orderId);
@@ -167,10 +166,119 @@ namespace IO.Swagger.Api
         /// <remarks>
         /// For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
         /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> DeleteOrderAsyncWithHttpInfo (string orderId);
         
+        /// <summary>
+        /// Finds orders by status
+        /// </summary>
+        /// <remarks>
+        /// A single status value can be provided as a string
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="status">Status value that needs to be considered for query (optional, default to placed)</param>
+        /// <returns>Task of List&lt;Order&gt;</returns>
+        System.Threading.Tasks.Task<List<Order>> FindOrdersByStatusAsync (string status = null);
+
+        /// <summary>
+        /// Finds orders by status
+        /// </summary>
+        /// <remarks>
+        /// A single status value can be provided as a string
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="status">Status value that needs to be considered for query (optional, default to placed)</param>
+        /// <returns>Task of ApiResponse (List&lt;Order&gt;)</returns>
+        System.Threading.Tasks.Task<ApiResponse<List<Order>>> FindOrdersByStatusAsyncWithHttpInfo (string status = null);
+        
+        /// <summary>
+        /// Returns pet inventories by status
+        /// </summary>
+        /// <remarks>
+        /// Returns a map of status codes to quantities
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of Dictionary&lt;string, int?&gt;</returns>
+        System.Threading.Tasks.Task<Dictionary<string, int?>> GetInventoryAsync ();
+
+        /// <summary>
+        /// Returns pet inventories by status
+        /// </summary>
+        /// <remarks>
+        /// Returns a map of status codes to quantities
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of ApiResponse (Dictionary&lt;string, int?&gt;)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Dictionary<string, int?>>> GetInventoryAsyncWithHttpInfo ();
+        
+        /// <summary>
+        /// Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+        /// </summary>
+        /// <remarks>
+        /// Returns an arbitrary object which is actually a map of status codes to quantities
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> GetInventoryInObjectAsync ();
+
+        /// <summary>
+        /// Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+        /// </summary>
+        /// <remarks>
+        /// Returns an arbitrary object which is actually a map of status codes to quantities
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> GetInventoryInObjectAsyncWithHttpInfo ();
+        
+        /// <summary>
+        /// Find purchase order by ID
+        /// </summary>
+        /// <remarks>
+        /// For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orderId">ID of pet that needs to be fetched</param>
+        /// <returns>Task of Order</returns>
+        System.Threading.Tasks.Task<Order> GetOrderByIdAsync (string orderId);
+
+        /// <summary>
+        /// Find purchase order by ID
+        /// </summary>
+        /// <remarks>
+        /// For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orderId">ID of pet that needs to be fetched</param>
+        /// <returns>Task of ApiResponse (Order)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Order>> GetOrderByIdAsyncWithHttpInfo (string orderId);
+        
+        /// <summary>
+        /// Place an order for a pet
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">order placed for purchasing the pet (optional)</param>
+        /// <returns>Task of Order</returns>
+        System.Threading.Tasks.Task<Order> PlaceOrderAsync (Order body = null);
+
+        /// <summary>
+        /// Place an order for a pet
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">order placed for purchasing the pet (optional)</param>
+        /// <returns>Task of ApiResponse (Order)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Order>> PlaceOrderAsyncWithHttpInfo (Order body = null);
+        
+        #endregion Asynchronous Operations
+        
     }
   
     /// <summary>
@@ -185,6 +293,12 @@ namespace IO.Swagger.Api
         public StoreApi(String basePath)
         {
             this.Configuration = new Configuration(new ApiClient(basePath));
+
+            // ensure API client has configuration ready
+            if (Configuration.ApiClient.Configuration == null)
+            {
+                this.Configuration.ApiClient.Configuration = this.Configuration;
+            }
         }
     
         /// <summary>
@@ -199,6 +313,12 @@ namespace IO.Swagger.Api
                 this.Configuration = Configuration.Default; 
             else
                 this.Configuration = configuration;
+
+            // ensure API client has configuration ready
+            if (Configuration.ApiClient.Configuration == null)
+            {
+                this.Configuration.ApiClient.Configuration = this.Configuration;
+            }
         }
 
         /// <summary>
@@ -249,417 +369,10 @@ namespace IO.Swagger.Api
         }
    
         
-        /// <summary>
-        /// Returns pet inventories by status Returns a map of status codes to quantities
-        /// </summary>
-        /// <returns>Dictionary&lt;string, int?&gt;</returns>
-        public Dictionary<string, int?> GetInventory ()
-        {
-             ApiResponse<Dictionary<string, int?>> response = GetInventoryWithHttpInfo();
-             return response.Data;
-        }
-
-        /// <summary>
-        /// Returns pet inventories by status Returns a map of status codes to quantities
-        /// </summary>
-        /// <returns>ApiResponse of Dictionary&lt;string, int?&gt;</returns>
-        public ApiResponse< Dictionary<string, int?> > GetInventoryWithHttpInfo ()
-        {
-            
-    
-            var path_ = "/store/inventory";
-    
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
-
-            // to determine the Accept header
-            String[] http_header_accepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            
-            
-            
-            
-            
-
-            
-            // authentication (api_key) required
-            
-            var apiKeyValue = Configuration.GetApiKeyWithPrefix("api_key");
-            if (!String.IsNullOrEmpty(apiKeyValue))
-            {
-                headerParams["api_key"] = apiKeyValue;
-            }
-            
-    
-            // make the HTTP request
-            IRestResponse response = (IRestResponse) Configuration.ApiClient.CallApi(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
-
-            int statusCode = (int) response.StatusCode;
-    
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling GetInventory: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling GetInventory: " + response.ErrorMessage, response.ErrorMessage);
-    
-            return new ApiResponse<Dictionary<string, int?>>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (Dictionary<string, int?>) Configuration.ApiClient.Deserialize(response, typeof(Dictionary<string, int?>)));
-            
-        }
-    
-        /// <summary>
-        /// Returns pet inventories by status Returns a map of status codes to quantities
-        /// </summary>
-        /// <returns>Task of Dictionary&lt;string, int?&gt;</returns>
-        public async System.Threading.Tasks.Task<Dictionary<string, int?>> GetInventoryAsync ()
-        {
-             ApiResponse<Dictionary<string, int?>> response = await GetInventoryAsyncWithHttpInfo();
-             return response.Data;
-
-        }
-
-        /// <summary>
-        /// Returns pet inventories by status Returns a map of status codes to quantities
-        /// </summary>
-        /// <returns>Task of ApiResponse (Dictionary&lt;string, int?&gt;)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Dictionary<string, int?>>> GetInventoryAsyncWithHttpInfo ()
-        {
-            
-    
-            var path_ = "/store/inventory";
-    
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>();
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
-
-            // to determine the Accept header
-            String[] http_header_accepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            
-            
-            
-            
-            
-
-            
-            // authentication (api_key) required
-            
-            var apiKeyValue = Configuration.GetApiKeyWithPrefix("api_key");
-            if (!String.IsNullOrEmpty(apiKeyValue))
-            {
-                headerParams["api_key"] = apiKeyValue;
-            }
-            
-
-            // make the HTTP request
-            IRestResponse response = (IRestResponse) await Configuration.ApiClient.CallApiAsync(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
-
-            int statusCode = (int) response.StatusCode;
- 
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling GetInventory: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling GetInventory: " + response.ErrorMessage, response.ErrorMessage);
-
-            return new ApiResponse<Dictionary<string, int?>>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (Dictionary<string, int?>) Configuration.ApiClient.Deserialize(response, typeof(Dictionary<string, int?>)));
-            
-        }
-        
-        /// <summary>
-        /// Place an order for a pet 
-        /// </summary>
-        /// <param name="body">order placed for purchasing the pet</param> 
-        /// <returns>Order</returns>
-        public Order PlaceOrder (Order body = null)
-        {
-             ApiResponse<Order> response = PlaceOrderWithHttpInfo(body);
-             return response.Data;
-        }
-
-        /// <summary>
-        /// Place an order for a pet 
-        /// </summary>
-        /// <param name="body">order placed for purchasing the pet</param> 
-        /// <returns>ApiResponse of Order</returns>
-        public ApiResponse< Order > PlaceOrderWithHttpInfo (Order body = null)
-        {
-            
-    
-            var path_ = "/store/order";
-    
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
-
-            // to determine the Accept header
-            String[] http_header_accepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            
-            
-            
-            
-            postBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
-            
-
-            
-    
-            // make the HTTP request
-            IRestResponse response = (IRestResponse) Configuration.ApiClient.CallApi(path_, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
-
-            int statusCode = (int) response.StatusCode;
-    
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling PlaceOrder: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling PlaceOrder: " + response.ErrorMessage, response.ErrorMessage);
-    
-            return new ApiResponse<Order>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (Order) Configuration.ApiClient.Deserialize(response, typeof(Order)));
-            
-        }
-    
-        /// <summary>
-        /// Place an order for a pet 
-        /// </summary>
-        /// <param name="body">order placed for purchasing the pet</param>
-        /// <returns>Task of Order</returns>
-        public async System.Threading.Tasks.Task<Order> PlaceOrderAsync (Order body = null)
-        {
-             ApiResponse<Order> response = await PlaceOrderAsyncWithHttpInfo(body);
-             return response.Data;
-
-        }
-
-        /// <summary>
-        /// Place an order for a pet 
-        /// </summary>
-        /// <param name="body">order placed for purchasing the pet</param>
-        /// <returns>Task of ApiResponse (Order)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Order>> PlaceOrderAsyncWithHttpInfo (Order body = null)
-        {
-            
-    
-            var path_ = "/store/order";
-    
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>();
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
-
-            // to determine the Accept header
-            String[] http_header_accepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            
-            
-            
-            
-            postBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
-            
-
-            
-
-            // make the HTTP request
-            IRestResponse response = (IRestResponse) await Configuration.ApiClient.CallApiAsync(path_, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
-
-            int statusCode = (int) response.StatusCode;
- 
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling PlaceOrder: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling PlaceOrder: " + response.ErrorMessage, response.ErrorMessage);
-
-            return new ApiResponse<Order>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (Order) Configuration.ApiClient.Deserialize(response, typeof(Order)));
-            
-        }
-        
-        /// <summary>
-        /// Find purchase order by ID For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-        /// </summary>
-        /// <param name="orderId">ID of pet that needs to be fetched</param> 
-        /// <returns>Order</returns>
-        public Order GetOrderById (string orderId)
-        {
-             ApiResponse<Order> response = GetOrderByIdWithHttpInfo(orderId);
-             return response.Data;
-        }
-
-        /// <summary>
-        /// Find purchase order by ID For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-        /// </summary>
-        /// <param name="orderId">ID of pet that needs to be fetched</param> 
-        /// <returns>ApiResponse of Order</returns>
-        public ApiResponse< Order > GetOrderByIdWithHttpInfo (string orderId)
-        {
-            
-            // verify the required parameter 'orderId' is set
-            if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling GetOrderById");
-            
-    
-            var path_ = "/store/order/{orderId}";
-    
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
-
-            // to determine the Accept header
-            String[] http_header_accepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            if (orderId != null) pathParams.Add("orderId", Configuration.ApiClient.ParameterToString(orderId)); // path parameter
-            
-            
-            
-            
-            
-
-            
-    
-            // make the HTTP request
-            IRestResponse response = (IRestResponse) Configuration.ApiClient.CallApi(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
-
-            int statusCode = (int) response.StatusCode;
-    
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling GetOrderById: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling GetOrderById: " + response.ErrorMessage, response.ErrorMessage);
-    
-            return new ApiResponse<Order>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (Order) Configuration.ApiClient.Deserialize(response, typeof(Order)));
-            
-        }
-    
-        /// <summary>
-        /// Find purchase order by ID For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-        /// </summary>
-        /// <param name="orderId">ID of pet that needs to be fetched</param>
-        /// <returns>Task of Order</returns>
-        public async System.Threading.Tasks.Task<Order> GetOrderByIdAsync (string orderId)
-        {
-             ApiResponse<Order> response = await GetOrderByIdAsyncWithHttpInfo(orderId);
-             return response.Data;
-
-        }
-
-        /// <summary>
-        /// Find purchase order by ID For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-        /// </summary>
-        /// <param name="orderId">ID of pet that needs to be fetched</param>
-        /// <returns>Task of ApiResponse (Order)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Order>> GetOrderByIdAsyncWithHttpInfo (string orderId)
-        {
-            // verify the required parameter 'orderId' is set
-            if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling GetOrderById");
-            
-    
-            var path_ = "/store/order/{orderId}";
-    
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>();
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
-
-            // to determine the Accept header
-            String[] http_header_accepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            if (orderId != null) pathParams.Add("orderId", Configuration.ApiClient.ParameterToString(orderId)); // path parameter
-            
-            
-            
-            
-            
-
-            
-
-            // make the HTTP request
-            IRestResponse response = (IRestResponse) await Configuration.ApiClient.CallApiAsync(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
-
-            int statusCode = (int) response.StatusCode;
- 
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling GetOrderById: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling GetOrderById: " + response.ErrorMessage, response.ErrorMessage);
-
-            return new ApiResponse<Order>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (Order) Configuration.ApiClient.Deserialize(response, typeof(Order)));
-            
-        }
-        
         /// <summary>
         /// Delete purchase order by ID For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
         /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="orderId">ID of the order that needs to be deleted</param> 
         /// <returns></returns>
         public void DeleteOrder (string orderId)
@@ -670,36 +383,44 @@ namespace IO.Swagger.Api
         /// <summary>
         /// Delete purchase order by ID For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
         /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="orderId">ID of the order that needs to be deleted</param> 
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> DeleteOrderWithHttpInfo (string orderId)
         {
             
             // verify the required parameter 'orderId' is set
-            if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling DeleteOrder");
+            if (orderId == null)
+                throw new ApiException(400, "Missing required parameter 'orderId' when calling StoreApi->DeleteOrder");
             
     
-            var path_ = "/store/order/{orderId}";
+            var localVarPath = "/store/order/{orderId}";
     
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
-            String[] http_header_accepts = new String[] {
+            String[] localVarHttpHeaderAccepts = new String[] {
                 "application/json", "application/xml"
             };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            if (orderId != null) pathParams.Add("orderId", Configuration.ApiClient.ParameterToString(orderId)); // path parameter
+            localVarPathParams.Add("format", "json");
+            if (orderId != null) localVarPathParams.Add("orderId", Configuration.ApiClient.ParameterToString(orderId)); // path parameter
             
             
             
@@ -709,24 +430,28 @@ namespace IO.Swagger.Api
             
     
             // make the HTTP request
-            IRestResponse response = (IRestResponse) Configuration.ApiClient.CallApi(path_, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
+            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath, 
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
 
-            int statusCode = (int) response.StatusCode;
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
     
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling DeleteOrder: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling DeleteOrder: " + response.ErrorMessage, response.ErrorMessage);
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling DeleteOrder: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling DeleteOrder: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
     
             
-            return new ApiResponse<Object>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
-    
+
+        
         /// <summary>
         /// Delete purchase order by ID For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
         /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task DeleteOrderAsync (string orderId)
@@ -738,6 +463,7 @@ namespace IO.Swagger.Api
         /// <summary>
         /// Delete purchase order by ID For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
         /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteOrderAsyncWithHttpInfo (string orderId)
@@ -746,27 +472,33 @@ namespace IO.Swagger.Api
             if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling DeleteOrder");
             
     
-            var path_ = "/store/order/{orderId}";
+            var localVarPath = "/store/order/{orderId}";
     
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>();
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
-            String[] http_header_accepts = new String[] {
+            String[] localVarHttpHeaderAccepts = new String[] {
                 "application/json", "application/xml"
             };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            if (orderId != null) pathParams.Add("orderId", Configuration.ApiClient.ParameterToString(orderId)); // path parameter
+            localVarPathParams.Add("format", "json");
+            if (orderId != null) localVarPathParams.Add("orderId", Configuration.ApiClient.ParameterToString(orderId)); // path parameter
             
             
             
@@ -776,21 +508,893 @@ namespace IO.Swagger.Api
             
 
             // make the HTTP request
-            IRestResponse response = (IRestResponse) await Configuration.ApiClient.CallApiAsync(path_, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
+            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath, 
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams, 
+                localVarPathParams, localVarHttpContentType);
 
-            int statusCode = (int) response.StatusCode;
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
  
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling DeleteOrder: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling DeleteOrder: " + response.ErrorMessage, response.ErrorMessage);
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling DeleteOrder: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling DeleteOrder: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
 
             
-            return new ApiResponse<Object>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
         
+        /// <summary>
+        /// Finds orders by status A single status value can be provided as a string
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="status">Status value that needs to be considered for query (optional, default to placed)</param> 
+        /// <returns>List&lt;Order&gt;</returns>
+        public List<Order> FindOrdersByStatus (string status = null)
+        {
+             ApiResponse<List<Order>> localVarResponse = FindOrdersByStatusWithHttpInfo(status);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        /// Finds orders by status A single status value can be provided as a string
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="status">Status value that needs to be considered for query (optional, default to placed)</param> 
+        /// <returns>ApiResponse of List&lt;Order&gt;</returns>
+        public ApiResponse< List<Order> > FindOrdersByStatusWithHttpInfo (string status = null)
+        {
+            
+    
+            var localVarPath = "/store/findByStatus";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            
+            if (status != null) localVarQueryParams.Add("status", Configuration.ApiClient.ParameterToString(status)); // query parameter
+            
+            
+            
+            
+
+            // authentication (test_api_client_id) required
+            
+            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("x-test_api_client_id")))
+            {
+                localVarHeaderParams["x-test_api_client_id"] = Configuration.GetApiKeyWithPrefix("x-test_api_client_id");
+            }
+            // authentication (test_api_client_secret) required
+            
+            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("x-test_api_client_secret")))
+            {
+                localVarHeaderParams["x-test_api_client_secret"] = Configuration.GetApiKeyWithPrefix("x-test_api_client_secret");
+            }
+            
+    
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath, 
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+    
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling FindOrdersByStatus: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling FindOrdersByStatus: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+    
+            return new ApiResponse<List<Order>>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (List<Order>) Configuration.ApiClient.Deserialize(localVarResponse, typeof(List<Order>)));
+            
+        }
+
+        
+        /// <summary>
+        /// Finds orders by status A single status value can be provided as a string
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="status">Status value that needs to be considered for query (optional, default to placed)</param>
+        /// <returns>Task of List&lt;Order&gt;</returns>
+        public async System.Threading.Tasks.Task<List<Order>> FindOrdersByStatusAsync (string status = null)
+        {
+             ApiResponse<List<Order>> localVarResponse = await FindOrdersByStatusAsyncWithHttpInfo(status);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        /// Finds orders by status A single status value can be provided as a string
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="status">Status value that needs to be considered for query (optional, default to placed)</param>
+        /// <returns>Task of ApiResponse (List&lt;Order&gt;)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<List<Order>>> FindOrdersByStatusAsyncWithHttpInfo (string status = null)
+        {
+            
+    
+            var localVarPath = "/store/findByStatus";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            
+            if (status != null) localVarQueryParams.Add("status", Configuration.ApiClient.ParameterToString(status)); // query parameter
+            
+            
+            
+            
+
+            
+            // authentication (test_api_client_id) required
+            
+            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("x-test_api_client_id")))
+            {
+                localVarHeaderParams["x-test_api_client_id"] = Configuration.GetApiKeyWithPrefix("x-test_api_client_id");
+            }
+            
+            // authentication (test_api_client_secret) required
+            
+            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("x-test_api_client_secret")))
+            {
+                localVarHeaderParams["x-test_api_client_secret"] = Configuration.GetApiKeyWithPrefix("x-test_api_client_secret");
+            }
+            
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath, 
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams, 
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+ 
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling FindOrdersByStatus: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling FindOrdersByStatus: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+
+            return new ApiResponse<List<Order>>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (List<Order>) Configuration.ApiClient.Deserialize(localVarResponse, typeof(List<Order>)));
+            
+        }
+        
+        /// <summary>
+        /// Returns pet inventories by status Returns a map of status codes to quantities
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Dictionary&lt;string, int?&gt;</returns>
+        public Dictionary<string, int?> GetInventory ()
+        {
+             ApiResponse<Dictionary<string, int?>> localVarResponse = GetInventoryWithHttpInfo();
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        /// Returns pet inventories by status Returns a map of status codes to quantities
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>ApiResponse of Dictionary&lt;string, int?&gt;</returns>
+        public ApiResponse< Dictionary<string, int?> > GetInventoryWithHttpInfo ()
+        {
+            
+    
+            var localVarPath = "/store/inventory";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            
+            
+            
+            
+            
+
+            // authentication (api_key) required
+            
+            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("api_key")))
+            {
+                localVarHeaderParams["api_key"] = Configuration.GetApiKeyWithPrefix("api_key");
+            }
+            
+    
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath, 
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+    
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling GetInventory: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling GetInventory: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+    
+            return new ApiResponse<Dictionary<string, int?>>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (Dictionary<string, int?>) Configuration.ApiClient.Deserialize(localVarResponse, typeof(Dictionary<string, int?>)));
+            
+        }
+
+        
+        /// <summary>
+        /// Returns pet inventories by status Returns a map of status codes to quantities
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of Dictionary&lt;string, int?&gt;</returns>
+        public async System.Threading.Tasks.Task<Dictionary<string, int?>> GetInventoryAsync ()
+        {
+             ApiResponse<Dictionary<string, int?>> localVarResponse = await GetInventoryAsyncWithHttpInfo();
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        /// Returns pet inventories by status Returns a map of status codes to quantities
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of ApiResponse (Dictionary&lt;string, int?&gt;)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Dictionary<string, int?>>> GetInventoryAsyncWithHttpInfo ()
+        {
+            
+    
+            var localVarPath = "/store/inventory";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            
+            
+            
+            
+            
+
+            
+            // authentication (api_key) required
+            
+            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("api_key")))
+            {
+                localVarHeaderParams["api_key"] = Configuration.GetApiKeyWithPrefix("api_key");
+            }
+            
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath, 
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams, 
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+ 
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling GetInventory: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling GetInventory: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+
+            return new ApiResponse<Dictionary<string, int?>>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (Dictionary<string, int?>) Configuration.ApiClient.Deserialize(localVarResponse, typeof(Dictionary<string, int?>)));
+            
+        }
+        
+        /// <summary>
+        /// Fake endpoint to test arbitrary object return by &#39;Get inventory&#39; Returns an arbitrary object which is actually a map of status codes to quantities
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Object</returns>
+        public Object GetInventoryInObject ()
+        {
+             ApiResponse<Object> localVarResponse = GetInventoryInObjectWithHttpInfo();
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        /// Fake endpoint to test arbitrary object return by &#39;Get inventory&#39; Returns an arbitrary object which is actually a map of status codes to quantities
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > GetInventoryInObjectWithHttpInfo ()
+        {
+            
+    
+            var localVarPath = "/store/inventory?response=arbitrary_object";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            
+            
+            
+            
+            
+
+            // authentication (api_key) required
+            
+            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("api_key")))
+            {
+                localVarHeaderParams["api_key"] = Configuration.GetApiKeyWithPrefix("api_key");
+            }
+            
+    
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath, 
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+    
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling GetInventoryInObject: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling GetInventoryInObject: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+    
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (Object) Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+            
+        }
+
+        
+        /// <summary>
+        /// Fake endpoint to test arbitrary object return by &#39;Get inventory&#39; Returns an arbitrary object which is actually a map of status codes to quantities
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> GetInventoryInObjectAsync ()
+        {
+             ApiResponse<Object> localVarResponse = await GetInventoryInObjectAsyncWithHttpInfo();
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        /// Fake endpoint to test arbitrary object return by &#39;Get inventory&#39; Returns an arbitrary object which is actually a map of status codes to quantities
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> GetInventoryInObjectAsyncWithHttpInfo ()
+        {
+            
+    
+            var localVarPath = "/store/inventory?response=arbitrary_object";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            
+            
+            
+            
+            
+
+            
+            // authentication (api_key) required
+            
+            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("api_key")))
+            {
+                localVarHeaderParams["api_key"] = Configuration.GetApiKeyWithPrefix("api_key");
+            }
+            
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath, 
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams, 
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+ 
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling GetInventoryInObject: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling GetInventoryInObject: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (Object) Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+            
+        }
+        
+        /// <summary>
+        /// Find purchase order by ID For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orderId">ID of pet that needs to be fetched</param> 
+        /// <returns>Order</returns>
+        public Order GetOrderById (string orderId)
+        {
+             ApiResponse<Order> localVarResponse = GetOrderByIdWithHttpInfo(orderId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        /// Find purchase order by ID For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orderId">ID of pet that needs to be fetched</param> 
+        /// <returns>ApiResponse of Order</returns>
+        public ApiResponse< Order > GetOrderByIdWithHttpInfo (string orderId)
+        {
+            
+            // verify the required parameter 'orderId' is set
+            if (orderId == null)
+                throw new ApiException(400, "Missing required parameter 'orderId' when calling StoreApi->GetOrderById");
+            
+    
+            var localVarPath = "/store/order/{orderId}";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            if (orderId != null) localVarPathParams.Add("orderId", Configuration.ApiClient.ParameterToString(orderId)); // path parameter
+            
+            
+            
+            
+            
+
+            // authentication (test_api_key_header) required
+            
+            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("test_api_key_header")))
+            {
+                localVarHeaderParams["test_api_key_header"] = Configuration.GetApiKeyWithPrefix("test_api_key_header");
+            }
+            // authentication (test_api_key_query) required
+            
+            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("test_api_key_query")))
+            {
+                localVarQueryParams["test_api_key_query"] = Configuration.GetApiKeyWithPrefix("test_api_key_query");
+            }
+            
+    
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath, 
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+    
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling GetOrderById: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling GetOrderById: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+    
+            return new ApiResponse<Order>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (Order) Configuration.ApiClient.Deserialize(localVarResponse, typeof(Order)));
+            
+        }
+
+        
+        /// <summary>
+        /// Find purchase order by ID For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orderId">ID of pet that needs to be fetched</param>
+        /// <returns>Task of Order</returns>
+        public async System.Threading.Tasks.Task<Order> GetOrderByIdAsync (string orderId)
+        {
+             ApiResponse<Order> localVarResponse = await GetOrderByIdAsyncWithHttpInfo(orderId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        /// Find purchase order by ID For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orderId">ID of pet that needs to be fetched</param>
+        /// <returns>Task of ApiResponse (Order)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Order>> GetOrderByIdAsyncWithHttpInfo (string orderId)
+        {
+            // verify the required parameter 'orderId' is set
+            if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling GetOrderById");
+            
+    
+            var localVarPath = "/store/order/{orderId}";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            if (orderId != null) localVarPathParams.Add("orderId", Configuration.ApiClient.ParameterToString(orderId)); // path parameter
+            
+            
+            
+            
+            
+
+            
+            // authentication (test_api_key_header) required
+            
+            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("test_api_key_header")))
+            {
+                localVarHeaderParams["test_api_key_header"] = Configuration.GetApiKeyWithPrefix("test_api_key_header");
+            }
+            
+            // authentication (test_api_key_query) required
+            
+            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("test_api_key_query")))
+            {
+                localVarQueryParams["test_api_key_query"] = Configuration.GetApiKeyWithPrefix("test_api_key_query");
+            }
+            
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath, 
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams, 
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+ 
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling GetOrderById: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling GetOrderById: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+
+            return new ApiResponse<Order>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (Order) Configuration.ApiClient.Deserialize(localVarResponse, typeof(Order)));
+            
+        }
+        
+        /// <summary>
+        /// Place an order for a pet 
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">order placed for purchasing the pet (optional)</param> 
+        /// <returns>Order</returns>
+        public Order PlaceOrder (Order body = null)
+        {
+             ApiResponse<Order> localVarResponse = PlaceOrderWithHttpInfo(body);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        /// Place an order for a pet 
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">order placed for purchasing the pet (optional)</param> 
+        /// <returns>ApiResponse of Order</returns>
+        public ApiResponse< Order > PlaceOrderWithHttpInfo (Order body = null)
+        {
+            
+    
+            var localVarPath = "/store/order";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            
+            
+            
+            
+            if (body.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = body; // byte array
+            }
+
+            // authentication (test_api_client_id) required
+            
+            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("x-test_api_client_id")))
+            {
+                localVarHeaderParams["x-test_api_client_id"] = Configuration.GetApiKeyWithPrefix("x-test_api_client_id");
+            }
+            // authentication (test_api_client_secret) required
+            
+            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("x-test_api_client_secret")))
+            {
+                localVarHeaderParams["x-test_api_client_secret"] = Configuration.GetApiKeyWithPrefix("x-test_api_client_secret");
+            }
+            
+    
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath, 
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+    
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling PlaceOrder: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling PlaceOrder: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+    
+            return new ApiResponse<Order>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (Order) Configuration.ApiClient.Deserialize(localVarResponse, typeof(Order)));
+            
+        }
+
+        
+        /// <summary>
+        /// Place an order for a pet 
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">order placed for purchasing the pet (optional)</param>
+        /// <returns>Task of Order</returns>
+        public async System.Threading.Tasks.Task<Order> PlaceOrderAsync (Order body = null)
+        {
+             ApiResponse<Order> localVarResponse = await PlaceOrderAsyncWithHttpInfo(body);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        /// Place an order for a pet 
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">order placed for purchasing the pet (optional)</param>
+        /// <returns>Task of ApiResponse (Order)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Order>> PlaceOrderAsyncWithHttpInfo (Order body = null)
+        {
+            
+    
+            var localVarPath = "/store/order";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            
+            
+            
+            
+            if (body.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = body; // byte array
+            }
+
+            
+            // authentication (test_api_client_id) required
+            
+            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("x-test_api_client_id")))
+            {
+                localVarHeaderParams["x-test_api_client_id"] = Configuration.GetApiKeyWithPrefix("x-test_api_client_id");
+            }
+            
+            // authentication (test_api_client_secret) required
+            
+            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("x-test_api_client_secret")))
+            {
+                localVarHeaderParams["x-test_api_client_secret"] = Configuration.GetApiKeyWithPrefix("x-test_api_client_secret");
+            }
+            
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath, 
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams, 
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+ 
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling PlaceOrder: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling PlaceOrder: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+
+            return new ApiResponse<Order>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (Order) Configuration.ApiClient.Deserialize(localVarResponse, typeof(Order)));
+            
+        }
+        
     }
     
 }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs
index 5502fe15da1..71ad89f6397 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using RestSharp;
 using IO.Swagger.Client;
@@ -14,6 +15,7 @@ namespace IO.Swagger.Api
     /// </summary>
     public interface IUserApi
     {
+        #region Synchronous Operations
         
         /// <summary>
         /// Create user
@@ -21,7 +23,8 @@ namespace IO.Swagger.Api
         /// <remarks>
         /// This can only be done by the logged in user.
         /// </remarks>
-        /// <param name="body">Created user object</param>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Created user object (optional)</param>
         /// <returns></returns>
         void CreateUser (User body = null);
   
@@ -31,29 +34,10 @@ namespace IO.Swagger.Api
         /// <remarks>
         /// This can only be done by the logged in user.
         /// </remarks>
-        /// <param name="body">Created user object</param>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Created user object (optional)</param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> CreateUserWithHttpInfo (User body = null);
-
-        /// <summary>
-        /// Create user
-        /// </summary>
-        /// <remarks>
-        /// This can only be done by the logged in user.
-        /// </remarks>
-        /// <param name="body">Created user object</param>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task CreateUserAsync (User body = null);
-
-        /// <summary>
-        /// Create user
-        /// </summary>
-        /// <remarks>
-        /// This can only be done by the logged in user.
-        /// </remarks>
-        /// <param name="body">Created user object</param>
-        /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> CreateUserAsyncWithHttpInfo (User body = null);
         
         /// <summary>
         /// Creates list of users with given input array
@@ -61,7 +45,8 @@ namespace IO.Swagger.Api
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="body">List of user object</param>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">List of user object (optional)</param>
         /// <returns></returns>
         void CreateUsersWithArrayInput (List<User> body = null);
   
@@ -71,29 +56,10 @@ namespace IO.Swagger.Api
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="body">List of user object</param>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">List of user object (optional)</param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> CreateUsersWithArrayInputWithHttpInfo (List<User> body = null);
-
-        /// <summary>
-        /// Creates list of users with given input array
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="body">List of user object</param>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task CreateUsersWithArrayInputAsync (List<User> body = null);
-
-        /// <summary>
-        /// Creates list of users with given input array
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="body">List of user object</param>
-        /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> CreateUsersWithArrayInputAsyncWithHttpInfo (List<User> body = null);
         
         /// <summary>
         /// Creates list of users with given input array
@@ -101,7 +67,8 @@ namespace IO.Swagger.Api
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="body">List of user object</param>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">List of user object (optional)</param>
         /// <returns></returns>
         void CreateUsersWithListInput (List<User> body = null);
   
@@ -111,193 +78,10 @@ namespace IO.Swagger.Api
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="body">List of user object</param>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">List of user object (optional)</param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> CreateUsersWithListInputWithHttpInfo (List<User> body = null);
-
-        /// <summary>
-        /// Creates list of users with given input array
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="body">List of user object</param>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task CreateUsersWithListInputAsync (List<User> body = null);
-
-        /// <summary>
-        /// Creates list of users with given input array
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="body">List of user object</param>
-        /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> CreateUsersWithListInputAsyncWithHttpInfo (List<User> body = null);
-        
-        /// <summary>
-        /// Logs user into the system
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="username">The user name for login</param>
-        /// <param name="password">The password for login in clear text</param>
-        /// <returns>string</returns>
-        string LoginUser (string username = null, string password = null);
-  
-        /// <summary>
-        /// Logs user into the system
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="username">The user name for login</param>
-        /// <param name="password">The password for login in clear text</param>
-        /// <returns>ApiResponse of string</returns>
-        ApiResponse<string> LoginUserWithHttpInfo (string username = null, string password = null);
-
-        /// <summary>
-        /// Logs user into the system
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="username">The user name for login</param>
-        /// <param name="password">The password for login in clear text</param>
-        /// <returns>Task of string</returns>
-        System.Threading.Tasks.Task<string> LoginUserAsync (string username = null, string password = null);
-
-        /// <summary>
-        /// Logs user into the system
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="username">The user name for login</param>
-        /// <param name="password">The password for login in clear text</param>
-        /// <returns>Task of ApiResponse (string)</returns>
-        System.Threading.Tasks.Task<ApiResponse<string>> LoginUserAsyncWithHttpInfo (string username = null, string password = null);
-        
-        /// <summary>
-        /// Logs out current logged in user session
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <returns></returns>
-        void LogoutUser ();
-  
-        /// <summary>
-        /// Logs out current logged in user session
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> LogoutUserWithHttpInfo ();
-
-        /// <summary>
-        /// Logs out current logged in user session
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task LogoutUserAsync ();
-
-        /// <summary>
-        /// Logs out current logged in user session
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> LogoutUserAsyncWithHttpInfo ();
-        
-        /// <summary>
-        /// Get user by user name
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
-        /// <returns>User</returns>
-        User GetUserByName (string username);
-  
-        /// <summary>
-        /// Get user by user name
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
-        /// <returns>ApiResponse of User</returns>
-        ApiResponse<User> GetUserByNameWithHttpInfo (string username);
-
-        /// <summary>
-        /// Get user by user name
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
-        /// <returns>Task of User</returns>
-        System.Threading.Tasks.Task<User> GetUserByNameAsync (string username);
-
-        /// <summary>
-        /// Get user by user name
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
-        /// <returns>Task of ApiResponse (User)</returns>
-        System.Threading.Tasks.Task<ApiResponse<User>> GetUserByNameAsyncWithHttpInfo (string username);
-        
-        /// <summary>
-        /// Updated user
-        /// </summary>
-        /// <remarks>
-        /// This can only be done by the logged in user.
-        /// </remarks>
-        /// <param name="username">name that need to be deleted</param>
-        /// <param name="body">Updated user object</param>
-        /// <returns></returns>
-        void UpdateUser (string username, User body = null);
-  
-        /// <summary>
-        /// Updated user
-        /// </summary>
-        /// <remarks>
-        /// This can only be done by the logged in user.
-        /// </remarks>
-        /// <param name="username">name that need to be deleted</param>
-        /// <param name="body">Updated user object</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> UpdateUserWithHttpInfo (string username, User body = null);
-
-        /// <summary>
-        /// Updated user
-        /// </summary>
-        /// <remarks>
-        /// This can only be done by the logged in user.
-        /// </remarks>
-        /// <param name="username">name that need to be deleted</param>
-        /// <param name="body">Updated user object</param>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task UpdateUserAsync (string username, User body = null);
-
-        /// <summary>
-        /// Updated user
-        /// </summary>
-        /// <remarks>
-        /// This can only be done by the logged in user.
-        /// </remarks>
-        /// <param name="username">name that need to be deleted</param>
-        /// <param name="body">Updated user object</param>
-        /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> UpdateUserAsyncWithHttpInfo (string username, User body = null);
         
         /// <summary>
         /// Delete user
@@ -305,6 +89,7 @@ namespace IO.Swagger.Api
         /// <remarks>
         /// This can only be done by the logged in user.
         /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="username">The name that needs to be deleted</param>
         /// <returns></returns>
         void DeleteUser (string username);
@@ -315,16 +100,178 @@ namespace IO.Swagger.Api
         /// <remarks>
         /// This can only be done by the logged in user.
         /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="username">The name that needs to be deleted</param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> DeleteUserWithHttpInfo (string username);
+        
+        /// <summary>
+        /// Get user by user name
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
+        /// <returns>User</returns>
+        User GetUserByName (string username);
+  
+        /// <summary>
+        /// Get user by user name
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
+        /// <returns>ApiResponse of User</returns>
+        ApiResponse<User> GetUserByNameWithHttpInfo (string username);
+        
+        /// <summary>
+        /// Logs user into the system
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="username">The user name for login (optional)</param>
+        /// <param name="password">The password for login in clear text (optional)</param>
+        /// <returns>string</returns>
+        string LoginUser (string username = null, string password = null);
+  
+        /// <summary>
+        /// Logs user into the system
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="username">The user name for login (optional)</param>
+        /// <param name="password">The password for login in clear text (optional)</param>
+        /// <returns>ApiResponse of string</returns>
+        ApiResponse<string> LoginUserWithHttpInfo (string username = null, string password = null);
+        
+        /// <summary>
+        /// Logs out current logged in user session
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns></returns>
+        void LogoutUser ();
+  
+        /// <summary>
+        /// Logs out current logged in user session
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> LogoutUserWithHttpInfo ();
+        
+        /// <summary>
+        /// Updated user
+        /// </summary>
+        /// <remarks>
+        /// This can only be done by the logged in user.
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="username">name that need to be deleted</param>
+        /// <param name="body">Updated user object (optional)</param>
+        /// <returns></returns>
+        void UpdateUser (string username, User body = null);
+  
+        /// <summary>
+        /// Updated user
+        /// </summary>
+        /// <remarks>
+        /// This can only be done by the logged in user.
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="username">name that need to be deleted</param>
+        /// <param name="body">Updated user object (optional)</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> UpdateUserWithHttpInfo (string username, User body = null);
+        
+        #endregion Synchronous Operations
+        
+        #region Asynchronous Operations
+        
+        /// <summary>
+        /// Create user
+        /// </summary>
+        /// <remarks>
+        /// This can only be done by the logged in user.
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Created user object (optional)</param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task CreateUserAsync (User body = null);
 
+        /// <summary>
+        /// Create user
+        /// </summary>
+        /// <remarks>
+        /// This can only be done by the logged in user.
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Created user object (optional)</param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> CreateUserAsyncWithHttpInfo (User body = null);
+        
+        /// <summary>
+        /// Creates list of users with given input array
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">List of user object (optional)</param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task CreateUsersWithArrayInputAsync (List<User> body = null);
+
+        /// <summary>
+        /// Creates list of users with given input array
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">List of user object (optional)</param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> CreateUsersWithArrayInputAsyncWithHttpInfo (List<User> body = null);
+        
+        /// <summary>
+        /// Creates list of users with given input array
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">List of user object (optional)</param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task CreateUsersWithListInputAsync (List<User> body = null);
+
+        /// <summary>
+        /// Creates list of users with given input array
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">List of user object (optional)</param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> CreateUsersWithListInputAsyncWithHttpInfo (List<User> body = null);
+        
         /// <summary>
         /// Delete user
         /// </summary>
         /// <remarks>
         /// This can only be done by the logged in user.
         /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="username">The name that needs to be deleted</param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task DeleteUserAsync (string username);
@@ -335,10 +282,103 @@ namespace IO.Swagger.Api
         /// <remarks>
         /// This can only be done by the logged in user.
         /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="username">The name that needs to be deleted</param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> DeleteUserAsyncWithHttpInfo (string username);
         
+        /// <summary>
+        /// Get user by user name
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
+        /// <returns>Task of User</returns>
+        System.Threading.Tasks.Task<User> GetUserByNameAsync (string username);
+
+        /// <summary>
+        /// Get user by user name
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
+        /// <returns>Task of ApiResponse (User)</returns>
+        System.Threading.Tasks.Task<ApiResponse<User>> GetUserByNameAsyncWithHttpInfo (string username);
+        
+        /// <summary>
+        /// Logs user into the system
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="username">The user name for login (optional)</param>
+        /// <param name="password">The password for login in clear text (optional)</param>
+        /// <returns>Task of string</returns>
+        System.Threading.Tasks.Task<string> LoginUserAsync (string username = null, string password = null);
+
+        /// <summary>
+        /// Logs user into the system
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="username">The user name for login (optional)</param>
+        /// <param name="password">The password for login in clear text (optional)</param>
+        /// <returns>Task of ApiResponse (string)</returns>
+        System.Threading.Tasks.Task<ApiResponse<string>> LoginUserAsyncWithHttpInfo (string username = null, string password = null);
+        
+        /// <summary>
+        /// Logs out current logged in user session
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task LogoutUserAsync ();
+
+        /// <summary>
+        /// Logs out current logged in user session
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> LogoutUserAsyncWithHttpInfo ();
+        
+        /// <summary>
+        /// Updated user
+        /// </summary>
+        /// <remarks>
+        /// This can only be done by the logged in user.
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="username">name that need to be deleted</param>
+        /// <param name="body">Updated user object (optional)</param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task UpdateUserAsync (string username, User body = null);
+
+        /// <summary>
+        /// Updated user
+        /// </summary>
+        /// <remarks>
+        /// This can only be done by the logged in user.
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="username">name that need to be deleted</param>
+        /// <param name="body">Updated user object (optional)</param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> UpdateUserAsyncWithHttpInfo (string username, User body = null);
+        
+        #endregion Asynchronous Operations
+        
     }
   
     /// <summary>
@@ -353,6 +393,12 @@ namespace IO.Swagger.Api
         public UserApi(String basePath)
         {
             this.Configuration = new Configuration(new ApiClient(basePath));
+
+            // ensure API client has configuration ready
+            if (Configuration.ApiClient.Configuration == null)
+            {
+                this.Configuration.ApiClient.Configuration = this.Configuration;
+            }
         }
     
         /// <summary>
@@ -367,6 +413,12 @@ namespace IO.Swagger.Api
                 this.Configuration = Configuration.Default; 
             else
                 this.Configuration = configuration;
+
+            // ensure API client has configuration ready
+            if (Configuration.ApiClient.Configuration == null)
+            {
+                this.Configuration.ApiClient.Configuration = this.Configuration;
+            }
         }
 
         /// <summary>
@@ -420,7 +472,8 @@ namespace IO.Swagger.Api
         /// <summary>
         /// Create user This can only be done by the logged in user.
         /// </summary>
-        /// <param name="body">Created user object</param> 
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Created user object (optional)</param> 
         /// <returns></returns>
         public void CreateUser (User body = null)
         {
@@ -430,61 +483,78 @@ namespace IO.Swagger.Api
         /// <summary>
         /// Create user This can only be done by the logged in user.
         /// </summary>
-        /// <param name="body">Created user object</param> 
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Created user object (optional)</param> 
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> CreateUserWithHttpInfo (User body = null)
         {
             
     
-            var path_ = "/user";
+            var localVarPath = "/user";
     
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
-            String[] http_header_accepts = new String[] {
+            String[] localVarHttpHeaderAccepts = new String[] {
                 "application/json", "application/xml"
             };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
+            localVarPathParams.Add("format", "json");
             
             
             
             
-            postBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
-            
+            if (body.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = body; // byte array
+            }
 
             
     
             // make the HTTP request
-            IRestResponse response = (IRestResponse) Configuration.ApiClient.CallApi(path_, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
+            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath, 
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
 
-            int statusCode = (int) response.StatusCode;
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
     
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling CreateUser: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling CreateUser: " + response.ErrorMessage, response.ErrorMessage);
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling CreateUser: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling CreateUser: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
     
             
-            return new ApiResponse<Object>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
-    
+
+        
         /// <summary>
         /// Create user This can only be done by the logged in user.
         /// </summary>
-        /// <param name="body">Created user object</param>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Created user object (optional)</param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task CreateUserAsync (User body = null)
         {
@@ -495,61 +565,77 @@ namespace IO.Swagger.Api
         /// <summary>
         /// Create user This can only be done by the logged in user.
         /// </summary>
-        /// <param name="body">Created user object</param>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">Created user object (optional)</param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateUserAsyncWithHttpInfo (User body = null)
         {
             
     
-            var path_ = "/user";
+            var localVarPath = "/user";
     
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>();
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
-            String[] http_header_accepts = new String[] {
+            String[] localVarHttpHeaderAccepts = new String[] {
                 "application/json", "application/xml"
             };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
+            localVarPathParams.Add("format", "json");
             
             
             
             
-            postBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
-            
+            if (body.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = body; // byte array
+            }
 
             
 
             // make the HTTP request
-            IRestResponse response = (IRestResponse) await Configuration.ApiClient.CallApiAsync(path_, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
+            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath, 
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams, 
+                localVarPathParams, localVarHttpContentType);
 
-            int statusCode = (int) response.StatusCode;
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
  
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling CreateUser: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling CreateUser: " + response.ErrorMessage, response.ErrorMessage);
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling CreateUser: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling CreateUser: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
 
             
-            return new ApiResponse<Object>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
         
         /// <summary>
         /// Creates list of users with given input array 
         /// </summary>
-        /// <param name="body">List of user object</param> 
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">List of user object (optional)</param> 
         /// <returns></returns>
         public void CreateUsersWithArrayInput (List<User> body = null)
         {
@@ -559,61 +645,78 @@ namespace IO.Swagger.Api
         /// <summary>
         /// Creates list of users with given input array 
         /// </summary>
-        /// <param name="body">List of user object</param> 
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">List of user object (optional)</param> 
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> CreateUsersWithArrayInputWithHttpInfo (List<User> body = null)
         {
             
     
-            var path_ = "/user/createWithArray";
+            var localVarPath = "/user/createWithArray";
     
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
-            String[] http_header_accepts = new String[] {
+            String[] localVarHttpHeaderAccepts = new String[] {
                 "application/json", "application/xml"
             };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
+            localVarPathParams.Add("format", "json");
             
             
             
             
-            postBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
-            
+            if (body.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = body; // byte array
+            }
 
             
     
             // make the HTTP request
-            IRestResponse response = (IRestResponse) Configuration.ApiClient.CallApi(path_, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
+            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath, 
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
 
-            int statusCode = (int) response.StatusCode;
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
     
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling CreateUsersWithArrayInput: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling CreateUsersWithArrayInput: " + response.ErrorMessage, response.ErrorMessage);
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling CreateUsersWithArrayInput: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling CreateUsersWithArrayInput: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
     
             
-            return new ApiResponse<Object>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
-    
+
+        
         /// <summary>
         /// Creates list of users with given input array 
         /// </summary>
-        /// <param name="body">List of user object</param>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">List of user object (optional)</param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task CreateUsersWithArrayInputAsync (List<User> body = null)
         {
@@ -624,61 +727,77 @@ namespace IO.Swagger.Api
         /// <summary>
         /// Creates list of users with given input array 
         /// </summary>
-        /// <param name="body">List of user object</param>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">List of user object (optional)</param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateUsersWithArrayInputAsyncWithHttpInfo (List<User> body = null)
         {
             
     
-            var path_ = "/user/createWithArray";
+            var localVarPath = "/user/createWithArray";
     
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>();
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
-            String[] http_header_accepts = new String[] {
+            String[] localVarHttpHeaderAccepts = new String[] {
                 "application/json", "application/xml"
             };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
+            localVarPathParams.Add("format", "json");
             
             
             
             
-            postBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
-            
+            if (body.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = body; // byte array
+            }
 
             
 
             // make the HTTP request
-            IRestResponse response = (IRestResponse) await Configuration.ApiClient.CallApiAsync(path_, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
+            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath, 
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams, 
+                localVarPathParams, localVarHttpContentType);
 
-            int statusCode = (int) response.StatusCode;
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
  
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling CreateUsersWithArrayInput: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling CreateUsersWithArrayInput: " + response.ErrorMessage, response.ErrorMessage);
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling CreateUsersWithArrayInput: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling CreateUsersWithArrayInput: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
 
             
-            return new ApiResponse<Object>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
         
         /// <summary>
         /// Creates list of users with given input array 
         /// </summary>
-        /// <param name="body">List of user object</param> 
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">List of user object (optional)</param> 
         /// <returns></returns>
         public void CreateUsersWithListInput (List<User> body = null)
         {
@@ -688,61 +807,78 @@ namespace IO.Swagger.Api
         /// <summary>
         /// Creates list of users with given input array 
         /// </summary>
-        /// <param name="body">List of user object</param> 
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">List of user object (optional)</param> 
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> CreateUsersWithListInputWithHttpInfo (List<User> body = null)
         {
             
     
-            var path_ = "/user/createWithList";
+            var localVarPath = "/user/createWithList";
     
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
-            String[] http_header_accepts = new String[] {
+            String[] localVarHttpHeaderAccepts = new String[] {
                 "application/json", "application/xml"
             };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
+            localVarPathParams.Add("format", "json");
             
             
             
             
-            postBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
-            
+            if (body.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = body; // byte array
+            }
 
             
     
             // make the HTTP request
-            IRestResponse response = (IRestResponse) Configuration.ApiClient.CallApi(path_, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
+            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath, 
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
 
-            int statusCode = (int) response.StatusCode;
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
     
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling CreateUsersWithListInput: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling CreateUsersWithListInput: " + response.ErrorMessage, response.ErrorMessage);
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling CreateUsersWithListInput: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling CreateUsersWithListInput: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
     
             
-            return new ApiResponse<Object>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
-    
+
+        
         /// <summary>
         /// Creates list of users with given input array 
         /// </summary>
-        /// <param name="body">List of user object</param>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">List of user object (optional)</param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task CreateUsersWithListInputAsync (List<User> body = null)
         {
@@ -753,596 +889,76 @@ namespace IO.Swagger.Api
         /// <summary>
         /// Creates list of users with given input array 
         /// </summary>
-        /// <param name="body">List of user object</param>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="body">List of user object (optional)</param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateUsersWithListInputAsyncWithHttpInfo (List<User> body = null)
         {
             
     
-            var path_ = "/user/createWithList";
+            var localVarPath = "/user/createWithList";
     
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>();
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
-            String[] http_header_accepts = new String[] {
+            String[] localVarHttpHeaderAccepts = new String[] {
                 "application/json", "application/xml"
             };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
+            localVarPathParams.Add("format", "json");
             
             
             
             
-            postBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
-            
+            if (body.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = body; // byte array
+            }
 
             
 
             // make the HTTP request
-            IRestResponse response = (IRestResponse) await Configuration.ApiClient.CallApiAsync(path_, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
+            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath, 
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams, 
+                localVarPathParams, localVarHttpContentType);
 
-            int statusCode = (int) response.StatusCode;
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
  
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling CreateUsersWithListInput: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling CreateUsersWithListInput: " + response.ErrorMessage, response.ErrorMessage);
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling CreateUsersWithListInput: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling CreateUsersWithListInput: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
 
             
-            return new ApiResponse<Object>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
-        }
-        
-        /// <summary>
-        /// Logs user into the system 
-        /// </summary>
-        /// <param name="username">The user name for login</param> 
-        /// <param name="password">The password for login in clear text</param> 
-        /// <returns>string</returns>
-        public string LoginUser (string username = null, string password = null)
-        {
-             ApiResponse<string> response = LoginUserWithHttpInfo(username, password);
-             return response.Data;
-        }
-
-        /// <summary>
-        /// Logs user into the system 
-        /// </summary>
-        /// <param name="username">The user name for login</param> 
-        /// <param name="password">The password for login in clear text</param> 
-        /// <returns>ApiResponse of string</returns>
-        public ApiResponse< string > LoginUserWithHttpInfo (string username = null, string password = null)
-        {
-            
-    
-            var path_ = "/user/login";
-    
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
-
-            // to determine the Accept header
-            String[] http_header_accepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            
-            if (username != null) queryParams.Add("username", Configuration.ApiClient.ParameterToString(username)); // query parameter
-            if (password != null) queryParams.Add("password", Configuration.ApiClient.ParameterToString(password)); // query parameter
-            
-            
-            
-            
-
-            
-    
-            // make the HTTP request
-            IRestResponse response = (IRestResponse) Configuration.ApiClient.CallApi(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
-
-            int statusCode = (int) response.StatusCode;
-    
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling LoginUser: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling LoginUser: " + response.ErrorMessage, response.ErrorMessage);
-    
-            return new ApiResponse<string>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (string) Configuration.ApiClient.Deserialize(response, typeof(string)));
-            
-        }
-    
-        /// <summary>
-        /// Logs user into the system 
-        /// </summary>
-        /// <param name="username">The user name for login</param>
-        /// <param name="password">The password for login in clear text</param>
-        /// <returns>Task of string</returns>
-        public async System.Threading.Tasks.Task<string> LoginUserAsync (string username = null, string password = null)
-        {
-             ApiResponse<string> response = await LoginUserAsyncWithHttpInfo(username, password);
-             return response.Data;
-
-        }
-
-        /// <summary>
-        /// Logs user into the system 
-        /// </summary>
-        /// <param name="username">The user name for login</param>
-        /// <param name="password">The password for login in clear text</param>
-        /// <returns>Task of ApiResponse (string)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<string>> LoginUserAsyncWithHttpInfo (string username = null, string password = null)
-        {
-            
-    
-            var path_ = "/user/login";
-    
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>();
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
-
-            // to determine the Accept header
-            String[] http_header_accepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            
-            if (username != null) queryParams.Add("username", Configuration.ApiClient.ParameterToString(username)); // query parameter
-            if (password != null) queryParams.Add("password", Configuration.ApiClient.ParameterToString(password)); // query parameter
-            
-            
-            
-            
-
-            
-
-            // make the HTTP request
-            IRestResponse response = (IRestResponse) await Configuration.ApiClient.CallApiAsync(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
-
-            int statusCode = (int) response.StatusCode;
- 
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling LoginUser: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling LoginUser: " + response.ErrorMessage, response.ErrorMessage);
-
-            return new ApiResponse<string>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (string) Configuration.ApiClient.Deserialize(response, typeof(string)));
-            
-        }
-        
-        /// <summary>
-        /// Logs out current logged in user session 
-        /// </summary>
-        /// <returns></returns>
-        public void LogoutUser ()
-        {
-             LogoutUserWithHttpInfo();
-        }
-
-        /// <summary>
-        /// Logs out current logged in user session 
-        /// </summary>
-        /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> LogoutUserWithHttpInfo ()
-        {
-            
-    
-            var path_ = "/user/logout";
-    
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
-
-            // to determine the Accept header
-            String[] http_header_accepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            
-            
-            
-            
-            
-
-            
-    
-            // make the HTTP request
-            IRestResponse response = (IRestResponse) Configuration.ApiClient.CallApi(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
-
-            int statusCode = (int) response.StatusCode;
-    
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling LogoutUser: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling LogoutUser: " + response.ErrorMessage, response.ErrorMessage);
-    
-            
-            return new ApiResponse<Object>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
-        }
-    
-        /// <summary>
-        /// Logs out current logged in user session 
-        /// </summary>
-        /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task LogoutUserAsync ()
-        {
-             await LogoutUserAsyncWithHttpInfo();
-
-        }
-
-        /// <summary>
-        /// Logs out current logged in user session 
-        /// </summary>
-        /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> LogoutUserAsyncWithHttpInfo ()
-        {
-            
-    
-            var path_ = "/user/logout";
-    
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>();
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
-
-            // to determine the Accept header
-            String[] http_header_accepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            
-            
-            
-            
-            
-
-            
-
-            // make the HTTP request
-            IRestResponse response = (IRestResponse) await Configuration.ApiClient.CallApiAsync(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
-
-            int statusCode = (int) response.StatusCode;
- 
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling LogoutUser: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling LogoutUser: " + response.ErrorMessage, response.ErrorMessage);
-
-            
-            return new ApiResponse<Object>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
-        }
-        
-        /// <summary>
-        /// Get user by user name 
-        /// </summary>
-        /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param> 
-        /// <returns>User</returns>
-        public User GetUserByName (string username)
-        {
-             ApiResponse<User> response = GetUserByNameWithHttpInfo(username);
-             return response.Data;
-        }
-
-        /// <summary>
-        /// Get user by user name 
-        /// </summary>
-        /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param> 
-        /// <returns>ApiResponse of User</returns>
-        public ApiResponse< User > GetUserByNameWithHttpInfo (string username)
-        {
-            
-            // verify the required parameter 'username' is set
-            if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling GetUserByName");
-            
-    
-            var path_ = "/user/{username}";
-    
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
-
-            // to determine the Accept header
-            String[] http_header_accepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            if (username != null) pathParams.Add("username", Configuration.ApiClient.ParameterToString(username)); // path parameter
-            
-            
-            
-            
-            
-
-            
-    
-            // make the HTTP request
-            IRestResponse response = (IRestResponse) Configuration.ApiClient.CallApi(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
-
-            int statusCode = (int) response.StatusCode;
-    
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling GetUserByName: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling GetUserByName: " + response.ErrorMessage, response.ErrorMessage);
-    
-            return new ApiResponse<User>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (User) Configuration.ApiClient.Deserialize(response, typeof(User)));
-            
-        }
-    
-        /// <summary>
-        /// Get user by user name 
-        /// </summary>
-        /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
-        /// <returns>Task of User</returns>
-        public async System.Threading.Tasks.Task<User> GetUserByNameAsync (string username)
-        {
-             ApiResponse<User> response = await GetUserByNameAsyncWithHttpInfo(username);
-             return response.Data;
-
-        }
-
-        /// <summary>
-        /// Get user by user name 
-        /// </summary>
-        /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
-        /// <returns>Task of ApiResponse (User)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<User>> GetUserByNameAsyncWithHttpInfo (string username)
-        {
-            // verify the required parameter 'username' is set
-            if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling GetUserByName");
-            
-    
-            var path_ = "/user/{username}";
-    
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>();
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
-
-            // to determine the Accept header
-            String[] http_header_accepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            if (username != null) pathParams.Add("username", Configuration.ApiClient.ParameterToString(username)); // path parameter
-            
-            
-            
-            
-            
-
-            
-
-            // make the HTTP request
-            IRestResponse response = (IRestResponse) await Configuration.ApiClient.CallApiAsync(path_, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
-
-            int statusCode = (int) response.StatusCode;
- 
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling GetUserByName: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling GetUserByName: " + response.ErrorMessage, response.ErrorMessage);
-
-            return new ApiResponse<User>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (User) Configuration.ApiClient.Deserialize(response, typeof(User)));
-            
-        }
-        
-        /// <summary>
-        /// Updated user This can only be done by the logged in user.
-        /// </summary>
-        /// <param name="username">name that need to be deleted</param> 
-        /// <param name="body">Updated user object</param> 
-        /// <returns></returns>
-        public void UpdateUser (string username, User body = null)
-        {
-             UpdateUserWithHttpInfo(username, body);
-        }
-
-        /// <summary>
-        /// Updated user This can only be done by the logged in user.
-        /// </summary>
-        /// <param name="username">name that need to be deleted</param> 
-        /// <param name="body">Updated user object</param> 
-        /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> UpdateUserWithHttpInfo (string username, User body = null)
-        {
-            
-            // verify the required parameter 'username' is set
-            if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling UpdateUser");
-            
-    
-            var path_ = "/user/{username}";
-    
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
-
-            // to determine the Accept header
-            String[] http_header_accepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            if (username != null) pathParams.Add("username", Configuration.ApiClient.ParameterToString(username)); // path parameter
-            
-            
-            
-            
-            postBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
-            
-
-            
-    
-            // make the HTTP request
-            IRestResponse response = (IRestResponse) Configuration.ApiClient.CallApi(path_, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
-
-            int statusCode = (int) response.StatusCode;
-    
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling UpdateUser: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling UpdateUser: " + response.ErrorMessage, response.ErrorMessage);
-    
-            
-            return new ApiResponse<Object>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
-        }
-    
-        /// <summary>
-        /// Updated user This can only be done by the logged in user.
-        /// </summary>
-        /// <param name="username">name that need to be deleted</param>
-        /// <param name="body">Updated user object</param>
-        /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task UpdateUserAsync (string username, User body = null)
-        {
-             await UpdateUserAsyncWithHttpInfo(username, body);
-
-        }
-
-        /// <summary>
-        /// Updated user This can only be done by the logged in user.
-        /// </summary>
-        /// <param name="username">name that need to be deleted</param>
-        /// <param name="body">Updated user object</param>
-        /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateUserAsyncWithHttpInfo (string username, User body = null)
-        {
-            // verify the required parameter 'username' is set
-            if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling UpdateUser");
-            
-    
-            var path_ = "/user/{username}";
-    
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>();
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
-
-            // to determine the Accept header
-            String[] http_header_accepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            if (username != null) pathParams.Add("username", Configuration.ApiClient.ParameterToString(username)); // path parameter
-            
-            
-            
-            
-            postBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
-            
-
-            
-
-            // make the HTTP request
-            IRestResponse response = (IRestResponse) await Configuration.ApiClient.CallApiAsync(path_, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
-
-            int statusCode = (int) response.StatusCode;
- 
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling UpdateUser: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling UpdateUser: " + response.ErrorMessage, response.ErrorMessage);
-
-            
-            return new ApiResponse<Object>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
         
         /// <summary>
         /// Delete user This can only be done by the logged in user.
         /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="username">The name that needs to be deleted</param> 
         /// <returns></returns>
         public void DeleteUser (string username)
@@ -1353,63 +969,82 @@ namespace IO.Swagger.Api
         /// <summary>
         /// Delete user This can only be done by the logged in user.
         /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="username">The name that needs to be deleted</param> 
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> DeleteUserWithHttpInfo (string username)
         {
             
             // verify the required parameter 'username' is set
-            if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling DeleteUser");
+            if (username == null)
+                throw new ApiException(400, "Missing required parameter 'username' when calling UserApi->DeleteUser");
             
     
-            var path_ = "/user/{username}";
+            var localVarPath = "/user/{username}";
     
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
-            String[] http_header_accepts = new String[] {
+            String[] localVarHttpHeaderAccepts = new String[] {
                 "application/json", "application/xml"
             };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            if (username != null) pathParams.Add("username", Configuration.ApiClient.ParameterToString(username)); // path parameter
+            localVarPathParams.Add("format", "json");
+            if (username != null) localVarPathParams.Add("username", Configuration.ApiClient.ParameterToString(username)); // path parameter
             
             
             
             
             
 
+            // authentication (test_http_basic) required
+            
+            // http basic authentication required
+            if (!String.IsNullOrEmpty(Configuration.Username) || !String.IsNullOrEmpty(Configuration.Password))
+            {
+                localVarHeaderParams["Authorization"] = "Basic " + ApiClient.Base64Encode(Configuration.Username + ":" + Configuration.Password);
+            }
             
     
             // make the HTTP request
-            IRestResponse response = (IRestResponse) Configuration.ApiClient.CallApi(path_, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
+            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath, 
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
 
-            int statusCode = (int) response.StatusCode;
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
     
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling DeleteUser: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling DeleteUser: " + response.ErrorMessage, response.ErrorMessage);
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling DeleteUser: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling DeleteUser: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
     
             
-            return new ApiResponse<Object>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
-    
+
+        
         /// <summary>
         /// Delete user This can only be done by the logged in user.
         /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="username">The name that needs to be deleted</param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task DeleteUserAsync (string username)
@@ -1421,6 +1056,7 @@ namespace IO.Swagger.Api
         /// <summary>
         /// Delete user This can only be done by the logged in user.
         /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="username">The name that needs to be deleted</param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteUserAsyncWithHttpInfo (string username)
@@ -1429,27 +1065,199 @@ namespace IO.Swagger.Api
             if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling DeleteUser");
             
     
-            var path_ = "/user/{username}";
+            var localVarPath = "/user/{username}";
     
-            var pathParams = new Dictionary<String, String>();
-            var queryParams = new Dictionary<String, String>();
-            var headerParams = new Dictionary<String, String>();
-            var formParams = new Dictionary<String, String>();
-            var fileParams = new Dictionary<String, FileParameter>();
-            String postBody = null;
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
-            String[] http_header_accepts = new String[] {
+            String[] localVarHttpHeaderAccepts = new String[] {
                 "application/json", "application/xml"
             };
-            String http_header_accept = Configuration.ApiClient.SelectHeaderAccept(http_header_accepts);
-            if (http_header_accept != null)
-                headerParams.Add("Accept", Configuration.ApiClient.SelectHeaderAccept(http_header_accepts));
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            pathParams.Add("format", "json");
-            if (username != null) pathParams.Add("username", Configuration.ApiClient.ParameterToString(username)); // path parameter
+            localVarPathParams.Add("format", "json");
+            if (username != null) localVarPathParams.Add("username", Configuration.ApiClient.ParameterToString(username)); // path parameter
+            
+            
+            
+            
+            
+
+            
+            // authentication (test_http_basic) required
+            
+            // http basic authentication required
+            if (!String.IsNullOrEmpty(Configuration.Username) || !String.IsNullOrEmpty(Configuration.Password))
+            {
+                localVarHeaderParams["Authorization"] = "Basic " + ApiClient.Base64Encode(Configuration.Username + ":" + Configuration.Password);
+            }
+            
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath, 
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams, 
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+ 
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling DeleteUser: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling DeleteUser: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+
+            
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+        
+        /// <summary>
+        /// Get user by user name 
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param> 
+        /// <returns>User</returns>
+        public User GetUserByName (string username)
+        {
+             ApiResponse<User> localVarResponse = GetUserByNameWithHttpInfo(username);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        /// Get user by user name 
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param> 
+        /// <returns>ApiResponse of User</returns>
+        public ApiResponse< User > GetUserByNameWithHttpInfo (string username)
+        {
+            
+            // verify the required parameter 'username' is set
+            if (username == null)
+                throw new ApiException(400, "Missing required parameter 'username' when calling UserApi->GetUserByName");
+            
+    
+            var localVarPath = "/user/{username}";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            if (username != null) localVarPathParams.Add("username", Configuration.ApiClient.ParameterToString(username)); // path parameter
+            
+            
+            
+            
+            
+
+            
+    
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath, 
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+    
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling GetUserByName: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling GetUserByName: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+    
+            return new ApiResponse<User>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (User) Configuration.ApiClient.Deserialize(localVarResponse, typeof(User)));
+            
+        }
+
+        
+        /// <summary>
+        /// Get user by user name 
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
+        /// <returns>Task of User</returns>
+        public async System.Threading.Tasks.Task<User> GetUserByNameAsync (string username)
+        {
+             ApiResponse<User> localVarResponse = await GetUserByNameAsyncWithHttpInfo(username);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        /// Get user by user name 
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
+        /// <returns>Task of ApiResponse (User)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<User>> GetUserByNameAsyncWithHttpInfo (string username)
+        {
+            // verify the required parameter 'username' is set
+            if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling GetUserByName");
+            
+    
+            var localVarPath = "/user/{username}";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            if (username != null) localVarPathParams.Add("username", Configuration.ApiClient.ParameterToString(username)); // path parameter
             
             
             
@@ -1459,18 +1267,496 @@ namespace IO.Swagger.Api
             
 
             // make the HTTP request
-            IRestResponse response = (IRestResponse) await Configuration.ApiClient.CallApiAsync(path_, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
+            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath, 
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams, 
+                localVarPathParams, localVarHttpContentType);
 
-            int statusCode = (int) response.StatusCode;
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
  
-            if (statusCode >= 400)
-                throw new ApiException (statusCode, "Error calling DeleteUser: " + response.Content, response.Content);
-            else if (statusCode == 0)
-                throw new ApiException (statusCode, "Error calling DeleteUser: " + response.ErrorMessage, response.ErrorMessage);
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling GetUserByName: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling GetUserByName: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+
+            return new ApiResponse<User>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (User) Configuration.ApiClient.Deserialize(localVarResponse, typeof(User)));
+            
+        }
+        
+        /// <summary>
+        /// Logs user into the system 
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="username">The user name for login (optional)</param> 
+        /// <param name="password">The password for login in clear text (optional)</param> 
+        /// <returns>string</returns>
+        public string LoginUser (string username = null, string password = null)
+        {
+             ApiResponse<string> localVarResponse = LoginUserWithHttpInfo(username, password);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        /// Logs user into the system 
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="username">The user name for login (optional)</param> 
+        /// <param name="password">The password for login in clear text (optional)</param> 
+        /// <returns>ApiResponse of string</returns>
+        public ApiResponse< string > LoginUserWithHttpInfo (string username = null, string password = null)
+        {
+            
+    
+            var localVarPath = "/user/login";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            
+            if (username != null) localVarQueryParams.Add("username", Configuration.ApiClient.ParameterToString(username)); // query parameter
+            if (password != null) localVarQueryParams.Add("password", Configuration.ApiClient.ParameterToString(password)); // query parameter
+            
+            
+            
+            
 
             
-            return new ApiResponse<Object>(statusCode,
-                response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+    
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath, 
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+    
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling LoginUser: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling LoginUser: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+    
+            return new ApiResponse<string>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (string) Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
+            
+        }
+
+        
+        /// <summary>
+        /// Logs user into the system 
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="username">The user name for login (optional)</param>
+        /// <param name="password">The password for login in clear text (optional)</param>
+        /// <returns>Task of string</returns>
+        public async System.Threading.Tasks.Task<string> LoginUserAsync (string username = null, string password = null)
+        {
+             ApiResponse<string> localVarResponse = await LoginUserAsyncWithHttpInfo(username, password);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        /// Logs user into the system 
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="username">The user name for login (optional)</param>
+        /// <param name="password">The password for login in clear text (optional)</param>
+        /// <returns>Task of ApiResponse (string)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<string>> LoginUserAsyncWithHttpInfo (string username = null, string password = null)
+        {
+            
+    
+            var localVarPath = "/user/login";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            
+            if (username != null) localVarQueryParams.Add("username", Configuration.ApiClient.ParameterToString(username)); // query parameter
+            if (password != null) localVarQueryParams.Add("password", Configuration.ApiClient.ParameterToString(password)); // query parameter
+            
+            
+            
+            
+
+            
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath, 
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams, 
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+ 
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling LoginUser: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling LoginUser: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+
+            return new ApiResponse<string>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                (string) Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
+            
+        }
+        
+        /// <summary>
+        /// Logs out current logged in user session 
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns></returns>
+        public void LogoutUser ()
+        {
+             LogoutUserWithHttpInfo();
+        }
+
+        /// <summary>
+        /// Logs out current logged in user session 
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> LogoutUserWithHttpInfo ()
+        {
+            
+    
+            var localVarPath = "/user/logout";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            
+            
+            
+            
+            
+
+            
+    
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath, 
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+    
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling LogoutUser: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling LogoutUser: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+    
+            
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        
+        /// <summary>
+        /// Logs out current logged in user session 
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task LogoutUserAsync ()
+        {
+             await LogoutUserAsyncWithHttpInfo();
+
+        }
+
+        /// <summary>
+        /// Logs out current logged in user session 
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> LogoutUserAsyncWithHttpInfo ()
+        {
+            
+    
+            var localVarPath = "/user/logout";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            
+            
+            
+            
+            
+
+            
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath, 
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams, 
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+ 
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling LogoutUser: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling LogoutUser: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+
+            
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+        
+        /// <summary>
+        /// Updated user This can only be done by the logged in user.
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="username">name that need to be deleted</param> 
+        /// <param name="body">Updated user object (optional)</param> 
+        /// <returns></returns>
+        public void UpdateUser (string username, User body = null)
+        {
+             UpdateUserWithHttpInfo(username, body);
+        }
+
+        /// <summary>
+        /// Updated user This can only be done by the logged in user.
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="username">name that need to be deleted</param> 
+        /// <param name="body">Updated user object (optional)</param> 
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> UpdateUserWithHttpInfo (string username, User body = null)
+        {
+            
+            // verify the required parameter 'username' is set
+            if (username == null)
+                throw new ApiException(400, "Missing required parameter 'username' when calling UserApi->UpdateUser");
+            
+    
+            var localVarPath = "/user/{username}";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            if (username != null) localVarPathParams.Add("username", Configuration.ApiClient.ParameterToString(username)); // path parameter
+            
+            
+            
+            
+            if (body.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = body; // byte array
+            }
+
+            
+    
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath, 
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+    
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling UpdateUser: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling UpdateUser: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+    
+            
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                null);
+        }
+
+        
+        /// <summary>
+        /// Updated user This can only be done by the logged in user.
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="username">name that need to be deleted</param>
+        /// <param name="body">Updated user object (optional)</param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task UpdateUserAsync (string username, User body = null)
+        {
+             await UpdateUserAsyncWithHttpInfo(username, body);
+
+        }
+
+        /// <summary>
+        /// Updated user This can only be done by the logged in user.
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="username">name that need to be deleted</param>
+        /// <param name="body">Updated user object (optional)</param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateUserAsyncWithHttpInfo (string username, User body = null)
+        {
+            // verify the required parameter 'username' is set
+            if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling UpdateUser");
+            
+    
+            var localVarPath = "/user/{username}";
+    
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new Dictionary<String, String>();
+            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                
+            };
+            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json", "application/xml"
+            };
+            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            // set "format" to json by default
+            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
+            localVarPathParams.Add("format", "json");
+            if (username != null) localVarPathParams.Add("username", Configuration.ApiClient.ParameterToString(username)); // path parameter
+            
+            
+            
+            
+            if (body.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = body; // byte array
+            }
+
+            
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath, 
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams, 
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+ 
+            if (localVarStatusCode >= 400)
+                throw new ApiException (localVarStatusCode, "Error calling UpdateUser: " + localVarResponse.Content, localVarResponse.Content);
+            else if (localVarStatusCode == 0)
+                throw new ApiException (localVarStatusCode, "Error calling UpdateUser: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+
+            
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
         
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs
index 7e6807f16a4..e3de155b82f 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs
@@ -61,7 +61,8 @@ namespace IO.Swagger.Client
         /// Gets or sets the default API client for making HTTP calls.
         /// </summary>
         /// <value>The default API client.</value>
-        public static ApiClient Default = new ApiClient(Configuration.Default);
+        [Obsolete("ApiClient.Default is deprecated, please use 'Configuration.Default.ApiClient' instead.")]
+        public static ApiClient Default;
     
         /// <summary>
         /// Gets or sets the Configuration.
@@ -77,12 +78,13 @@ namespace IO.Swagger.Client
     
         // Creates and sets up a RestRequest prior to a call.
         private RestRequest PrepareRequest(
-            String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
+            String path, RestSharp.Method method, Dictionary<String, String> queryParams, Object postBody,
             Dictionary<String, String> headerParams, Dictionary<String, String> formParams,
-            Dictionary<String, FileParameter> fileParams, Dictionary<String, String> pathParams)
+            Dictionary<String, FileParameter> fileParams, Dictionary<String, String> pathParams,
+            String contentType)
         {
             var request = new RestRequest(path, method);
-   
+
             // add path parameter, if any
             foreach(var param in pathParams)
                 request.AddParameter(param.Key, param.Value, ParameterType.UrlSegment); 
@@ -103,8 +105,17 @@ namespace IO.Swagger.Client
             foreach(var param in fileParams)
                 request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType);
 
-            if (postBody != null) // http body (model) parameter
-                request.AddParameter("application/json", postBody, ParameterType.RequestBody);
+            if (postBody != null) // http body (model or byte[]) parameter
+            {
+                if (postBody.GetType() == typeof(String))
+                {
+                    request.AddParameter("application/json", postBody, ParameterType.RequestBody);
+                }
+                else if (postBody.GetType() == typeof(byte[]))
+                {
+                    request.AddParameter(contentType, postBody, ParameterType.RequestBody);
+                }
+            }
     
             return request;
         }
@@ -120,18 +131,27 @@ namespace IO.Swagger.Client
         /// <param name="formParams">Form parameters.</param>
         /// <param name="fileParams">File parameters.</param>
         /// <param name="pathParams">Path parameters.</param>
+        /// <param name="contentType">Content Type of the request</param>
         /// <returns>Object</returns>
         public Object CallApi(
-            String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
+            String path, RestSharp.Method method, Dictionary<String, String> queryParams, Object postBody,
             Dictionary<String, String> headerParams, Dictionary<String, String> formParams,
-            Dictionary<String, FileParameter> fileParams, Dictionary<String, String> pathParams)
+            Dictionary<String, FileParameter> fileParams, Dictionary<String, String> pathParams,
+            String contentType)
         {
             var request = PrepareRequest(
-                path, method, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
+                path, method, queryParams, postBody, headerParams, formParams, fileParams,
+                pathParams, contentType);
+
+            // set timeout
+            RestClient.Timeout = Configuration.Timeout;
+            // set user agent
+            RestClient.UserAgent = Configuration.UserAgent;
+
             var response = RestClient.Execute(request);
             return (Object) response;
         }
-
+        
         /// <summary>
         /// Makes the asynchronous HTTP request.
         /// </summary>
@@ -143,14 +163,17 @@ namespace IO.Swagger.Client
         /// <param name="formParams">Form parameters.</param>
         /// <param name="fileParams">File parameters.</param>
         /// <param name="pathParams">Path parameters.</param>
+        /// <param name="contentType">Content type.</param>
         /// <returns>The Task instance.</returns>
         public async System.Threading.Tasks.Task<Object> CallApiAsync(
-            String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
+            String path, RestSharp.Method method, Dictionary<String, String> queryParams, Object postBody,
             Dictionary<String, String> headerParams, Dictionary<String, String> formParams,
-            Dictionary<String, FileParameter> fileParams, Dictionary<String, String> pathParams)
+            Dictionary<String, FileParameter> fileParams, Dictionary<String, String> pathParams,
+            String contentType)
         {
             var request = PrepareRequest(
-                path, method, queryParams, postBody, headerParams, formParams, fileParams, pathParams);
+                path, method, queryParams, postBody, headerParams, formParams, fileParams,
+                pathParams, contentType);
             var response = await RestClient.ExecuteTaskAsync(request);
             return (Object)response;
         }
@@ -194,6 +217,12 @@ namespace IO.Swagger.Client
                 // https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8
                 // For example: 2009-06-15T13:45:30.0000000
                 return ((DateTime)obj).ToString (Configuration.DateTimeFormat);
+            else if (obj is DateTimeOffset)
+                // Return a formatted date string - Can be customized with Configuration.DateTimeFormat
+                // Defaults to an ISO 8601, using the known as a Round-trip date/time pattern ("o")
+                // https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8
+                // For example: 2009-06-15T13:45:30.0000000
+                return ((DateTimeOffset)obj).ToString (Configuration.DateTimeFormat);   
             else if (obj is IList)
             {
                 var flattenedString = new StringBuilder();
@@ -217,12 +246,10 @@ namespace IO.Swagger.Client
         /// <returns>Object representation of the JSON string.</returns>
         public object Deserialize(IRestResponse response, Type type)
         {
-            byte[] data = response.RawBytes;
-            string content = response.Content;
             IList<Parameter> headers = response.Headers;
-            if (type == typeof(Object)) // return an object
+            if (type == typeof(byte[])) // return byte array
             {
-                return content;
+                return response.RawBytes;
             }
 
             if (type == typeof(Stream))
@@ -238,30 +265,30 @@ namespace IO.Swagger.Client
                         var match = regex.Match(header.ToString());
                         if (match.Success)
                         {
-                            string fileName = filePath + match.Groups[1].Value.Replace("\"", "").Replace("'", "");
-                            File.WriteAllBytes(fileName, data);
+                            string fileName = filePath + SanitizeFilename(match.Groups[1].Value.Replace("\"", "").Replace("'", ""));
+                            File.WriteAllBytes(fileName, response.RawBytes);
                             return new FileStream(fileName, FileMode.Open);
                         }
                     }
                 }
-                var stream = new MemoryStream(data);
+                var stream = new MemoryStream(response.RawBytes);
                 return stream;
             }
 
             if (type.Name.StartsWith("System.Nullable`1[[System.DateTime")) // return a datetime object
             {
-                return DateTime.Parse(content,  null, System.Globalization.DateTimeStyles.RoundtripKind);
+                return DateTime.Parse(response.Content,  null, System.Globalization.DateTimeStyles.RoundtripKind);
             }
 
             if (type == typeof(String) || type.Name.StartsWith("System.Nullable")) // return primitive type
             {
-                return ConvertType(content, type); 
+                return ConvertType(response.Content, type); 
             }
     
             // at this point, it must be a model (json)
             try
             {
-                return JsonConvert.DeserializeObject(content, type);
+                return JsonConvert.DeserializeObject(response.Content, type);
             }
             catch (Exception e)
             {
@@ -270,11 +297,11 @@ namespace IO.Swagger.Client
         }
     
         /// <summary>
-        /// Serialize an object into JSON string.
+        /// Serialize an input (model) into JSON string
         /// </summary>
         /// <param name="obj">Object.</param>
         /// <returns>JSON string.</returns>
-        public string Serialize(object obj)
+        public String Serialize(object obj)
         {
             try
             {
@@ -286,6 +313,24 @@ namespace IO.Swagger.Client
             }
         }
     
+        /// <summary>
+        /// Select the Content-Type header's value from the given content-type array:
+        /// if JSON exists in the given array, use it;
+        /// otherwise use the first one defined in 'consumes'
+        /// </summary>
+        /// <param name="contentTypes">The Content-Type array to select from.</param>
+        /// <returns>The Content-Type header to use.</returns>
+        public String SelectHeaderContentType(String[] contentTypes)
+        {
+            if (contentTypes.Length == 0)
+                return null;
+
+            if (contentTypes.Contains("application/json", StringComparer.OrdinalIgnoreCase))
+                return "application/json";
+
+            return contentTypes[0]; // use the first content type specified in 'consumes'
+        }
+
         /// <summary>
         /// Select the Accept header's value from the given accepts array:
         /// if JSON exists in the given array, use it;
@@ -381,6 +426,23 @@ namespace IO.Swagger.Client
             return sb.ToString();
         }
 
-  
+        /// <summary>
+        /// Sanitize filename by removing the path
+        /// </summary>
+        /// <param name="filename">Filename</param>
+        /// <returns>Filename</returns>
+        public static string SanitizeFilename(string filename)
+        {
+            Match match = Regex.Match(filename, @".*[/\\](.*)$");
+
+            if (match.Success)
+            {
+                return match.Groups[1].Value;
+            }
+            else
+            {
+                return filename;
+            }
+        }
     }
 }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiResponse.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiResponse.cs
index 15735711656..651d3609c22 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiResponse.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiResponse.cs
@@ -27,10 +27,10 @@ namespace IO.Swagger.Client
         public T Data { get; private set; }
   
         /// <summary>
-        /// Initializes a new instance of the <see cref="ApiResponse"/> class.
+        /// Initializes a new instance of the <see cref="ApiResponse&lt;T&gt;" /> class.
         /// </summary>
         /// <param name="statusCode">HTTP status code.</param>
-        /// <param name="message">Error message.</param>
+        /// <param name="headers">HTTP headers.</param>
         /// <param name="data">Data (parsed HTTP body)</param>
         public ApiResponse(int statusCode, IDictionary<string, string> headers, T data)
         {
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/Configuration.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/Configuration.cs
index 000b8893cdf..4d04d5770ec 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/Configuration.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/Configuration.cs
@@ -24,6 +24,8 @@ namespace IO.Swagger.Client
         /// <param name="apiKeyPrefix">Dictionary of API key prefix</param>
         /// <param name="tempFolderPath">Temp folder path</param>
         /// <param name="dateTimeFormat">DateTime format string</param>
+        /// <param name="timeout">HTTP connection timeout (in milliseconds)</param>
+        /// <param name="userAgent">HTTP user agent</param>
         public Configuration(ApiClient apiClient = null,
                              Dictionary<String, String> defaultHeader = null,
                              string username = null,
@@ -33,17 +35,16 @@ namespace IO.Swagger.Client
                              Dictionary<String, String> apiKeyPrefix = null,
                              string tempFolderPath = null,
                              string dateTimeFormat = null,
-                             int timeout = 100000
+                             int timeout = 100000,
+                             string userAgent = "Swagger-Codegen/1.0.0/csharp"
                             )
         {
-            if (apiClient == null)
-                ApiClient = ApiClient.Default;
-            else 
-                ApiClient = apiClient;
+            setApiClientUsingDefault(apiClient);
 
             Username = username;
             Password = password;
             AccessToken = accessToken;
+            UserAgent = userAgent;
 
             if (defaultHeader != null)
                 DefaultHeader = defaultHeader;
@@ -63,18 +64,15 @@ namespace IO.Swagger.Client
         /// <param name="apiClient">Api client.</param>
         public Configuration(ApiClient apiClient)
         {
-            if (apiClient == null)
-                ApiClient = ApiClient.Default;
-            else 
-                ApiClient = apiClient;
+            setApiClientUsingDefault(apiClient);
         }
-  
+
         /// <summary>
         /// Version of the package.
         /// </summary>
         /// <value>Version of the package.</value>
         public const string Version = "1.0.0";
-  
+
         /// <summary>
         /// Gets or sets the default Configuration.
         /// </summary>
@@ -91,7 +89,8 @@ namespace IO.Swagger.Client
 
             set 
             {
-                ApiClient.RestClient.Timeout = value;
+                if (ApiClient != null)
+                    ApiClient.RestClient.Timeout = value;
             }
         }
 
@@ -101,8 +100,31 @@ namespace IO.Swagger.Client
         /// <value>The API client.</value>
         public ApiClient ApiClient;
 
+        /// <summary>
+        /// Set the ApiClient using Default or ApiClient instance.
+        /// </summary>
+        /// <param name="apiClient">An instance of ApiClient.</param>
+        /// <returns></returns>
+        public void setApiClientUsingDefault (ApiClient apiClient = null)
+        {
+            if (apiClient == null)
+            {
+                if (Default != null && Default.ApiClient == null)
+                    Default.ApiClient = new ApiClient();
+
+                ApiClient = Default != null ? Default.ApiClient : new ApiClient();
+            }
+            else
+            {
+                if (Default != null && Default.ApiClient == null)
+                    Default.ApiClient = apiClient;
+
+                ApiClient = apiClient;
+            }
+        }
+
         private Dictionary<String, String> _defaultHeaderMap = new Dictionary<String, String>();
-        
+
         /// <summary>
         /// Gets or sets the default header.
         /// </summary>
@@ -127,18 +149,24 @@ namespace IO.Swagger.Client
             _defaultHeaderMap.Add(key, value);
         }
 
+        /// <summary>
+        /// Gets or sets the HTTP user agent.
+        /// </summary>
+        /// <value>Http user agent.</value>
+        public String UserAgent { get; set; }
+
         /// <summary>
         /// Gets or sets the username (HTTP basic authentication).
         /// </summary>
         /// <value>The username.</value>
         public String Username { get; set; }
-  
+
         /// <summary>
         /// Gets or sets the password (HTTP basic authentication).
         /// </summary>
         /// <value>The password.</value>
         public String Password { get; set; }
-  
+
         /// <summary>
         /// Gets or sets the access token for OAuth2 authentication.
         /// </summary>
@@ -150,7 +178,7 @@ namespace IO.Swagger.Client
         /// </summary>
         /// <value>The API key.</value>
         public Dictionary<String, String> ApiKey = new Dictionary<String, String>();
-  
+
         /// <summary>
         /// Gets or sets the prefix (e.g. Token) of the API key based on the authentication name.
         /// </summary>
@@ -172,9 +200,9 @@ namespace IO.Swagger.Client
             else
                 return apiKeyValue;
         }
-  
+
         private string _tempFolderPath = Path.GetTempPath();
-  
+
         /// <summary>
         /// Gets or sets the temporary folder path to store the files downloaded from the server.
         /// </summary>
@@ -182,19 +210,19 @@ namespace IO.Swagger.Client
         public String TempFolderPath
         {
             get { return _tempFolderPath; }
-  
-            set 
+
+            set
             {
                 if (String.IsNullOrEmpty(value))
                 {
                     _tempFolderPath = value;
                     return;
                 }
-      
+
                 // create the directory if it does not exist
                 if (!Directory.Exists(value)) 
                     Directory.CreateDirectory(value);
-      
+
                 // check if the path contains directory separator at the end
                 if (value[value.Length - 1] == Path.DirectorySeparatorChar)
                     _tempFolderPath = value;
@@ -249,7 +277,7 @@ namespace IO.Swagger.Client
                      .Where(x => x.Name == "System.Core").First().Version.ToString()  + "\n";
             report += "    Version of the API: 1.0.0\n";
             report += "    SDK Package Version: 1.0.0\n";
-  
+
             return report;
         }
     }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Animal.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Animal.cs
new file mode 100644
index 00000000000..0d5bbd4aa60
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Animal.cs
@@ -0,0 +1,121 @@
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace IO.Swagger.Model
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [DataContract]
+    public partial class Animal :  IEquatable<Animal>
+    { 
+    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Animal" /> class.
+        /// Initializes a new instance of the <see cref="Animal" />class.
+        /// </summary>
+        /// <param name="ClassName">ClassName (required).</param>
+
+        public Animal(string ClassName = null)
+        {
+            // to ensure "ClassName" is required (not null)
+            if (ClassName == null)
+            {
+                throw new InvalidDataException("ClassName is a required property for Animal and cannot be null");
+            }
+            else
+            {
+                this.ClassName = ClassName;
+            }
+            
+        }
+        
+    
+        /// <summary>
+        /// Gets or Sets ClassName
+        /// </summary>
+        [DataMember(Name="className", EmitDefaultValue=false)]
+        public string ClassName { get; set; }
+    
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class Animal {\n");
+            sb.Append("  ClassName: ").Append(ClassName).Append("\n");
+            
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="obj">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object obj)
+        {
+            // credit: http://stackoverflow.com/a/10454552/677735
+            return this.Equals(obj as Animal);
+        }
+
+        /// <summary>
+        /// Returns true if Animal instances are equal
+        /// </summary>
+        /// <param name="other">Instance of Animal to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(Animal other)
+        {
+            // credit: http://stackoverflow.com/a/10454552/677735
+            if (other == null)
+                return false;
+
+            return 
+                (
+                    this.ClassName == other.ClassName ||
+                    this.ClassName != null &&
+                    this.ClassName.Equals(other.ClassName)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            // credit: http://stackoverflow.com/a/263416/677735
+            unchecked // Overflow is fine, just wrap
+            {
+                int hash = 41;
+                // Suitable nullity checks etc, of course :)
+                
+                if (this.ClassName != null)
+                    hash = hash * 59 + this.ClassName.GetHashCode();
+                
+                return hash;
+            }
+        }
+
+    }
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Cat.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Cat.cs
new file mode 100644
index 00000000000..8d62273892c
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Cat.cs
@@ -0,0 +1,138 @@
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace IO.Swagger.Model
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [DataContract]
+    public partial class Cat : Animal,  IEquatable<Cat>
+    { 
+    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Cat" /> class.
+        /// Initializes a new instance of the <see cref="Cat" />class.
+        /// </summary>
+        /// <param name="ClassName">ClassName (required).</param>
+        /// <param name="Declawed">Declawed.</param>
+
+        public Cat(string ClassName = null, bool? Declawed = null)
+        {
+            // to ensure "ClassName" is required (not null)
+            if (ClassName == null)
+            {
+                throw new InvalidDataException("ClassName is a required property for Cat and cannot be null");
+            }
+            else
+            {
+                this.ClassName = ClassName;
+            }
+            this.Declawed = Declawed;
+            
+        }
+        
+    
+        /// <summary>
+        /// Gets or Sets ClassName
+        /// </summary>
+        [DataMember(Name="className", EmitDefaultValue=false)]
+        public string ClassName { get; set; }
+    
+        /// <summary>
+        /// Gets or Sets Declawed
+        /// </summary>
+        [DataMember(Name="declawed", EmitDefaultValue=false)]
+        public bool? Declawed { get; set; }
+    
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class Cat {\n");
+            sb.Append("  ClassName: ").Append(ClassName).Append("\n");
+            sb.Append("  Declawed: ").Append(Declawed).Append("\n");
+            
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public  new string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="obj">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object obj)
+        {
+            // credit: http://stackoverflow.com/a/10454552/677735
+            return this.Equals(obj as Cat);
+        }
+
+        /// <summary>
+        /// Returns true if Cat instances are equal
+        /// </summary>
+        /// <param name="other">Instance of Cat to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(Cat other)
+        {
+            // credit: http://stackoverflow.com/a/10454552/677735
+            if (other == null)
+                return false;
+
+            return 
+                (
+                    this.ClassName == other.ClassName ||
+                    this.ClassName != null &&
+                    this.ClassName.Equals(other.ClassName)
+                ) && 
+                (
+                    this.Declawed == other.Declawed ||
+                    this.Declawed != null &&
+                    this.Declawed.Equals(other.Declawed)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            // credit: http://stackoverflow.com/a/263416/677735
+            unchecked // Overflow is fine, just wrap
+            {
+                int hash = 41;
+                // Suitable nullity checks etc, of course :)
+                
+                if (this.ClassName != null)
+                    hash = hash * 59 + this.ClassName.GetHashCode();
+                
+                if (this.Declawed != null)
+                    hash = hash * 59 + this.Declawed.GetHashCode();
+                
+                return hash;
+            }
+        }
+
+    }
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs
index 6ad53e05257..80683074e9f 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs
@@ -4,42 +4,47 @@ using System.IO;
 using System.Text;
 using System.Collections;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace IO.Swagger.Model
 {
-
     /// <summary>
     /// 
     /// </summary>
     [DataContract]
-    public class Category :  IEquatable<Category>
-    {
+    public partial class Category :  IEquatable<Category>
+    { 
+    
         /// <summary>
         /// Initializes a new instance of the <see cref="Category" /> class.
+        /// Initializes a new instance of the <see cref="Category" />class.
         /// </summary>
-        public Category()
+        /// <param name="Id">Id.</param>
+        /// <param name="Name">Name.</param>
+
+        public Category(long? Id = null, string Name = null)
         {
+            this.Id = Id;
+            this.Name = Name;
             
         }
-
         
+    
         /// <summary>
         /// Gets or Sets Id
         /// </summary>
         [DataMember(Name="id", EmitDefaultValue=false)]
         public long? Id { get; set; }
-  
-        
+    
         /// <summary>
         /// Gets or Sets Name
         /// </summary>
         [DataMember(Name="name", EmitDefaultValue=false)]
         public string Name { get; set; }
-  
-        
-  
+    
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -78,7 +83,7 @@ namespace IO.Swagger.Model
         /// <summary>
         /// Returns true if Category instances are equal
         /// </summary>
-        /// <param name="obj">Instance of Category to be compared</param>
+        /// <param name="other">Instance of Category to be compared</param>
         /// <returns>Boolean</returns>
         public bool Equals(Category other)
         {
@@ -112,10 +117,10 @@ namespace IO.Swagger.Model
                 // Suitable nullity checks etc, of course :)
                 
                 if (this.Id != null)
-                    hash = hash * 57 + this.Id.GetHashCode();
+                    hash = hash * 59 + this.Id.GetHashCode();
                 
                 if (this.Name != null)
-                    hash = hash * 57 + this.Name.GetHashCode();
+                    hash = hash * 59 + this.Name.GetHashCode();
                 
                 return hash;
             }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Dog.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Dog.cs
new file mode 100644
index 00000000000..2308b7488f1
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Dog.cs
@@ -0,0 +1,138 @@
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace IO.Swagger.Model
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [DataContract]
+    public partial class Dog : Animal,  IEquatable<Dog>
+    { 
+    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Dog" /> class.
+        /// Initializes a new instance of the <see cref="Dog" />class.
+        /// </summary>
+        /// <param name="ClassName">ClassName (required).</param>
+        /// <param name="Breed">Breed.</param>
+
+        public Dog(string ClassName = null, string Breed = null)
+        {
+            // to ensure "ClassName" is required (not null)
+            if (ClassName == null)
+            {
+                throw new InvalidDataException("ClassName is a required property for Dog and cannot be null");
+            }
+            else
+            {
+                this.ClassName = ClassName;
+            }
+            this.Breed = Breed;
+            
+        }
+        
+    
+        /// <summary>
+        /// Gets or Sets ClassName
+        /// </summary>
+        [DataMember(Name="className", EmitDefaultValue=false)]
+        public string ClassName { get; set; }
+    
+        /// <summary>
+        /// Gets or Sets Breed
+        /// </summary>
+        [DataMember(Name="breed", EmitDefaultValue=false)]
+        public string Breed { get; set; }
+    
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class Dog {\n");
+            sb.Append("  ClassName: ").Append(ClassName).Append("\n");
+            sb.Append("  Breed: ").Append(Breed).Append("\n");
+            
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public  new string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="obj">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object obj)
+        {
+            // credit: http://stackoverflow.com/a/10454552/677735
+            return this.Equals(obj as Dog);
+        }
+
+        /// <summary>
+        /// Returns true if Dog instances are equal
+        /// </summary>
+        /// <param name="other">Instance of Dog to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(Dog other)
+        {
+            // credit: http://stackoverflow.com/a/10454552/677735
+            if (other == null)
+                return false;
+
+            return 
+                (
+                    this.ClassName == other.ClassName ||
+                    this.ClassName != null &&
+                    this.ClassName.Equals(other.ClassName)
+                ) && 
+                (
+                    this.Breed == other.Breed ||
+                    this.Breed != null &&
+                    this.Breed.Equals(other.Breed)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            // credit: http://stackoverflow.com/a/263416/677735
+            unchecked // Overflow is fine, just wrap
+            {
+                int hash = 41;
+                // Suitable nullity checks etc, of course :)
+                
+                if (this.ClassName != null)
+                    hash = hash * 59 + this.ClassName.GetHashCode();
+                
+                if (this.Breed != null)
+                    hash = hash * 59 + this.Breed.GetHashCode();
+                
+                return hash;
+            }
+        }
+
+    }
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/InlineResponse200.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/InlineResponse200.cs
new file mode 100644
index 00000000000..8889cdae0a7
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/InlineResponse200.cs
@@ -0,0 +1,225 @@
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace IO.Swagger.Model
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [DataContract]
+    public partial class InlineResponse200 :  IEquatable<InlineResponse200>
+    { 
+    
+        /// <summary>
+        /// pet status in the store
+        /// </summary>
+        /// <value>pet status in the store</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum StatusEnum {
+            
+            [EnumMember(Value = "available")]
+            Available,
+            
+            [EnumMember(Value = "pending")]
+            Pending,
+            
+            [EnumMember(Value = "sold")]
+            Sold
+        }
+
+    
+        /// <summary>
+        /// pet status in the store
+        /// </summary>
+        /// <value>pet status in the store</value>
+        [DataMember(Name="status", EmitDefaultValue=false)]
+        public StatusEnum? Status { get; set; }
+    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="InlineResponse200" /> class.
+        /// Initializes a new instance of the <see cref="InlineResponse200" />class.
+        /// </summary>
+        /// <param name="Tags">Tags.</param>
+        /// <param name="Id">Id (required).</param>
+        /// <param name="Category">Category.</param>
+        /// <param name="Status">pet status in the store.</param>
+        /// <param name="Name">Name.</param>
+        /// <param name="PhotoUrls">PhotoUrls.</param>
+
+        public InlineResponse200(List<Tag> Tags = null, long? Id = null, Object Category = null, StatusEnum? Status = null, string Name = null, List<string> PhotoUrls = null)
+        {
+            // to ensure "Id" is required (not null)
+            if (Id == null)
+            {
+                throw new InvalidDataException("Id is a required property for InlineResponse200 and cannot be null");
+            }
+            else
+            {
+                this.Id = Id;
+            }
+            this.Tags = Tags;
+            this.Category = Category;
+            this.Status = Status;
+            this.Name = Name;
+            this.PhotoUrls = PhotoUrls;
+            
+        }
+        
+    
+        /// <summary>
+        /// Gets or Sets Tags
+        /// </summary>
+        [DataMember(Name="tags", EmitDefaultValue=false)]
+        public List<Tag> Tags { get; set; }
+    
+        /// <summary>
+        /// Gets or Sets Id
+        /// </summary>
+        [DataMember(Name="id", EmitDefaultValue=false)]
+        public long? Id { get; set; }
+    
+        /// <summary>
+        /// Gets or Sets Category
+        /// </summary>
+        [DataMember(Name="category", EmitDefaultValue=false)]
+        public Object Category { get; set; }
+    
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        [DataMember(Name="name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+    
+        /// <summary>
+        /// Gets or Sets PhotoUrls
+        /// </summary>
+        [DataMember(Name="photoUrls", EmitDefaultValue=false)]
+        public List<string> PhotoUrls { get; set; }
+    
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class InlineResponse200 {\n");
+            sb.Append("  Tags: ").Append(Tags).Append("\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  Category: ").Append(Category).Append("\n");
+            sb.Append("  Status: ").Append(Status).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  PhotoUrls: ").Append(PhotoUrls).Append("\n");
+            
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="obj">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object obj)
+        {
+            // credit: http://stackoverflow.com/a/10454552/677735
+            return this.Equals(obj as InlineResponse200);
+        }
+
+        /// <summary>
+        /// Returns true if InlineResponse200 instances are equal
+        /// </summary>
+        /// <param name="other">Instance of InlineResponse200 to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(InlineResponse200 other)
+        {
+            // credit: http://stackoverflow.com/a/10454552/677735
+            if (other == null)
+                return false;
+
+            return 
+                (
+                    this.Tags == other.Tags ||
+                    this.Tags != null &&
+                    this.Tags.SequenceEqual(other.Tags)
+                ) && 
+                (
+                    this.Id == other.Id ||
+                    this.Id != null &&
+                    this.Id.Equals(other.Id)
+                ) && 
+                (
+                    this.Category == other.Category ||
+                    this.Category != null &&
+                    this.Category.Equals(other.Category)
+                ) && 
+                (
+                    this.Status == other.Status ||
+                    this.Status != null &&
+                    this.Status.Equals(other.Status)
+                ) && 
+                (
+                    this.Name == other.Name ||
+                    this.Name != null &&
+                    this.Name.Equals(other.Name)
+                ) && 
+                (
+                    this.PhotoUrls == other.PhotoUrls ||
+                    this.PhotoUrls != null &&
+                    this.PhotoUrls.SequenceEqual(other.PhotoUrls)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            // credit: http://stackoverflow.com/a/263416/677735
+            unchecked // Overflow is fine, just wrap
+            {
+                int hash = 41;
+                // Suitable nullity checks etc, of course :)
+                
+                if (this.Tags != null)
+                    hash = hash * 59 + this.Tags.GetHashCode();
+                
+                if (this.Id != null)
+                    hash = hash * 59 + this.Id.GetHashCode();
+                
+                if (this.Category != null)
+                    hash = hash * 59 + this.Category.GetHashCode();
+                
+                if (this.Status != null)
+                    hash = hash * 59 + this.Status.GetHashCode();
+                
+                if (this.Name != null)
+                    hash = hash * 59 + this.Name.GetHashCode();
+                
+                if (this.PhotoUrls != null)
+                    hash = hash * 59 + this.PhotoUrls.GetHashCode();
+                
+                return hash;
+            }
+        }
+
+    }
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Model200Response.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Model200Response.cs
new file mode 100644
index 00000000000..4c8cfb0cb13
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Model200Response.cs
@@ -0,0 +1,113 @@
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace IO.Swagger.Model
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [DataContract]
+    public partial class Model200Response :  IEquatable<Model200Response>
+    { 
+    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Model200Response" /> class.
+        /// Initializes a new instance of the <see cref="Model200Response" />class.
+        /// </summary>
+        /// <param name="Name">Name.</param>
+
+        public Model200Response(int? Name = null)
+        {
+            this.Name = Name;
+            
+        }
+        
+    
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        [DataMember(Name="name", EmitDefaultValue=false)]
+        public int? Name { get; set; }
+    
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class Model200Response {\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="obj">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object obj)
+        {
+            // credit: http://stackoverflow.com/a/10454552/677735
+            return this.Equals(obj as Model200Response);
+        }
+
+        /// <summary>
+        /// Returns true if Model200Response instances are equal
+        /// </summary>
+        /// <param name="other">Instance of Model200Response to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(Model200Response other)
+        {
+            // credit: http://stackoverflow.com/a/10454552/677735
+            if (other == null)
+                return false;
+
+            return 
+                (
+                    this.Name == other.Name ||
+                    this.Name != null &&
+                    this.Name.Equals(other.Name)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            // credit: http://stackoverflow.com/a/263416/677735
+            unchecked // Overflow is fine, just wrap
+            {
+                int hash = 41;
+                // Suitable nullity checks etc, of course :)
+                
+                if (this.Name != null)
+                    hash = hash * 59 + this.Name.GetHashCode();
+                
+                return hash;
+            }
+        }
+
+    }
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/ModelReturn.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/ModelReturn.cs
new file mode 100644
index 00000000000..4f900214c45
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/ModelReturn.cs
@@ -0,0 +1,113 @@
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace IO.Swagger.Model
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [DataContract]
+    public partial class ModelReturn :  IEquatable<ModelReturn>
+    { 
+    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ModelReturn" /> class.
+        /// Initializes a new instance of the <see cref="ModelReturn" />class.
+        /// </summary>
+        /// <param name="_Return">_Return.</param>
+
+        public ModelReturn(int? _Return = null)
+        {
+            this._Return = _Return;
+            
+        }
+        
+    
+        /// <summary>
+        /// Gets or Sets _Return
+        /// </summary>
+        [DataMember(Name="return", EmitDefaultValue=false)]
+        public int? _Return { get; set; }
+    
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class ModelReturn {\n");
+            sb.Append("  _Return: ").Append(_Return).Append("\n");
+            
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="obj">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object obj)
+        {
+            // credit: http://stackoverflow.com/a/10454552/677735
+            return this.Equals(obj as ModelReturn);
+        }
+
+        /// <summary>
+        /// Returns true if ModelReturn instances are equal
+        /// </summary>
+        /// <param name="other">Instance of ModelReturn to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(ModelReturn other)
+        {
+            // credit: http://stackoverflow.com/a/10454552/677735
+            if (other == null)
+                return false;
+
+            return 
+                (
+                    this._Return == other._Return ||
+                    this._Return != null &&
+                    this._Return.Equals(other._Return)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            // credit: http://stackoverflow.com/a/263416/677735
+            unchecked // Overflow is fine, just wrap
+            {
+                int hash = 41;
+                // Suitable nullity checks etc, of course :)
+                
+                if (this._Return != null)
+                    hash = hash * 59 + this._Return.GetHashCode();
+                
+                return hash;
+            }
+        }
+
+    }
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Name.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Name.cs
new file mode 100644
index 00000000000..55fd01dfb97
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Name.cs
@@ -0,0 +1,130 @@
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace IO.Swagger.Model
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [DataContract]
+    public partial class Name :  IEquatable<Name>
+    { 
+    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Name" /> class.
+        /// Initializes a new instance of the <see cref="Name" />class.
+        /// </summary>
+        /// <param name="_Name">_Name.</param>
+        /// <param name="SnakeCase">SnakeCase.</param>
+
+        public Name(int? _Name = null, int? SnakeCase = null)
+        {
+            this._Name = _Name;
+            this.SnakeCase = SnakeCase;
+            
+        }
+        
+    
+        /// <summary>
+        /// Gets or Sets _Name
+        /// </summary>
+        [DataMember(Name="name", EmitDefaultValue=false)]
+        public int? _Name { get; set; }
+    
+        /// <summary>
+        /// Gets or Sets SnakeCase
+        /// </summary>
+        [DataMember(Name="snake_case", EmitDefaultValue=false)]
+        public int? SnakeCase { get; set; }
+    
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class Name {\n");
+            sb.Append("  _Name: ").Append(_Name).Append("\n");
+            sb.Append("  SnakeCase: ").Append(SnakeCase).Append("\n");
+            
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="obj">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object obj)
+        {
+            // credit: http://stackoverflow.com/a/10454552/677735
+            return this.Equals(obj as Name);
+        }
+
+        /// <summary>
+        /// Returns true if Name instances are equal
+        /// </summary>
+        /// <param name="other">Instance of Name to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(Name other)
+        {
+            // credit: http://stackoverflow.com/a/10454552/677735
+            if (other == null)
+                return false;
+
+            return 
+                (
+                    this._Name == other._Name ||
+                    this._Name != null &&
+                    this._Name.Equals(other._Name)
+                ) && 
+                (
+                    this.SnakeCase == other.SnakeCase ||
+                    this.SnakeCase != null &&
+                    this.SnakeCase.Equals(other.SnakeCase)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            // credit: http://stackoverflow.com/a/263416/677735
+            unchecked // Overflow is fine, just wrap
+            {
+                int hash = 41;
+                // Suitable nullity checks etc, of course :)
+                
+                if (this._Name != null)
+                    hash = hash * 59 + this._Name.GetHashCode();
+                
+                if (this.SnakeCase != null)
+                    hash = hash * 59 + this.SnakeCase.GetHashCode();
+                
+                return hash;
+            }
+        }
+
+    }
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/ObjectReturn.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/ObjectReturn.cs
new file mode 100644
index 00000000000..1ea3dea45c5
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/ObjectReturn.cs
@@ -0,0 +1,113 @@
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace IO.Swagger.Model
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [DataContract]
+    public partial class ObjectReturn :  IEquatable<ObjectReturn>
+    { 
+    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ObjectReturn" /> class.
+        /// Initializes a new instance of the <see cref="ObjectReturn" />class.
+        /// </summary>
+        /// <param name="_Return">_Return.</param>
+
+        public ObjectReturn(int? _Return = null)
+        {
+            this._Return = _Return;
+            
+        }
+        
+    
+        /// <summary>
+        /// Gets or Sets _Return
+        /// </summary>
+        [DataMember(Name="return", EmitDefaultValue=false)]
+        public int? _Return { get; set; }
+    
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class ObjectReturn {\n");
+            sb.Append("  _Return: ").Append(_Return).Append("\n");
+            
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="obj">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object obj)
+        {
+            // credit: http://stackoverflow.com/a/10454552/677735
+            return this.Equals(obj as ObjectReturn);
+        }
+
+        /// <summary>
+        /// Returns true if ObjectReturn instances are equal
+        /// </summary>
+        /// <param name="other">Instance of ObjectReturn to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(ObjectReturn other)
+        {
+            // credit: http://stackoverflow.com/a/10454552/677735
+            if (other == null)
+                return false;
+
+            return 
+                (
+                    this._Return == other._Return ||
+                    this._Return != null &&
+                    this._Return.Equals(other._Return)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            // credit: http://stackoverflow.com/a/263416/677735
+            unchecked // Overflow is fine, just wrap
+            {
+                int hash = 41;
+                // Suitable nullity checks etc, of course :)
+                
+                if (this._Return != null)
+                    hash = hash * 59 + this._Return.GetHashCode();
+                
+                return hash;
+            }
+        }
+
+    }
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs
index eb649ccf587..db712c98181 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs
@@ -4,71 +4,96 @@ using System.IO;
 using System.Text;
 using System.Collections;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace IO.Swagger.Model
 {
-
     /// <summary>
     /// 
     /// </summary>
     [DataContract]
-    public class Order :  IEquatable<Order>
-    {
+    public partial class Order :  IEquatable<Order>
+    { 
+    
         /// <summary>
-        /// Initializes a new instance of the <see cref="Order" /> class.
+        /// Order Status
         /// </summary>
-        public Order()
-        {
+        /// <value>Order Status</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum StatusEnum {
             
+            [EnumMember(Value = "placed")]
+            Placed,
+            
+            [EnumMember(Value = "approved")]
+            Approved,
+            
+            [EnumMember(Value = "delivered")]
+            Delivered
         }
 
-        
-        /// <summary>
-        /// Gets or Sets Id
-        /// </summary>
-        [DataMember(Name="id", EmitDefaultValue=false)]
-        public long? Id { get; set; }
-  
-        
-        /// <summary>
-        /// Gets or Sets PetId
-        /// </summary>
-        [DataMember(Name="petId", EmitDefaultValue=false)]
-        public long? PetId { get; set; }
-  
-        
-        /// <summary>
-        /// Gets or Sets Quantity
-        /// </summary>
-        [DataMember(Name="quantity", EmitDefaultValue=false)]
-        public int? Quantity { get; set; }
-  
-        
-        /// <summary>
-        /// Gets or Sets ShipDate
-        /// </summary>
-        [DataMember(Name="shipDate", EmitDefaultValue=false)]
-        public DateTime? ShipDate { get; set; }
-  
-        
+    
         /// <summary>
         /// Order Status
         /// </summary>
         /// <value>Order Status</value>
         [DataMember(Name="status", EmitDefaultValue=false)]
-        public string Status { get; set; }
-  
+        public StatusEnum? Status { get; set; }
+    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Order" /> class.
+        /// Initializes a new instance of the <see cref="Order" />class.
+        /// </summary>
+        /// <param name="PetId">PetId.</param>
+        /// <param name="Quantity">Quantity.</param>
+        /// <param name="ShipDate">ShipDate.</param>
+        /// <param name="Status">Order Status.</param>
+        /// <param name="Complete">Complete.</param>
+
+        public Order(long? PetId = null, int? Quantity = null, DateTime? ShipDate = null, StatusEnum? Status = null, bool? Complete = null)
+        {
+            this.PetId = PetId;
+            this.Quantity = Quantity;
+            this.ShipDate = ShipDate;
+            this.Status = Status;
+            this.Complete = Complete;
+            
+        }
         
+    
+        /// <summary>
+        /// Gets or Sets Id
+        /// </summary>
+        [DataMember(Name="id", EmitDefaultValue=false)]
+        public long? Id { get; private set; }
+    
+        /// <summary>
+        /// Gets or Sets PetId
+        /// </summary>
+        [DataMember(Name="petId", EmitDefaultValue=false)]
+        public long? PetId { get; set; }
+    
+        /// <summary>
+        /// Gets or Sets Quantity
+        /// </summary>
+        [DataMember(Name="quantity", EmitDefaultValue=false)]
+        public int? Quantity { get; set; }
+    
+        /// <summary>
+        /// Gets or Sets ShipDate
+        /// </summary>
+        [DataMember(Name="shipDate", EmitDefaultValue=false)]
+        public DateTime? ShipDate { get; set; }
+    
         /// <summary>
         /// Gets or Sets Complete
         /// </summary>
         [DataMember(Name="complete", EmitDefaultValue=false)]
         public bool? Complete { get; set; }
-  
-        
-  
+    
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -111,7 +136,7 @@ namespace IO.Swagger.Model
         /// <summary>
         /// Returns true if Order instances are equal
         /// </summary>
-        /// <param name="obj">Instance of Order to be compared</param>
+        /// <param name="other">Instance of Order to be compared</param>
         /// <returns>Boolean</returns>
         public bool Equals(Order other)
         {
@@ -165,22 +190,22 @@ namespace IO.Swagger.Model
                 // Suitable nullity checks etc, of course :)
                 
                 if (this.Id != null)
-                    hash = hash * 57 + this.Id.GetHashCode();
+                    hash = hash * 59 + this.Id.GetHashCode();
                 
                 if (this.PetId != null)
-                    hash = hash * 57 + this.PetId.GetHashCode();
+                    hash = hash * 59 + this.PetId.GetHashCode();
                 
                 if (this.Quantity != null)
-                    hash = hash * 57 + this.Quantity.GetHashCode();
+                    hash = hash * 59 + this.Quantity.GetHashCode();
                 
                 if (this.ShipDate != null)
-                    hash = hash * 57 + this.ShipDate.GetHashCode();
+                    hash = hash * 59 + this.ShipDate.GetHashCode();
                 
                 if (this.Status != null)
-                    hash = hash * 57 + this.Status.GetHashCode();
+                    hash = hash * 59 + this.Status.GetHashCode();
                 
                 if (this.Complete != null)
-                    hash = hash * 57 + this.Complete.GetHashCode();
+                    hash = hash * 59 + this.Complete.GetHashCode();
                 
                 return hash;
             }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs
index 202a171c219..5d30c24af78 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs
@@ -4,71 +4,114 @@ using System.IO;
 using System.Text;
 using System.Collections;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace IO.Swagger.Model
 {
-
     /// <summary>
     /// 
     /// </summary>
     [DataContract]
-    public class Pet :  IEquatable<Pet>
-    {
+    public partial class Pet :  IEquatable<Pet>
+    { 
+    
         /// <summary>
-        /// Initializes a new instance of the <see cref="Pet" /> class.
+        /// pet status in the store
         /// </summary>
-        public Pet()
-        {
+        /// <value>pet status in the store</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum StatusEnum {
             
+            [EnumMember(Value = "available")]
+            Available,
+            
+            [EnumMember(Value = "pending")]
+            Pending,
+            
+            [EnumMember(Value = "sold")]
+            Sold
         }
 
-        
-        /// <summary>
-        /// Gets or Sets Id
-        /// </summary>
-        [DataMember(Name="id", EmitDefaultValue=false)]
-        public long? Id { get; set; }
-  
-        
-        /// <summary>
-        /// Gets or Sets Category
-        /// </summary>
-        [DataMember(Name="category", EmitDefaultValue=false)]
-        public Category Category { get; set; }
-  
-        
-        /// <summary>
-        /// Gets or Sets Name
-        /// </summary>
-        [DataMember(Name="name", EmitDefaultValue=false)]
-        public string Name { get; set; }
-  
-        
-        /// <summary>
-        /// Gets or Sets PhotoUrls
-        /// </summary>
-        [DataMember(Name="photoUrls", EmitDefaultValue=false)]
-        public List<string> PhotoUrls { get; set; }
-  
-        
-        /// <summary>
-        /// Gets or Sets Tags
-        /// </summary>
-        [DataMember(Name="tags", EmitDefaultValue=false)]
-        public List<Tag> Tags { get; set; }
-  
-        
+    
         /// <summary>
         /// pet status in the store
         /// </summary>
         /// <value>pet status in the store</value>
         [DataMember(Name="status", EmitDefaultValue=false)]
-        public string Status { get; set; }
-  
+        public StatusEnum? Status { get; set; }
+    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Pet" /> class.
+        /// Initializes a new instance of the <see cref="Pet" />class.
+        /// </summary>
+        /// <param name="Id">Id.</param>
+        /// <param name="Category">Category.</param>
+        /// <param name="Name">Name (required).</param>
+        /// <param name="PhotoUrls">PhotoUrls (required).</param>
+        /// <param name="Tags">Tags.</param>
+        /// <param name="Status">pet status in the store.</param>
+
+        public Pet(long? Id = null, Category Category = null, string Name = null, List<string> PhotoUrls = null, List<Tag> Tags = null, StatusEnum? Status = null)
+        {
+            // to ensure "Name" is required (not null)
+            if (Name == null)
+            {
+                throw new InvalidDataException("Name is a required property for Pet and cannot be null");
+            }
+            else
+            {
+                this.Name = Name;
+            }
+            // to ensure "PhotoUrls" is required (not null)
+            if (PhotoUrls == null)
+            {
+                throw new InvalidDataException("PhotoUrls is a required property for Pet and cannot be null");
+            }
+            else
+            {
+                this.PhotoUrls = PhotoUrls;
+            }
+            this.Id = Id;
+            this.Category = Category;
+            this.Tags = Tags;
+            this.Status = Status;
+            
+        }
         
-  
+    
+        /// <summary>
+        /// Gets or Sets Id
+        /// </summary>
+        [DataMember(Name="id", EmitDefaultValue=false)]
+        public long? Id { get; set; }
+    
+        /// <summary>
+        /// Gets or Sets Category
+        /// </summary>
+        [DataMember(Name="category", EmitDefaultValue=false)]
+        public Category Category { get; set; }
+    
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        [DataMember(Name="name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+    
+        /// <summary>
+        /// Gets or Sets PhotoUrls
+        /// </summary>
+        [DataMember(Name="photoUrls", EmitDefaultValue=false)]
+        public List<string> PhotoUrls { get; set; }
+    
+        /// <summary>
+        /// Gets or Sets Tags
+        /// </summary>
+        [DataMember(Name="tags", EmitDefaultValue=false)]
+        public List<Tag> Tags { get; set; }
+    
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -111,7 +154,7 @@ namespace IO.Swagger.Model
         /// <summary>
         /// Returns true if Pet instances are equal
         /// </summary>
-        /// <param name="obj">Instance of Pet to be compared</param>
+        /// <param name="other">Instance of Pet to be compared</param>
         /// <returns>Boolean</returns>
         public bool Equals(Pet other)
         {
@@ -165,22 +208,22 @@ namespace IO.Swagger.Model
                 // Suitable nullity checks etc, of course :)
                 
                 if (this.Id != null)
-                    hash = hash * 57 + this.Id.GetHashCode();
+                    hash = hash * 59 + this.Id.GetHashCode();
                 
                 if (this.Category != null)
-                    hash = hash * 57 + this.Category.GetHashCode();
+                    hash = hash * 59 + this.Category.GetHashCode();
                 
                 if (this.Name != null)
-                    hash = hash * 57 + this.Name.GetHashCode();
+                    hash = hash * 59 + this.Name.GetHashCode();
                 
                 if (this.PhotoUrls != null)
-                    hash = hash * 57 + this.PhotoUrls.GetHashCode();
+                    hash = hash * 59 + this.PhotoUrls.GetHashCode();
                 
                 if (this.Tags != null)
-                    hash = hash * 57 + this.Tags.GetHashCode();
+                    hash = hash * 59 + this.Tags.GetHashCode();
                 
                 if (this.Status != null)
-                    hash = hash * 57 + this.Status.GetHashCode();
+                    hash = hash * 59 + this.Status.GetHashCode();
                 
                 return hash;
             }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/SpecialModelName.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/SpecialModelName.cs
new file mode 100644
index 00000000000..4424503f008
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/SpecialModelName.cs
@@ -0,0 +1,113 @@
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace IO.Swagger.Model
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [DataContract]
+    public partial class SpecialModelName :  IEquatable<SpecialModelName>
+    { 
+    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SpecialModelName" /> class.
+        /// Initializes a new instance of the <see cref="SpecialModelName" />class.
+        /// </summary>
+        /// <param name="SpecialPropertyName">SpecialPropertyName.</param>
+
+        public SpecialModelName(long? SpecialPropertyName = null)
+        {
+            this.SpecialPropertyName = SpecialPropertyName;
+            
+        }
+        
+    
+        /// <summary>
+        /// Gets or Sets SpecialPropertyName
+        /// </summary>
+        [DataMember(Name="$special[property.name]", EmitDefaultValue=false)]
+        public long? SpecialPropertyName { get; set; }
+    
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class SpecialModelName {\n");
+            sb.Append("  SpecialPropertyName: ").Append(SpecialPropertyName).Append("\n");
+            
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="obj">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object obj)
+        {
+            // credit: http://stackoverflow.com/a/10454552/677735
+            return this.Equals(obj as SpecialModelName);
+        }
+
+        /// <summary>
+        /// Returns true if SpecialModelName instances are equal
+        /// </summary>
+        /// <param name="other">Instance of SpecialModelName to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(SpecialModelName other)
+        {
+            // credit: http://stackoverflow.com/a/10454552/677735
+            if (other == null)
+                return false;
+
+            return 
+                (
+                    this.SpecialPropertyName == other.SpecialPropertyName ||
+                    this.SpecialPropertyName != null &&
+                    this.SpecialPropertyName.Equals(other.SpecialPropertyName)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            // credit: http://stackoverflow.com/a/263416/677735
+            unchecked // Overflow is fine, just wrap
+            {
+                int hash = 41;
+                // Suitable nullity checks etc, of course :)
+                
+                if (this.SpecialPropertyName != null)
+                    hash = hash * 59 + this.SpecialPropertyName.GetHashCode();
+                
+                return hash;
+            }
+        }
+
+    }
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Tag.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Tag.cs
index 4aa4a9c97f0..8b511075d56 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Tag.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Tag.cs
@@ -4,42 +4,47 @@ using System.IO;
 using System.Text;
 using System.Collections;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace IO.Swagger.Model
 {
-
     /// <summary>
     /// 
     /// </summary>
     [DataContract]
-    public class Tag :  IEquatable<Tag>
-    {
+    public partial class Tag :  IEquatable<Tag>
+    { 
+    
         /// <summary>
         /// Initializes a new instance of the <see cref="Tag" /> class.
+        /// Initializes a new instance of the <see cref="Tag" />class.
         /// </summary>
-        public Tag()
+        /// <param name="Id">Id.</param>
+        /// <param name="Name">Name.</param>
+
+        public Tag(long? Id = null, string Name = null)
         {
+            this.Id = Id;
+            this.Name = Name;
             
         }
-
         
+    
         /// <summary>
         /// Gets or Sets Id
         /// </summary>
         [DataMember(Name="id", EmitDefaultValue=false)]
         public long? Id { get; set; }
-  
-        
+    
         /// <summary>
         /// Gets or Sets Name
         /// </summary>
         [DataMember(Name="name", EmitDefaultValue=false)]
         public string Name { get; set; }
-  
-        
-  
+    
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -78,7 +83,7 @@ namespace IO.Swagger.Model
         /// <summary>
         /// Returns true if Tag instances are equal
         /// </summary>
-        /// <param name="obj">Instance of Tag to be compared</param>
+        /// <param name="other">Instance of Tag to be compared</param>
         /// <returns>Boolean</returns>
         public bool Equals(Tag other)
         {
@@ -112,10 +117,10 @@ namespace IO.Swagger.Model
                 // Suitable nullity checks etc, of course :)
                 
                 if (this.Id != null)
-                    hash = hash * 57 + this.Id.GetHashCode();
+                    hash = hash * 59 + this.Id.GetHashCode();
                 
                 if (this.Name != null)
-                    hash = hash * 57 + this.Name.GetHashCode();
+                    hash = hash * 59 + this.Name.GetHashCode();
                 
                 return hash;
             }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Task.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Task.cs
new file mode 100644
index 00000000000..b2182f2f712
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Task.cs
@@ -0,0 +1,113 @@
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace IO.Swagger.Model
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [DataContract]
+    public partial class Task :  IEquatable<Task>
+    { 
+    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Task" /> class.
+        /// Initializes a new instance of the <see cref="Task" />class.
+        /// </summary>
+        /// <param name="_Return">_Return.</param>
+
+        public Task(int? _Return = null)
+        {
+            this._Return = _Return;
+            
+        }
+        
+    
+        /// <summary>
+        /// Gets or Sets _Return
+        /// </summary>
+        [DataMember(Name="return", EmitDefaultValue=false)]
+        public int? _Return { get; set; }
+    
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class Task {\n");
+            sb.Append("  _Return: ").Append(_Return).Append("\n");
+            
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="obj">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object obj)
+        {
+            // credit: http://stackoverflow.com/a/10454552/677735
+            return this.Equals(obj as Task);
+        }
+
+        /// <summary>
+        /// Returns true if Task instances are equal
+        /// </summary>
+        /// <param name="other">Instance of Task to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(Task other)
+        {
+            // credit: http://stackoverflow.com/a/10454552/677735
+            if (other == null)
+                return false;
+
+            return 
+                (
+                    this._Return == other._Return ||
+                    this._Return != null &&
+                    this._Return.Equals(other._Return)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            // credit: http://stackoverflow.com/a/263416/677735
+            unchecked // Overflow is fine, just wrap
+            {
+                int hash = 41;
+                // Suitable nullity checks etc, of course :)
+                
+                if (this._Return != null)
+                    hash = hash * 59 + this._Return.GetHashCode();
+                
+                return hash;
+            }
+        }
+
+    }
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/User.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/User.cs
index 5785a3d3509..2216619c0bf 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/User.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/User.cs
@@ -4,85 +4,96 @@ using System.IO;
 using System.Text;
 using System.Collections;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace IO.Swagger.Model
 {
-
     /// <summary>
     /// 
     /// </summary>
     [DataContract]
-    public class User :  IEquatable<User>
-    {
+    public partial class User :  IEquatable<User>
+    { 
+    
         /// <summary>
         /// Initializes a new instance of the <see cref="User" /> class.
+        /// Initializes a new instance of the <see cref="User" />class.
         /// </summary>
-        public User()
+        /// <param name="Id">Id.</param>
+        /// <param name="Username">Username.</param>
+        /// <param name="FirstName">FirstName.</param>
+        /// <param name="LastName">LastName.</param>
+        /// <param name="Email">Email.</param>
+        /// <param name="Password">Password.</param>
+        /// <param name="Phone">Phone.</param>
+        /// <param name="UserStatus">User Status.</param>
+
+        public User(long? Id = null, string Username = null, string FirstName = null, string LastName = null, string Email = null, string Password = null, string Phone = null, int? UserStatus = null)
         {
+            this.Id = Id;
+            this.Username = Username;
+            this.FirstName = FirstName;
+            this.LastName = LastName;
+            this.Email = Email;
+            this.Password = Password;
+            this.Phone = Phone;
+            this.UserStatus = UserStatus;
             
         }
-
         
+    
         /// <summary>
         /// Gets or Sets Id
         /// </summary>
         [DataMember(Name="id", EmitDefaultValue=false)]
         public long? Id { get; set; }
-  
-        
+    
         /// <summary>
         /// Gets or Sets Username
         /// </summary>
         [DataMember(Name="username", EmitDefaultValue=false)]
         public string Username { get; set; }
-  
-        
+    
         /// <summary>
         /// Gets or Sets FirstName
         /// </summary>
         [DataMember(Name="firstName", EmitDefaultValue=false)]
         public string FirstName { get; set; }
-  
-        
+    
         /// <summary>
         /// Gets or Sets LastName
         /// </summary>
         [DataMember(Name="lastName", EmitDefaultValue=false)]
         public string LastName { get; set; }
-  
-        
+    
         /// <summary>
         /// Gets or Sets Email
         /// </summary>
         [DataMember(Name="email", EmitDefaultValue=false)]
         public string Email { get; set; }
-  
-        
+    
         /// <summary>
         /// Gets or Sets Password
         /// </summary>
         [DataMember(Name="password", EmitDefaultValue=false)]
         public string Password { get; set; }
-  
-        
+    
         /// <summary>
         /// Gets or Sets Phone
         /// </summary>
         [DataMember(Name="phone", EmitDefaultValue=false)]
         public string Phone { get; set; }
-  
-        
+    
         /// <summary>
         /// User Status
         /// </summary>
         /// <value>User Status</value>
         [DataMember(Name="userStatus", EmitDefaultValue=false)]
         public int? UserStatus { get; set; }
-  
-        
-  
+    
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -127,7 +138,7 @@ namespace IO.Swagger.Model
         /// <summary>
         /// Returns true if User instances are equal
         /// </summary>
-        /// <param name="obj">Instance of User to be compared</param>
+        /// <param name="other">Instance of User to be compared</param>
         /// <returns>Boolean</returns>
         public bool Equals(User other)
         {
@@ -191,28 +202,28 @@ namespace IO.Swagger.Model
                 // Suitable nullity checks etc, of course :)
                 
                 if (this.Id != null)
-                    hash = hash * 57 + this.Id.GetHashCode();
+                    hash = hash * 59 + this.Id.GetHashCode();
                 
                 if (this.Username != null)
-                    hash = hash * 57 + this.Username.GetHashCode();
+                    hash = hash * 59 + this.Username.GetHashCode();
                 
                 if (this.FirstName != null)
-                    hash = hash * 57 + this.FirstName.GetHashCode();
+                    hash = hash * 59 + this.FirstName.GetHashCode();
                 
                 if (this.LastName != null)
-                    hash = hash * 57 + this.LastName.GetHashCode();
+                    hash = hash * 59 + this.LastName.GetHashCode();
                 
                 if (this.Email != null)
-                    hash = hash * 57 + this.Email.GetHashCode();
+                    hash = hash * 59 + this.Email.GetHashCode();
                 
                 if (this.Password != null)
-                    hash = hash * 57 + this.Password.GetHashCode();
+                    hash = hash * 59 + this.Password.GetHashCode();
                 
                 if (this.Phone != null)
-                    hash = hash * 57 + this.Phone.GetHashCode();
+                    hash = hash * 59 + this.Phone.GetHashCode();
                 
                 if (this.UserStatus != null)
-                    hash = hash * 57 + this.UserStatus.GetHashCode();
+                    hash = hash * 59 + this.UserStatus.GetHashCode();
                 
                 return hash;
             }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Properties/AssemblyInfo.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000000..f3b9f7d1d14
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Properties/AssemblyInfo.cs
@@ -0,0 +1,32 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Swagger Library")]
+[assembly: AssemblyDescription("A library generated from a Swagger doc")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Swagger")]
+[assembly: AssemblyProduct("SwaggerLibrary")]
+[assembly: AssemblyCopyright("No Copyright")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0")]
+[assembly: AssemblyFileVersion("1.0.0")]
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/vendor/packages.config b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/vendor/packages.config
new file mode 100644
index 00000000000..91f17cd0819
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/vendor/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="RestSharp" version="105.1.0" targetFramework="net45" developmentDependency="true" />
+  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" developmentDependency="true" />
+</packages>
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.csproj b/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.csproj
index 5556641ea1f..83c4f19ab17 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.csproj
+++ b/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.csproj
@@ -58,6 +58,14 @@
     <Compile Include="TestApiClient.cs" />
     <Compile Include="TestConfiguration.cs" />
     <Compile Include="Lib\SwaggerClient\src\main\csharp\IO\Swagger\Client\ApiResponse.cs" />
+    <Compile Include="TestOrder.cs" />
+    <Compile Include="Lib\SwaggerClient\src\main\csharp\IO\Swagger\Model\InlineResponse200.cs" />
+    <Compile Include="Lib\SwaggerClient\src\main\csharp\IO\Swagger\Model\ObjectReturn.cs" />
+    <Compile Include="Lib\SwaggerClient\src\main\csharp\IO\Swagger\Model\SpecialModelName.cs" />
+    <Compile Include="Lib\SwaggerClient\src\main\csharp\IO\Swagger\Model\ModelReturn.cs" />
+    <Compile Include="Lib\SwaggerClient\src\main\csharp\IO\Swagger\Model\Name.cs" />
+    <Compile Include="Lib\SwaggerClient\src\main\csharp\IO\Swagger\Model\Task.cs" />
+    <Compile Include="Lib\SwaggerClient\src\main\csharp\IO\Swagger\Model\Model200Response.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs b/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs
index a5ad5d531bd..c507559e57d 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs
@@ -1,10 +1,9 @@
 <Properties StartupItem="SwaggerClientTest.csproj">
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="TestPet.cs">
     <Files>
-      <File FileName="TestConfiguration.cs" Line="1" Column="1" />
-      <File FileName="TestPet.cs" Line="1" Column="1" />
-      <File FileName="Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs" Line="15" Column="29" />
+      <File FileName="TestPet.cs" Line="23" Column="17" />
+      <File FileName="TestOrder.cs" Line="1" Column="1" />
     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/TestApiClient.cs b/samples/client/petstore/csharp/SwaggerClientTest/TestApiClient.cs
index f0232c330f0..9d1921d8ea7 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/TestApiClient.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/TestApiClient.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using IO.Swagger.Client;
+using IO.Swagger.Api;
 
 namespace SwaggerClientTest.TestApiClient
 {
@@ -14,6 +15,26 @@ namespace SwaggerClientTest.TestApiClient
             Configuration.Default.DateTimeFormat = "o";
         }
 
+		/// <summary>
+		/// Test SelectHeaderContentType
+		/// </summary>
+		[Test ()]
+		public void TestSelectHeaderContentType ()
+		{	
+			ApiClient api = new ApiClient ();
+			String[] contentTypes = new String[] { "application/json", "application/xml" };
+			Assert.AreEqual("application/json", api.SelectHeaderContentType (contentTypes));
+
+			contentTypes = new String[] { "application/xml" };
+			Assert.AreEqual("application/xml", api.SelectHeaderContentType (contentTypes));
+
+			contentTypes = new String[] {};
+			Assert.IsNull(api.SelectHeaderContentType (contentTypes));	
+		}
+
+		/// <summary>
+		/// Test ParameterToString
+		/// </summary>
         [Test ()]
 		public void TestParameterToString ()
 		{	
@@ -48,7 +69,7 @@ namespace SwaggerClientTest.TestApiClient
 		{
 			ApiClient api = new ApiClient ();
             // test datetime with a time zone
-            DateTime dateWithTz = DateTime.Parse("2008-04-10T13:30:00.0000000-04:00", null, System.Globalization.DateTimeStyles.RoundtripKind);
+            DateTimeOffset dateWithTz = DateTimeOffset.Parse("2008-04-10T13:30:00.0000000-04:00", null, System.Globalization.DateTimeStyles.RoundtripKind);
             Assert.AreEqual("2008-04-10T13:30:00.0000000-04:00", api.ParameterToString(dateWithTz));
         }
 
@@ -75,6 +96,50 @@ namespace SwaggerClientTest.TestApiClient
             DateTime dateUtc = DateTime.Parse("2009-06-15 20:45:30Z", null, System.Globalization.DateTimeStyles.RoundtripKind);
             Assert.AreEqual("15/06/09 20:45:30", api.ParameterToString(dateUtc));
         }
+
+		[Test ()]
+		public void TestSanitizeFilename ()
+		{
+			Assert.AreEqual("sun.gif", ApiClient.SanitizeFilename("sun.gif"));
+			Assert.AreEqual("sun.gif", ApiClient.SanitizeFilename("../sun.gif"));
+			Assert.AreEqual("sun.gif", ApiClient.SanitizeFilename("/var/tmp/sun.gif"));
+			Assert.AreEqual("sun.gif", ApiClient.SanitizeFilename("./sun.gif"));
+			        
+			Assert.AreEqual("sun", ApiClient.SanitizeFilename("sun"));
+			Assert.AreEqual("sun.gif", ApiClient.SanitizeFilename("..\\sun.gif"));
+			Assert.AreEqual("sun.gif", ApiClient.SanitizeFilename("\\var\\tmp\\sun.gif"));
+			Assert.AreEqual("sun.gif", ApiClient.SanitizeFilename("c:\\var\\tmp\\sun.gif"));
+			Assert.AreEqual("sun.gif", ApiClient.SanitizeFilename(".\\sun.gif"));
+
+		}
+
+		[Test ()]
+		public void TestApiClientInstance ()
+		{
+			PetApi p1 = new PetApi ();
+			PetApi p2 = new PetApi ();
+
+			Configuration c1 = new Configuration (); // using default ApiClient
+			PetApi p3 = new PetApi (c1);
+
+			ApiClient a1 = new ApiClient();
+			Configuration c2 = new Configuration (a1); // using "a1" as the ApiClient
+			PetApi p4 = new PetApi (c2);
+
+
+			// ensure both using the same default ApiClient
+			Assert.AreSame(p1.Configuration.ApiClient, p2.Configuration.ApiClient);
+			Assert.AreSame(p1.Configuration.ApiClient, Configuration.Default.ApiClient);
+
+			// ensure both using the same default ApiClient
+			Assert.AreSame(p3.Configuration.ApiClient, c1.ApiClient);
+			Assert.AreSame(p3.Configuration.ApiClient, Configuration.Default.ApiClient);
+
+			// ensure it's not using the default ApiClient
+			Assert.AreSame(p4.Configuration.ApiClient, c2.ApiClient);
+			Assert.AreNotSame(p4.Configuration.ApiClient, Configuration.Default.ApiClient);
+
+		}
     }
 }
 
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/TestOrder.cs b/samples/client/petstore/csharp/SwaggerClientTest/TestOrder.cs
new file mode 100644
index 00000000000..f66e34a5e9e
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/TestOrder.cs
@@ -0,0 +1,100 @@
+using NUnit.Framework;
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using IO.Swagger.Api;
+using IO.Swagger.Model;
+using IO.Swagger.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+
+namespace SwaggerClientTest.TestOrder
+{
+	[TestFixture ()]
+	public class TestOrder
+	{
+		public TestOrder ()
+		{
+			
+		}
+
+		/// <summary>
+		/// Test creating a new instance of Order
+		/// </summary>
+		[Test ()]
+		public void TestNewOrder()
+		{
+			Order o = new Order ();
+
+			Assert.IsNull (o.Id);
+
+		}
+
+		/// <summary>
+		/// Test deserialization of JSON to Order and its readonly property
+		/// </summary>
+		[Test ()]
+		public void TesOrderDeserialization()
+		{
+			string json = @"{
+'id': 1982,
+'petId': 1020,
+'quantity': 1,
+'status': 'placed',
+'complete': true,
+}";
+			var o = JsonConvert.DeserializeObject<Order>(json);
+			Assert.AreEqual (1982, o.Id);
+			Assert.AreEqual (1020, o.PetId);
+			Assert.AreEqual (1, o.Quantity);
+			Assert.AreEqual (Order.StatusEnum.Placed, o.Status);
+			Assert.AreEqual (true, o.Complete);
+
+		}
+
+		/// <summary>
+		/// Test GetInvetory
+		/// </summary>
+		[Test ()]
+		public void TestGetInventory ()
+		{
+			// set timeout to 10 seconds
+			Configuration c1 = new Configuration (timeout: 10000);
+
+			StoreApi storeApi = new StoreApi (c1);
+			Dictionary<String, int?> response = storeApi.GetInventory ();
+
+			foreach(KeyValuePair<string, int?> entry in response)
+			{
+				Assert.IsInstanceOf (typeof(int?), entry.Value);
+			}
+				
+		}
+
+		/// <summary>
+		/// Test GetInvetoryInObject
+		/// </summary>
+		[Test ()]
+		public void TestGetInventoryInObject ()
+		{
+			// set timeout to 10 seconds
+			Configuration c1 = new Configuration (timeout: 10000);
+
+			StoreApi storeApi = new StoreApi (c1);
+			Newtonsoft.Json.Linq.JObject response = (Newtonsoft.Json.Linq.JObject)storeApi.GetInventoryInObject ();
+
+			// should be a Newtonsoft.Json.Linq.JObject since type is object
+			Assert.IsInstanceOf (typeof(Newtonsoft.Json.Linq.JObject), response);
+
+			foreach(KeyValuePair<string, string> entry in response.ToObject<Dictionary<string, string>>())
+			{
+				Assert.IsInstanceOf (typeof(int?), Int32.Parse(entry.Value));
+			}
+
+		}
+
+	}
+}
+
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/TestPet.cs b/samples/client/petstore/csharp/SwaggerClientTest/TestPet.cs
index fbbf4494951..0b04ca72b05 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/TestPet.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/TestPet.cs
@@ -1,4 +1,4 @@
-using NUnit.Framework;
+using NUnit.Framework;
 using System;
 using System.Linq;
 using System.IO;
@@ -15,13 +15,16 @@ namespace SwaggerClientTest.TestPet
 	{
 		public long petId = 11088;
 
-		[SetUp] public void Init()
+		/// <summary>
+		/// Create a Pet object
+		/// </summary>
+		private Pet createPet()
 		{
 			// create pet
-			Pet p = new Pet();
+			Pet p = new Pet(Name: "Csharp test", PhotoUrls: new List<string> { "http://petstore.com/csharp_test" });
 			p.Id = petId;
-			p.Name = "Csharp test";
-			p.Status = "available";
+			//p.Name = "Csharp test";
+			p.Status = Pet.StatusEnum.Available;
 			// create Category object
 			Category category = new Category();
 			category.Id = 56;
@@ -30,12 +33,30 @@ namespace SwaggerClientTest.TestPet
 			// create Tag object
 			Tag tag = new Tag();
 			tag.Id = petId;
-			tag.Name = "sample tag name1";
+			tag.Name = "csharp sample tag name1";
 			List<Tag> tags = new List<Tag>(new Tag[] {tag});
 			p.Tags = tags;
 			p.Category = category;
 			p.PhotoUrls = photoUrls;
 
+			return p;
+		}
+
+		/// <summary>
+		/// Convert string to byte array
+		/// </summary>
+		private byte[] GetBytes(string str)
+		{
+			byte[] bytes = new byte[str.Length * sizeof(char)];
+			System.Buffer.BlockCopy(str.ToCharArray(), 0, bytes, 0, bytes.Length);
+			return bytes;
+		}
+
+		[SetUp] public void Init()
+		{
+			// create pet
+			Pet p = createPet();
+
 			// add pet before testing
 			PetApi petApi = new PetApi("http://petstore.swagger.io/v2/");
 			petApi.AddPet (p);
@@ -61,11 +82,11 @@ namespace SwaggerClientTest.TestPet
 			Assert.IsInstanceOf<Pet> (response, "Response is a Pet");
 
 			Assert.AreEqual ("Csharp test", response.Name);
-			Assert.AreEqual ("available", response.Status);
+			Assert.AreEqual (Pet.StatusEnum.Available, response.Status);
 
 			Assert.IsInstanceOf<List<Tag>> (response.Tags, "Response.Tags is a Array");
 			Assert.AreEqual (petId, response.Tags [0].Id);
-			Assert.AreEqual ("sample tag name1", response.Tags [0].Name);
+			Assert.AreEqual ("csharp sample tag name1", response.Tags [0].Name);
 
 			Assert.IsInstanceOf<List<String>> (response.PhotoUrls, "Response.PhotoUrls is a Array");
 			Assert.AreEqual ("sample photoUrls", response.PhotoUrls [0]);
@@ -93,11 +114,11 @@ namespace SwaggerClientTest.TestPet
 			Assert.IsInstanceOf<Pet> (response, "Response is a Pet");
 
 			Assert.AreEqual ("Csharp test", response.Name);
-			Assert.AreEqual ("available", response.Status);
+			Assert.AreEqual (Pet.StatusEnum.Available, response.Status);
 
 			Assert.IsInstanceOf<List<Tag>> (response.Tags, "Response.Tags is a Array");
 			Assert.AreEqual (petId, response.Tags [0].Id);
-			Assert.AreEqual ("sample tag name1", response.Tags [0].Name);
+			Assert.AreEqual ("csharp sample tag name1", response.Tags [0].Name);
 
 			Assert.IsInstanceOf<List<String>> (response.PhotoUrls, "Response.PhotoUrls is a Array");
 			Assert.AreEqual ("sample photoUrls", response.PhotoUrls [0]);
@@ -115,18 +136,18 @@ namespace SwaggerClientTest.TestPet
 		public void TestGetPetById ()
 		{
 			// set timeout to 10 seconds
-			Configuration c1 = new Configuration (timeout: 10000);
+			Configuration c1 = new Configuration (timeout: 10000, userAgent: "TEST_USER_AGENT");
 
 			PetApi petApi = new PetApi (c1);
 			Pet response = petApi.GetPetById (petId);
 			Assert.IsInstanceOf<Pet> (response, "Response is a Pet");
 
 			Assert.AreEqual ("Csharp test", response.Name);
-			Assert.AreEqual ("available", response.Status);
+			Assert.AreEqual (Pet.StatusEnum.Available, response.Status);
 
 			Assert.IsInstanceOf<List<Tag>> (response.Tags, "Response.Tags is a Array");
 			Assert.AreEqual (petId, response.Tags [0].Id);
-			Assert.AreEqual ("sample tag name1", response.Tags [0].Name);
+			Assert.AreEqual ("csharp sample tag name1", response.Tags [0].Name);
 
 			Assert.IsInstanceOf<List<String>> (response.PhotoUrls, "Response.PhotoUrls is a Array");
 			Assert.AreEqual ("sample photoUrls", response.PhotoUrls [0]);
@@ -137,6 +158,66 @@ namespace SwaggerClientTest.TestPet
 
 		}
 
+		/// <summary>
+		/// Test GetPetByIdInObject
+		/// </summary>
+		[Test ()]
+		public void TestGetPetByIdInObject ()
+		{
+			// set timeout to 10 seconds
+			Configuration c1 = new Configuration (timeout: 10000);
+
+			PetApi petApi = new PetApi (c1);
+			InlineResponse200 response = petApi.GetPetByIdInObject (petId);
+			Assert.IsInstanceOf<InlineResponse200> (response, "Response is a Pet");
+
+			Assert.AreEqual ("Csharp test", response.Name);
+			Assert.AreEqual (InlineResponse200.StatusEnum.Available, response.Status);
+
+			Assert.IsInstanceOf<List<Tag>> (response.Tags, "Response.Tags is a Array");
+			Assert.AreEqual (petId, response.Tags [0].Id);
+			Assert.AreEqual ("csharp sample tag name1", response.Tags [0].Name);
+
+			Assert.IsInstanceOf<List<String>> (response.PhotoUrls, "Response.PhotoUrls is a Array");
+			Assert.AreEqual ("sample photoUrls", response.PhotoUrls [0]);
+
+			Assert.IsInstanceOf<Newtonsoft.Json.Linq.JObject> (response.Category, "Response.Category is a Newtonsoft.Json.Linq.JObject");
+
+			Newtonsoft.Json.Linq.JObject category = (Newtonsoft.Json.Linq.JObject)response.Category;
+			Assert.AreEqual (56, (int)category ["id"]);
+			Assert.AreEqual ("sample category name2", (string) category["name"]);
+
+		}
+
+		/// <summary>
+		/// Test GetPetByIdWithByteArray
+		/// </summary>
+		[Test ()]
+		public void TestGetPetByIdWithByteArray ()
+		{
+			// set timeout to 10 seconds
+			Configuration c1 = new Configuration (timeout: 10000);
+
+			PetApi petApi = new PetApi (c1);
+			byte[] response = petApi.PetPetIdtestingByteArraytrueGet (petId);
+			Assert.IsInstanceOf<byte[]> (response, "Response is byte array");
+		}
+
+		/// <summary>
+		/// Test AddPetUsingByteArray
+		/// </summary>
+		[Test ()]
+		public void TestAddPetUsingByteArray ()
+		{
+			// set timeout to 10 seconds
+			Configuration c1 = new Configuration (timeout: 10000);
+
+			PetApi petApi = new PetApi (c1);
+			Pet p = createPet ();
+			byte[] petByteArray = GetBytes ((string)petApi.Configuration.ApiClient.Serialize (p));
+			petApi.AddPetUsingByteArray (petByteArray);
+		}
+
 		/// <summary>
 		/// Test UpdatePetWithForm
 		/// </summary>
@@ -152,7 +233,7 @@ namespace SwaggerClientTest.TestPet
 			Assert.IsInstanceOf<List<Tag>> (response.Tags, "Response.Tags is a Array");
 
 			Assert.AreEqual ("new form name", response.Name);
-			Assert.AreEqual ("pending", response.Status);
+			Assert.AreEqual (Pet.StatusEnum.Pending, response.Status);
 
 			Assert.AreEqual (petId, response.Tags [0].Id);
 			Assert.AreEqual (56, response.Category.Id);
@@ -171,7 +252,7 @@ namespace SwaggerClientTest.TestPet
 		{
 		    Assembly _assembly = Assembly.GetExecutingAssembly();
 		    Stream _imageStream = _assembly.GetManifestResourceStream("SwaggerClientTest.swagger-logo.png");
-            PetApi petApi = new PetApi ();			
+            PetApi petApi = new PetApi ();
 			// test file upload with form parameters
 			petApi.UploadFile(petId, "new form name", _imageStream);
 
@@ -185,16 +266,16 @@ namespace SwaggerClientTest.TestPet
 		/// Test FindPetByStatus
 		/// </summary>
 		[Test ()]
-		public void TestFindPetByStatus ()
+		public void TestFindPetByTags ()
 		{
 			PetApi petApi = new PetApi ();
-			List<String> statusList = new List<String>(new String[] {"available"});
+			List<String> tagsList = new List<String>(new String[] {"available"});
 
-			List<Pet> listPet = petApi.FindPetsByStatus (statusList);
+			List<Pet> listPet = petApi.FindPetsByTags (tagsList);
 			foreach (Pet pet in listPet) // Loop through List with foreach.
 			{
 				Assert.IsInstanceOf<Pet> (pet, "Response is a Pet");
-				Assert.AreEqual ("available", pet.Status);
+				Assert.AreEqual ("csharp sample tag name1", pet.Tags[0]);
 			}
 
 		}
@@ -206,10 +287,10 @@ namespace SwaggerClientTest.TestPet
 		public void TestEqual()
 		{
 			// create pet
-			Pet p1 = new Pet();
+			Pet p1 = new Pet(Name: "Csharp test", PhotoUrls: new List<string> { "http://petstore.com/csharp_test"} );
 			p1.Id = petId;
-			p1.Name = "Csharp test";
-			p1.Status = "available";
+			//p1.Name = "Csharp test";
+			p1.Status = Pet.StatusEnum.Available;
 			// create Category object
 			Category category1 = new Category();
 			category1.Id = 56;
@@ -218,17 +299,17 @@ namespace SwaggerClientTest.TestPet
 			// create Tag object
 			Tag tag1 = new Tag();
 			tag1.Id = petId;
-			tag1.Name = "sample tag name1";
+			tag1.Name = "csharp sample tag name1";
 			List<Tag> tags1 = new List<Tag>(new Tag[] {tag1});
 			p1.Tags = tags1;
 			p1.Category = category1;
 			p1.PhotoUrls = photoUrls1;
 
 			// create pet 2
-			Pet p2 = new Pet();
+			Pet p2 = new Pet(Name: "Csharp test", PhotoUrls: new List<string> { "http://petstore.com/csharp_test"} );
 			p2.Id = petId;
 			p2.Name = "Csharp test";
-			p2.Status = "available";
+			p2.Status = Pet.StatusEnum.Available;
 			// create Category object
 			Category category2 = new Category();
 			category2.Id = 56;
@@ -237,7 +318,7 @@ namespace SwaggerClientTest.TestPet
 			// create Tag object
 			Tag tag2 = new Tag();
 			tag2.Id = petId;
-			tag2.Name = "sample tag name1";
+			tag2.Name = "csharp sample tag name1";
 			List<Tag> tags2 = new List<Tag>(new Tag[] {tag2});
 			p2.Tags = tags2;
 			p2.Category = category2;
@@ -284,8 +365,9 @@ namespace SwaggerClientTest.TestPet
 		public void TestDefaultHeader ()
 		{
 			PetApi petApi = new PetApi ();
+			// commented out the warning test below as it's confirmed the warning is working as expected
 			// there should be a warning for using AddDefaultHeader (deprecated) below
-			petApi.AddDefaultHeader ("header_key", "header_value");
+			//petApi.AddDefaultHeader ("header_key", "header_value");
 			// the following should be used instead as suggested in the doc
 			petApi.Configuration.AddDefaultHeader ("header_key2", "header_value2");
 
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/Newtonsoft.Json.dll b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/Newtonsoft.Json.dll
deleted file mode 100644
index ae725c4b598..00000000000
Binary files a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/Newtonsoft.Json.dll and /dev/null differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/RestSharp.dll b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/RestSharp.dll
deleted file mode 100644
index a7331ed6e23..00000000000
Binary files a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/RestSharp.dll and /dev/null differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll
deleted file mode 100755
index 807ef197edf..00000000000
Binary files a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll and /dev/null differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll.mdb b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll.mdb
deleted file mode 100644
index d4c01b5c42a..00000000000
Binary files a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll.mdb and /dev/null differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/nunit.framework.dll b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/nunit.framework.dll
deleted file mode 100644
index ed6550bb055..00000000000
Binary files a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/nunit.framework.dll and /dev/null differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/mono-nunit.sh b/samples/client/petstore/csharp/SwaggerClientTest/mono-nunit.sh
new file mode 100755
index 00000000000..c14e76dad05
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/mono-nunit.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+wget -nc https://nuget.org/nuget.exe;
+mozroots --import --sync
+
+# remove bin/Debug/SwaggerClientTest.dll
+rm bin/Debug/SwaggerClientTest.dll 2> /dev/null 
+
+# install NUnit runners via NuGet
+mono nuget.exe install NUnit.Runners -Version 2.6.4 -OutputDirectory testrunner
+
+# build the solution and run the unit test
+xbuild SwaggerClientTest.sln && \
+mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe bin/Debug/SwaggerClientTest.dll 
+
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttribute.cs b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttribute.cs
deleted file mode 100644
index fdcb678cdda..00000000000
--- a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttribute.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-// <autogenerated />
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName = "")]
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.csproj.FilesWrittenAbsolute.txt b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.csproj.FilesWrittenAbsolute.txt
index 285fc683bfc..323cad108c6 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.csproj.FilesWrittenAbsolute.txt
+++ b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.csproj.FilesWrittenAbsolute.txt
@@ -1,9 +1,9 @@
-/Users/williamcheng/Code/tmp/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttribute.cs
-/Users/williamcheng/Code/tmp/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.swagger-logo.png
-/Users/williamcheng/Code/tmp/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll.mdb
-/Users/williamcheng/Code/tmp/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll
-/Users/williamcheng/Code/tmp/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll
-/Users/williamcheng/Code/tmp/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll.mdb
-/Users/williamcheng/Code/tmp/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/Newtonsoft.Json.dll
-/Users/williamcheng/Code/tmp/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/nunit.framework.dll
-/Users/williamcheng/Code/tmp/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/RestSharp.dll
+/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttribute.cs
+/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.swagger-logo.png
+/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll.mdb
+/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll
+/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll
+/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll.mdb
+/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/Newtonsoft.Json.dll
+/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/nunit.framework.dll
+/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/RestSharp.dll
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll
deleted file mode 100755
index 807ef197edf..00000000000
Binary files a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll and /dev/null differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll.mdb b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll.mdb
deleted file mode 100644
index d4c01b5c42a..00000000000
Binary files a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll.mdb and /dev/null differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/pom.xml b/samples/client/petstore/csharp/SwaggerClientTest/pom.xml
new file mode 100644
index 00000000000..46304c21621
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/pom.xml
@@ -0,0 +1,56 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.wordnik</groupId>
+    <artifactId>CsharpPetstoreClientTests</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>C# Swagger Petstore Client</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <!--execution>
+                        <id>bundle-install</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>bundle</executable>
+                            <arguments>
+                                <argument>install</argument>
+                            </arguments>
+                        </configuration>
+                    </execution-->
+                    <execution>
+                        <id>mono-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>mono-nunit.sh</executable>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/samples/client/petstore/flash/flash/README.txt b/samples/client/petstore/flash/flash/README.txt
new file mode 100644
index 00000000000..c9a2a38d6a6
--- /dev/null
+++ b/samples/client/petstore/flash/flash/README.txt
@@ -0,0 +1,65 @@
+README for the Flash application. 
+
+These instructions are given using the version 4.7 of Flash Builder. 
+
+How to use the Flash client library:
+
+The code which is given to you is to be considered as a Library. Therefore, in Flash Builder, you have to:
+1. Create an ActionScript Library Project. (Warning: If you are dealing with Files as parameter, you need to include the Adobe AIR libraries)
+2. Copy the src folder from the flash library to the project.
+3. Copy the lib folder.
+4. Copy the build.properties and build.xml. (You can update the paths in build.properties)
+5. Right+Click on the project folder and go to Properties. Then go to the tab 'ActionScript Library Build Path' and add these two SWC: 'as3corelib.swc' and 'ASAXB-0.1.1.swc'. (They are located in the folder lib)
+6. Create the Flash Application
+
+How to use the Flash client library in an application:
+
+Using the Flash client library (especially getting the response message from the server) is a bit tricky.
+
+The response message is given through an EventDispatcher. Therefore, you have to create an EventDispatcher and listen to the endpoints that you're calling. Below, you will find a pseudo-code explaining how to do this.
+
+After creating an application in java, you will have a mxml file. In this mxml file, you need to declare a Script (given below) after the Declarations.
+
+<fx:Script>
+<![CDATA[
+
+    // Import the different libraries you need
+    // ... 
+
+    // Import the io.swagger libraries
+    import io.swagger.common.ApiUserCredentials;
+	import io.swagger.event.ApiClientEvent;
+    import io.swagger.client.api.[[API]]; // Put your Api here.
+
+    // Variables
+	private var cred:ApiUserCredentials;
+	private var dispatcher:EventDispatcher;
+    private var myAPI:[[API]]; // Change [[API]] to be the real name
+
+    // Function that print in the console the message of the response
+    public function onEvent(event:ApiClientEvent):void {
+        // trace only prints when in debug mod. Be carefule about that.		
+        trace(event.response.payload); 
+	}   
+
+    // Main function
+    public main():void {
+        // Define a dispatcher
+		dispatcher = new EventDispatcher();
+        // Define the EventListener. Fill the [[function]] by the name of the function you have in
+        // the API file.  
+		dispatcher.addEventListener([[function]], onEvent);
+
+        // To create the API, you need the ApiUserCredentials and the dispatcher.
+        cred = new ApiUserCredentials([[host]], [[basePath]] , [[apiToken]]); 
+        // You can add more parameters. Go see the function in ApiUserCredential.as in io/swagger/common
+
+        // Create the API
+        myAPI = new [[API]](cred, dispatcher); // change [[API]] to be the real name
+        
+        // Now, you can use the API
+        myAPI.[[function]]([[PARAMETERS]]);
+        // Change [[function]] and add your parameters. Then, you will see the response in the console.
+    }     
+]]>
+</fx:Script>
diff --git a/samples/client/petstore/flash/flash/build.properties b/samples/client/petstore/flash/flash/build.properties
new file mode 100644
index 00000000000..8e77d88c961
--- /dev/null
+++ b/samples/client/petstore/flash/flash/build.properties
@@ -0,0 +1,29 @@
+# Window and document title for the documentation
+title=Sample app AS3 SDK API Documentation
+
+#Path to the source folder where the .as files are located
+sourcepath = ./src/main/flex
+
+# Class-folders you want to search for classes to be included in the docs, seperated by spaces (for example   ../com/ ../net/  )
+# to include every .as and .mxml file within your project, just state   ../
+domainextensions = ./src/main/flex
+
+# The Location of deployment library on your Computer (PC/Mac) for compiled SWC file
+liboutputfolder = bin
+liboutputfile = as3-sample-sdk.swc
+libpath = lib
+
+# The Location of the output folder for your generated documents
+docsoutputfolder = asdoc
+
+# The location of the test sources
+testsourcepath = ./src/test/flex
+
+# Home directory for flex sdk, change this to build for Mac or PC using # as comment
+FLEX4_SDK_HOME = /usr/local/flex_sdk_4.1.0/
+#FLEX4_SDK_HOME = /Applications/Adobe Flash Builder 4/sdks/4.1.0/
+
+# The location of your asdoc.exe, change this to build for Mac or PC using # as comment
+#asdoc.exe = C:/Program Files/Adobe/Flash Builder 4/sdks/3.5.0/bin/asdoc.exe
+#asdoc.exe = /Applications/Adobe Flash Builder 4/sdks/3.5.0/bin/asdoc
+
diff --git a/samples/client/petstore/flash/flash/build.xml b/samples/client/petstore/flash/flash/build.xml
new file mode 100644
index 00000000000..4f021b0b8b2
--- /dev/null
+++ b/samples/client/petstore/flash/flash/build.xml
@@ -0,0 +1,192 @@
+<!-- Flex Library Project ASDocs -->
+
+<project name="AS3SDKCompile" default="compile" basedir=".">
+
+    <!-- import our build properties file -->
+    <property file="./build.properties"/>
+    <property environment="env"/>
+    <property name="FLEX_HOME" value="${FLEX4_SDK_HOME}"/>
+    <property name="FLEX4_HOME" value="${FLEX4_SDK_HOME}"/>
+
+    <!--<property name="flexunit.swc" value="../lib/ext/flexunit-4.1.0_RC2-28-flex_3.5.0.12683.swc" />
+    <property name="flexunit-uilistener.swc" value="../lib/ext/flexunit-uilistener-4.1.0_RC2-28-flex_3.5.0.12683.swc" />
+    <property name="flexunit-cilistener.swc" value="../lib/ext/flexunit-cilistener-4.1.0_RC2-28-flex_3.5.0.12683.swc" />-->
+
+    <!-- Flex Ant Tasks used to perform compc and mxml compiling more info at http://labs.adobe.com/wiki/index.php/Flex_Ant_Tasks -->
+    <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
+
+    <target name="setup" description="perform an setup operations"/>
+
+    <!-- Execute the ASDoc Compile wich runs 3 seperate tasks in a series -->
+    <target name="compile" description="series of tasks to create docs and swc">
+
+        <!--<antcall target="cleanDir" description="clean the docs directory"/>-->
+
+        <!--<antcall target="asDocs" description="full build of asdocs"/>-->
+
+        <antcall target="buildSWC" description="build the SWC file"/>
+
+    </target>
+
+    <target name="deploy" description="perform an deployment operations"/>
+
+    <target name="install" description="perform an installation operations"/>
+
+    <!--
+
+    DELETE the existing output folder and files and then re-generate the output folder
+
+    -->
+
+    <target name="clean"
+            description="DELETE the existing output folder and files and then re-generate the output folder">
+
+        <delete dir="${basedir}/${docsoutputfolder}" failonerror="true" includeemptydirs="true"/>
+        <delete file="${basedir}/${liboutputfolder}/${liboutputfile}"/>
+        <delete dir="${basedir}/dist" failonerror="true" includeemptydirs="true"/>
+
+        <mkdir dir="${basedir}/${docsoutputfolder}"/>
+
+    </target>
+
+    <!--
+
+    Run the ASDoc executable and generate the ASDocs to the new output folder
+
+    -->
+
+    <target name="docs" description="Run the ASDoc executable and generate the ASDocs to the new output folder">
+
+        <exec executable="${FLEX_HOME}/bin/asdoc" failonerror="true">
+
+            <arg line="-doc-sources ${sourcepath}"/>
+            <arg line="-source-path ${sourcepath}"/>
+            <arg line="-footer 'Copyright Wordnik'"/>
+            <arg line="-package io.swagger.api 'Contains the apis which are used by clients to make calls to the services deployed'"/>
+            <arg line="-package io.swagger.codegen.model 'Contains common classes which encapsulate data elements required'"/>
+            <arg line="-package io.swagger.common 'Contains classes which are used by the api classes to invoke the deployed api like SwaggerApi - a base class, ApiUserCredentials, etc.'"/>
+            <arg line="-package io.swagger.event 'Results of calls made to Wordnik are returned via dispatched events. This package contains such event classes. Right now thats just ApiClientEvent and Response.'"/>
+            <arg line="-package io.swagger.exception 'Contains classes that encapsulate the errors generated'"/>
+
+            <arg value="-window-title"/>
+            <arg value="${title}"/>
+
+            <arg value="-main-title"/>
+            <arg value="${title}"/>
+
+            <arg value="-output"/>
+            <arg value="${basedir}/${docsoutputfolder}"/>
+
+            <arg value="-external-library-path"/>
+            <arg value="${basedir}/${libpath}"/>
+
+        </exec>
+
+        <echo>docs created</echo>
+
+    </target>
+
+    <!--
+
+    Compile the  SWC file library including lib folder and the path to our classes, we use compc for library,
+     check the docs for Flex Ant Tasks, http://labs.adobe.com/wiki/index.php/Flex_Ant_Tasks.
+
+    -->
+
+    <target name="buildSWC" description="Compile the SWC file for the Librayr Project">
+
+        <compc output="${basedir}/${liboutputfolder}/${liboutputfile}">
+
+            <!--
+                   Include the path to any external SWC files used in the sdk, you may have to place name of SWC (ASAXB-0.1.1.swc) at end of path.
+                   So file path would be file="${basedir}/${libpath}/ASAXB-0.1.1.swc"
+                -->
+            <include-libraries file="${basedir}/${libpath}/"/>
+
+            <source-path path-element="${sourcepath}"/>
+
+            <keep-as3-metadata name="XmlRootNode"/>
+            <keep-as3-metadata name="XmlElement"/>
+            <keep-as3-metadata name="XmlElements"/>
+
+            <!-- include our Class packages into the build (com folder) -->
+            <include-sources dir="${sourcepath}" includes="*"/>
+
+        </compc>
+
+        <echo>SWC created</echo>
+
+    </target>
+
+    <target name="dist" depends="clean, buildSWC, docs">
+        <mkdir dir="${basedir}/dist/lib"/>
+        <mkdir dir="${basedir}/dist/docs"/>
+        <mkdir dir="${basedir}/dist/sample"/>
+
+        <copy file="${basedir}/${liboutputfolder}/${liboutputfile}" todir="${basedir}/dist/lib/">
+        </copy>
+        <copy todir="${basedir}/dist/docs/">
+            <fileset dir="${basedir}/asdoc"/>
+        </copy>
+
+
+        <zip destfile="sample-as3-sdk.zip" basedir="${basedir}/dist"/>
+    </target>
+
+    <!-- Compiles and creates a test app that can be run using the adl - AIR Debug Launcher from command line
+        Note: For the output file to be executed an xml file is needed which points to this output swf - this is not
+        generated here
+    -->
+    <target name="compile-test" depends="buildSWC">
+        <property name="FLEX_HOME" value="${FLEX4_SDK_HOME}"/>
+        <mxmlc
+                static-rsls="false"
+                fork="true"
+                maxmemory="512m"
+                file="${testsourcepath}/AirExecutorApp.mxml"
+                output="${basedir}/${liboutputfolder}/AirExecutorApp.swf"
+                warnings="false"
+                configname="air"
+                locale="en_US">
+            <load-config filename="${FLEX4_HOME}/frameworks/air-config.xml"/>
+            <source-path path-element="${FLEX_HOME}/frameworks"/>
+
+            <compiler.debug>true</compiler.debug>
+
+
+            <source-path path-element="${testsourcepath}"/>
+            <!--<source-path path-element="${APP_ROOT}/locale/{locale}" />-->
+
+            <library-path dir="${FLEX_HOME}/frameworks/libs" append="true">
+                <include name="*.swc"/>
+            </library-path>
+            <library-path dir="${FLEX_HOME}/frameworks/libs/air" append="true">
+                <include name="*.swc"/>
+            </library-path>
+            <library-path dir="${FLEX_HOME}/frameworks/locale" append="true">
+                <include name="{locale}"/>
+            </library-path>
+            <library-path dir="${basedir}/${libpath}" append="true">
+                <include name="*.swc"/>
+            </library-path>
+            <library-path dir="${basedir}/${liboutputfolder}" append="true">
+                <include name="*.swc"/>
+            </library-path>
+            <library-path dir="${basedir}/${libpath}/ext" append="true">
+                <include name="*.swc"/>
+            </library-path>
+
+            <verbose-stacktraces>true</verbose-stacktraces>
+        </mxmlc>
+    </target>
+
+    <target name="do-test">
+        <exec executable="${FLEX_HOME}/bin/adl" failonerror="true">
+            <arg value="${basedir}/bin/AirExecutorApp-app.xml"/>
+        </exec>
+    </target>
+
+    <target name="test" depends="compile-test, do-test">
+    </target>
+
+</project>
\ No newline at end of file
diff --git a/samples/client/petstore/flash/flash/lib/ASAXB-0.1.1.swc b/samples/client/petstore/flash/flash/lib/ASAXB-0.1.1.swc
new file mode 100644
index 00000000000..c9359026784
Binary files /dev/null and b/samples/client/petstore/flash/flash/lib/ASAXB-0.1.1.swc differ
diff --git a/samples/client/petstore/flash/flash/lib/as3corelib.swc b/samples/client/petstore/flash/flash/lib/as3corelib.swc
new file mode 100644
index 00000000000..12dd6b3b0a6
Binary files /dev/null and b/samples/client/petstore/flash/flash/lib/as3corelib.swc differ
diff --git a/samples/client/petstore/flash/flash/lib/ext/flexunit-4.1.0_RC2-28-flex_3.5.0.12683.swc b/samples/client/petstore/flash/flash/lib/ext/flexunit-4.1.0_RC2-28-flex_3.5.0.12683.swc
new file mode 100644
index 00000000000..e41bc68abd9
Binary files /dev/null and b/samples/client/petstore/flash/flash/lib/ext/flexunit-4.1.0_RC2-28-flex_3.5.0.12683.swc differ
diff --git a/samples/client/petstore/flash/flash/lib/ext/flexunit-aircilistener-4.1.0_RC2-28-3.5.0.12683.swc b/samples/client/petstore/flash/flash/lib/ext/flexunit-aircilistener-4.1.0_RC2-28-3.5.0.12683.swc
new file mode 100644
index 00000000000..8bbdf8b86a0
Binary files /dev/null and b/samples/client/petstore/flash/flash/lib/ext/flexunit-aircilistener-4.1.0_RC2-28-3.5.0.12683.swc differ
diff --git a/samples/client/petstore/flash/flash/lib/ext/flexunit-cilistener-4.1.0_RC2-28-3.5.0.12683.swc b/samples/client/petstore/flash/flash/lib/ext/flexunit-cilistener-4.1.0_RC2-28-3.5.0.12683.swc
new file mode 100644
index 00000000000..b69064ac765
Binary files /dev/null and b/samples/client/petstore/flash/flash/lib/ext/flexunit-cilistener-4.1.0_RC2-28-3.5.0.12683.swc differ
diff --git a/samples/client/petstore/flash/flash/lib/ext/flexunit-core-flex-4.0.0.2-sdk3.5.0.12683.swc b/samples/client/petstore/flash/flash/lib/ext/flexunit-core-flex-4.0.0.2-sdk3.5.0.12683.swc
new file mode 100644
index 00000000000..a90af750bb5
Binary files /dev/null and b/samples/client/petstore/flash/flash/lib/ext/flexunit-core-flex-4.0.0.2-sdk3.5.0.12683.swc differ
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/api/PetApi.as b/samples/client/petstore/flash/flash/src/io/swagger/client/api/PetApi.as
new file mode 100644
index 00000000000..b35cd5efdc9
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/api/PetApi.as
@@ -0,0 +1,336 @@
+package io.swagger.client.api {
+
+import io.swagger.common.ApiInvoker;
+import io.swagger.exception.ApiErrorCodes;
+import io.swagger.exception.ApiError;
+import io.swagger.common.ApiUserCredentials;
+import io.swagger.event.Response;
+import io.swagger.common.SwaggerApi;
+import io.swagger.client.model.Pet;
+import flash.filesystem.File;
+
+import mx.rpc.AsyncToken;
+import mx.utils.UIDUtil;
+import flash.utils.Dictionary;
+import flash.events.EventDispatcher;
+
+public class PetApi extends SwaggerApi {
+    /**
+    * Constructor for the PetApi api client
+    * @param apiCredentials Wrapper object for tokens and hostName required towards authentication
+    * @param eventDispatcher Optional event dispatcher that when provided is used by the SDK to dispatch any Response
+    */
+    public function PetApi(apiCredentials: ApiUserCredentials, eventDispatcher: EventDispatcher = null) {
+        super(apiCredentials, eventDispatcher);
+    }
+
+        public static const event_update_pet: String = "update_pet";
+        public static const event_add_pet: String = "add_pet";
+        public static const event_find_pets_by_status: String = "find_pets_by_status";
+        public static const event_find_pets_by_tags: String = "find_pets_by_tags";
+        public static const event_get_pet_by_id: String = "get_pet_by_id";
+        public static const event_update_pet_with_form: String = "update_pet_with_form";
+        public static const event_delete_pet: String = "delete_pet";
+        public static const event_upload_file: String = "upload_file";
+        public static const event_get_pet_by_id_with_byte_array: String = "get_pet_by_id_with_byte_array";
+        public static const event_add_pet_using_byte_array: String = "add_pet_using_byte_array";
+
+
+    /*
+     * Returns void 
+     */
+    public function update_pet (body: Pet): String {
+        // create path and map variables
+        var path: String = "/pet".replace(/{format}/g,"xml");
+
+        // query params
+        var queryParams: Dictionary = new Dictionary();
+        var headerParams: Dictionary = new Dictionary();
+
+        
+
+        
+
+        
+
+        var token:AsyncToken = getApiInvoker().invokeAPI(path, "PUT", queryParams, body, headerParams);
+
+        var requestId: String = getUniqueId();
+
+        token.requestId = requestId;
+        token.completionEventType = "update_pet";
+
+        token.returnType = null ;
+        return requestId;
+
+    }
+    
+    /*
+     * Returns void 
+     */
+    public function add_pet (body: Pet): String {
+        // create path and map variables
+        var path: String = "/pet".replace(/{format}/g,"xml");
+
+        // query params
+        var queryParams: Dictionary = new Dictionary();
+        var headerParams: Dictionary = new Dictionary();
+
+        
+
+        
+
+        
+
+        var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, body, headerParams);
+
+        var requestId: String = getUniqueId();
+
+        token.requestId = requestId;
+        token.completionEventType = "add_pet";
+
+        token.returnType = null ;
+        return requestId;
+
+    }
+    
+    /*
+     * Returns Array 
+     */
+    public function find_pets_by_status (status: Array): String {
+        // create path and map variables
+        var path: String = "/pet/findByStatus".replace(/{format}/g,"xml");
+
+        // query params
+        var queryParams: Dictionary = new Dictionary();
+        var headerParams: Dictionary = new Dictionary();
+
+        
+
+        if("null" != String(status))
+            queryParams["status"] = toPathValue(status);
+        
+
+        
+
+        var token:AsyncToken = getApiInvoker().invokeAPI(path, "GET", queryParams, null, headerParams);
+
+        var requestId: String = getUniqueId();
+
+        token.requestId = requestId;
+        token.completionEventType = "find_pets_by_status";
+
+        token.returnType = Array;
+        return requestId;
+
+    }
+    
+    /*
+     * Returns Array 
+     */
+    public function find_pets_by_tags (tags: Array): String {
+        // create path and map variables
+        var path: String = "/pet/findByTags".replace(/{format}/g,"xml");
+
+        // query params
+        var queryParams: Dictionary = new Dictionary();
+        var headerParams: Dictionary = new Dictionary();
+
+        
+
+        if("null" != String(tags))
+            queryParams["tags"] = toPathValue(tags);
+        
+
+        
+
+        var token:AsyncToken = getApiInvoker().invokeAPI(path, "GET", queryParams, null, headerParams);
+
+        var requestId: String = getUniqueId();
+
+        token.requestId = requestId;
+        token.completionEventType = "find_pets_by_tags";
+
+        token.returnType = Array;
+        return requestId;
+
+    }
+    
+    /*
+     * Returns Pet 
+     */
+    public function get_pet_by_id (petId: Number): String {
+        // create path and map variables
+        var path: String = "/pet/{petId}".replace(/{format}/g,"xml").replace("{" + "petId" + "}", getApiInvoker().escapeString(petId));
+
+        // query params
+        var queryParams: Dictionary = new Dictionary();
+        var headerParams: Dictionary = new Dictionary();
+
+        
+
+        
+
+        
+
+        var token:AsyncToken = getApiInvoker().invokeAPI(path, "GET", queryParams, null, headerParams);
+
+        var requestId: String = getUniqueId();
+
+        token.requestId = requestId;
+        token.completionEventType = "get_pet_by_id";
+
+        token.returnType = Pet;
+        return requestId;
+
+    }
+    
+    /*
+     * Returns void 
+     */
+    public function update_pet_with_form (petId: String, name: String, status: String): String {
+        // create path and map variables
+        var path: String = "/pet/{petId}".replace(/{format}/g,"xml").replace("{" + "petId" + "}", getApiInvoker().escapeString(petId));
+
+        // query params
+        var queryParams: Dictionary = new Dictionary();
+        var headerParams: Dictionary = new Dictionary();
+
+        
+
+        
+
+        
+
+        var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, null, headerParams);
+
+        var requestId: String = getUniqueId();
+
+        token.requestId = requestId;
+        token.completionEventType = "update_pet_with_form";
+
+        token.returnType = null ;
+        return requestId;
+
+    }
+    
+    /*
+     * Returns void 
+     */
+    public function delete_pet (petId: Number, apiKey: String): String {
+        // create path and map variables
+        var path: String = "/pet/{petId}".replace(/{format}/g,"xml").replace("{" + "petId" + "}", getApiInvoker().escapeString(petId));
+
+        // query params
+        var queryParams: Dictionary = new Dictionary();
+        var headerParams: Dictionary = new Dictionary();
+
+        
+
+        
+
+        headerParams["apiKey"] = toPathValue(apiKey);
+        
+
+        var token:AsyncToken = getApiInvoker().invokeAPI(path, "DELETE", queryParams, null, headerParams);
+
+        var requestId: String = getUniqueId();
+
+        token.requestId = requestId;
+        token.completionEventType = "delete_pet";
+
+        token.returnType = null ;
+        return requestId;
+
+    }
+    
+    /*
+     * Returns void 
+     */
+    public function upload_file (petId: Number, additionalMetadata: String, file: File): String {
+        // create path and map variables
+        var path: String = "/pet/{petId}/uploadImage".replace(/{format}/g,"xml").replace("{" + "petId" + "}", getApiInvoker().escapeString(petId));
+
+        // query params
+        var queryParams: Dictionary = new Dictionary();
+        var headerParams: Dictionary = new Dictionary();
+
+        
+
+        
+
+        
+
+        var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, null, headerParams);
+
+        var requestId: String = getUniqueId();
+
+        token.requestId = requestId;
+        token.completionEventType = "upload_file";
+
+        token.returnType = null ;
+        return requestId;
+
+    }
+    
+    /*
+     * Returns String 
+     */
+    public function get_pet_by_id_with_byte_array (petId: Number): String {
+        // create path and map variables
+        var path: String = "/pet/{petId}?testing_byte_array=true".replace(/{format}/g,"xml").replace("{" + "petId" + "}", getApiInvoker().escapeString(petId));
+
+        // query params
+        var queryParams: Dictionary = new Dictionary();
+        var headerParams: Dictionary = new Dictionary();
+
+        
+
+        
+
+        
+
+        var token:AsyncToken = getApiInvoker().invokeAPI(path, "GET", queryParams, null, headerParams);
+
+        var requestId: String = getUniqueId();
+
+        token.requestId = requestId;
+        token.completionEventType = "get_pet_by_id_with_byte_array";
+
+        token.returnType = String;
+        return requestId;
+
+    }
+    
+    /*
+     * Returns void 
+     */
+    public function add_pet_using_byte_array (body: String): String {
+        // create path and map variables
+        var path: String = "/pet?testing_byte_array=true".replace(/{format}/g,"xml");
+
+        // query params
+        var queryParams: Dictionary = new Dictionary();
+        var headerParams: Dictionary = new Dictionary();
+
+        
+
+        
+
+        
+
+        var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, body, headerParams);
+
+        var requestId: String = getUniqueId();
+
+        token.requestId = requestId;
+        token.completionEventType = "add_pet_using_byte_array";
+
+        token.returnType = null ;
+        return requestId;
+
+    }
+    
+}
+        
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/api/StoreApi.as b/samples/client/petstore/flash/flash/src/io/swagger/client/api/StoreApi.as
new file mode 100644
index 00000000000..061878ad257
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/api/StoreApi.as
@@ -0,0 +1,150 @@
+package io.swagger.client.api {
+
+import io.swagger.common.ApiInvoker;
+import io.swagger.exception.ApiErrorCodes;
+import io.swagger.exception.ApiError;
+import io.swagger.common.ApiUserCredentials;
+import io.swagger.event.Response;
+import io.swagger.common.SwaggerApi;
+import io.swagger.client.model.Order;
+
+import mx.rpc.AsyncToken;
+import mx.utils.UIDUtil;
+import flash.utils.Dictionary;
+import flash.events.EventDispatcher;
+
+public class StoreApi extends SwaggerApi {
+    /**
+    * Constructor for the StoreApi api client
+    * @param apiCredentials Wrapper object for tokens and hostName required towards authentication
+    * @param eventDispatcher Optional event dispatcher that when provided is used by the SDK to dispatch any Response
+    */
+    public function StoreApi(apiCredentials: ApiUserCredentials, eventDispatcher: EventDispatcher = null) {
+        super(apiCredentials, eventDispatcher);
+    }
+
+        public static const event_get_inventory: String = "get_inventory";
+        public static const event_place_order: String = "place_order";
+        public static const event_get_order_by_id: String = "get_order_by_id";
+        public static const event_delete_order: String = "delete_order";
+
+
+    /*
+     * Returns Dictionary 
+     */
+    public function get_inventory (): String {
+        // create path and map variables
+        var path: String = "/store/inventory".replace(/{format}/g,"xml");
+
+        // query params
+        var queryParams: Dictionary = new Dictionary();
+        var headerParams: Dictionary = new Dictionary();
+
+        
+
+        
+
+        
+
+        var token:AsyncToken = getApiInvoker().invokeAPI(path, "GET", queryParams, null, headerParams);
+
+        var requestId: String = getUniqueId();
+
+        token.requestId = requestId;
+        token.completionEventType = "get_inventory";
+
+        token.returnType = Dictionary;
+        return requestId;
+
+    }
+    
+    /*
+     * Returns Order 
+     */
+    public function place_order (body: Order): String {
+        // create path and map variables
+        var path: String = "/store/order".replace(/{format}/g,"xml");
+
+        // query params
+        var queryParams: Dictionary = new Dictionary();
+        var headerParams: Dictionary = new Dictionary();
+
+        
+
+        
+
+        
+
+        var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, body, headerParams);
+
+        var requestId: String = getUniqueId();
+
+        token.requestId = requestId;
+        token.completionEventType = "place_order";
+
+        token.returnType = Order;
+        return requestId;
+
+    }
+    
+    /*
+     * Returns Order 
+     */
+    public function get_order_by_id (orderId: String): String {
+        // create path and map variables
+        var path: String = "/store/order/{orderId}".replace(/{format}/g,"xml").replace("{" + "orderId" + "}", getApiInvoker().escapeString(orderId));
+
+        // query params
+        var queryParams: Dictionary = new Dictionary();
+        var headerParams: Dictionary = new Dictionary();
+
+        
+
+        
+
+        
+
+        var token:AsyncToken = getApiInvoker().invokeAPI(path, "GET", queryParams, null, headerParams);
+
+        var requestId: String = getUniqueId();
+
+        token.requestId = requestId;
+        token.completionEventType = "get_order_by_id";
+
+        token.returnType = Order;
+        return requestId;
+
+    }
+    
+    /*
+     * Returns void 
+     */
+    public function delete_order (orderId: String): String {
+        // create path and map variables
+        var path: String = "/store/order/{orderId}".replace(/{format}/g,"xml").replace("{" + "orderId" + "}", getApiInvoker().escapeString(orderId));
+
+        // query params
+        var queryParams: Dictionary = new Dictionary();
+        var headerParams: Dictionary = new Dictionary();
+
+        
+
+        
+
+        
+
+        var token:AsyncToken = getApiInvoker().invokeAPI(path, "DELETE", queryParams, null, headerParams);
+
+        var requestId: String = getUniqueId();
+
+        token.requestId = requestId;
+        token.completionEventType = "delete_order";
+
+        token.returnType = null ;
+        return requestId;
+
+    }
+    
+}
+        
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/api/UserApi.as b/samples/client/petstore/flash/flash/src/io/swagger/client/api/UserApi.as
new file mode 100644
index 00000000000..06b0d079799
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/api/UserApi.as
@@ -0,0 +1,274 @@
+package io.swagger.client.api {
+
+import io.swagger.common.ApiInvoker;
+import io.swagger.exception.ApiErrorCodes;
+import io.swagger.exception.ApiError;
+import io.swagger.common.ApiUserCredentials;
+import io.swagger.event.Response;
+import io.swagger.common.SwaggerApi;
+import io.swagger.client.model.User;
+
+import mx.rpc.AsyncToken;
+import mx.utils.UIDUtil;
+import flash.utils.Dictionary;
+import flash.events.EventDispatcher;
+
+public class UserApi extends SwaggerApi {
+    /**
+    * Constructor for the UserApi api client
+    * @param apiCredentials Wrapper object for tokens and hostName required towards authentication
+    * @param eventDispatcher Optional event dispatcher that when provided is used by the SDK to dispatch any Response
+    */
+    public function UserApi(apiCredentials: ApiUserCredentials, eventDispatcher: EventDispatcher = null) {
+        super(apiCredentials, eventDispatcher);
+    }
+
+        public static const event_create_user: String = "create_user";
+        public static const event_create_users_with_array_input: String = "create_users_with_array_input";
+        public static const event_create_users_with_list_input: String = "create_users_with_list_input";
+        public static const event_login_user: String = "login_user";
+        public static const event_logout_user: String = "logout_user";
+        public static const event_get_user_by_name: String = "get_user_by_name";
+        public static const event_update_user: String = "update_user";
+        public static const event_delete_user: String = "delete_user";
+
+
+    /*
+     * Returns void 
+     */
+    public function create_user (body: User): String {
+        // create path and map variables
+        var path: String = "/user".replace(/{format}/g,"xml");
+
+        // query params
+        var queryParams: Dictionary = new Dictionary();
+        var headerParams: Dictionary = new Dictionary();
+
+        
+
+        
+
+        
+
+        var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, body, headerParams);
+
+        var requestId: String = getUniqueId();
+
+        token.requestId = requestId;
+        token.completionEventType = "create_user";
+
+        token.returnType = null ;
+        return requestId;
+
+    }
+    
+    /*
+     * Returns void 
+     */
+    public function create_users_with_array_input (body: Array): String {
+        // create path and map variables
+        var path: String = "/user/createWithArray".replace(/{format}/g,"xml");
+
+        // query params
+        var queryParams: Dictionary = new Dictionary();
+        var headerParams: Dictionary = new Dictionary();
+
+        
+
+        
+
+        
+
+        var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, body, headerParams);
+
+        var requestId: String = getUniqueId();
+
+        token.requestId = requestId;
+        token.completionEventType = "create_users_with_array_input";
+
+        token.returnType = null ;
+        return requestId;
+
+    }
+    
+    /*
+     * Returns void 
+     */
+    public function create_users_with_list_input (body: Array): String {
+        // create path and map variables
+        var path: String = "/user/createWithList".replace(/{format}/g,"xml");
+
+        // query params
+        var queryParams: Dictionary = new Dictionary();
+        var headerParams: Dictionary = new Dictionary();
+
+        
+
+        
+
+        
+
+        var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, body, headerParams);
+
+        var requestId: String = getUniqueId();
+
+        token.requestId = requestId;
+        token.completionEventType = "create_users_with_list_input";
+
+        token.returnType = null ;
+        return requestId;
+
+    }
+    
+    /*
+     * Returns String 
+     */
+    public function login_user (username: String, password: String): String {
+        // create path and map variables
+        var path: String = "/user/login".replace(/{format}/g,"xml");
+
+        // query params
+        var queryParams: Dictionary = new Dictionary();
+        var headerParams: Dictionary = new Dictionary();
+
+        
+
+        if("null" != String(username))
+            queryParams["username"] = toPathValue(username);
+        if("null" != String(password))
+            queryParams["password"] = toPathValue(password);
+        
+
+        
+
+        var token:AsyncToken = getApiInvoker().invokeAPI(path, "GET", queryParams, null, headerParams);
+
+        var requestId: String = getUniqueId();
+
+        token.requestId = requestId;
+        token.completionEventType = "login_user";
+
+        token.returnType = String;
+        return requestId;
+
+    }
+    
+    /*
+     * Returns void 
+     */
+    public function logout_user (): String {
+        // create path and map variables
+        var path: String = "/user/logout".replace(/{format}/g,"xml");
+
+        // query params
+        var queryParams: Dictionary = new Dictionary();
+        var headerParams: Dictionary = new Dictionary();
+
+        
+
+        
+
+        
+
+        var token:AsyncToken = getApiInvoker().invokeAPI(path, "GET", queryParams, null, headerParams);
+
+        var requestId: String = getUniqueId();
+
+        token.requestId = requestId;
+        token.completionEventType = "logout_user";
+
+        token.returnType = null ;
+        return requestId;
+
+    }
+    
+    /*
+     * Returns User 
+     */
+    public function get_user_by_name (username: String): String {
+        // create path and map variables
+        var path: String = "/user/{username}".replace(/{format}/g,"xml").replace("{" + "username" + "}", getApiInvoker().escapeString(username));
+
+        // query params
+        var queryParams: Dictionary = new Dictionary();
+        var headerParams: Dictionary = new Dictionary();
+
+        
+
+        
+
+        
+
+        var token:AsyncToken = getApiInvoker().invokeAPI(path, "GET", queryParams, null, headerParams);
+
+        var requestId: String = getUniqueId();
+
+        token.requestId = requestId;
+        token.completionEventType = "get_user_by_name";
+
+        token.returnType = User;
+        return requestId;
+
+    }
+    
+    /*
+     * Returns void 
+     */
+    public function update_user (username: String, body: User): String {
+        // create path and map variables
+        var path: String = "/user/{username}".replace(/{format}/g,"xml").replace("{" + "username" + "}", getApiInvoker().escapeString(username));
+
+        // query params
+        var queryParams: Dictionary = new Dictionary();
+        var headerParams: Dictionary = new Dictionary();
+
+        
+
+        
+
+        
+
+        var token:AsyncToken = getApiInvoker().invokeAPI(path, "PUT", queryParams, body, headerParams);
+
+        var requestId: String = getUniqueId();
+
+        token.requestId = requestId;
+        token.completionEventType = "update_user";
+
+        token.returnType = null ;
+        return requestId;
+
+    }
+    
+    /*
+     * Returns void 
+     */
+    public function delete_user (username: String): String {
+        // create path and map variables
+        var path: String = "/user/{username}".replace(/{format}/g,"xml").replace("{" + "username" + "}", getApiInvoker().escapeString(username));
+
+        // query params
+        var queryParams: Dictionary = new Dictionary();
+        var headerParams: Dictionary = new Dictionary();
+
+        
+
+        
+
+        
+
+        var token:AsyncToken = getApiInvoker().invokeAPI(path, "DELETE", queryParams, null, headerParams);
+
+        var requestId: String = getUniqueId();
+
+        token.requestId = requestId;
+        token.completionEventType = "delete_user";
+
+        token.returnType = null ;
+        return requestId;
+
+    }
+    
+}
+        
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/Category.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/Category.as
new file mode 100644
index 00000000000..6aa73414387
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/Category.as
@@ -0,0 +1,32 @@
+package io.swagger.client.model {
+
+
+    [XmlRootNode(name="Category")]
+    public class Category {
+        
+        
+        
+        [XmlElement(name="id")]
+        
+        public var id: Number = 0;
+    
+        
+        
+        [XmlElement(name="name")]
+        
+        public var name: String = null;
+    
+
+    public function toString(): String {
+        var str: String = "Category: ";
+        
+        str += " (id: " + id + ")";
+        
+        str += " (name: " + name + ")";
+        
+        return str;
+    }
+
+}
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/CategoryList.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/CategoryList.as
new file mode 100644
index 00000000000..342cd70c001
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/CategoryList.as
@@ -0,0 +1,18 @@
+package io.swagger.client.model {
+
+import io.swagger.common.ListWrapper;
+
+    public class CategoryList implements ListWrapper {
+        // This declaration below of _Category_obj_class is to force flash compiler to include this class
+        private var _category_obj_class: io.swagger.client.model.Category = null;
+        [XmlElements(name="category", type="io.swagger.client.model.Category")]
+        public var category: Array = new Array();
+
+        public function getList(): Array{
+            return category;
+        }
+
+}
+        
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/Order.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/Order.as
new file mode 100644
index 00000000000..d6e4e6dc4d7
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/Order.as
@@ -0,0 +1,65 @@
+package io.swagger.client.model {
+
+
+    [XmlRootNode(name="Order")]
+    public class Order {
+        
+        
+        
+        [XmlElement(name="id")]
+        
+        public var id: Number = 0;
+    
+        
+        
+        [XmlElement(name="petId")]
+        
+        public var petId: Number = 0;
+    
+        
+        
+        [XmlElement(name="quantity")]
+        
+        public var quantity: Number = 0;
+    
+        
+        
+        [XmlElement(name="shipDate")]
+        
+        public var shipDate: Date = null;
+    
+        /* Order Status */
+        
+        
+        [XmlElement(name="status")]
+        
+        public var status: String = null;
+    
+        
+        
+        [XmlElement(name="complete")]
+        
+        public var complete: Boolean = false;
+    
+
+    public function toString(): String {
+        var str: String = "Order: ";
+        
+        str += " (id: " + id + ")";
+        
+        str += " (petId: " + petId + ")";
+        
+        str += " (quantity: " + quantity + ")";
+        
+        str += " (shipDate: " + shipDate + ")";
+        
+        str += " (status: " + status + ")";
+        
+        str += " (complete: " + complete + ")";
+        
+        return str;
+    }
+
+}
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/OrderList.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/OrderList.as
new file mode 100644
index 00000000000..bba3d8a4724
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/OrderList.as
@@ -0,0 +1,18 @@
+package io.swagger.client.model {
+
+import io.swagger.common.ListWrapper;
+
+    public class OrderList implements ListWrapper {
+        // This declaration below of _Order_obj_class is to force flash compiler to include this class
+        private var _order_obj_class: io.swagger.client.model.Order = null;
+        [XmlElements(name="order", type="io.swagger.client.model.Order")]
+        public var order: Array = new Array();
+
+        public function getList(): Array{
+            return order;
+        }
+
+}
+        
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/Pet.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/Pet.as
new file mode 100644
index 00000000000..a4a7d04830f
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/Pet.as
@@ -0,0 +1,75 @@
+package io.swagger.client.model {
+
+import io.swagger.client.model.Category;
+import io.swagger.client.model.Tag;
+
+    [XmlRootNode(name="Pet")]
+    public class Pet {
+        
+        
+        
+        [XmlElement(name="id")]
+        
+        public var id: Number = 0;
+    
+        
+        
+        [XmlElement(name="category")]
+        
+        public var category: Category = NaN;
+    
+        
+        
+        [XmlElement(name="name")]
+        
+        public var name: String = null;
+    
+        
+        
+        // This declaration below of _photoUrls_obj_class is to force flash compiler to include this class
+        private var _photoUrls_obj_class: Array = null;
+        [XmlElementWrapper(name="photoUrls")]
+        [XmlElements(name="photoUrls", type="Array")]
+        
+        
+        public var photoUrls: Array = new Array();
+    
+        
+        
+        // This declaration below of _tags_obj_class is to force flash compiler to include this class
+        private var _tags_obj_class: Array = null;
+        [XmlElementWrapper(name="tags")]
+        [XmlElements(name="tags", type="Array")]
+        
+        
+        public var tags: Array = new Array();
+    
+        /* pet status in the store */
+        
+        
+        [XmlElement(name="status")]
+        
+        public var status: String = null;
+    
+
+    public function toString(): String {
+        var str: String = "Pet: ";
+        
+        str += " (id: " + id + ")";
+        
+        str += " (category: " + category + ")";
+        
+        str += " (name: " + name + ")";
+        
+        str += " (photoUrls: " + photoUrls + ")";
+        
+        str += " (tags: " + tags + ")";
+        
+        str += " (status: " + status + ")";
+        
+        return str;
+    }
+
+}
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/PetList.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/PetList.as
new file mode 100644
index 00000000000..ada0846c5ea
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/PetList.as
@@ -0,0 +1,20 @@
+package io.swagger.client.model {
+
+import io.swagger.common.ListWrapper;
+import io.swagger.client.model.Category;
+import io.swagger.client.model.Tag;
+
+    public class PetList implements ListWrapper {
+        // This declaration below of _Pet_obj_class is to force flash compiler to include this class
+        private var _pet_obj_class: io.swagger.client.model.Pet = null;
+        [XmlElements(name="pet", type="io.swagger.client.model.Pet")]
+        public var pet: Array = new Array();
+
+        public function getList(): Array{
+            return pet;
+        }
+
+}
+        
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/Tag.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/Tag.as
new file mode 100644
index 00000000000..7387e2e2745
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/Tag.as
@@ -0,0 +1,32 @@
+package io.swagger.client.model {
+
+
+    [XmlRootNode(name="Tag")]
+    public class Tag {
+        
+        
+        
+        [XmlElement(name="id")]
+        
+        public var id: Number = 0;
+    
+        
+        
+        [XmlElement(name="name")]
+        
+        public var name: String = null;
+    
+
+    public function toString(): String {
+        var str: String = "Tag: ";
+        
+        str += " (id: " + id + ")";
+        
+        str += " (name: " + name + ")";
+        
+        return str;
+    }
+
+}
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/TagList.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/TagList.as
new file mode 100644
index 00000000000..25ebadb27fb
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/TagList.as
@@ -0,0 +1,18 @@
+package io.swagger.client.model {
+
+import io.swagger.common.ListWrapper;
+
+    public class TagList implements ListWrapper {
+        // This declaration below of _Tag_obj_class is to force flash compiler to include this class
+        private var _tag_obj_class: io.swagger.client.model.Tag = null;
+        [XmlElements(name="tag", type="io.swagger.client.model.Tag")]
+        public var tag: Array = new Array();
+
+        public function getList(): Array{
+            return tag;
+        }
+
+}
+        
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/User.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/User.as
new file mode 100644
index 00000000000..2b6474de90c
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/User.as
@@ -0,0 +1,81 @@
+package io.swagger.client.model {
+
+
+    [XmlRootNode(name="User")]
+    public class User {
+        
+        
+        
+        [XmlElement(name="id")]
+        
+        public var id: Number = 0;
+    
+        
+        
+        [XmlElement(name="username")]
+        
+        public var username: String = null;
+    
+        
+        
+        [XmlElement(name="firstName")]
+        
+        public var firstName: String = null;
+    
+        
+        
+        [XmlElement(name="lastName")]
+        
+        public var lastName: String = null;
+    
+        
+        
+        [XmlElement(name="email")]
+        
+        public var email: String = null;
+    
+        
+        
+        [XmlElement(name="password")]
+        
+        public var password: String = null;
+    
+        
+        
+        [XmlElement(name="phone")]
+        
+        public var phone: String = null;
+    
+        /* User Status */
+        
+        
+        [XmlElement(name="userStatus")]
+        
+        public var userStatus: Number = 0;
+    
+
+    public function toString(): String {
+        var str: String = "User: ";
+        
+        str += " (id: " + id + ")";
+        
+        str += " (username: " + username + ")";
+        
+        str += " (firstName: " + firstName + ")";
+        
+        str += " (lastName: " + lastName + ")";
+        
+        str += " (email: " + email + ")";
+        
+        str += " (password: " + password + ")";
+        
+        str += " (phone: " + phone + ")";
+        
+        str += " (userStatus: " + userStatus + ")";
+        
+        return str;
+    }
+
+}
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/UserList.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/UserList.as
new file mode 100644
index 00000000000..e8a1fdb27f6
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/UserList.as
@@ -0,0 +1,18 @@
+package io.swagger.client.model {
+
+import io.swagger.common.ListWrapper;
+
+    public class UserList implements ListWrapper {
+        // This declaration below of _User_obj_class is to force flash compiler to include this class
+        private var _user_obj_class: io.swagger.client.model.User = null;
+        [XmlElements(name="user", type="io.swagger.client.model.User")]
+        public var user: Array = new Array();
+
+        public function getList(): Array{
+            return user;
+        }
+
+}
+        
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/common/ApiInvoker.as b/samples/client/petstore/flash/flash/src/io/swagger/common/ApiInvoker.as
new file mode 100644
index 00000000000..6d8466390a6
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/common/ApiInvoker.as
@@ -0,0 +1,276 @@
+package io.swagger.common {
+import io.swagger.event.ApiClientEvent;
+import io.swagger.event.Response;
+
+import flash.events.EventDispatcher;
+import flash.utils.*;
+import mx.rpc.AsyncToken;
+import mx.rpc.events.ResultEvent;
+import mx.rpc.events.FaultEvent;
+import mx.utils.ObjectUtil;
+import mx.rpc.http.HTTPService;
+import mx.messaging.messages.HTTPRequestMessage;
+import mx.messaging.ChannelSet;
+import mx.messaging.channels.DirectHTTPChannel;
+import asaxb.xml.bind.ASAXBContext;
+import asaxb.xml.bind.Unmarshaller;
+
+public class ApiInvoker extends EventDispatcher {
+
+    private static const DELETE_DATA_DUMMY:String = "dummyDataRequiredForDeleteOverride";
+    private static const X_HTTP_OVERRIDE_KEY:String = "X-HTTP-Method-Override";
+    private static const CONTENT_TYPE_HEADER_KEY:String = "Content-Type";
+
+    public function ApiInvoker(apiUsageCredentials:ApiUserCredentials, eventNotifier:EventDispatcher, useProxy:Boolean = true) {
+        _apiUsageCredentials = apiUsageCredentials;
+        _useProxyServer = useProxy;
+        if (_apiUsageCredentials.hostName != null) {
+            _proxyHostName = _apiUsageCredentials.hostName;
+        }
+        _apiPath = _apiUsageCredentials.apiPath;
+        _proxyPath = _apiUsageCredentials.proxyPath;
+        _apiProxyServerUrl = _apiUsageCredentials.apiProxyServerUrl;
+        _apiEventNotifier = eventNotifier;
+    }
+    public var _apiEventNotifier:EventDispatcher;
+    internal var _apiProxyServerUrl:String = "";
+    internal var _useProxyServer:Boolean = true;
+    private var _apiUsageCredentials:ApiUserCredentials;
+    private var _baseUrl:String = "";
+    private var _proxyHostName:String = "";
+    private var _apiPath:String = "";
+    private var _proxyPath:String = "";
+
+    public function invokeAPI(resourceURL:String, method:String, queryParams:Dictionary, postObject:Object, headerParams:Dictionary):AsyncToken {
+        //make the communication
+        if (_useProxyServer) {
+            resourceURL = _apiProxyServerUrl + resourceURL;
+        }
+        else {
+            resourceURL = "http://" + _proxyHostName + _apiPath + resourceURL;
+        }
+
+        var counter:int = 0;
+        var symbol:String = "&";
+        var paramValue:Object;
+        for (var paramName:String in queryParams) {
+            paramValue = queryParams[paramName];
+            //var key:String = paramName;
+            // do stuff
+            symbol = "&";
+            if (counter == 0) {
+                symbol = "?";
+            }
+            resourceURL = resourceURL + symbol + paramName + "=" + paramValue.toString();
+            counter++;
+
+        }
+//        trace(resourceURL);
+        //create a httpservice and invoke the rest url waiting for response
+        var requestHeader:Object = new Object();
+        if (headerParams != null) {
+            for (var key:String in headerParams) {
+                requestHeader[key] = headerParams[key];
+            }
+        }
+
+        resourceURL = ApiUrlHelper.appendTokenInfo(resourceURL, requestHeader, _apiUsageCredentials);
+
+        var bodyData:String = marshal(postObject).toString();//restRequest.postData;
+
+        return doRestCall(resourceURL, onApiRequestResult, onApiRequestFault, method, bodyData, requestHeader, "application/xml");
+
+
+    }
+
+    public function marshal(source:Object):Object {
+//        trace("marshal got - "  + source)
+        if (source is String) {
+            return source;
+        } else if (source is Array && source.length > 0) {
+            var writer:XMLWriter = new XMLWriter();
+            var sourceArray:Array = source as Array;
+            var arrayEnclosure:String = getArrayEnclosure(sourceArray);
+            writer.xml.setName(arrayEnclosure);
+
+            for (var i:int = 0; i < sourceArray.length; i++) {
+                var o:Object = sourceArray[i];
+                writer.xml.appendChild(marshal(o));
+            }
+            return writer.xml;
+        } else
+            return marshalObject(source);
+    }
+
+    public function marshalObject(source:Object):XML {
+        var writer:XMLWriter = new XMLWriter();
+        var objDescriptor:XML = describeType(source);
+        var property:XML;
+        var propertyType:String;
+        var propertyValue:Object;
+
+        var qualifiedClassName:String = objDescriptor.@name;
+        qualifiedClassName = qualifiedClassName.replace("::", ".");
+        var className:String = qualifiedClassName.substring(qualifiedClassName.lastIndexOf(".") + 1);
+        className = className.toLowerCase() + className.substring(1);
+        writer.xml.setName(className);
+
+        for each(property in objDescriptor.elements("variable")) {
+            propertyValue = source[property.@name];
+            if (propertyValue != null) {
+                if (ObjectUtil.isSimple(propertyValue)) {
+                    writer.addProperty(property.@name, propertyValue.toString());
+                }
+                else {
+                    writer.addProperty(property.@name, marshal(propertyValue).toXMLString());
+                }
+            }
+        }
+        for each(property in objDescriptor.elements("accessor")) {
+            if (property.@access == "readonly") {
+                continue;
+            }
+            propertyValue = source[property.@name];
+            if (source[property.@name] != null) {
+                if (ObjectUtil.isSimple(propertyValue)) {
+                    writer.addProperty(property.@name, propertyValue.toString());
+                }
+                else {
+                    writer.addProperty(property.@name, marshal(propertyValue).toXMLString());
+                }
+            }
+        }
+        return writer.xml;
+    }
+
+    public function escapeString(str:String):String {
+        return str;
+    }
+
+    private function doRestCall(url:String, resultFunction:Function, faultFunction:Function = null,
+                                restMethod:String = "GET",
+                                bodyData:Object = null, headers:Object = null, contentType:String = "application/xml"):AsyncToken {
+        var httpService:HTTPService = new HTTPService();
+
+        if (headers == null) {
+            headers = new Object();
+        }
+        httpService.method = restMethod;
+
+        if (restMethod.toUpperCase() != HTTPRequestMessage.GET_METHOD) {
+            //httpService.method = HTTPRequestMessage.POST_METHOD; - not required as we're using the proxy
+            if (bodyData == null) {
+                bodyData = new Object();
+            }
+
+            if (restMethod == HTTPRequestMessage.DELETE_METHOD) {
+                headers[X_HTTP_OVERRIDE_KEY] = HTTPRequestMessage.DELETE_METHOD;
+                bodyData = DELETE_DATA_DUMMY;
+            }
+            else if (restMethod == HTTPRequestMessage.PUT_METHOD) {
+                headers[X_HTTP_OVERRIDE_KEY] = HTTPRequestMessage.PUT_METHOD;
+            }
+            else {
+                headers[CONTENT_TYPE_HEADER_KEY] = contentType;
+            }
+        }
+        else {
+            //if the request type is GET and content type is xml then the Flex HTTPService converts it to a POST ... yeah
+            contentType = null;
+        }
+
+        httpService.url = url;
+        httpService.contentType = contentType;
+        httpService.resultFormat = "e4x";
+        httpService.headers = headers;
+        httpService.addEventListener(ResultEvent.RESULT, resultFunction);
+        if (faultFunction != null) {
+            httpService.addEventListener(FaultEvent.FAULT, faultFunction);
+        }
+        if (_useProxyServer) {
+            httpService.useProxy = true;
+
+            var channelSet:ChannelSet = new ChannelSet();
+            var httpChannel:DirectHTTPChannel = new DirectHTTPChannel("");
+            httpChannel.uri = ApiUrlHelper.getProxyUrl(_proxyHostName, _proxyPath);
+            channelSet.addChannel(httpChannel);
+            httpService.channelSet = channelSet;
+        }
+
+        return httpService.send(bodyData);
+    }
+
+    private function onApiRequestResult(event:ResultEvent):void {
+        
+        // I put this in comments. Here, it's trying to parse XML and it fails if it's not XML.
+        // Therefore, it's better to have the raw result that we can parse as we want. 
+        // TODO: Create different parser (JSON, XML, etc.)
+        /*
+        var completionListener:Function = event.token.completionListener;
+        var result:Object = event.result;
+        var resultType:Class = event.token.returnType;
+        var resultObject:Object;
+        if (resultType != null) {
+            var context:ASAXBContext = ASAXBContext.newInstance(resultType);
+            var unmarshaller:Unmarshaller = context.createUnmarshaller();
+            var resultXML:XML = new XML(event.result);
+            try {
+                resultObject = unmarshaller.unmarshal(resultXML);
+            }
+            catch (error:TypeError) {
+                var errorResponse:Response = new Response(false, null, "Could not unmarshall response");
+                if (_apiEventNotifier != null) { //dispatch event via assigned dispatcher
+                    var failureEvent:ApiClientEvent = new ApiClientEvent(event.token.completionEventType);
+                    failureEvent.response = errorResponse;
+                    _apiEventNotifier.dispatchEvent(failureEvent);
+                }
+            }
+
+            if (resultObject is ListWrapper) {
+                resultObject = ListWrapper(resultObject).getList();
+            }
+        }
+
+        var response:Response = new Response(true, resultObject);
+        */
+
+        var response:Response = new Response(true, event.result);
+        response.requestId = event.token.requestId;
+        var successEventType:String = event.token.completionEventType != null ? event.token.completionEventType : ApiClientEvent.SUCCESS_EVENT;
+
+        if (_apiEventNotifier != null) { //dispatch event via assigned dispatcher
+            var successEvent:ApiClientEvent = new ApiClientEvent(successEventType);
+            successEvent.response = response;
+            _apiEventNotifier.dispatchEvent(successEvent);
+        }
+    }
+
+    private function onApiRequestFault(event:FaultEvent):void {
+        var completionListener:Function = event.token.completionListener;
+        if (completionListener != null) {
+            completionListener.call(null, new Response(false, null, event.fault.faultString));
+        }
+
+        var failureEventType:String = event.token.completionEventType != null ? event.token.completionEventType : ApiClientEvent.FAILURE_EVENT;
+
+        if (_apiEventNotifier != null) { //dispatch event via assigned dispatcher
+            var failureEvent:ApiClientEvent = new ApiClientEvent(failureEventType);
+            failureEvent.response = new Response(false, null, event.fault.faultString);
+            _apiEventNotifier.dispatchEvent(failureEvent);
+        }
+    }
+
+    private function getArrayEnclosure(arr:Array):String {
+        if (arr != null && arr.length > 0) {
+            var className:String = flash.utils.getQualifiedClassName(arr[0])
+            if (className.indexOf("::") > 0)
+                className = className.substr(className.indexOf("::") + 2, className.length)
+
+            return className.substring(0, 1).toLowerCase() + className.substring(1, className.length) + "s";
+        } else
+            return "";
+    }
+
+
+}
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/common/ApiUrlHelper.as b/samples/client/petstore/flash/flash/src/io/swagger/common/ApiUrlHelper.as
new file mode 100644
index 00000000000..8779610cd48
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/common/ApiUrlHelper.as
@@ -0,0 +1,41 @@
+package io.swagger.common {
+import io.swagger.common.ApiUserCredentials;
+
+/**
+ * @private
+ * Internal class for the Rest client
+ */
+internal class ApiUrlHelper {
+
+    private static const API_URL_KEY:String = "api_key";
+    private static const AUTH_TOKEN_URL_KEY:String = "auth_token";
+
+    private static const HTTP_URL_PREFIX:String = "http://";
+
+    internal static function appendTokenInfo(restUrl:String, requestHeader: Object, credentials: ApiUserCredentials): String {
+        //checks for the presence api credentials on client initialization and not repeated here
+        if(restUrl.indexOf("?") == -1){
+            restUrl += ( "?" + API_URL_KEY + "=" + credentials.apiToken );
+        }
+        else{
+            restUrl += ( "&" + API_URL_KEY + "=" + credentials.apiToken );
+        }
+        requestHeader.api_key = credentials.apiToken;
+
+        if(credentials.authToken != null && credentials.authToken != ""){
+            restUrl += ( "&" + AUTH_TOKEN_URL_KEY + "=" + credentials.authToken );
+            requestHeader.auth_token = credentials.authToken;
+        }
+
+        return restUrl;
+    }
+
+    internal static function getProxyUrl(hostName: String, proxyPath: String): String{
+        if (hostName..charAt(hostName.length) == "/") //remove trailing slash
+        {
+            hostName = hostName.substring(0, hostName.length - 1);
+        }
+        return HTTP_URL_PREFIX + hostName + proxyPath;
+    }
+}
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/common/ApiUserCredentials.as b/samples/client/petstore/flash/flash/src/io/swagger/common/ApiUserCredentials.as
new file mode 100644
index 00000000000..118d917a247
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/common/ApiUserCredentials.as
@@ -0,0 +1,63 @@
+package io.swagger.common {
+
+/**
+ * Api account credentials.
+ *
+ */
+public class ApiUserCredentials {
+    /**
+     * An apitoken that is passed along with the requests
+     */
+    public var apiToken:String;
+    /**
+     * A valid auth_token which could be necessary for certain operations
+     */
+    public var authToken:String;
+    /**
+     * The userId which could be required for certain operations
+     */
+    public var userId:Number;
+    /**
+     * The host name for the Rest API eg. api.companyName.com
+     */
+    public var hostName:String;
+	
+	/**
+	 * The base path to the api resources - used along with the hostname 
+	 * eg. /v4  
+	 */ 
+	public var apiPath: String;
+	
+	/**
+	 * The base path to the blazeds proxy
+	 * eg. /v4/messagebroker/restproxy
+	 */
+	public var proxyPath: String;
+
+	/**
+	 * If a proxy server has been set up for the services specify the URL here. This value is used when the Api is invoked with 
+	 * the value useProxy as true
+	 */ 
+	public var apiProxyServerUrl: String;
+
+    /**
+     * Constructor of ApiUserCredentials
+     * @param apiToken An apitoken that is passed along with the requests
+     * @param authToken A valid auth_token which could necessary for certain operations
+     * @param hostName The host name for the Rest API eg. api.companyName.com
+     * @param userId The userId which is required for certain operations - currently, get user lists
+     */
+    public function ApiUserCredentials(hostName: String, apiPath: String, apiToken: String,
+                                       authToken: String = null, userId: Number = -1, apiProxyServerUrl: String="",
+                                       proxyPath: String = null) {
+        this.hostName = hostName;
+        this.apiToken = apiToken;
+        this.authToken = authToken;
+        this.userId = userId;
+		this.apiPath = apiPath;
+		this.apiProxyServerUrl = apiProxyServerUrl;
+		this.proxyPath = proxyPath;
+    }
+
+}
+}
\ No newline at end of file
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/common/ListWrapper.as b/samples/client/petstore/flash/flash/src/io/swagger/common/ListWrapper.as
new file mode 100644
index 00000000000..b22890ad1d1
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/common/ListWrapper.as
@@ -0,0 +1,9 @@
+package io.swagger.common
+{
+	public interface ListWrapper
+	{
+		
+		function getList(): Array;
+		
+	}
+}
\ No newline at end of file
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/common/SwaggerApi.as b/samples/client/petstore/flash/flash/src/io/swagger/common/SwaggerApi.as
new file mode 100644
index 00000000000..059de642a74
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/common/SwaggerApi.as
@@ -0,0 +1,75 @@
+package io.swagger.common
+{
+	import io.swagger.common.ApiUserCredentials;
+	
+	import flash.events.EventDispatcher;
+	import flash.events.IEventDispatcher;
+	
+	import mx.utils.UIDUtil;
+	
+	public class SwaggerApi extends EventDispatcher
+	{
+			
+		protected var _apiUsageCredentials:ApiUserCredentials;
+		protected var _apiEventNotifier:EventDispatcher;
+		protected var _apiInvoker: ApiInvoker;
+		
+		protected var _useProxyServer: Boolean = false;
+
+		
+		/**
+		 * Constructor for the api client
+		 * @param apiCredentials Wrapper object for tokens and hostName required towards authentication
+		 * @param eventDispatcher Optional event dispatcher that when provided is used by the SDK to dispatch any Response
+		 */
+		public function SwaggerApi(apiCredentials: ApiUserCredentials, eventDispatcher: EventDispatcher = null) {
+			super();
+			_apiUsageCredentials = apiCredentials;
+			_apiEventNotifier = eventDispatcher;
+		}
+		
+		public function useProxyServer(value:Boolean, proxyServerUrl: String = null):void {
+			_useProxyServer = value;
+		}
+		
+		protected function getApiInvoker():ApiInvoker {
+			if(_apiInvoker == null){
+				if(_apiEventNotifier == null){
+					_apiEventNotifier = this;
+				}
+				_apiInvoker = new ApiInvoker(_apiUsageCredentials, _apiEventNotifier, _useProxyServer);
+			}
+			return _apiInvoker;
+		}
+		
+		protected function getUniqueId():String {
+			return UIDUtil.createUID();
+		}
+		
+		/**
+		 * Method for returning the path value
+		 * For a string value an empty value is returned if the value is null
+		 * @param value
+		 * @return
+		 */
+		protected static function toPathValue(value: Object): String {
+			if(value is Array){
+				return arrayToPathValue(value as Array);
+			}
+			return  value == null ? "" : value.toString();
+		}
+		
+		/**
+		 * Method for returning a path value
+		 * For a list of objects a comma separated string is returned
+		 * @param objects
+		 * @return
+		 */
+		protected static function arrayToPathValue(objects: Array): String {
+			var out: String = "";
+			
+			return objects.join(",");
+		}
+		
+	}
+}
\ No newline at end of file
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/common/XMLWriter.as b/samples/client/petstore/flash/flash/src/io/swagger/common/XMLWriter.as
new file mode 100644
index 00000000000..0b08066775b
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/common/XMLWriter.as
@@ -0,0 +1,28 @@
+package io.swagger.common
+{
+	public class XMLWriter
+	{
+		public var xml:XML;
+		
+		public function XMLWriter()
+		{
+			xml=<obj/>;
+		}
+		
+		public function reset():void {
+			xml=new XML();
+		}
+		
+		public function addProperty(propertyName:String, propertyValue:String):XML {
+			var xmlProperty:XML=<new/>
+			xmlProperty.setName(propertyName);
+			xmlProperty.appendChild(propertyValue);
+			xml.appendChild(xmlProperty);
+			return xmlProperty;		
+		}
+		
+		public function addAttribute(propertyName:String, attribute:String, attributeValue:String):void {
+			xml.elements(propertyName)[0].@[attribute]=attributeValue;
+		}
+	}
+}
\ No newline at end of file
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/event/ApiClientEvent.as b/samples/client/petstore/flash/flash/src/io/swagger/event/ApiClientEvent.as
new file mode 100644
index 00000000000..d64cd304d49
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/event/ApiClientEvent.as
@@ -0,0 +1,36 @@
+package io.swagger.event {
+import io.swagger.event.Response;
+
+import flash.events.Event;
+
+/**
+ * Event dispatched by the SDK to communicate success events and failure events.
+ * If a custom dispatcher has been assigned by the consumer on the generated client then the dispatcher dispatches
+ * the ApiClientEvent to indicate success or failure of the invocation using the Response
+ */
+public class ApiClientEvent extends Event{
+
+    /**
+     * Event type to indicate a unsuccessful invocation
+     */
+    public static const FAILURE_EVENT:String = "unsuccesfulInvocation";
+
+    /**
+     * Event type to indicate a successful invocation
+     */
+    public static const SUCCESS_EVENT:String = "successfulInvocation";
+    
+    /**
+     * The Response object which contains response info
+     */
+    public var response: Response;
+    /**
+     * Any additional info
+     */
+    public var message:String;
+
+    public function ApiClientEvent(type:String,bubbles:Boolean = false,cancelable:Boolean = false) {
+        super(type, bubbles, cancelable);
+    }
+}
+}
\ No newline at end of file
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/event/Response.as b/samples/client/petstore/flash/flash/src/io/swagger/event/Response.as
new file mode 100644
index 00000000000..a43b7980a38
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/event/Response.as
@@ -0,0 +1,56 @@
+package io.swagger.event {
+
+/**
+ * Response contains info on the result of an API invocation.
+ * A completion listener will expect this Response object.
+ */
+public class Response {
+
+    /**
+     * Indicates whether the invoked operation failed or succeeded
+     */
+    public var isSuccess:Boolean;
+
+    /**
+     * The payload of the succesful operation eg. a Word in a WordRequest
+     */
+    public var payload:Object;
+
+    /**
+     * Error message in case of failure
+     */
+    public var errorMessage:String;
+
+    /**
+     * A request Id that was passed in by the user as a param when invoking the operation
+     */
+    public var requestId:String;
+    private static const API_ERROR_MSG:String = "Api error response: ";
+
+    public function Response(isSuccessful: Boolean, payload: Object = null, errorMessage: String = null, requestId: String = null) {
+        this.isSuccess = isSuccessful;
+        this.payload = payload;
+        this.errorMessage = getFriendlyMessage(errorMessage);
+    }
+
+    private static function getFriendlyMessage(errorMessage: String): String{
+        var result: String = errorMessage;
+        if(errorMessage == null)
+            return null;
+        var errorCode: String;
+        var errorCodeArray: Array = errorMessage.match(/(?<=HTTP\/1.1 )[0-9][0-9][0-9]/);
+        if(errorCodeArray != null && errorCodeArray.length == 1){
+            errorCode = String(errorCodeArray[0]);
+        }
+        var msgArray: Array = errorMessage.match(/(?<=HTTP\/1.1 [0-9][0-9][0-9] )[^]*/);
+        if(msgArray != null && msgArray.length == 1){
+            result = API_ERROR_MSG + String(msgArray[0]);
+        }
+        return result;
+    }
+
+    public function toString(): String {
+        return "Response (requestId:" + requestId + "; isSuccess:" + isSuccess + "; errorMessage:" + errorMessage + "; payload:" + payload + ")";
+    }
+}
+}
\ No newline at end of file
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/exception/ApiError.as b/samples/client/petstore/flash/flash/src/io/swagger/exception/ApiError.as
new file mode 100644
index 00000000000..c8ac95a5c59
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/exception/ApiError.as
@@ -0,0 +1,10 @@
+package io.swagger.exception
+{
+	public class ApiError extends Error
+	{		
+		public function ApiError(id:*=0, message:*="")
+		{
+			super(message,id);
+		}
+	}
+}
\ No newline at end of file
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/exception/ApiErrorCodes.as b/samples/client/petstore/flash/flash/src/io/swagger/exception/ApiErrorCodes.as
new file mode 100644
index 00000000000..e5ea46480aa
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/exception/ApiErrorCodes.as
@@ -0,0 +1,34 @@
+package io.swagger.exception
+{
+	public class ApiErrorCodes
+	{
+		/**
+		 * System exception.
+		 */
+		public static const SYSTEM_EXCEPTION: Number = 0;
+		
+		/**
+		 * With Arguments as current key. 
+		 */
+		public static const API_KEY_NOT_VALID: Number = 1000;
+		/**
+		 * With arguments as current token value
+		 */
+		public static const AUTH_TOKEN_NOT_VALID: Number = 1001;
+		/**
+		 * With arguments as input JSON and output class anme
+		 */
+		public static const ERROR_CONVERTING_JSON_TO_JAVA: Number = 1002;
+		/**
+		 * With arguments as JAVA class name
+		 */
+		public static const ERROR_CONVERTING_JAVA_TO_JSON: Number = 1003;
+		
+		public static const ERROR_FROM_WEBSERVICE_CALL: Number = 1004;
+		/**
+		 * With arguments as current API server name
+		 */
+		public static const API_SERVER_NOT_VALID: Number = 1005;
+		
+	}
+}
\ No newline at end of file
diff --git a/samples/client/petstore/go/.gitignore b/samples/client/petstore/go/.gitignore
new file mode 100644
index 00000000000..daf913b1b34
--- /dev/null
+++ b/samples/client/petstore/go/.gitignore
@@ -0,0 +1,24 @@
+# Compiled Object files, Static and Dynamic libs (Shared Objects)
+*.o
+*.a
+*.so
+
+# Folders
+_obj
+_test
+
+# Architecture specific extensions/prefixes
+*.[568vq]
+[568vq].out
+
+*.cgo1.go
+*.cgo2.c
+_cgo_defun.c
+_cgo_gotypes.go
+_cgo_export.*
+
+_testmain.go
+
+*.exe
+*.test
+*.prof
diff --git a/samples/client/petstore/go/README.md b/samples/client/petstore/go/README.md
new file mode 100644
index 00000000000..7ce753fba9f
--- /dev/null
+++ b/samples/client/petstore/go/README.md
@@ -0,0 +1,12 @@
+# Go API client for swagger
+
+## Overview
+This API client was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.  By using the [swagger-spec](https://github.com/swagger-api/swagger-spec) from a remote server, you can easily generate an API client.
+
+
+## Installation
+Put the package under your project folder and add the following in import:
+```
+    "./swagger"
+```
+
diff --git a/samples/client/petstore/go/git_push.sh b/samples/client/petstore/go/git_push.sh
new file mode 100644
index 00000000000..1a36388db02
--- /dev/null
+++ b/samples/client/petstore/go/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="YOUR_GIT_USR_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="YOUR_GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/client/petstore/go/swagger/Category.go b/samples/client/petstore/go/swagger/Category.go
new file mode 100644
index 00000000000..0268f62488a
--- /dev/null
+++ b/samples/client/petstore/go/swagger/Category.go
@@ -0,0 +1,10 @@
+package swagger
+
+import (
+)
+
+type Category struct {
+    Id  int64  `json:"id,omitempty"`
+    Name  string  `json:"name,omitempty"`
+    
+}
diff --git a/samples/client/petstore/go/swagger/InlineResponse200.go b/samples/client/petstore/go/swagger/InlineResponse200.go
new file mode 100644
index 00000000000..2fd550dcb82
--- /dev/null
+++ b/samples/client/petstore/go/swagger/InlineResponse200.go
@@ -0,0 +1,14 @@
+package swagger
+
+import (
+)
+
+type InlineResponse200 struct {
+    Tags  []Tag  `json:"tags,omitempty"`
+    Id  int64  `json:"id,omitempty"`
+    Category  Object  `json:"category,omitempty"`
+    Status  string  `json:"status,omitempty"`
+    Name  string  `json:"name,omitempty"`
+    PhotoUrls  []string  `json:"photoUrls,omitempty"`
+    
+}
diff --git a/samples/client/petstore/go/swagger/ModelReturn.go b/samples/client/petstore/go/swagger/ModelReturn.go
new file mode 100644
index 00000000000..daac97e1763
--- /dev/null
+++ b/samples/client/petstore/go/swagger/ModelReturn.go
@@ -0,0 +1,9 @@
+package swagger
+
+import (
+)
+
+type ModelReturn struct {
+    Return_  int32  `json:"return,omitempty"`
+    
+}
diff --git a/samples/client/petstore/go/swagger/Name.go b/samples/client/petstore/go/swagger/Name.go
new file mode 100644
index 00000000000..5c0d7bc6d44
--- /dev/null
+++ b/samples/client/petstore/go/swagger/Name.go
@@ -0,0 +1,9 @@
+package swagger
+
+import (
+)
+
+type Name struct {
+    Name  int32  `json:"name,omitempty"`
+    
+}
diff --git a/samples/client/petstore/go/swagger/Order.go b/samples/client/petstore/go/swagger/Order.go
new file mode 100644
index 00000000000..9db0f945110
--- /dev/null
+++ b/samples/client/petstore/go/swagger/Order.go
@@ -0,0 +1,15 @@
+package swagger
+
+import (
+    "time"
+)
+
+type Order struct {
+    Id  int64  `json:"id,omitempty"`
+    PetId  int64  `json:"petId,omitempty"`
+    Quantity  int32  `json:"quantity,omitempty"`
+    ShipDate  time.Time  `json:"shipDate,omitempty"`
+    Status  string  `json:"status,omitempty"`
+    Complete  bool  `json:"complete,omitempty"`
+    
+}
diff --git a/samples/client/petstore/go/swagger/Pet.go b/samples/client/petstore/go/swagger/Pet.go
new file mode 100644
index 00000000000..7544eed6384
--- /dev/null
+++ b/samples/client/petstore/go/swagger/Pet.go
@@ -0,0 +1,14 @@
+package swagger
+
+import (
+)
+
+type Pet struct {
+    Id  int64  `json:"id,omitempty"`
+    Category  Category  `json:"category,omitempty"`
+    Name  string  `json:"name,omitempty"`
+    PhotoUrls  []string  `json:"photoUrls,omitempty"`
+    Tags  []Tag  `json:"tags,omitempty"`
+    Status  string  `json:"status,omitempty"`
+    
+}
diff --git a/samples/client/petstore/go/swagger/PetApi.go b/samples/client/petstore/go/swagger/PetApi.go
new file mode 100644
index 00000000000..3e7b3a77315
--- /dev/null
+++ b/samples/client/petstore/go/swagger/PetApi.go
@@ -0,0 +1,704 @@
+package swagger
+
+import (
+    "strings"
+    "fmt"
+    "encoding/json"
+    "errors"
+    "github.com/dghubble/sling"
+    "os"
+)
+
+type PetApi struct {
+    basePath  string
+}
+
+func NewPetApi() *PetApi{
+    return &PetApi {
+        basePath:   "http://petstore.swagger.io/v2",
+    }
+}
+
+func NewPetApiWithBasePath(basePath string) *PetApi{
+    return &PetApi {
+        basePath:   basePath,
+    }
+}
+
+/**
+ * Add a new pet to the store
+ * 
+ * @param body Pet object that needs to be added to the store
+ * @return void
+ */
+//func (a PetApi) AddPet (body Pet) (error) {
+func (a PetApi) AddPet (body Pet) (error) {
+
+    _sling := sling.New().Post(a.basePath)
+
+    // create path and map variables
+    path := "/v2/pet"
+
+    _sling = _sling.Path(path)
+
+    // accept header
+    accepts := []string { "application/json", "application/xml" }
+    for key := range accepts {
+        _sling = _sling.Set("Accept", accepts[key])
+        break // only use the first Accept
+    }
+
+// body params
+    _sling = _sling.BodyJSON(body)
+
+
+
+  // We use this map (below) so that any arbitrary error JSON can be handled.
+  // FIXME: This is in the absence of this Go generator honoring the non-2xx
+  // response (error) models, which needs to be implemented at some point.
+  var failurePayload map[string]interface{}
+
+  httpResponse, err := _sling.Receive(nil, &failurePayload)
+
+  if err == nil {
+    // err == nil only means that there wasn't a sub-application-layer error (e.g. no network error)
+    if failurePayload != nil {
+      // If the failurePayload is present, there likely was some kind of non-2xx status
+      // returned (and a JSON payload error present)
+      var str []byte
+      str, err = json.Marshal(failurePayload)
+      if err == nil { // For safety, check for an error marshalling... probably superfluous
+        // This will return the JSON error body as a string
+        err = errors.New(string(str))
+      }
+  } else {
+    // So, there was no network-type error, and nothing in the failure payload,
+    // but we should still check the status code
+    if httpResponse == nil {
+      // This should never happen...
+      err = errors.New("No HTTP Response received.")
+    } else if code := httpResponse.StatusCode; 200 > code || code > 299 {
+        err = errors.New("HTTP Error: " + string(httpResponse.StatusCode))
+      }
+    }
+  }
+
+  return err
+}
+/**
+ * Fake endpoint to test byte array in body parameter for adding a new pet to the store
+ * 
+ * @param body Pet object in the form of byte array
+ * @return void
+ */
+//func (a PetApi) AddPetUsingByteArray (body string) (error) {
+func (a PetApi) AddPetUsingByteArray (body string) (error) {
+
+    _sling := sling.New().Post(a.basePath)
+
+    // create path and map variables
+    path := "/v2/pet?testing_byte_array=true"
+
+    _sling = _sling.Path(path)
+
+    // accept header
+    accepts := []string { "application/json", "application/xml" }
+    for key := range accepts {
+        _sling = _sling.Set("Accept", accepts[key])
+        break // only use the first Accept
+    }
+
+// body params
+    _sling = _sling.BodyJSON(body)
+
+
+
+  // We use this map (below) so that any arbitrary error JSON can be handled.
+  // FIXME: This is in the absence of this Go generator honoring the non-2xx
+  // response (error) models, which needs to be implemented at some point.
+  var failurePayload map[string]interface{}
+
+  httpResponse, err := _sling.Receive(nil, &failurePayload)
+
+  if err == nil {
+    // err == nil only means that there wasn't a sub-application-layer error (e.g. no network error)
+    if failurePayload != nil {
+      // If the failurePayload is present, there likely was some kind of non-2xx status
+      // returned (and a JSON payload error present)
+      var str []byte
+      str, err = json.Marshal(failurePayload)
+      if err == nil { // For safety, check for an error marshalling... probably superfluous
+        // This will return the JSON error body as a string
+        err = errors.New(string(str))
+      }
+  } else {
+    // So, there was no network-type error, and nothing in the failure payload,
+    // but we should still check the status code
+    if httpResponse == nil {
+      // This should never happen...
+      err = errors.New("No HTTP Response received.")
+    } else if code := httpResponse.StatusCode; 200 > code || code > 299 {
+        err = errors.New("HTTP Error: " + string(httpResponse.StatusCode))
+      }
+    }
+  }
+
+  return err
+}
+/**
+ * Deletes a pet
+ * 
+ * @param petId Pet id to delete
+ * @param apiKey 
+ * @return void
+ */
+//func (a PetApi) DeletePet (petId int64, apiKey string) (error) {
+func (a PetApi) DeletePet (petId int64, apiKey string) (error) {
+
+    _sling := sling.New().Delete(a.basePath)
+
+    // create path and map variables
+    path := "/v2/pet/{petId}"
+    path = strings.Replace(path, "{" + "petId" + "}", fmt.Sprintf("%v", petId), -1)
+
+    _sling = _sling.Path(path)
+
+    // accept header
+    accepts := []string { "application/json", "application/xml" }
+    for key := range accepts {
+        _sling = _sling.Set("Accept", accepts[key])
+        break // only use the first Accept
+    }
+    // header params "api_key"
+    _sling = _sling.Set("api_key", apiKey)
+
+
+
+
+  // We use this map (below) so that any arbitrary error JSON can be handled.
+  // FIXME: This is in the absence of this Go generator honoring the non-2xx
+  // response (error) models, which needs to be implemented at some point.
+  var failurePayload map[string]interface{}
+
+  httpResponse, err := _sling.Receive(nil, &failurePayload)
+
+  if err == nil {
+    // err == nil only means that there wasn't a sub-application-layer error (e.g. no network error)
+    if failurePayload != nil {
+      // If the failurePayload is present, there likely was some kind of non-2xx status
+      // returned (and a JSON payload error present)
+      var str []byte
+      str, err = json.Marshal(failurePayload)
+      if err == nil { // For safety, check for an error marshalling... probably superfluous
+        // This will return the JSON error body as a string
+        err = errors.New(string(str))
+      }
+  } else {
+    // So, there was no network-type error, and nothing in the failure payload,
+    // but we should still check the status code
+    if httpResponse == nil {
+      // This should never happen...
+      err = errors.New("No HTTP Response received.")
+    } else if code := httpResponse.StatusCode; 200 > code || code > 299 {
+        err = errors.New("HTTP Error: " + string(httpResponse.StatusCode))
+      }
+    }
+  }
+
+  return err
+}
+/**
+ * Finds Pets by status
+ * Multiple status values can be provided with comma separated strings
+ * @param status Status values that need to be considered for query
+ * @return []Pet
+ */
+//func (a PetApi) FindPetsByStatus (status []string) ([]Pet, error) {
+func (a PetApi) FindPetsByStatus (status []string) ([]Pet, error) {
+
+    _sling := sling.New().Get(a.basePath)
+
+    // create path and map variables
+    path := "/v2/pet/findByStatus"
+
+    _sling = _sling.Path(path)
+
+    type QueryParams struct {
+        status    []string `url:"status,omitempty"`
+        
+}
+    _sling = _sling.QueryStruct(&QueryParams{ status: status })
+    // accept header
+    accepts := []string { "application/json", "application/xml" }
+    for key := range accepts {
+        _sling = _sling.Set("Accept", accepts[key])
+        break // only use the first Accept
+    }
+
+
+  var successPayload = new([]Pet)
+
+  // We use this map (below) so that any arbitrary error JSON can be handled.
+  // FIXME: This is in the absence of this Go generator honoring the non-2xx
+  // response (error) models, which needs to be implemented at some point.
+  var failurePayload map[string]interface{}
+
+  httpResponse, err := _sling.Receive(successPayload, &failurePayload)
+
+  if err == nil {
+    // err == nil only means that there wasn't a sub-application-layer error (e.g. no network error)
+    if failurePayload != nil {
+      // If the failurePayload is present, there likely was some kind of non-2xx status
+      // returned (and a JSON payload error present)
+      var str []byte
+      str, err = json.Marshal(failurePayload)
+      if err == nil { // For safety, check for an error marshalling... probably superfluous
+        // This will return the JSON error body as a string
+        err = errors.New(string(str))
+      }
+  } else {
+    // So, there was no network-type error, and nothing in the failure payload,
+    // but we should still check the status code
+    if httpResponse == nil {
+      // This should never happen...
+      err = errors.New("No HTTP Response received.")
+    } else if code := httpResponse.StatusCode; 200 > code || code > 299 {
+        err = errors.New("HTTP Error: " + string(httpResponse.StatusCode))
+      }
+    }
+  }
+
+  return *successPayload, err
+}
+/**
+ * Finds Pets by tags
+ * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+ * @param tags Tags to filter by
+ * @return []Pet
+ */
+//func (a PetApi) FindPetsByTags (tags []string) ([]Pet, error) {
+func (a PetApi) FindPetsByTags (tags []string) ([]Pet, error) {
+
+    _sling := sling.New().Get(a.basePath)
+
+    // create path and map variables
+    path := "/v2/pet/findByTags"
+
+    _sling = _sling.Path(path)
+
+    type QueryParams struct {
+        tags    []string `url:"tags,omitempty"`
+        
+}
+    _sling = _sling.QueryStruct(&QueryParams{ tags: tags })
+    // accept header
+    accepts := []string { "application/json", "application/xml" }
+    for key := range accepts {
+        _sling = _sling.Set("Accept", accepts[key])
+        break // only use the first Accept
+    }
+
+
+  var successPayload = new([]Pet)
+
+  // We use this map (below) so that any arbitrary error JSON can be handled.
+  // FIXME: This is in the absence of this Go generator honoring the non-2xx
+  // response (error) models, which needs to be implemented at some point.
+  var failurePayload map[string]interface{}
+
+  httpResponse, err := _sling.Receive(successPayload, &failurePayload)
+
+  if err == nil {
+    // err == nil only means that there wasn't a sub-application-layer error (e.g. no network error)
+    if failurePayload != nil {
+      // If the failurePayload is present, there likely was some kind of non-2xx status
+      // returned (and a JSON payload error present)
+      var str []byte
+      str, err = json.Marshal(failurePayload)
+      if err == nil { // For safety, check for an error marshalling... probably superfluous
+        // This will return the JSON error body as a string
+        err = errors.New(string(str))
+      }
+  } else {
+    // So, there was no network-type error, and nothing in the failure payload,
+    // but we should still check the status code
+    if httpResponse == nil {
+      // This should never happen...
+      err = errors.New("No HTTP Response received.")
+    } else if code := httpResponse.StatusCode; 200 > code || code > 299 {
+        err = errors.New("HTTP Error: " + string(httpResponse.StatusCode))
+      }
+    }
+  }
+
+  return *successPayload, err
+}
+/**
+ * Find pet by ID
+ * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+ * @param petId ID of pet that needs to be fetched
+ * @return Pet
+ */
+//func (a PetApi) GetPetById (petId int64) (Pet, error) {
+func (a PetApi) GetPetById (petId int64) (Pet, error) {
+
+    _sling := sling.New().Get(a.basePath)
+
+    // create path and map variables
+    path := "/v2/pet/{petId}"
+    path = strings.Replace(path, "{" + "petId" + "}", fmt.Sprintf("%v", petId), -1)
+
+    _sling = _sling.Path(path)
+
+    // accept header
+    accepts := []string { "application/json", "application/xml" }
+    for key := range accepts {
+        _sling = _sling.Set("Accept", accepts[key])
+        break // only use the first Accept
+    }
+
+
+  var successPayload = new(Pet)
+
+  // We use this map (below) so that any arbitrary error JSON can be handled.
+  // FIXME: This is in the absence of this Go generator honoring the non-2xx
+  // response (error) models, which needs to be implemented at some point.
+  var failurePayload map[string]interface{}
+
+  httpResponse, err := _sling.Receive(successPayload, &failurePayload)
+
+  if err == nil {
+    // err == nil only means that there wasn't a sub-application-layer error (e.g. no network error)
+    if failurePayload != nil {
+      // If the failurePayload is present, there likely was some kind of non-2xx status
+      // returned (and a JSON payload error present)
+      var str []byte
+      str, err = json.Marshal(failurePayload)
+      if err == nil { // For safety, check for an error marshalling... probably superfluous
+        // This will return the JSON error body as a string
+        err = errors.New(string(str))
+      }
+  } else {
+    // So, there was no network-type error, and nothing in the failure payload,
+    // but we should still check the status code
+    if httpResponse == nil {
+      // This should never happen...
+      err = errors.New("No HTTP Response received.")
+    } else if code := httpResponse.StatusCode; 200 > code || code > 299 {
+        err = errors.New("HTTP Error: " + string(httpResponse.StatusCode))
+      }
+    }
+  }
+
+  return *successPayload, err
+}
+/**
+ * Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+ * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+ * @param petId ID of pet that needs to be fetched
+ * @return InlineResponse200
+ */
+//func (a PetApi) GetPetByIdInObject (petId int64) (InlineResponse200, error) {
+func (a PetApi) GetPetByIdInObject (petId int64) (InlineResponse200, error) {
+
+    _sling := sling.New().Get(a.basePath)
+
+    // create path and map variables
+    path := "/v2/pet/{petId}?response=inline_arbitrary_object"
+    path = strings.Replace(path, "{" + "petId" + "}", fmt.Sprintf("%v", petId), -1)
+
+    _sling = _sling.Path(path)
+
+    // accept header
+    accepts := []string { "application/json", "application/xml" }
+    for key := range accepts {
+        _sling = _sling.Set("Accept", accepts[key])
+        break // only use the first Accept
+    }
+
+
+  var successPayload = new(InlineResponse200)
+
+  // We use this map (below) so that any arbitrary error JSON can be handled.
+  // FIXME: This is in the absence of this Go generator honoring the non-2xx
+  // response (error) models, which needs to be implemented at some point.
+  var failurePayload map[string]interface{}
+
+  httpResponse, err := _sling.Receive(successPayload, &failurePayload)
+
+  if err == nil {
+    // err == nil only means that there wasn't a sub-application-layer error (e.g. no network error)
+    if failurePayload != nil {
+      // If the failurePayload is present, there likely was some kind of non-2xx status
+      // returned (and a JSON payload error present)
+      var str []byte
+      str, err = json.Marshal(failurePayload)
+      if err == nil { // For safety, check for an error marshalling... probably superfluous
+        // This will return the JSON error body as a string
+        err = errors.New(string(str))
+      }
+  } else {
+    // So, there was no network-type error, and nothing in the failure payload,
+    // but we should still check the status code
+    if httpResponse == nil {
+      // This should never happen...
+      err = errors.New("No HTTP Response received.")
+    } else if code := httpResponse.StatusCode; 200 > code || code > 299 {
+        err = errors.New("HTTP Error: " + string(httpResponse.StatusCode))
+      }
+    }
+  }
+
+  return *successPayload, err
+}
+/**
+ * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+ * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+ * @param petId ID of pet that needs to be fetched
+ * @return string
+ */
+//func (a PetApi) PetPetIdtestingByteArraytrueGet (petId int64) (string, error) {
+func (a PetApi) PetPetIdtestingByteArraytrueGet (petId int64) (string, error) {
+
+    _sling := sling.New().Get(a.basePath)
+
+    // create path and map variables
+    path := "/v2/pet/{petId}?testing_byte_array=true"
+    path = strings.Replace(path, "{" + "petId" + "}", fmt.Sprintf("%v", petId), -1)
+
+    _sling = _sling.Path(path)
+
+    // accept header
+    accepts := []string { "application/json", "application/xml" }
+    for key := range accepts {
+        _sling = _sling.Set("Accept", accepts[key])
+        break // only use the first Accept
+    }
+
+
+  var successPayload = new(string)
+
+  // We use this map (below) so that any arbitrary error JSON can be handled.
+  // FIXME: This is in the absence of this Go generator honoring the non-2xx
+  // response (error) models, which needs to be implemented at some point.
+  var failurePayload map[string]interface{}
+
+  httpResponse, err := _sling.Receive(successPayload, &failurePayload)
+
+  if err == nil {
+    // err == nil only means that there wasn't a sub-application-layer error (e.g. no network error)
+    if failurePayload != nil {
+      // If the failurePayload is present, there likely was some kind of non-2xx status
+      // returned (and a JSON payload error present)
+      var str []byte
+      str, err = json.Marshal(failurePayload)
+      if err == nil { // For safety, check for an error marshalling... probably superfluous
+        // This will return the JSON error body as a string
+        err = errors.New(string(str))
+      }
+  } else {
+    // So, there was no network-type error, and nothing in the failure payload,
+    // but we should still check the status code
+    if httpResponse == nil {
+      // This should never happen...
+      err = errors.New("No HTTP Response received.")
+    } else if code := httpResponse.StatusCode; 200 > code || code > 299 {
+        err = errors.New("HTTP Error: " + string(httpResponse.StatusCode))
+      }
+    }
+  }
+
+  return *successPayload, err
+}
+/**
+ * Update an existing pet
+ * 
+ * @param body Pet object that needs to be added to the store
+ * @return void
+ */
+//func (a PetApi) UpdatePet (body Pet) (error) {
+func (a PetApi) UpdatePet (body Pet) (error) {
+
+    _sling := sling.New().Put(a.basePath)
+
+    // create path and map variables
+    path := "/v2/pet"
+
+    _sling = _sling.Path(path)
+
+    // accept header
+    accepts := []string { "application/json", "application/xml" }
+    for key := range accepts {
+        _sling = _sling.Set("Accept", accepts[key])
+        break // only use the first Accept
+    }
+
+// body params
+    _sling = _sling.BodyJSON(body)
+
+
+
+  // We use this map (below) so that any arbitrary error JSON can be handled.
+  // FIXME: This is in the absence of this Go generator honoring the non-2xx
+  // response (error) models, which needs to be implemented at some point.
+  var failurePayload map[string]interface{}
+
+  httpResponse, err := _sling.Receive(nil, &failurePayload)
+
+  if err == nil {
+    // err == nil only means that there wasn't a sub-application-layer error (e.g. no network error)
+    if failurePayload != nil {
+      // If the failurePayload is present, there likely was some kind of non-2xx status
+      // returned (and a JSON payload error present)
+      var str []byte
+      str, err = json.Marshal(failurePayload)
+      if err == nil { // For safety, check for an error marshalling... probably superfluous
+        // This will return the JSON error body as a string
+        err = errors.New(string(str))
+      }
+  } else {
+    // So, there was no network-type error, and nothing in the failure payload,
+    // but we should still check the status code
+    if httpResponse == nil {
+      // This should never happen...
+      err = errors.New("No HTTP Response received.")
+    } else if code := httpResponse.StatusCode; 200 > code || code > 299 {
+        err = errors.New("HTTP Error: " + string(httpResponse.StatusCode))
+      }
+    }
+  }
+
+  return err
+}
+/**
+ * Updates a pet in the store with form data
+ * 
+ * @param petId ID of pet that needs to be updated
+ * @param name Updated name of the pet
+ * @param status Updated status of the pet
+ * @return void
+ */
+//func (a PetApi) UpdatePetWithForm (petId string, name string, status string) (error) {
+func (a PetApi) UpdatePetWithForm (petId string, name string, status string) (error) {
+
+    _sling := sling.New().Post(a.basePath)
+
+    // create path and map variables
+    path := "/v2/pet/{petId}"
+    path = strings.Replace(path, "{" + "petId" + "}", fmt.Sprintf("%v", petId), -1)
+
+    _sling = _sling.Path(path)
+
+    // accept header
+    accepts := []string { "application/json", "application/xml" }
+    for key := range accepts {
+        _sling = _sling.Set("Accept", accepts[key])
+        break // only use the first Accept
+    }
+
+    type FormParams struct {
+        name    string `url:"name,omitempty"`
+        status    string `url:"status,omitempty"`
+    }
+    _sling = _sling.BodyForm(&FormParams{ name: name,status: status })
+
+
+
+  // We use this map (below) so that any arbitrary error JSON can be handled.
+  // FIXME: This is in the absence of this Go generator honoring the non-2xx
+  // response (error) models, which needs to be implemented at some point.
+  var failurePayload map[string]interface{}
+
+  httpResponse, err := _sling.Receive(nil, &failurePayload)
+
+  if err == nil {
+    // err == nil only means that there wasn't a sub-application-layer error (e.g. no network error)
+    if failurePayload != nil {
+      // If the failurePayload is present, there likely was some kind of non-2xx status
+      // returned (and a JSON payload error present)
+      var str []byte
+      str, err = json.Marshal(failurePayload)
+      if err == nil { // For safety, check for an error marshalling... probably superfluous
+        // This will return the JSON error body as a string
+        err = errors.New(string(str))
+      }
+  } else {
+    // So, there was no network-type error, and nothing in the failure payload,
+    // but we should still check the status code
+    if httpResponse == nil {
+      // This should never happen...
+      err = errors.New("No HTTP Response received.")
+    } else if code := httpResponse.StatusCode; 200 > code || code > 299 {
+        err = errors.New("HTTP Error: " + string(httpResponse.StatusCode))
+      }
+    }
+  }
+
+  return err
+}
+/**
+ * uploads an image
+ * 
+ * @param petId ID of pet to update
+ * @param additionalMetadata Additional data to pass to server
+ * @param file file to upload
+ * @return void
+ */
+//func (a PetApi) UploadFile (petId int64, additionalMetadata string, file *os.File) (error) {
+func (a PetApi) UploadFile (petId int64, additionalMetadata string, file *os.File) (error) {
+
+    _sling := sling.New().Post(a.basePath)
+
+    // create path and map variables
+    path := "/v2/pet/{petId}/uploadImage"
+    path = strings.Replace(path, "{" + "petId" + "}", fmt.Sprintf("%v", petId), -1)
+
+    _sling = _sling.Path(path)
+
+    // accept header
+    accepts := []string { "application/json", "application/xml" }
+    for key := range accepts {
+        _sling = _sling.Set("Accept", accepts[key])
+        break // only use the first Accept
+    }
+
+    type FormParams struct {
+        additionalMetadata    string `url:"additionalMetadata,omitempty"`
+        file    *os.File `url:"file,omitempty"`
+    }
+    _sling = _sling.BodyForm(&FormParams{ additionalMetadata: additionalMetadata,file: file })
+
+
+
+  // We use this map (below) so that any arbitrary error JSON can be handled.
+  // FIXME: This is in the absence of this Go generator honoring the non-2xx
+  // response (error) models, which needs to be implemented at some point.
+  var failurePayload map[string]interface{}
+
+  httpResponse, err := _sling.Receive(nil, &failurePayload)
+
+  if err == nil {
+    // err == nil only means that there wasn't a sub-application-layer error (e.g. no network error)
+    if failurePayload != nil {
+      // If the failurePayload is present, there likely was some kind of non-2xx status
+      // returned (and a JSON payload error present)
+      var str []byte
+      str, err = json.Marshal(failurePayload)
+      if err == nil { // For safety, check for an error marshalling... probably superfluous
+        // This will return the JSON error body as a string
+        err = errors.New(string(str))
+      }
+  } else {
+    // So, there was no network-type error, and nothing in the failure payload,
+    // but we should still check the status code
+    if httpResponse == nil {
+      // This should never happen...
+      err = errors.New("No HTTP Response received.")
+    } else if code := httpResponse.StatusCode; 200 > code || code > 299 {
+        err = errors.New("HTTP Error: " + string(httpResponse.StatusCode))
+      }
+    }
+  }
+
+  return err
+}
diff --git a/samples/client/petstore/go/swagger/SpecialModelName.go b/samples/client/petstore/go/swagger/SpecialModelName.go
new file mode 100644
index 00000000000..fcf30882303
--- /dev/null
+++ b/samples/client/petstore/go/swagger/SpecialModelName.go
@@ -0,0 +1,9 @@
+package swagger
+
+import (
+)
+
+type SpecialModelName struct {
+    $Special[propertyName]  int64  `json:"$special[property.name],omitempty"`
+    
+}
diff --git a/samples/client/petstore/go/swagger/StoreApi.go b/samples/client/petstore/go/swagger/StoreApi.go
new file mode 100644
index 00000000000..b23c0f3d622
--- /dev/null
+++ b/samples/client/petstore/go/swagger/StoreApi.go
@@ -0,0 +1,381 @@
+package swagger
+
+import (
+    "strings"
+    "fmt"
+    "encoding/json"
+    "errors"
+    "github.com/dghubble/sling"
+)
+
+type StoreApi struct {
+    basePath  string
+}
+
+func NewStoreApi() *StoreApi{
+    return &StoreApi {
+        basePath:   "http://petstore.swagger.io/v2",
+    }
+}
+
+func NewStoreApiWithBasePath(basePath string) *StoreApi{
+    return &StoreApi {
+        basePath:   basePath,
+    }
+}
+
+/**
+ * Delete purchase order by ID
+ * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+ * @param orderId ID of the order that needs to be deleted
+ * @return void
+ */
+//func (a StoreApi) DeleteOrder (orderId string) (error) {
+func (a StoreApi) DeleteOrder (orderId string) (error) {
+
+    _sling := sling.New().Delete(a.basePath)
+
+    // create path and map variables
+    path := "/v2/store/order/{orderId}"
+    path = strings.Replace(path, "{" + "orderId" + "}", fmt.Sprintf("%v", orderId), -1)
+
+    _sling = _sling.Path(path)
+
+    // accept header
+    accepts := []string { "application/json", "application/xml" }
+    for key := range accepts {
+        _sling = _sling.Set("Accept", accepts[key])
+        break // only use the first Accept
+    }
+
+
+
+
+  // We use this map (below) so that any arbitrary error JSON can be handled.
+  // FIXME: This is in the absence of this Go generator honoring the non-2xx
+  // response (error) models, which needs to be implemented at some point.
+  var failurePayload map[string]interface{}
+
+  httpResponse, err := _sling.Receive(nil, &failurePayload)
+
+  if err == nil {
+    // err == nil only means that there wasn't a sub-application-layer error (e.g. no network error)
+    if failurePayload != nil {
+      // If the failurePayload is present, there likely was some kind of non-2xx status
+      // returned (and a JSON payload error present)
+      var str []byte
+      str, err = json.Marshal(failurePayload)
+      if err == nil { // For safety, check for an error marshalling... probably superfluous
+        // This will return the JSON error body as a string
+        err = errors.New(string(str))
+      }
+  } else {
+    // So, there was no network-type error, and nothing in the failure payload,
+    // but we should still check the status code
+    if httpResponse == nil {
+      // This should never happen...
+      err = errors.New("No HTTP Response received.")
+    } else if code := httpResponse.StatusCode; 200 > code || code > 299 {
+        err = errors.New("HTTP Error: " + string(httpResponse.StatusCode))
+      }
+    }
+  }
+
+  return err
+}
+/**
+ * Finds orders by status
+ * A single status value can be provided as a string
+ * @param status Status value that needs to be considered for query
+ * @return []Order
+ */
+//func (a StoreApi) FindOrdersByStatus (status string) ([]Order, error) {
+func (a StoreApi) FindOrdersByStatus (status string) ([]Order, error) {
+
+    _sling := sling.New().Get(a.basePath)
+
+    // create path and map variables
+    path := "/v2/store/findByStatus"
+
+    _sling = _sling.Path(path)
+
+    type QueryParams struct {
+        status    string `url:"status,omitempty"`
+        
+}
+    _sling = _sling.QueryStruct(&QueryParams{ status: status })
+    // accept header
+    accepts := []string { "application/json", "application/xml" }
+    for key := range accepts {
+        _sling = _sling.Set("Accept", accepts[key])
+        break // only use the first Accept
+    }
+
+
+  var successPayload = new([]Order)
+
+  // We use this map (below) so that any arbitrary error JSON can be handled.
+  // FIXME: This is in the absence of this Go generator honoring the non-2xx
+  // response (error) models, which needs to be implemented at some point.
+  var failurePayload map[string]interface{}
+
+  httpResponse, err := _sling.Receive(successPayload, &failurePayload)
+
+  if err == nil {
+    // err == nil only means that there wasn't a sub-application-layer error (e.g. no network error)
+    if failurePayload != nil {
+      // If the failurePayload is present, there likely was some kind of non-2xx status
+      // returned (and a JSON payload error present)
+      var str []byte
+      str, err = json.Marshal(failurePayload)
+      if err == nil { // For safety, check for an error marshalling... probably superfluous
+        // This will return the JSON error body as a string
+        err = errors.New(string(str))
+      }
+  } else {
+    // So, there was no network-type error, and nothing in the failure payload,
+    // but we should still check the status code
+    if httpResponse == nil {
+      // This should never happen...
+      err = errors.New("No HTTP Response received.")
+    } else if code := httpResponse.StatusCode; 200 > code || code > 299 {
+        err = errors.New("HTTP Error: " + string(httpResponse.StatusCode))
+      }
+    }
+  }
+
+  return *successPayload, err
+}
+/**
+ * Returns pet inventories by status
+ * Returns a map of status codes to quantities
+ * @return map[string]int32
+ */
+//func (a StoreApi) GetInventory () (map[string]int32, error) {
+func (a StoreApi) GetInventory () (map[string]int32, error) {
+
+    _sling := sling.New().Get(a.basePath)
+
+    // create path and map variables
+    path := "/v2/store/inventory"
+
+    _sling = _sling.Path(path)
+
+    // accept header
+    accepts := []string { "application/json", "application/xml" }
+    for key := range accepts {
+        _sling = _sling.Set("Accept", accepts[key])
+        break // only use the first Accept
+    }
+
+
+  var successPayload = new(map[string]int32)
+
+  // We use this map (below) so that any arbitrary error JSON can be handled.
+  // FIXME: This is in the absence of this Go generator honoring the non-2xx
+  // response (error) models, which needs to be implemented at some point.
+  var failurePayload map[string]interface{}
+
+  httpResponse, err := _sling.Receive(successPayload, &failurePayload)
+
+  if err == nil {
+    // err == nil only means that there wasn't a sub-application-layer error (e.g. no network error)
+    if failurePayload != nil {
+      // If the failurePayload is present, there likely was some kind of non-2xx status
+      // returned (and a JSON payload error present)
+      var str []byte
+      str, err = json.Marshal(failurePayload)
+      if err == nil { // For safety, check for an error marshalling... probably superfluous
+        // This will return the JSON error body as a string
+        err = errors.New(string(str))
+      }
+  } else {
+    // So, there was no network-type error, and nothing in the failure payload,
+    // but we should still check the status code
+    if httpResponse == nil {
+      // This should never happen...
+      err = errors.New("No HTTP Response received.")
+    } else if code := httpResponse.StatusCode; 200 > code || code > 299 {
+        err = errors.New("HTTP Error: " + string(httpResponse.StatusCode))
+      }
+    }
+  }
+
+  return *successPayload, err
+}
+/**
+ * Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+ * Returns an arbitrary object which is actually a map of status codes to quantities
+ * @return Object
+ */
+//func (a StoreApi) GetInventoryInObject () (Object, error) {
+func (a StoreApi) GetInventoryInObject () (Object, error) {
+
+    _sling := sling.New().Get(a.basePath)
+
+    // create path and map variables
+    path := "/v2/store/inventory?response=arbitrary_object"
+
+    _sling = _sling.Path(path)
+
+    // accept header
+    accepts := []string { "application/json", "application/xml" }
+    for key := range accepts {
+        _sling = _sling.Set("Accept", accepts[key])
+        break // only use the first Accept
+    }
+
+
+  var successPayload = new(Object)
+
+  // We use this map (below) so that any arbitrary error JSON can be handled.
+  // FIXME: This is in the absence of this Go generator honoring the non-2xx
+  // response (error) models, which needs to be implemented at some point.
+  var failurePayload map[string]interface{}
+
+  httpResponse, err := _sling.Receive(successPayload, &failurePayload)
+
+  if err == nil {
+    // err == nil only means that there wasn't a sub-application-layer error (e.g. no network error)
+    if failurePayload != nil {
+      // If the failurePayload is present, there likely was some kind of non-2xx status
+      // returned (and a JSON payload error present)
+      var str []byte
+      str, err = json.Marshal(failurePayload)
+      if err == nil { // For safety, check for an error marshalling... probably superfluous
+        // This will return the JSON error body as a string
+        err = errors.New(string(str))
+      }
+  } else {
+    // So, there was no network-type error, and nothing in the failure payload,
+    // but we should still check the status code
+    if httpResponse == nil {
+      // This should never happen...
+      err = errors.New("No HTTP Response received.")
+    } else if code := httpResponse.StatusCode; 200 > code || code > 299 {
+        err = errors.New("HTTP Error: " + string(httpResponse.StatusCode))
+      }
+    }
+  }
+
+  return *successPayload, err
+}
+/**
+ * Find purchase order by ID
+ * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+ * @param orderId ID of pet that needs to be fetched
+ * @return Order
+ */
+//func (a StoreApi) GetOrderById (orderId string) (Order, error) {
+func (a StoreApi) GetOrderById (orderId string) (Order, error) {
+
+    _sling := sling.New().Get(a.basePath)
+
+    // create path and map variables
+    path := "/v2/store/order/{orderId}"
+    path = strings.Replace(path, "{" + "orderId" + "}", fmt.Sprintf("%v", orderId), -1)
+
+    _sling = _sling.Path(path)
+
+    // accept header
+    accepts := []string { "application/json", "application/xml" }
+    for key := range accepts {
+        _sling = _sling.Set("Accept", accepts[key])
+        break // only use the first Accept
+    }
+
+
+  var successPayload = new(Order)
+
+  // We use this map (below) so that any arbitrary error JSON can be handled.
+  // FIXME: This is in the absence of this Go generator honoring the non-2xx
+  // response (error) models, which needs to be implemented at some point.
+  var failurePayload map[string]interface{}
+
+  httpResponse, err := _sling.Receive(successPayload, &failurePayload)
+
+  if err == nil {
+    // err == nil only means that there wasn't a sub-application-layer error (e.g. no network error)
+    if failurePayload != nil {
+      // If the failurePayload is present, there likely was some kind of non-2xx status
+      // returned (and a JSON payload error present)
+      var str []byte
+      str, err = json.Marshal(failurePayload)
+      if err == nil { // For safety, check for an error marshalling... probably superfluous
+        // This will return the JSON error body as a string
+        err = errors.New(string(str))
+      }
+  } else {
+    // So, there was no network-type error, and nothing in the failure payload,
+    // but we should still check the status code
+    if httpResponse == nil {
+      // This should never happen...
+      err = errors.New("No HTTP Response received.")
+    } else if code := httpResponse.StatusCode; 200 > code || code > 299 {
+        err = errors.New("HTTP Error: " + string(httpResponse.StatusCode))
+      }
+    }
+  }
+
+  return *successPayload, err
+}
+/**
+ * Place an order for a pet
+ * 
+ * @param body order placed for purchasing the pet
+ * @return Order
+ */
+//func (a StoreApi) PlaceOrder (body Order) (Order, error) {
+func (a StoreApi) PlaceOrder (body Order) (Order, error) {
+
+    _sling := sling.New().Post(a.basePath)
+
+    // create path and map variables
+    path := "/v2/store/order"
+
+    _sling = _sling.Path(path)
+
+    // accept header
+    accepts := []string { "application/json", "application/xml" }
+    for key := range accepts {
+        _sling = _sling.Set("Accept", accepts[key])
+        break // only use the first Accept
+    }
+
+// body params
+    _sling = _sling.BodyJSON(body)
+
+  var successPayload = new(Order)
+
+  // We use this map (below) so that any arbitrary error JSON can be handled.
+  // FIXME: This is in the absence of this Go generator honoring the non-2xx
+  // response (error) models, which needs to be implemented at some point.
+  var failurePayload map[string]interface{}
+
+  httpResponse, err := _sling.Receive(successPayload, &failurePayload)
+
+  if err == nil {
+    // err == nil only means that there wasn't a sub-application-layer error (e.g. no network error)
+    if failurePayload != nil {
+      // If the failurePayload is present, there likely was some kind of non-2xx status
+      // returned (and a JSON payload error present)
+      var str []byte
+      str, err = json.Marshal(failurePayload)
+      if err == nil { // For safety, check for an error marshalling... probably superfluous
+        // This will return the JSON error body as a string
+        err = errors.New(string(str))
+      }
+  } else {
+    // So, there was no network-type error, and nothing in the failure payload,
+    // but we should still check the status code
+    if httpResponse == nil {
+      // This should never happen...
+      err = errors.New("No HTTP Response received.")
+    } else if code := httpResponse.StatusCode; 200 > code || code > 299 {
+        err = errors.New("HTTP Error: " + string(httpResponse.StatusCode))
+      }
+    }
+  }
+
+  return *successPayload, err
+}
diff --git a/samples/client/petstore/go/swagger/Tag.go b/samples/client/petstore/go/swagger/Tag.go
new file mode 100644
index 00000000000..6b505272a15
--- /dev/null
+++ b/samples/client/petstore/go/swagger/Tag.go
@@ -0,0 +1,10 @@
+package swagger
+
+import (
+)
+
+type Tag struct {
+    Id  int64  `json:"id,omitempty"`
+    Name  string  `json:"name,omitempty"`
+    
+}
diff --git a/samples/client/petstore/go/swagger/User.go b/samples/client/petstore/go/swagger/User.go
new file mode 100644
index 00000000000..e7f26d1d10c
--- /dev/null
+++ b/samples/client/petstore/go/swagger/User.go
@@ -0,0 +1,16 @@
+package swagger
+
+import (
+)
+
+type User struct {
+    Id  int64  `json:"id,omitempty"`
+    Username  string  `json:"username,omitempty"`
+    FirstName  string  `json:"firstName,omitempty"`
+    LastName  string  `json:"lastName,omitempty"`
+    Email  string  `json:"email,omitempty"`
+    Password  string  `json:"password,omitempty"`
+    Phone  string  `json:"phone,omitempty"`
+    UserStatus  int32  `json:"userStatus,omitempty"`
+    
+}
diff --git a/samples/client/petstore/go/swagger/UserApi.go b/samples/client/petstore/go/swagger/UserApi.go
new file mode 100644
index 00000000000..53aaf4c85ca
--- /dev/null
+++ b/samples/client/petstore/go/swagger/UserApi.go
@@ -0,0 +1,508 @@
+package swagger
+
+import (
+    "strings"
+    "fmt"
+    "encoding/json"
+    "errors"
+    "github.com/dghubble/sling"
+)
+
+type UserApi struct {
+    basePath  string
+}
+
+func NewUserApi() *UserApi{
+    return &UserApi {
+        basePath:   "http://petstore.swagger.io/v2",
+    }
+}
+
+func NewUserApiWithBasePath(basePath string) *UserApi{
+    return &UserApi {
+        basePath:   basePath,
+    }
+}
+
+/**
+ * Create user
+ * This can only be done by the logged in user.
+ * @param body Created user object
+ * @return void
+ */
+//func (a UserApi) CreateUser (body User) (error) {
+func (a UserApi) CreateUser (body User) (error) {
+
+    _sling := sling.New().Post(a.basePath)
+
+    // create path and map variables
+    path := "/v2/user"
+
+    _sling = _sling.Path(path)
+
+    // accept header
+    accepts := []string { "application/json", "application/xml" }
+    for key := range accepts {
+        _sling = _sling.Set("Accept", accepts[key])
+        break // only use the first Accept
+    }
+
+// body params
+    _sling = _sling.BodyJSON(body)
+
+
+
+  // We use this map (below) so that any arbitrary error JSON can be handled.
+  // FIXME: This is in the absence of this Go generator honoring the non-2xx
+  // response (error) models, which needs to be implemented at some point.
+  var failurePayload map[string]interface{}
+
+  httpResponse, err := _sling.Receive(nil, &failurePayload)
+
+  if err == nil {
+    // err == nil only means that there wasn't a sub-application-layer error (e.g. no network error)
+    if failurePayload != nil {
+      // If the failurePayload is present, there likely was some kind of non-2xx status
+      // returned (and a JSON payload error present)
+      var str []byte
+      str, err = json.Marshal(failurePayload)
+      if err == nil { // For safety, check for an error marshalling... probably superfluous
+        // This will return the JSON error body as a string
+        err = errors.New(string(str))
+      }
+  } else {
+    // So, there was no network-type error, and nothing in the failure payload,
+    // but we should still check the status code
+    if httpResponse == nil {
+      // This should never happen...
+      err = errors.New("No HTTP Response received.")
+    } else if code := httpResponse.StatusCode; 200 > code || code > 299 {
+        err = errors.New("HTTP Error: " + string(httpResponse.StatusCode))
+      }
+    }
+  }
+
+  return err
+}
+/**
+ * Creates list of users with given input array
+ * 
+ * @param body List of user object
+ * @return void
+ */
+//func (a UserApi) CreateUsersWithArrayInput (body []User) (error) {
+func (a UserApi) CreateUsersWithArrayInput (body []User) (error) {
+
+    _sling := sling.New().Post(a.basePath)
+
+    // create path and map variables
+    path := "/v2/user/createWithArray"
+
+    _sling = _sling.Path(path)
+
+    // accept header
+    accepts := []string { "application/json", "application/xml" }
+    for key := range accepts {
+        _sling = _sling.Set("Accept", accepts[key])
+        break // only use the first Accept
+    }
+
+// body params
+    _sling = _sling.BodyJSON(body)
+
+
+
+  // We use this map (below) so that any arbitrary error JSON can be handled.
+  // FIXME: This is in the absence of this Go generator honoring the non-2xx
+  // response (error) models, which needs to be implemented at some point.
+  var failurePayload map[string]interface{}
+
+  httpResponse, err := _sling.Receive(nil, &failurePayload)
+
+  if err == nil {
+    // err == nil only means that there wasn't a sub-application-layer error (e.g. no network error)
+    if failurePayload != nil {
+      // If the failurePayload is present, there likely was some kind of non-2xx status
+      // returned (and a JSON payload error present)
+      var str []byte
+      str, err = json.Marshal(failurePayload)
+      if err == nil { // For safety, check for an error marshalling... probably superfluous
+        // This will return the JSON error body as a string
+        err = errors.New(string(str))
+      }
+  } else {
+    // So, there was no network-type error, and nothing in the failure payload,
+    // but we should still check the status code
+    if httpResponse == nil {
+      // This should never happen...
+      err = errors.New("No HTTP Response received.")
+    } else if code := httpResponse.StatusCode; 200 > code || code > 299 {
+        err = errors.New("HTTP Error: " + string(httpResponse.StatusCode))
+      }
+    }
+  }
+
+  return err
+}
+/**
+ * Creates list of users with given input array
+ * 
+ * @param body List of user object
+ * @return void
+ */
+//func (a UserApi) CreateUsersWithListInput (body []User) (error) {
+func (a UserApi) CreateUsersWithListInput (body []User) (error) {
+
+    _sling := sling.New().Post(a.basePath)
+
+    // create path and map variables
+    path := "/v2/user/createWithList"
+
+    _sling = _sling.Path(path)
+
+    // accept header
+    accepts := []string { "application/json", "application/xml" }
+    for key := range accepts {
+        _sling = _sling.Set("Accept", accepts[key])
+        break // only use the first Accept
+    }
+
+// body params
+    _sling = _sling.BodyJSON(body)
+
+
+
+  // We use this map (below) so that any arbitrary error JSON can be handled.
+  // FIXME: This is in the absence of this Go generator honoring the non-2xx
+  // response (error) models, which needs to be implemented at some point.
+  var failurePayload map[string]interface{}
+
+  httpResponse, err := _sling.Receive(nil, &failurePayload)
+
+  if err == nil {
+    // err == nil only means that there wasn't a sub-application-layer error (e.g. no network error)
+    if failurePayload != nil {
+      // If the failurePayload is present, there likely was some kind of non-2xx status
+      // returned (and a JSON payload error present)
+      var str []byte
+      str, err = json.Marshal(failurePayload)
+      if err == nil { // For safety, check for an error marshalling... probably superfluous
+        // This will return the JSON error body as a string
+        err = errors.New(string(str))
+      }
+  } else {
+    // So, there was no network-type error, and nothing in the failure payload,
+    // but we should still check the status code
+    if httpResponse == nil {
+      // This should never happen...
+      err = errors.New("No HTTP Response received.")
+    } else if code := httpResponse.StatusCode; 200 > code || code > 299 {
+        err = errors.New("HTTP Error: " + string(httpResponse.StatusCode))
+      }
+    }
+  }
+
+  return err
+}
+/**
+ * Delete user
+ * This can only be done by the logged in user.
+ * @param username The name that needs to be deleted
+ * @return void
+ */
+//func (a UserApi) DeleteUser (username string) (error) {
+func (a UserApi) DeleteUser (username string) (error) {
+
+    _sling := sling.New().Delete(a.basePath)
+
+    // create path and map variables
+    path := "/v2/user/{username}"
+    path = strings.Replace(path, "{" + "username" + "}", fmt.Sprintf("%v", username), -1)
+
+    _sling = _sling.Path(path)
+
+    // accept header
+    accepts := []string { "application/json", "application/xml" }
+    for key := range accepts {
+        _sling = _sling.Set("Accept", accepts[key])
+        break // only use the first Accept
+    }
+
+
+
+
+  // We use this map (below) so that any arbitrary error JSON can be handled.
+  // FIXME: This is in the absence of this Go generator honoring the non-2xx
+  // response (error) models, which needs to be implemented at some point.
+  var failurePayload map[string]interface{}
+
+  httpResponse, err := _sling.Receive(nil, &failurePayload)
+
+  if err == nil {
+    // err == nil only means that there wasn't a sub-application-layer error (e.g. no network error)
+    if failurePayload != nil {
+      // If the failurePayload is present, there likely was some kind of non-2xx status
+      // returned (and a JSON payload error present)
+      var str []byte
+      str, err = json.Marshal(failurePayload)
+      if err == nil { // For safety, check for an error marshalling... probably superfluous
+        // This will return the JSON error body as a string
+        err = errors.New(string(str))
+      }
+  } else {
+    // So, there was no network-type error, and nothing in the failure payload,
+    // but we should still check the status code
+    if httpResponse == nil {
+      // This should never happen...
+      err = errors.New("No HTTP Response received.")
+    } else if code := httpResponse.StatusCode; 200 > code || code > 299 {
+        err = errors.New("HTTP Error: " + string(httpResponse.StatusCode))
+      }
+    }
+  }
+
+  return err
+}
+/**
+ * Get user by user name
+ * 
+ * @param username The name that needs to be fetched. Use user1 for testing.
+ * @return User
+ */
+//func (a UserApi) GetUserByName (username string) (User, error) {
+func (a UserApi) GetUserByName (username string) (User, error) {
+
+    _sling := sling.New().Get(a.basePath)
+
+    // create path and map variables
+    path := "/v2/user/{username}"
+    path = strings.Replace(path, "{" + "username" + "}", fmt.Sprintf("%v", username), -1)
+
+    _sling = _sling.Path(path)
+
+    // accept header
+    accepts := []string { "application/json", "application/xml" }
+    for key := range accepts {
+        _sling = _sling.Set("Accept", accepts[key])
+        break // only use the first Accept
+    }
+
+
+  var successPayload = new(User)
+
+  // We use this map (below) so that any arbitrary error JSON can be handled.
+  // FIXME: This is in the absence of this Go generator honoring the non-2xx
+  // response (error) models, which needs to be implemented at some point.
+  var failurePayload map[string]interface{}
+
+  httpResponse, err := _sling.Receive(successPayload, &failurePayload)
+
+  if err == nil {
+    // err == nil only means that there wasn't a sub-application-layer error (e.g. no network error)
+    if failurePayload != nil {
+      // If the failurePayload is present, there likely was some kind of non-2xx status
+      // returned (and a JSON payload error present)
+      var str []byte
+      str, err = json.Marshal(failurePayload)
+      if err == nil { // For safety, check for an error marshalling... probably superfluous
+        // This will return the JSON error body as a string
+        err = errors.New(string(str))
+      }
+  } else {
+    // So, there was no network-type error, and nothing in the failure payload,
+    // but we should still check the status code
+    if httpResponse == nil {
+      // This should never happen...
+      err = errors.New("No HTTP Response received.")
+    } else if code := httpResponse.StatusCode; 200 > code || code > 299 {
+        err = errors.New("HTTP Error: " + string(httpResponse.StatusCode))
+      }
+    }
+  }
+
+  return *successPayload, err
+}
+/**
+ * Logs user into the system
+ * 
+ * @param username The user name for login
+ * @param password The password for login in clear text
+ * @return string
+ */
+//func (a UserApi) LoginUser (username string, password string) (string, error) {
+func (a UserApi) LoginUser (username string, password string) (string, error) {
+
+    _sling := sling.New().Get(a.basePath)
+
+    // create path and map variables
+    path := "/v2/user/login"
+
+    _sling = _sling.Path(path)
+
+    type QueryParams struct {
+        username    string `url:"username,omitempty"`
+        password    string `url:"password,omitempty"`
+        
+}
+    _sling = _sling.QueryStruct(&QueryParams{ username: username,password: password })
+    // accept header
+    accepts := []string { "application/json", "application/xml" }
+    for key := range accepts {
+        _sling = _sling.Set("Accept", accepts[key])
+        break // only use the first Accept
+    }
+
+
+  var successPayload = new(string)
+
+  // We use this map (below) so that any arbitrary error JSON can be handled.
+  // FIXME: This is in the absence of this Go generator honoring the non-2xx
+  // response (error) models, which needs to be implemented at some point.
+  var failurePayload map[string]interface{}
+
+  httpResponse, err := _sling.Receive(successPayload, &failurePayload)
+
+  if err == nil {
+    // err == nil only means that there wasn't a sub-application-layer error (e.g. no network error)
+    if failurePayload != nil {
+      // If the failurePayload is present, there likely was some kind of non-2xx status
+      // returned (and a JSON payload error present)
+      var str []byte
+      str, err = json.Marshal(failurePayload)
+      if err == nil { // For safety, check for an error marshalling... probably superfluous
+        // This will return the JSON error body as a string
+        err = errors.New(string(str))
+      }
+  } else {
+    // So, there was no network-type error, and nothing in the failure payload,
+    // but we should still check the status code
+    if httpResponse == nil {
+      // This should never happen...
+      err = errors.New("No HTTP Response received.")
+    } else if code := httpResponse.StatusCode; 200 > code || code > 299 {
+        err = errors.New("HTTP Error: " + string(httpResponse.StatusCode))
+      }
+    }
+  }
+
+  return *successPayload, err
+}
+/**
+ * Logs out current logged in user session
+ * 
+ * @return void
+ */
+//func (a UserApi) LogoutUser () (error) {
+func (a UserApi) LogoutUser () (error) {
+
+    _sling := sling.New().Get(a.basePath)
+
+    // create path and map variables
+    path := "/v2/user/logout"
+
+    _sling = _sling.Path(path)
+
+    // accept header
+    accepts := []string { "application/json", "application/xml" }
+    for key := range accepts {
+        _sling = _sling.Set("Accept", accepts[key])
+        break // only use the first Accept
+    }
+
+
+
+
+  // We use this map (below) so that any arbitrary error JSON can be handled.
+  // FIXME: This is in the absence of this Go generator honoring the non-2xx
+  // response (error) models, which needs to be implemented at some point.
+  var failurePayload map[string]interface{}
+
+  httpResponse, err := _sling.Receive(nil, &failurePayload)
+
+  if err == nil {
+    // err == nil only means that there wasn't a sub-application-layer error (e.g. no network error)
+    if failurePayload != nil {
+      // If the failurePayload is present, there likely was some kind of non-2xx status
+      // returned (and a JSON payload error present)
+      var str []byte
+      str, err = json.Marshal(failurePayload)
+      if err == nil { // For safety, check for an error marshalling... probably superfluous
+        // This will return the JSON error body as a string
+        err = errors.New(string(str))
+      }
+  } else {
+    // So, there was no network-type error, and nothing in the failure payload,
+    // but we should still check the status code
+    if httpResponse == nil {
+      // This should never happen...
+      err = errors.New("No HTTP Response received.")
+    } else if code := httpResponse.StatusCode; 200 > code || code > 299 {
+        err = errors.New("HTTP Error: " + string(httpResponse.StatusCode))
+      }
+    }
+  }
+
+  return err
+}
+/**
+ * Updated user
+ * This can only be done by the logged in user.
+ * @param username name that need to be deleted
+ * @param body Updated user object
+ * @return void
+ */
+//func (a UserApi) UpdateUser (username string, body User) (error) {
+func (a UserApi) UpdateUser (username string, body User) (error) {
+
+    _sling := sling.New().Put(a.basePath)
+
+    // create path and map variables
+    path := "/v2/user/{username}"
+    path = strings.Replace(path, "{" + "username" + "}", fmt.Sprintf("%v", username), -1)
+
+    _sling = _sling.Path(path)
+
+    // accept header
+    accepts := []string { "application/json", "application/xml" }
+    for key := range accepts {
+        _sling = _sling.Set("Accept", accepts[key])
+        break // only use the first Accept
+    }
+
+// body params
+    _sling = _sling.BodyJSON(body)
+
+
+
+  // We use this map (below) so that any arbitrary error JSON can be handled.
+  // FIXME: This is in the absence of this Go generator honoring the non-2xx
+  // response (error) models, which needs to be implemented at some point.
+  var failurePayload map[string]interface{}
+
+  httpResponse, err := _sling.Receive(nil, &failurePayload)
+
+  if err == nil {
+    // err == nil only means that there wasn't a sub-application-layer error (e.g. no network error)
+    if failurePayload != nil {
+      // If the failurePayload is present, there likely was some kind of non-2xx status
+      // returned (and a JSON payload error present)
+      var str []byte
+      str, err = json.Marshal(failurePayload)
+      if err == nil { // For safety, check for an error marshalling... probably superfluous
+        // This will return the JSON error body as a string
+        err = errors.New(string(str))
+      }
+  } else {
+    // So, there was no network-type error, and nothing in the failure payload,
+    // but we should still check the status code
+    if httpResponse == nil {
+      // This should never happen...
+      err = errors.New("No HTTP Response received.")
+    } else if code := httpResponse.StatusCode; 200 > code || code > 299 {
+        err = errors.New("HTTP Error: " + string(httpResponse.StatusCode))
+      }
+    }
+  }
+
+  return err
+}
diff --git a/samples/client/petstore/go/test.go b/samples/client/petstore/go/test.go
new file mode 100644
index 00000000000..d65e70575fc
--- /dev/null
+++ b/samples/client/petstore/go/test.go
@@ -0,0 +1,28 @@
+package main
+
+import (
+	sw "./swagger"
+	"encoding/json"
+	"fmt"
+)
+
+func main() {
+
+	s := sw.NewPetApi()
+
+	// test POST(body)
+	newPet := (sw.Pet{Id: 12830, Name: "gopher",
+		PhotoUrls: []string{"http://1.com", "http://2.com"}, Status: "pending"})
+
+	jsonNewPet, _ := json.Marshal(newPet)
+	fmt.Println("newPet:", string(jsonNewPet))
+	s.AddPet(newPet)
+
+	// test POST(form)
+	s.UpdatePetWithForm("12830", "golang", "available")
+
+	// test GET
+	resp, err := s.GetPetById(12830)
+	fmt.Println("GetPetById: ", resp, err)
+
+}
diff --git a/samples/client/petstore/java/default/.gitignore b/samples/client/petstore/java/default/.gitignore
new file mode 100644
index 00000000000..32858aad3c3
--- /dev/null
+++ b/samples/client/petstore/java/default/.gitignore
@@ -0,0 +1,12 @@
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
diff --git a/samples/client/petstore/java/default/README.md b/samples/client/petstore/java/default/README.md
index 8afc37518fc..cc9672eab41 100644
--- a/samples/client/petstore/java/default/README.md
+++ b/samples/client/petstore/java/default/README.md
@@ -20,7 +20,7 @@ mvn deploy
 
 Refer to the [official documentation](https://maven.apache.org/plugins/maven-deploy-plugin/usage.html) for more information.
 
-After the client libarary is installed/deployed, you can use it in your Maven project by adding the following to your *pom.xml*:
+After the client library is installed/deployed, you can use it in your Maven project by adding the following to your *pom.xml*:
 
 ```xml
 <dependency>
diff --git a/samples/client/petstore/java/default/build.gradle b/samples/client/petstore/java/default/build.gradle
index b7ccd1df774..9e7ac008009 100644
--- a/samples/client/petstore/java/default/build.gradle
+++ b/samples/client/petstore/java/default/build.gradle
@@ -1,3 +1,6 @@
+apply plugin: 'idea'
+apply plugin: 'eclipse'
+
 group = 'io.swagger'
 version = '1.0.0'
 
@@ -105,7 +108,9 @@ dependencies {
     compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
+    compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
     compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.1.5"
     compile "joda-time:joda-time:$jodatime_version"
+    compile "com.brsanthu:migbase64:2.2"
     testCompile "junit:junit:$junit_version"
 }
diff --git a/samples/client/petstore/java/default/git_push.sh b/samples/client/petstore/java/default/git_push.sh
new file mode 100644
index 00000000000..1a36388db02
--- /dev/null
+++ b/samples/client/petstore/java/default/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="YOUR_GIT_USR_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="YOUR_GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiClient.java
index 057dcd7d72d..50c0e8db641 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiClient.java
@@ -41,13 +41,15 @@ import io.swagger.client.auth.HttpBasicAuth;
 import io.swagger.client.auth.ApiKeyAuth;
 import io.swagger.client.auth.OAuth;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:16.440+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-17T15:55:38.841+08:00")
 public class ApiClient {
-  private Map<String, Client> hostMap = new HashMap<String, Client>();
   private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
-  private boolean debugging = false;
   private String basePath = "http://petstore.swagger.io/v2";
-  private ObjectMapper mapper;
+  private boolean debugging = false;
+  private int connectionTimeout = 0;
+
+  private Client httpClient;
+  private ObjectMapper objectMapper;
 
   private Map<String, Authentication> authentications;
 
@@ -57,32 +59,87 @@ public class ApiClient {
   private DateFormat dateFormat;
 
   public ApiClient() {
-    mapper = new ObjectMapper();
-    mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-    mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-    mapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
-    mapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
-    mapper.registerModule(new JodaModule());
-  
-    // Use RFC3339 format for date and datetime.
-    // See http://xml2rfc.ietf.org/public/rfc/html/rfc3339.html#anchor14
-    this.dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
+    objectMapper = new ObjectMapper();
+    objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+    objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+    objectMapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
+    objectMapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
+    objectMapper.registerModule(new JodaModule());
+    objectMapper.setDateFormat(ApiClient.buildDefaultDateFormat());
 
-    // Use UTC as the default time zone.
-    this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
-
-    this.mapper.setDateFormat((DateFormat) dateFormat.clone());
+    dateFormat = ApiClient.buildDefaultDateFormat();
 
     // Set default User-Agent.
-    setUserAgent("Java-Swagger");
+    setUserAgent("Swagger-Codegen/1.0.0/java");
 
     // Setup authentications (key: authentication name, value: authentication).
     authentications = new HashMap<String, Authentication>();
-    authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
     authentications.put("petstore_auth", new OAuth());
+    authentications.put("test_api_client_id", new ApiKeyAuth("header", "x-test_api_client_id"));
+    authentications.put("test_api_client_secret", new ApiKeyAuth("header", "x-test_api_client_secret"));
+    authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
+    authentications.put("test_http_basic", new HttpBasicAuth());
+    authentications.put("test_api_key_query", new ApiKeyAuth("query", "test_api_key_query"));
+    authentications.put("test_api_key_header", new ApiKeyAuth("header", "test_api_key_header"));
     // Prevent the authentications from being modified.
     authentications = Collections.unmodifiableMap(authentications);
+
+    rebuildHttpClient();
+  }
+
+  public static DateFormat buildDefaultDateFormat() {
+    // Use RFC3339 format for date and datetime.
+    // See http://xml2rfc.ietf.org/public/rfc/html/rfc3339.html#anchor14
+    DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
+    // Use UTC as the default time zone.
+    dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+    return dateFormat;
+  }
+
+  /**
+   * Build the Client used to make HTTP requests with the latest settings,
+   * i.e. objectMapper and debugging.
+   * TODO: better to use the Builder Pattern?
+   */
+  public ApiClient rebuildHttpClient() {
+    // Add the JSON serialization support to Jersey
+    JacksonJsonProvider jsonProvider = new JacksonJsonProvider(objectMapper);
+    DefaultClientConfig conf = new DefaultClientConfig();
+    conf.getSingletons().add(jsonProvider);
+    Client client = Client.create(conf);
+    if (debugging) {
+      client.addFilter(new LoggingFilter());
+    }
+    this.httpClient = client;
+    return this;
+  }
+
+  /**
+   * Returns the current object mapper used for JSON serialization/deserialization.
+   * <p>
+   * Note: If you make changes to the object mapper, remember to set it back via
+   * <code>setObjectMapper</code> in order to trigger HTTP client rebuilding.
+   * </p>
+   */
+  public ObjectMapper getObjectMapper() {
+    return objectMapper;
+  }
+
+  public ApiClient setObjectMapper(ObjectMapper objectMapper) {
+    this.objectMapper = objectMapper;
+    // Need to rebuild the Client as it depends on object mapper.
+    rebuildHttpClient();
+    return this;
+  }
+
+  public Client getHttpClient() {
+    return httpClient;
+  }
+
+  public ApiClient setHttpClient(Client httpClient) {
+    this.httpClient = httpClient;
+    return this;
   }
 
   public String getBasePath() {
@@ -223,9 +280,29 @@ public class ApiClient {
    */
   public ApiClient setDebugging(boolean debugging) {
     this.debugging = debugging;
+    // Need to rebuild the Client as it depends on the value of debugging.
+    rebuildHttpClient();
     return this;
   }
 
+  /**
+   * Connect timeout (in milliseconds).
+   */
+  public int getConnectTimeout() {
+    return connectionTimeout;
+  }
+
+  /**
+   * Set the connect timeout (in milliseconds).
+   * A value of 0 means no timeout, otherwise values must be between 1 and
+   * {@link Integer#MAX_VALUE}.
+   */
+   public ApiClient setConnectTimeout(int connectionTimeout) {
+     this.connectionTimeout = connectionTimeout;
+     httpClient.setConnectTimeout(connectionTimeout);
+     return this;
+   }
+
   /**
    * Get the date format used to parse/format date parameters.
    */
@@ -238,8 +315,10 @@ public class ApiClient {
    */
   public ApiClient setDateFormat(DateFormat dateFormat) {
     this.dateFormat = dateFormat;
-    // also set the date format for model (de)serialization with Date properties
-    this.mapper.setDateFormat((DateFormat) dateFormat.clone());
+    // Also set the date format for model (de)serialization with Date properties.
+    this.objectMapper.setDateFormat((DateFormat) dateFormat.clone());
+    // Need to rebuild the Client as objectMapper changes.
+    rebuildHttpClient();
     return this;
   }
 
@@ -427,36 +506,51 @@ public class ApiClient {
     }
   }
 
-  private ClientResponse getAPIResponse(String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, Object> formParams, String accept, String contentType, String[] authNames) throws ApiException {
+  /**
+   * Build full URL by concatenating base path, the given sub path and query parameters.
+   *
+   * @param path The sub path
+   * @param queryParams The query parameters
+   * @return The full URL
+   */
+  private String buildUrl(String path, List<Pair> queryParams) {
+    final StringBuilder url = new StringBuilder();
+    url.append(basePath).append(path);
 
-    if (body != null && !formParams.isEmpty()){
+    if (queryParams != null && !queryParams.isEmpty()) {
+      // support (constant) query string in `path`, e.g. "/posts?draft=1"
+      String prefix = path.contains("?") ? "&" : "?";
+      for (Pair param : queryParams) {
+        if (param.getValue() != null) {
+          if (prefix != null) {
+            url.append(prefix);
+            prefix = null;
+          } else {
+            url.append("&");
+          }
+          String value = parameterToString(param.getValue());
+          url.append(escapeString(param.getName())).append("=").append(escapeString(value));
+        }
+      }
+    }
+
+    return url.toString();
+  }
+
+  private ClientResponse getAPIResponse(String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, Object> formParams, String accept, String contentType, String[] authNames) throws ApiException {
+    if (body != null && !formParams.isEmpty()) {
       throw new ApiException(500, "Cannot have body and form params");
     }
 
     updateParamsForAuth(authNames, queryParams, headerParams);
 
-    Client client = getClient();
-
-    StringBuilder b = new StringBuilder();
-    b.append("?");
-    if (queryParams != null){
-      for (Pair queryParam : queryParams){
-        if (!queryParam.getName().isEmpty()) {
-          b.append(escapeString(queryParam.getName()));
-          b.append("=");
-          b.append(escapeString(queryParam.getValue()));
-          b.append("&");
-        }
-      }
-    }
-
-    String querystring = b.substring(0, b.length() - 1);
-
+    final String url = buildUrl(path, queryParams);
     Builder builder;
-    if (accept == null)
-      builder = client.resource(basePath + path + querystring).getRequestBuilder();
-    else
-      builder = client.resource(basePath + path + querystring).accept(accept);
+    if (accept == null) {
+      builder = httpClient.resource(url).getRequestBuilder();
+    } else {
+      builder = httpClient.resource(url).accept(accept);
+    }
 
     for (String key : headerParams.keySet()) {
       builder = builder.header(key, headerParams.get(key));
@@ -477,7 +571,10 @@ public class ApiClient {
       response = builder.type(contentType).put(ClientResponse.class, serialize(body, contentType, formParams));
     } else if ("DELETE".equals(method)) {
       response = builder.type(contentType).delete(ClientResponse.class, serialize(body, contentType, formParams));
-    } else {
+    } else if ("PATCH".equals(method)) {
+      response = builder.type(contentType).header("X-HTTP-Method-Override", "PATCH").post(ClientResponse.class, serialize(body, contentType, formParams));
+    }
+    else {
       throw new ApiException(500, "unknown method type " + method);
     }
     return response;
@@ -568,21 +665,4 @@ public class ApiClient {
 
     return encodedFormParams;
   }
-
-  /**
-   * Get an existing client or create a new client to handle HTTP request.
-   */
-  private Client getClient() {
-    if(!hostMap.containsKey(basePath)) {
-      // Add the JSON serialization support to Jersey
-      JacksonJsonProvider jsonProvider = new JacksonJsonProvider(mapper);
-      DefaultClientConfig conf = new DefaultClientConfig();
-      conf.getSingletons().add(jsonProvider);
-      Client client = Client.create(conf);
-      if (debugging)
-        client.addFilter(new LoggingFilter());
-      hostMap.put(basePath, client);
-    }
-    return hostMap.get(basePath);
-  }
 }
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiException.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiException.java
index ce41657cbad..27395e86ba9 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiException.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiException.java
@@ -3,7 +3,7 @@ package io.swagger.client;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:16.440+08:00")
+
 public class ApiException extends Exception {
   private int code = 0;
   private Map<String, List<String>> responseHeaders = null;
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/Configuration.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/Configuration.java
index 5214af1cf49..19b0ebeae4e 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/Configuration.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/Configuration.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:16.440+08:00")
+
 public class Configuration {
   private static ApiClient defaultApiClient = new ApiClient();
 
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/Pair.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/Pair.java
index ff8b7a6f9cd..d8d32210b10 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/Pair.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/Pair.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:16.440+08:00")
+
 public class Pair {
     private String name = "";
     private String value = "";
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/StringUtil.java
index f38d4702907..1383dd0decb 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/StringUtil.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/StringUtil.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:16.440+08:00")
+
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java
index 1ae3b1dc44d..00bd52b9a6f 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java
@@ -8,11 +8,15 @@ import io.swagger.client.Configuration;
 import io.swagger.client.Pair;
 
 import io.swagger.client.model.Pet;
+import io.swagger.client.model.InlineResponse200;
 import java.io.File;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:16.440+08:00")
 public class PetApi {
   private ApiClient apiClient;
 
@@ -33,62 +37,22 @@ public class PetApi {
   }
 
   
-  /**
-   * Update an existing pet
-   * 
-   * @param body Pet object that needs to be added to the store
-   * @return void
-   */
-  public void updatePet(Pet body) throws ApiException {
-    Object postBody = body;
-    
-    // create path and map variables
-    String path = "/pet".replaceAll("\\{format\\}","json");
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
-
-    
-
-    
-
-    
-
-    final String[] accepts = {
-      "application/json", "application/xml"
-    };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-
-    final String[] contentTypes = {
-      "application/json", "application/xml"
-    };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-
-    String[] authNames = new String[] { "petstore_auth" };
-
-    
-    apiClient.invokeAPI(path, "PUT", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
-    
-  }
-  
   /**
    * Add a new pet to the store
    * 
-   * @param body Pet object that needs to be added to the store
-   * @return void
+   * @param body Pet object that needs to be added to the store (optional)
+   * @throws ApiException if fails to make API call
    */
   public void addPet(Pet body) throws ApiException {
-    Object postBody = body;
+    Object localVarPostBody = body;
     
     // create path and map variables
-    String path = "/pet".replaceAll("\\{format\\}","json");
+    String localVarPath = "/pet".replaceAll("\\{format\\}","json");
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
     
 
@@ -96,306 +60,485 @@ public class PetApi {
 
     
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       "application/json", "application/xml"
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
-    String[] authNames = new String[] { "petstore_auth" };
+    String[] localVarAuthNames = new String[] { "petstore_auth" };
 
     
-    apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
     
   }
   
   /**
-   * Finds Pets by status
-   * Multiple status values can be provided with comma seperated strings
-   * @param status Status values that need to be considered for filter
-   * @return List<Pet>
-   */
-  public List<Pet> findPetsByStatus(List<String> status) throws ApiException {
-    Object postBody = null;
-    
-    // create path and map variables
-    String path = "/pet/findByStatus".replaceAll("\\{format\\}","json");
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
-
-    
-    queryParams.addAll(apiClient.parameterToPairs("multi", "status", status));
-    
-
-    
-
-    
-
-    final String[] accepts = {
-      "application/json", "application/xml"
-    };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-
-    final String[] contentTypes = {
-      
-    };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-
-    String[] authNames = new String[] { "petstore_auth" };
-
-    
-    GenericType<List<Pet>> returnType = new GenericType<List<Pet>>() {};
-    return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
-    
-  }
-  
-  /**
-   * Finds Pets by tags
-   * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-   * @param tags Tags to filter by
-   * @return List<Pet>
-   */
-  public List<Pet> findPetsByTags(List<String> tags) throws ApiException {
-    Object postBody = null;
-    
-    // create path and map variables
-    String path = "/pet/findByTags".replaceAll("\\{format\\}","json");
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
-
-    
-    queryParams.addAll(apiClient.parameterToPairs("multi", "tags", tags));
-    
-
-    
-
-    
-
-    final String[] accepts = {
-      "application/json", "application/xml"
-    };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-
-    final String[] contentTypes = {
-      
-    };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-
-    String[] authNames = new String[] { "petstore_auth" };
-
-    
-    GenericType<List<Pet>> returnType = new GenericType<List<Pet>>() {};
-    return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
-    
-  }
-  
-  /**
-   * Find pet by ID
-   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-   * @param petId ID of pet that needs to be fetched
-   * @return Pet
-   */
-  public Pet getPetById(Long petId) throws ApiException {
-    Object postBody = null;
-    
-     // verify the required parameter 'petId' is set
-     if (petId == null) {
-        throw new ApiException(400, "Missing the required parameter 'petId' when calling getPetById");
-     }
-     
-    // create path and map variables
-    String path = "/pet/{petId}".replaceAll("\\{format\\}","json")
-      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
-
-    
-
-    
-
-    
-
-    final String[] accepts = {
-      "application/json", "application/xml"
-    };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-
-    final String[] contentTypes = {
-      
-    };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-
-    String[] authNames = new String[] { "api_key" };
-
-    
-    GenericType<Pet> returnType = new GenericType<Pet>() {};
-    return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
-    
-  }
-  
-  /**
-   * Updates a pet in the store with form data
+   * Fake endpoint to test byte array in body parameter for adding a new pet to the store
    * 
-   * @param petId ID of pet that needs to be updated
-   * @param name Updated name of the pet
-   * @param status Updated status of the pet
-   * @return void
+   * @param body Pet object in the form of byte array (optional)
+   * @throws ApiException if fails to make API call
    */
-  public void updatePetWithForm(String petId, String name, String status) throws ApiException {
-    Object postBody = null;
+  public void addPetUsingByteArray(byte[] body) throws ApiException {
+    Object localVarPostBody = body;
     
-     // verify the required parameter 'petId' is set
-     if (petId == null) {
-        throw new ApiException(400, "Missing the required parameter 'petId' when calling updatePetWithForm");
-     }
-     
     // create path and map variables
-    String path = "/pet/{petId}".replaceAll("\\{format\\}","json")
-      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
+    String localVarPath = "/pet?testing_byte_array=true".replaceAll("\\{format\\}","json");
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
     
 
     
 
-    if (name != null)
-      formParams.put("name", name);
-    if (status != null)
-      formParams.put("status", status);
     
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
 
-    final String[] contentTypes = {
-      "application/x-www-form-urlencoded"
+    final String[] localVarContentTypes = {
+      "application/json", "application/xml"
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
-    String[] authNames = new String[] { "petstore_auth" };
+    String[] localVarAuthNames = new String[] { "petstore_auth" };
 
     
-    apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
     
   }
   
   /**
    * Deletes a pet
    * 
-   * @param petId Pet id to delete
-   * @param apiKey 
-   * @return void
+   * @param petId Pet id to delete (required)
+   * @param apiKey  (optional)
+   * @throws ApiException if fails to make API call
    */
   public void deletePet(Long petId, String apiKey) throws ApiException {
-    Object postBody = null;
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'petId' is set
+    if (petId == null) {
+      throw new ApiException(400, "Missing the required parameter 'petId' when calling deletePet");
+    }
     
-     // verify the required parameter 'petId' is set
-     if (petId == null) {
-        throw new ApiException(400, "Missing the required parameter 'petId' when calling deletePet");
-     }
-     
     // create path and map variables
-    String path = "/pet/{petId}".replaceAll("\\{format\\}","json")
+    String localVarPath = "/pet/{petId}".replaceAll("\\{format\\}","json")
       .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
     
 
     if (apiKey != null)
-      headerParams.put("api_key", apiClient.parameterToString(apiKey));
+      localVarHeaderParams.put("api_key", apiClient.parameterToString(apiKey));
     
 
     
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
-    String[] authNames = new String[] { "petstore_auth" };
+    String[] localVarAuthNames = new String[] { "petstore_auth" };
 
     
-    apiClient.invokeAPI(path, "DELETE", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    apiClient.invokeAPI(localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
+    
+  }
+  
+  /**
+   * Finds Pets by status
+   * Multiple status values can be provided with comma separated strings
+   * @param status Status values that need to be considered for query (optional, default to available)
+   * @return List<Pet>
+   * @throws ApiException if fails to make API call
+   */
+  public List<Pet> findPetsByStatus(List<String> status) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // create path and map variables
+    String localVarPath = "/pet/findByStatus".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+    localVarQueryParams.addAll(apiClient.parameterToPairs("multi", "status", status));
+    
+
+    
+
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] { "petstore_auth" };
+
+    
+    GenericType<List<Pet>> localVarReturnType = new GenericType<List<Pet>>() {};
+    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
+    
+  }
+  
+  /**
+   * Finds Pets by tags
+   * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+   * @param tags Tags to filter by (optional)
+   * @return List<Pet>
+   * @throws ApiException if fails to make API call
+   */
+  public List<Pet> findPetsByTags(List<String> tags) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // create path and map variables
+    String localVarPath = "/pet/findByTags".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+    localVarQueryParams.addAll(apiClient.parameterToPairs("multi", "tags", tags));
+    
+
+    
+
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] { "petstore_auth" };
+
+    
+    GenericType<List<Pet>> localVarReturnType = new GenericType<List<Pet>>() {};
+    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
+    
+  }
+  
+  /**
+   * Find pet by ID
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched (required)
+   * @return Pet
+   * @throws ApiException if fails to make API call
+   */
+  public Pet getPetById(Long petId) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'petId' is set
+    if (petId == null) {
+      throw new ApiException(400, "Missing the required parameter 'petId' when calling getPetById");
+    }
+    
+    // create path and map variables
+    String localVarPath = "/pet/{petId}".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+
+    
+
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] { "api_key", "petstore_auth" };
+
+    
+    GenericType<Pet> localVarReturnType = new GenericType<Pet>() {};
+    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
+    
+  }
+  
+  /**
+   * Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched (required)
+   * @return InlineResponse200
+   * @throws ApiException if fails to make API call
+   */
+  public InlineResponse200 getPetByIdInObject(Long petId) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'petId' is set
+    if (petId == null) {
+      throw new ApiException(400, "Missing the required parameter 'petId' when calling getPetByIdInObject");
+    }
+    
+    // create path and map variables
+    String localVarPath = "/pet/{petId}?response=inline_arbitrary_object".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+
+    
+
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] { "api_key", "petstore_auth" };
+
+    
+    GenericType<InlineResponse200> localVarReturnType = new GenericType<InlineResponse200>() {};
+    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
+    
+  }
+  
+  /**
+   * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched (required)
+   * @return byte[]
+   * @throws ApiException if fails to make API call
+   */
+  public byte[] petPetIdtestingByteArraytrueGet(Long petId) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'petId' is set
+    if (petId == null) {
+      throw new ApiException(400, "Missing the required parameter 'petId' when calling petPetIdtestingByteArraytrueGet");
+    }
+    
+    // create path and map variables
+    String localVarPath = "/pet/{petId}?testing_byte_array=true".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+
+    
+
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] { "api_key", "petstore_auth" };
+
+    
+    GenericType<byte[]> localVarReturnType = new GenericType<byte[]>() {};
+    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
+    
+  }
+  
+  /**
+   * Update an existing pet
+   * 
+   * @param body Pet object that needs to be added to the store (optional)
+   * @throws ApiException if fails to make API call
+   */
+  public void updatePet(Pet body) throws ApiException {
+    Object localVarPostBody = body;
+    
+    // create path and map variables
+    String localVarPath = "/pet".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+
+    
+
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      "application/json", "application/xml"
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] { "petstore_auth" };
+
+    
+    apiClient.invokeAPI(localVarPath, "PUT", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
+    
+  }
+  
+  /**
+   * Updates a pet in the store with form data
+   * 
+   * @param petId ID of pet that needs to be updated (required)
+   * @param name Updated name of the pet (optional)
+   * @param status Updated status of the pet (optional)
+   * @throws ApiException if fails to make API call
+   */
+  public void updatePetWithForm(String petId, String name, String status) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'petId' is set
+    if (petId == null) {
+      throw new ApiException(400, "Missing the required parameter 'petId' when calling updatePetWithForm");
+    }
+    
+    // create path and map variables
+    String localVarPath = "/pet/{petId}".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+
+    
+
+    if (name != null)
+      localVarFormParams.put("name", name);
+    if (status != null)
+      localVarFormParams.put("status", status);
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      "application/x-www-form-urlencoded"
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] { "petstore_auth" };
+
+    
+    apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
     
   }
   
   /**
    * uploads an image
    * 
-   * @param petId ID of pet to update
-   * @param additionalMetadata Additional data to pass to server
-   * @param file file to upload
-   * @return void
+   * @param petId ID of pet to update (required)
+   * @param additionalMetadata Additional data to pass to server (optional)
+   * @param file file to upload (optional)
+   * @throws ApiException if fails to make API call
    */
   public void uploadFile(Long petId, String additionalMetadata, File file) throws ApiException {
-    Object postBody = null;
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'petId' is set
+    if (petId == null) {
+      throw new ApiException(400, "Missing the required parameter 'petId' when calling uploadFile");
+    }
     
-     // verify the required parameter 'petId' is set
-     if (petId == null) {
-        throw new ApiException(400, "Missing the required parameter 'petId' when calling uploadFile");
-     }
-     
     // create path and map variables
-    String path = "/pet/{petId}/uploadImage".replaceAll("\\{format\\}","json")
+    String localVarPath = "/pet/{petId}/uploadImage".replaceAll("\\{format\\}","json")
       .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
     
 
     
 
     if (additionalMetadata != null)
-      formParams.put("additionalMetadata", additionalMetadata);
+      localVarFormParams.put("additionalMetadata", additionalMetadata);
     if (file != null)
-      formParams.put("file", file);
+      localVarFormParams.put("file", file);
     
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       "multipart/form-data"
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
-    String[] authNames = new String[] { "petstore_auth" };
+    String[] localVarAuthNames = new String[] { "petstore_auth" };
 
     
-    apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
     
   }
   
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/StoreApi.java
index 0db899119c1..7e8bccd8da3 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/StoreApi.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/StoreApi.java
@@ -7,12 +7,14 @@ import io.swagger.client.ApiClient;
 import io.swagger.client.Configuration;
 import io.swagger.client.Pair;
 
-import java.util.Map;
 import io.swagger.client.model.Order;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:16.440+08:00")
 public class StoreApi {
   private ApiClient apiClient;
 
@@ -34,20 +36,27 @@ public class StoreApi {
 
   
   /**
-   * Returns pet inventories by status
-   * Returns a map of status codes to quantities
-   * @return Map<String, Integer>
+   * Delete purchase order by ID
+   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+   * @param orderId ID of the order that needs to be deleted (required)
+   * @throws ApiException if fails to make API call
    */
-  public Map<String, Integer> getInventory() throws ApiException {
-    Object postBody = null;
+  public void deleteOrder(String orderId) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'orderId' is set
+    if (orderId == null) {
+      throw new ApiException(400, "Missing the required parameter 'orderId' when calling deleteOrder");
+    }
     
     // create path and map variables
-    String path = "/store/inventory".replaceAll("\\{format\\}","json");
+    String localVarPath = "/store/order/{orderId}".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString()));
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
     
 
@@ -55,87 +64,172 @@ public class StoreApi {
 
     
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
-    String[] authNames = new String[] { "api_key" };
+    String[] localVarAuthNames = new String[] {  };
 
     
-    GenericType<Map<String, Integer>> returnType = new GenericType<Map<String, Integer>>() {};
-    return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
+    apiClient.invokeAPI(localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
     
   }
   
   /**
-   * Place an order for a pet
-   * 
-   * @param body order placed for purchasing the pet
-   * @return Order
+   * Finds orders by status
+   * A single status value can be provided as a string
+   * @param status Status value that needs to be considered for query (optional, default to placed)
+   * @return List<Order>
+   * @throws ApiException if fails to make API call
    */
-  public Order placeOrder(Order body) throws ApiException {
-    Object postBody = body;
+  public List<Order> findOrdersByStatus(String status) throws ApiException {
+    Object localVarPostBody = null;
     
     // create path and map variables
-    String path = "/store/order".replaceAll("\\{format\\}","json");
+    String localVarPath = "/store/findByStatus".replaceAll("\\{format\\}","json");
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
     
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "status", status));
+    
 
     
 
     
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
-    String[] authNames = new String[] {  };
+    String[] localVarAuthNames = new String[] { "test_api_client_id", "test_api_client_secret" };
 
     
-    GenericType<Order> returnType = new GenericType<Order>() {};
-    return apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
+    GenericType<List<Order>> localVarReturnType = new GenericType<List<Order>>() {};
+    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
+    
+  }
+  
+  /**
+   * Returns pet inventories by status
+   * Returns a map of status codes to quantities
+   * @return Map<String, Integer>
+   * @throws ApiException if fails to make API call
+   */
+  public Map<String, Integer> getInventory() throws ApiException {
+    Object localVarPostBody = null;
+    
+    // create path and map variables
+    String localVarPath = "/store/inventory".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+
+    
+
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] { "api_key" };
+
+    
+    GenericType<Map<String, Integer>> localVarReturnType = new GenericType<Map<String, Integer>>() {};
+    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
+    
+  }
+  
+  /**
+   * Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+   * Returns an arbitrary object which is actually a map of status codes to quantities
+   * @return Object
+   * @throws ApiException if fails to make API call
+   */
+  public Object getInventoryInObject() throws ApiException {
+    Object localVarPostBody = null;
+    
+    // create path and map variables
+    String localVarPath = "/store/inventory?response=arbitrary_object".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+
+    
+
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] { "api_key" };
+
+    
+    GenericType<Object> localVarReturnType = new GenericType<Object>() {};
+    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
     
   }
   
   /**
    * Find purchase order by ID
    * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-   * @param orderId ID of pet that needs to be fetched
+   * @param orderId ID of pet that needs to be fetched (required)
    * @return Order
+   * @throws ApiException if fails to make API call
    */
   public Order getOrderById(String orderId) throws ApiException {
-    Object postBody = null;
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'orderId' is set
+    if (orderId == null) {
+      throw new ApiException(400, "Missing the required parameter 'orderId' when calling getOrderById");
+    }
     
-     // verify the required parameter 'orderId' is set
-     if (orderId == null) {
-        throw new ApiException(400, "Missing the required parameter 'orderId' when calling getOrderById");
-     }
-     
     // create path and map variables
-    String path = "/store/order/{orderId}".replaceAll("\\{format\\}","json")
+    String localVarPath = "/store/order/{orderId}".replaceAll("\\{format\\}","json")
       .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString()));
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
     
 
@@ -143,46 +237,41 @@ public class StoreApi {
 
     
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
-    String[] authNames = new String[] {  };
+    String[] localVarAuthNames = new String[] { "test_api_key_header", "test_api_key_query" };
 
     
-    GenericType<Order> returnType = new GenericType<Order>() {};
-    return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
+    GenericType<Order> localVarReturnType = new GenericType<Order>() {};
+    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
     
   }
   
   /**
-   * Delete purchase order by ID
-   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-   * @param orderId ID of the order that needs to be deleted
-   * @return void
+   * Place an order for a pet
+   * 
+   * @param body order placed for purchasing the pet (optional)
+   * @return Order
+   * @throws ApiException if fails to make API call
    */
-  public void deleteOrder(String orderId) throws ApiException {
-    Object postBody = null;
+  public Order placeOrder(Order body) throws ApiException {
+    Object localVarPostBody = body;
     
-     // verify the required parameter 'orderId' is set
-     if (orderId == null) {
-        throw new ApiException(400, "Missing the required parameter 'orderId' when calling deleteOrder");
-     }
-     
     // create path and map variables
-    String path = "/store/order/{orderId}".replaceAll("\\{format\\}","json")
-      .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString()));
+    String localVarPath = "/store/order".replaceAll("\\{format\\}","json");
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
     
 
@@ -190,20 +279,21 @@ public class StoreApi {
 
     
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
-    String[] authNames = new String[] {  };
+    String[] localVarAuthNames = new String[] { "test_api_client_id", "test_api_client_secret" };
 
     
-    apiClient.invokeAPI(path, "DELETE", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    GenericType<Order> localVarReturnType = new GenericType<Order>() {};
+    return apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
     
   }
   
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/UserApi.java
index 7d9c48a0c45..848ec58ce17 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/UserApi.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/UserApi.java
@@ -8,11 +8,13 @@ import io.swagger.client.Configuration;
 import io.swagger.client.Pair;
 
 import io.swagger.client.model.User;
-import java.util.*;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:16.440+08:00")
 public class UserApi {
   private ApiClient apiClient;
 
@@ -36,19 +38,19 @@ public class UserApi {
   /**
    * Create user
    * This can only be done by the logged in user.
-   * @param body Created user object
-   * @return void
+   * @param body Created user object (optional)
+   * @throws ApiException if fails to make API call
    */
   public void createUser(User body) throws ApiException {
-    Object postBody = body;
+    Object localVarPostBody = body;
     
     // create path and map variables
-    String path = "/user".replaceAll("\\{format\\}","json");
+    String localVarPath = "/user".replaceAll("\\{format\\}","json");
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
     
 
@@ -56,39 +58,39 @@ public class UserApi {
 
     
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
-    String[] authNames = new String[] {  };
+    String[] localVarAuthNames = new String[] {  };
 
     
-    apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
     
   }
   
   /**
    * Creates list of users with given input array
    * 
-   * @param body List of user object
-   * @return void
+   * @param body List of user object (optional)
+   * @throws ApiException if fails to make API call
    */
   public void createUsersWithArrayInput(List<User> body) throws ApiException {
-    Object postBody = body;
+    Object localVarPostBody = body;
     
     // create path and map variables
-    String path = "/user/createWithArray".replaceAll("\\{format\\}","json");
+    String localVarPath = "/user/createWithArray".replaceAll("\\{format\\}","json");
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
     
 
@@ -96,39 +98,39 @@ public class UserApi {
 
     
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
-    String[] authNames = new String[] {  };
+    String[] localVarAuthNames = new String[] {  };
 
     
-    apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
     
   }
   
   /**
    * Creates list of users with given input array
    * 
-   * @param body List of user object
-   * @return void
+   * @param body List of user object (optional)
+   * @throws ApiException if fails to make API call
    */
   public void createUsersWithListInput(List<User> body) throws ApiException {
-    Object postBody = body;
+    Object localVarPostBody = body;
     
     // create path and map variables
-    String path = "/user/createWithList".replaceAll("\\{format\\}","json");
+    String localVarPath = "/user/createWithList".replaceAll("\\{format\\}","json");
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
     
 
@@ -136,224 +138,45 @@ public class UserApi {
 
     
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
-    String[] authNames = new String[] {  };
+    String[] localVarAuthNames = new String[] {  };
 
     
-    apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
-    
-  }
-  
-  /**
-   * Logs user into the system
-   * 
-   * @param username The user name for login
-   * @param password The password for login in clear text
-   * @return String
-   */
-  public String loginUser(String username, String password) throws ApiException {
-    Object postBody = null;
-    
-    // create path and map variables
-    String path = "/user/login".replaceAll("\\{format\\}","json");
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
-
-    
-    queryParams.addAll(apiClient.parameterToPairs("", "username", username));
-    
-    queryParams.addAll(apiClient.parameterToPairs("", "password", password));
-    
-
-    
-
-    
-
-    final String[] accepts = {
-      "application/json", "application/xml"
-    };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-
-    final String[] contentTypes = {
-      
-    };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-
-    String[] authNames = new String[] {  };
-
-    
-    GenericType<String> returnType = new GenericType<String>() {};
-    return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
-    
-  }
-  
-  /**
-   * Logs out current logged in user session
-   * 
-   * @return void
-   */
-  public void logoutUser() throws ApiException {
-    Object postBody = null;
-    
-    // create path and map variables
-    String path = "/user/logout".replaceAll("\\{format\\}","json");
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
-
-    
-
-    
-
-    
-
-    final String[] accepts = {
-      "application/json", "application/xml"
-    };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-
-    final String[] contentTypes = {
-      
-    };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-
-    String[] authNames = new String[] {  };
-
-    
-    apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
-    
-  }
-  
-  /**
-   * Get user by user name
-   * 
-   * @param username The name that needs to be fetched. Use user1 for testing.
-   * @return User
-   */
-  public User getUserByName(String username) throws ApiException {
-    Object postBody = null;
-    
-     // verify the required parameter 'username' is set
-     if (username == null) {
-        throw new ApiException(400, "Missing the required parameter 'username' when calling getUserByName");
-     }
-     
-    // create path and map variables
-    String path = "/user/{username}".replaceAll("\\{format\\}","json")
-      .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
-
-    
-
-    
-
-    
-
-    final String[] accepts = {
-      "application/json", "application/xml"
-    };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-
-    final String[] contentTypes = {
-      
-    };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-
-    String[] authNames = new String[] {  };
-
-    
-    GenericType<User> returnType = new GenericType<User>() {};
-    return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
-    
-  }
-  
-  /**
-   * Updated user
-   * This can only be done by the logged in user.
-   * @param username name that need to be deleted
-   * @param body Updated user object
-   * @return void
-   */
-  public void updateUser(String username, User body) throws ApiException {
-    Object postBody = body;
-    
-     // verify the required parameter 'username' is set
-     if (username == null) {
-        throw new ApiException(400, "Missing the required parameter 'username' when calling updateUser");
-     }
-     
-    // create path and map variables
-    String path = "/user/{username}".replaceAll("\\{format\\}","json")
-      .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
-
-    
-
-    
-
-    
-
-    final String[] accepts = {
-      "application/json", "application/xml"
-    };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-
-    final String[] contentTypes = {
-      
-    };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-
-    String[] authNames = new String[] {  };
-
-    
-    apiClient.invokeAPI(path, "PUT", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
     
   }
   
   /**
    * Delete user
    * This can only be done by the logged in user.
-   * @param username The name that needs to be deleted
-   * @return void
+   * @param username The name that needs to be deleted (required)
+   * @throws ApiException if fails to make API call
    */
   public void deleteUser(String username) throws ApiException {
-    Object postBody = null;
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'username' is set
+    if (username == null) {
+      throw new ApiException(400, "Missing the required parameter 'username' when calling deleteUser");
+    }
     
-     // verify the required parameter 'username' is set
-     if (username == null) {
-        throw new ApiException(400, "Missing the required parameter 'username' when calling deleteUser");
-     }
-     
     // create path and map variables
-    String path = "/user/{username}".replaceAll("\\{format\\}","json")
+    String localVarPath = "/user/{username}".replaceAll("\\{format\\}","json")
       .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
     
 
@@ -361,20 +184,201 @@ public class UserApi {
 
     
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
-    String[] authNames = new String[] {  };
+    String[] localVarAuthNames = new String[] { "test_http_basic" };
 
     
-    apiClient.invokeAPI(path, "DELETE", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    apiClient.invokeAPI(localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
+    
+  }
+  
+  /**
+   * Get user by user name
+   * 
+   * @param username The name that needs to be fetched. Use user1 for testing.  (required)
+   * @return User
+   * @throws ApiException if fails to make API call
+   */
+  public User getUserByName(String username) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'username' is set
+    if (username == null) {
+      throw new ApiException(400, "Missing the required parameter 'username' when calling getUserByName");
+    }
+    
+    // create path and map variables
+    String localVarPath = "/user/{username}".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+
+    
+
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] {  };
+
+    
+    GenericType<User> localVarReturnType = new GenericType<User>() {};
+    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
+    
+  }
+  
+  /**
+   * Logs user into the system
+   * 
+   * @param username The user name for login (optional)
+   * @param password The password for login in clear text (optional)
+   * @return String
+   * @throws ApiException if fails to make API call
+   */
+  public String loginUser(String username, String password) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // create path and map variables
+    String localVarPath = "/user/login".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "username", username));
+    
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "password", password));
+    
+
+    
+
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] {  };
+
+    
+    GenericType<String> localVarReturnType = new GenericType<String>() {};
+    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
+    
+  }
+  
+  /**
+   * Logs out current logged in user session
+   * 
+   * @throws ApiException if fails to make API call
+   */
+  public void logoutUser() throws ApiException {
+    Object localVarPostBody = null;
+    
+    // create path and map variables
+    String localVarPath = "/user/logout".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+
+    
+
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] {  };
+
+    
+    apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
+    
+  }
+  
+  /**
+   * Updated user
+   * This can only be done by the logged in user.
+   * @param username name that need to be deleted (required)
+   * @param body Updated user object (optional)
+   * @throws ApiException if fails to make API call
+   */
+  public void updateUser(String username, User body) throws ApiException {
+    Object localVarPostBody = body;
+    
+    // verify the required parameter 'username' is set
+    if (username == null) {
+      throw new ApiException(400, "Missing the required parameter 'username' when calling updateUser");
+    }
+    
+    // create path and map variables
+    String localVarPath = "/user/{username}".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+
+    
+
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] {  };
+
+    
+    apiClient.invokeAPI(localVarPath, "PUT", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
     
   }
   
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
index 1a94c997e64..6882dbc41c0 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
@@ -5,7 +5,7 @@ import io.swagger.client.Pair;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:16.440+08:00")
+
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
index c4861a69782..64f2c887377 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
@@ -9,7 +9,7 @@ import java.util.List;
 
 import java.io.UnsupportedEncodingException;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:16.440+08:00")
+
 public class HttpBasicAuth implements Authentication {
   private String username;
   private String password;
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/OAuth.java
index 1280a589076..76d2917f24e 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/OAuth.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/OAuth.java
@@ -5,7 +5,7 @@ import io.swagger.client.Pair;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:16.440+08:00")
+
 public class OAuth implements Authentication {
   private String accessToken;
 
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Category.java
index 1faa3f27589..3289c469672 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Category.java
@@ -2,7 +2,6 @@ package io.swagger.client.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -10,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:16.440+08:00")
+
 public class Category   {
   
   private Long id = null;
@@ -19,8 +18,12 @@ public class Category   {
   
   /**
    **/
+  public Category id(Long id) {
+    this.id = id;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
@@ -32,8 +35,12 @@ public class Category   {
   
   /**
    **/
+  public Category name(String name) {
+    this.name = name;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("name")
   public String getName() {
     return name;
@@ -45,7 +52,7 @@ public class Category   {
   
 
   @Override
-  public boolean equals(Object o) {
+  public boolean equals(java.lang.Object o) {
     if (this == o) {
       return true;
     }
@@ -53,8 +60,8 @@ public class Category   {
       return false;
     }
     Category category = (Category) o;
-    return Objects.equals(id, category.id) &&
-        Objects.equals(name, category.name);
+    return Objects.equals(this.id, category.id) &&
+        Objects.equals(this.name, category.name);
   }
 
   @Override
@@ -77,7 +84,7 @@ public class Category   {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(Object o) {
+  private String toIndentedString(java.lang.Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/InlineResponse200.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/InlineResponse200.java
new file mode 100644
index 00000000000..c7d3c155657
--- /dev/null
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/InlineResponse200.java
@@ -0,0 +1,199 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.client.model.Tag;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+public class InlineResponse200   {
+  
+  private List<Tag> tags = new ArrayList<Tag>();
+  private Long id = null;
+  private Object category = null;
+
+
+  public enum StatusEnum {
+    AVAILABLE("available"),
+    PENDING("pending"),
+    SOLD("sold");
+
+    private String value;
+
+    StatusEnum(String value) {
+      this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+      return value;
+    }
+  }
+
+  private StatusEnum status = null;
+  private String name = null;
+  private List<String> photoUrls = new ArrayList<String>();
+
+  
+  /**
+   **/
+  public InlineResponse200 tags(List<Tag> tags) {
+    this.tags = tags;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("tags")
+  public List<Tag> getTags() {
+    return tags;
+  }
+  public void setTags(List<Tag> tags) {
+    this.tags = tags;
+  }
+
+  
+  /**
+   **/
+  public InlineResponse200 id(Long id) {
+    this.id = id;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", required = true, value = "")
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  public InlineResponse200 category(Object category) {
+    this.category = category;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("category")
+  public Object getCategory() {
+    return category;
+  }
+  public void setCategory(Object category) {
+    this.category = category;
+  }
+
+  
+  /**
+   * pet status in the store
+   **/
+  public InlineResponse200 status(StatusEnum status) {
+    this.status = status;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "pet status in the store")
+  @JsonProperty("status")
+  public StatusEnum getStatus() {
+    return status;
+  }
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+  
+  /**
+   **/
+  public InlineResponse200 name(String name) {
+    this.name = name;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "doggie", value = "")
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  
+  /**
+   **/
+  public InlineResponse200 photoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("photoUrls")
+  public List<String> getPhotoUrls() {
+    return photoUrls;
+  }
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
+  
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    InlineResponse200 inlineResponse200 = (InlineResponse200) o;
+    return Objects.equals(this.tags, inlineResponse200.tags) &&
+        Objects.equals(this.id, inlineResponse200.id) &&
+        Objects.equals(this.category, inlineResponse200.category) &&
+        Objects.equals(this.status, inlineResponse200.status) &&
+        Objects.equals(this.name, inlineResponse200.name) &&
+        Objects.equals(this.photoUrls, inlineResponse200.photoUrls);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(tags, id, category, status, name, photoUrls);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class InlineResponse200 {\n");
+    
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    category: ").append(toIndentedString(category)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Model200Response.java
new file mode 100644
index 00000000000..fb24ee29a3f
--- /dev/null
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Model200Response.java
@@ -0,0 +1,74 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+
+
+
+
+public class Model200Response   {
+  
+  private Integer name = null;
+
+  
+  /**
+   **/
+  public Model200Response name(Integer name) {
+    this.name = name;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("name")
+  public Integer getName() {
+    return name;
+  }
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+  
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Model200Response _200Response = (Model200Response) o;
+    return Objects.equals(this.name, _200Response.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Model200Response {\n");
+    
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/ModelReturn.java
new file mode 100644
index 00000000000..fbb4135ce27
--- /dev/null
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -0,0 +1,74 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+
+
+
+
+public class ModelReturn   {
+  
+  private Integer _return = null;
+
+  
+  /**
+   **/
+  public ModelReturn _return(Integer _return) {
+    this._return = _return;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("return")
+  public Integer getReturn() {
+    return _return;
+  }
+  public void setReturn(Integer _return) {
+    this._return = _return;
+  }
+
+  
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ModelReturn _return = (ModelReturn) o;
+    return Objects.equals(this._return, _return._return);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(_return);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ModelReturn {\n");
+    
+    sb.append("    _return: ").append(toIndentedString(_return)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Name.java
new file mode 100644
index 00000000000..512289310c7
--- /dev/null
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Name.java
@@ -0,0 +1,94 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+
+
+
+
+public class Name   {
+  
+  private Integer name = null;
+  private Integer snakeCase = null;
+
+  
+  /**
+   **/
+  public Name name(Integer name) {
+    this.name = name;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("name")
+  public Integer getName() {
+    return name;
+  }
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+  
+  /**
+   **/
+  public Name snakeCase(Integer snakeCase) {
+    this.snakeCase = snakeCase;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("snake_case")
+  public Integer getSnakeCase() {
+    return snakeCase;
+  }
+  public void setSnakeCase(Integer snakeCase) {
+    this.snakeCase = snakeCase;
+  }
+
+  
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Name name = (Name) o;
+    return Objects.equals(this.name, name.name) &&
+        Objects.equals(this.snakeCase, name.snakeCase);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, snakeCase);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Name {\n");
+    
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Order.java
index ec66ccbd777..77df445af66 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Order.java
@@ -11,7 +11,7 @@ import java.util.Date;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:16.440+08:00")
+
 public class Order   {
   
   private Long id = null;
@@ -42,23 +42,21 @@ public class Order   {
   private Boolean complete = null;
 
   
-  /**
-   **/
-  
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
   }
-  public void setId(Long id) {
-    this.id = id;
-  }
 
   
   /**
    **/
+  public Order petId(Long petId) {
+    this.petId = petId;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("petId")
   public Long getPetId() {
     return petId;
@@ -70,8 +68,12 @@ public class Order   {
   
   /**
    **/
+  public Order quantity(Integer quantity) {
+    this.quantity = quantity;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
@@ -83,8 +85,12 @@ public class Order   {
   
   /**
    **/
+  public Order shipDate(Date shipDate) {
+    this.shipDate = shipDate;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("shipDate")
   public Date getShipDate() {
     return shipDate;
@@ -97,8 +103,12 @@ public class Order   {
   /**
    * Order Status
    **/
+  public Order status(StatusEnum status) {
+    this.status = status;
+    return this;
+  }
   
-  @ApiModelProperty(value = "Order Status")
+  @ApiModelProperty(example = "null", value = "Order Status")
   @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
@@ -110,8 +120,12 @@ public class Order   {
   
   /**
    **/
+  public Order complete(Boolean complete) {
+    this.complete = complete;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
@@ -123,7 +137,7 @@ public class Order   {
   
 
   @Override
-  public boolean equals(Object o) {
+  public boolean equals(java.lang.Object o) {
     if (this == o) {
       return true;
     }
@@ -131,12 +145,12 @@ public class Order   {
       return false;
     }
     Order order = (Order) o;
-    return Objects.equals(id, order.id) &&
-        Objects.equals(petId, order.petId) &&
-        Objects.equals(quantity, order.quantity) &&
-        Objects.equals(shipDate, order.shipDate) &&
-        Objects.equals(status, order.status) &&
-        Objects.equals(complete, order.complete);
+    return Objects.equals(this.id, order.id) &&
+        Objects.equals(this.petId, order.petId) &&
+        Objects.equals(this.quantity, order.quantity) &&
+        Objects.equals(this.shipDate, order.shipDate) &&
+        Objects.equals(this.status, order.status) &&
+        Objects.equals(this.complete, order.complete);
   }
 
   @Override
@@ -163,7 +177,7 @@ public class Order   {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(Object o) {
+  private String toIndentedString(java.lang.Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Pet.java
index 2d773d9f5bd..42c23a9db0e 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Pet.java
@@ -7,13 +7,14 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.client.model.Category;
 import io.swagger.client.model.Tag;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+
 
 
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:16.440+08:00")
 public class Pet   {
   
   private Long id = null;
@@ -46,8 +47,12 @@ public class Pet   {
   
   /**
    **/
+  public Pet id(Long id) {
+    this.id = id;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
@@ -59,8 +64,12 @@ public class Pet   {
   
   /**
    **/
+  public Pet category(Category category) {
+    this.category = category;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("category")
   public Category getCategory() {
     return category;
@@ -72,8 +81,12 @@ public class Pet   {
   
   /**
    **/
+  public Pet name(String name) {
+    this.name = name;
+    return this;
+  }
   
-  @ApiModelProperty(required = true, value = "")
+  @ApiModelProperty(example = "doggie", required = true, value = "")
   @JsonProperty("name")
   public String getName() {
     return name;
@@ -85,8 +98,12 @@ public class Pet   {
   
   /**
    **/
+  public Pet photoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+    return this;
+  }
   
-  @ApiModelProperty(required = true, value = "")
+  @ApiModelProperty(example = "null", required = true, value = "")
   @JsonProperty("photoUrls")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -98,8 +115,12 @@ public class Pet   {
   
   /**
    **/
+  public Pet tags(List<Tag> tags) {
+    this.tags = tags;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("tags")
   public List<Tag> getTags() {
     return tags;
@@ -112,8 +133,12 @@ public class Pet   {
   /**
    * pet status in the store
    **/
+  public Pet status(StatusEnum status) {
+    this.status = status;
+    return this;
+  }
   
-  @ApiModelProperty(value = "pet status in the store")
+  @ApiModelProperty(example = "null", value = "pet status in the store")
   @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
@@ -125,7 +150,7 @@ public class Pet   {
   
 
   @Override
-  public boolean equals(Object o) {
+  public boolean equals(java.lang.Object o) {
     if (this == o) {
       return true;
     }
@@ -133,12 +158,12 @@ public class Pet   {
       return false;
     }
     Pet pet = (Pet) o;
-    return Objects.equals(id, pet.id) &&
-        Objects.equals(category, pet.category) &&
-        Objects.equals(name, pet.name) &&
-        Objects.equals(photoUrls, pet.photoUrls) &&
-        Objects.equals(tags, pet.tags) &&
-        Objects.equals(status, pet.status);
+    return Objects.equals(this.id, pet.id) &&
+        Objects.equals(this.category, pet.category) &&
+        Objects.equals(this.name, pet.name) &&
+        Objects.equals(this.photoUrls, pet.photoUrls) &&
+        Objects.equals(this.tags, pet.tags) &&
+        Objects.equals(this.status, pet.status);
   }
 
   @Override
@@ -165,7 +190,7 @@ public class Pet   {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(Object o) {
+  private String toIndentedString(java.lang.Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/SpecialModelName.java
new file mode 100644
index 00000000000..7fa91b8827c
--- /dev/null
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -0,0 +1,74 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+
+
+
+
+public class SpecialModelName   {
+  
+  private Long specialPropertyName = null;
+
+  
+  /**
+   **/
+  public SpecialModelName specialPropertyName(Long specialPropertyName) {
+    this.specialPropertyName = specialPropertyName;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("$special[property.name]")
+  public Long getSpecialPropertyName() {
+    return specialPropertyName;
+  }
+  public void setSpecialPropertyName(Long specialPropertyName) {
+    this.specialPropertyName = specialPropertyName;
+  }
+
+  
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    SpecialModelName specialModelName = (SpecialModelName) o;
+    return Objects.equals(this.specialPropertyName, specialModelName.specialPropertyName);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(specialPropertyName);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class SpecialModelName {\n");
+    
+    sb.append("    specialPropertyName: ").append(toIndentedString(specialPropertyName)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Tag.java
index c1156c9f4c0..4e6055c1410 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Tag.java
@@ -2,7 +2,6 @@ package io.swagger.client.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -10,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:16.440+08:00")
+
 public class Tag   {
   
   private Long id = null;
@@ -19,8 +18,12 @@ public class Tag   {
   
   /**
    **/
+  public Tag id(Long id) {
+    this.id = id;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
@@ -32,8 +35,12 @@ public class Tag   {
   
   /**
    **/
+  public Tag name(String name) {
+    this.name = name;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("name")
   public String getName() {
     return name;
@@ -45,7 +52,7 @@ public class Tag   {
   
 
   @Override
-  public boolean equals(Object o) {
+  public boolean equals(java.lang.Object o) {
     if (this == o) {
       return true;
     }
@@ -53,8 +60,8 @@ public class Tag   {
       return false;
     }
     Tag tag = (Tag) o;
-    return Objects.equals(id, tag.id) &&
-        Objects.equals(name, tag.name);
+    return Objects.equals(this.id, tag.id) &&
+        Objects.equals(this.name, tag.name);
   }
 
   @Override
@@ -77,7 +84,7 @@ public class Tag   {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(Object o) {
+  private String toIndentedString(java.lang.Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/User.java
index 7c07662debe..272ec6d3843 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/User.java
@@ -2,7 +2,6 @@ package io.swagger.client.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -10,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:16.440+08:00")
+
 public class User   {
   
   private Long id = null;
@@ -25,8 +24,12 @@ public class User   {
   
   /**
    **/
+  public User id(Long id) {
+    this.id = id;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
@@ -38,8 +41,12 @@ public class User   {
   
   /**
    **/
+  public User username(String username) {
+    this.username = username;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("username")
   public String getUsername() {
     return username;
@@ -51,8 +58,12 @@ public class User   {
   
   /**
    **/
+  public User firstName(String firstName) {
+    this.firstName = firstName;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
@@ -64,8 +75,12 @@ public class User   {
   
   /**
    **/
+  public User lastName(String lastName) {
+    this.lastName = lastName;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
@@ -77,8 +92,12 @@ public class User   {
   
   /**
    **/
+  public User email(String email) {
+    this.email = email;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("email")
   public String getEmail() {
     return email;
@@ -90,8 +109,12 @@ public class User   {
   
   /**
    **/
+  public User password(String password) {
+    this.password = password;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("password")
   public String getPassword() {
     return password;
@@ -103,8 +126,12 @@ public class User   {
   
   /**
    **/
+  public User phone(String phone) {
+    this.phone = phone;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("phone")
   public String getPhone() {
     return phone;
@@ -117,8 +144,12 @@ public class User   {
   /**
    * User Status
    **/
+  public User userStatus(Integer userStatus) {
+    this.userStatus = userStatus;
+    return this;
+  }
   
-  @ApiModelProperty(value = "User Status")
+  @ApiModelProperty(example = "null", value = "User Status")
   @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
@@ -130,7 +161,7 @@ public class User   {
   
 
   @Override
-  public boolean equals(Object o) {
+  public boolean equals(java.lang.Object o) {
     if (this == o) {
       return true;
     }
@@ -138,14 +169,14 @@ public class User   {
       return false;
     }
     User user = (User) o;
-    return Objects.equals(id, user.id) &&
-        Objects.equals(username, user.username) &&
-        Objects.equals(firstName, user.firstName) &&
-        Objects.equals(lastName, user.lastName) &&
-        Objects.equals(email, user.email) &&
-        Objects.equals(password, user.password) &&
-        Objects.equals(phone, user.phone) &&
-        Objects.equals(userStatus, user.userStatus);
+    return Objects.equals(this.id, user.id) &&
+        Objects.equals(this.username, user.username) &&
+        Objects.equals(this.firstName, user.firstName) &&
+        Objects.equals(this.lastName, user.lastName) &&
+        Objects.equals(this.email, user.email) &&
+        Objects.equals(this.password, user.password) &&
+        Objects.equals(this.phone, user.phone) &&
+        Objects.equals(this.userStatus, user.userStatus);
   }
 
   @Override
@@ -174,7 +205,7 @@ public class User   {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(Object o) {
+  private String toIndentedString(java.lang.Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/samples/client/petstore/java/default/src/test/java/io/swagger/PetstoreProfiling.java b/samples/client/petstore/java/default/src/test/java/io/swagger/PetstoreProfiling.java
index ab2ba5d71bf..0c5ef6f1eda 100644
--- a/samples/client/petstore/java/default/src/test/java/io/swagger/PetstoreProfiling.java
+++ b/samples/client/petstore/java/default/src/test/java/io/swagger/PetstoreProfiling.java
@@ -85,7 +85,7 @@ public class PetstoreProfiling {
 
     private void writeResultsToFile(List<Map<String, String>> results) {
         try {
-            File file = new File(outputFile);
+            java.io.File file = new java.io.File(outputFile);
             PrintWriter writer = new PrintWriter(file);
             String command = "mvn compile test-compile exec:java -Dexec.classpathScope=test -Dexec.mainClass=\"io.swagger.PetstoreProfiling\"";
             writer.println("# To run the profiling:");
diff --git a/samples/client/petstore/java/default/src/test/java/io/swagger/TestUtils.java b/samples/client/petstore/java/default/src/test/java/io/swagger/TestUtils.java
new file mode 100644
index 00000000000..7ddf142426e
--- /dev/null
+++ b/samples/client/petstore/java/default/src/test/java/io/swagger/TestUtils.java
@@ -0,0 +1,17 @@
+package io.swagger;
+
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicLong;
+
+public class TestUtils {
+    private static final AtomicLong atomicId = createAtomicId();
+
+    public static long nextId() {
+      return atomicId.getAndIncrement();
+    }
+
+    private static AtomicLong createAtomicId() {
+        int baseId = new Random(System.currentTimeMillis()).nextInt(1000000) + 20000;
+        return new AtomicLong((long) baseId);
+    }
+}
diff --git a/samples/client/petstore/java/default/src/test/java/io/swagger/client/ApiClientTest.java b/samples/client/petstore/java/default/src/test/java/io/swagger/client/ApiClientTest.java
index 29eae3d017e..47f004c283b 100644
--- a/samples/client/petstore/java/default/src/test/java/io/swagger/client/ApiClientTest.java
+++ b/samples/client/petstore/java/default/src/test/java/io/swagger/client/ApiClientTest.java
@@ -112,26 +112,36 @@ public class ApiClientTest {
     }
 
     @Test
-    public void testSetUsername() {
-        try {
-            apiClient.setUsername("my-username");
-            fail("there should be no HTTP basic authentications");
-        } catch (RuntimeException e) {
+    public void testSetUsernameAndPassword() {
+        HttpBasicAuth auth = null;
+        for (Authentication _auth : apiClient.getAuthentications().values()) {
+            if (_auth instanceof HttpBasicAuth) {
+                auth = (HttpBasicAuth) _auth;
+                break;
+            }
         }
-    }
+        auth.setUsername(null);
+        auth.setPassword(null);
 
-    @Test
-    public void testSetPassword() {
-        try {
-            apiClient.setPassword("my-password");
-            fail("there should be no HTTP basic authentications");
-        } catch (RuntimeException e) {
-        }
+        apiClient.setUsername("my-username");
+        apiClient.setPassword("my-password");
+        assertEquals("my-username", auth.getUsername());
+        assertEquals("my-password", auth.getPassword());
+
+        // reset values
+        auth.setUsername(null);
+        auth.setPassword(null);
     }
 
     @Test
     public void testSetApiKeyAndPrefix() {
-        ApiKeyAuth auth = (ApiKeyAuth) apiClient.getAuthentications().get("api_key");
+        ApiKeyAuth auth = null;
+        for (Authentication _auth : apiClient.getAuthentications().values()) {
+            if (_auth instanceof ApiKeyAuth) {
+                auth = (ApiKeyAuth) _auth;
+                break;
+            }
+        }
         auth.setApiKey(null);
         auth.setApiKeyPrefix(null);
 
diff --git a/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/PetApiTest.java
index c0bee9328d5..ad971ea6669 100644
--- a/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/PetApiTest.java
+++ b/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/PetApiTest.java
@@ -1,9 +1,12 @@
 package io.swagger.petstore.test;
 
-import io.swagger.client.ApiClient;
-import io.swagger.client.ApiException;
-import io.swagger.client.Configuration;
+import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.datatype.joda.*;
 
+import io.swagger.TestUtils;
+
+import io.swagger.client.*;
 import io.swagger.client.api.*;
 import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
@@ -14,12 +17,14 @@ import java.io.FileWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 import org.junit.*;
 import static org.junit.Assert.*;
 
 public class PetApiTest {
-    PetApi api = null;
+    private PetApi api;
+    private ObjectMapper mapper;
 
     @Before
     public void setup() {
@@ -68,6 +73,53 @@ public class PetApiTest {
         assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
     }
 
+    @Test
+    public void testCreateAndGetPetWithByteArray() throws Exception {
+        Pet pet = createRandomPet();
+        byte[] bytes = serializeJson(pet).getBytes();
+        api.addPetUsingByteArray(bytes);
+
+        byte[] fetchedBytes = api.petPetIdtestingByteArraytrueGet(pet.getId());
+        Pet fetched = deserializeJson(new String(fetchedBytes), Pet.class);
+        assertNotNull(fetched);
+        assertEquals(pet.getId(), fetched.getId());
+        assertNotNull(fetched.getCategory());
+        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
+    }
+
+    @Test
+    public void testGetPetByIdInObject() throws Exception {
+        Pet pet = new Pet();
+        pet.setId(TestUtils.nextId());
+        pet.setName("pet " + pet.getId());
+
+        Category category = new Category();
+        category.setId(TestUtils.nextId());
+        category.setName("category " + category.getId());
+        pet.setCategory(category);
+
+        pet.setStatus(Pet.StatusEnum.PENDING);
+        List<String> photos = Arrays.asList(new String[]{"http://foo.bar.com/1"});
+        pet.setPhotoUrls(photos);
+
+        api.addPet(pet);
+
+        InlineResponse200 fetched = api.getPetByIdInObject(pet.getId());
+        assertEquals(pet.getId(), fetched.getId());
+        assertEquals(pet.getName(), fetched.getName());
+
+        Object categoryObj = fetched.getCategory();
+        assertNotNull(categoryObj);
+        assertTrue(categoryObj instanceof Map);
+
+        Map categoryMap = (Map) categoryObj;
+        Object categoryIdObj = categoryMap.get("id");
+        assertTrue(categoryIdObj instanceof Integer);
+        Integer categoryIdInt = (Integer) categoryIdObj;
+        assertEquals(category.getId(), Long.valueOf(categoryIdInt));
+        assertEquals(category.getName(), categoryMap.get("name"));
+    }
+
     @Test
     public void testUpdatePet() throws Exception {
         Pet pet = createRandomPet();
@@ -203,7 +255,7 @@ public class PetApiTest {
 
     private Pet createRandomPet() {
         Pet pet = new Pet();
-        pet.setId(System.currentTimeMillis());
+        pet.setId(TestUtils.nextId());
         pet.setName("gorilla");
 
         Category category = new Category();
@@ -216,4 +268,37 @@ public class PetApiTest {
 
         return pet;
     }
+
+    private String serializeJson(Object o) {
+        if (mapper == null) {
+            mapper = createObjectMapper();
+        }
+        try {
+            return mapper.writeValueAsString(o);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private <T> T deserializeJson(String json, Class<T> klass) {
+        if (mapper == null) {
+            mapper = createObjectMapper();
+        }
+        try {
+            return mapper.readValue(json, klass);
+        } catch (Exception e) {
+          throw new RuntimeException(e);
+        }
+    }
+
+    private ObjectMapper createObjectMapper() {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        mapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
+        mapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
+        mapper.registerModule(new JodaModule());
+        return mapper;
+    }
 }
diff --git a/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/StoreApiTest.java
index 6094f2242e1..403f9b64ec9 100644
--- a/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/StoreApiTest.java
+++ b/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/StoreApiTest.java
@@ -1,5 +1,7 @@
 package io.swagger.petstore.test;
 
+import io.swagger.TestUtils;
+
 import io.swagger.client.ApiException;
 
 import io.swagger.client.*;
@@ -7,6 +9,7 @@ import io.swagger.client.api.*;
 import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
 
+import java.lang.reflect.Field;
 import java.util.Map;
 import java.text.SimpleDateFormat;
 
@@ -32,6 +35,19 @@ public class StoreApiTest {
         assertTrue(inventory.keySet().size() > 0);
     }
 
+    @Test
+    public void testGetInventoryInObject() throws Exception {
+        Object inventoryObj = api.getInventoryInObject();
+        assertTrue(inventoryObj instanceof Map);
+
+        Map inventoryMap = (Map) inventoryObj;
+        assertTrue(inventoryMap.keySet().size() > 0);
+
+        Map.Entry firstEntry = (Map.Entry) inventoryMap.entrySet().iterator().next();
+        assertTrue(firstEntry.getKey() instanceof String);
+        assertTrue(firstEntry.getValue() instanceof Integer);
+    }
+
     @Test
     public void testPlaceOrder() throws Exception {
         Order order = createOrder();
@@ -63,13 +79,20 @@ public class StoreApiTest {
 
     private Order createOrder() {
         Order order = new Order();
-        order.setId(new Long(System.currentTimeMillis()));
         order.setPetId(new Long(200));
         order.setQuantity(new Integer(13));
         order.setShipDate(new java.util.Date());
         order.setStatus(Order.StatusEnum.PLACED);
         order.setComplete(true);
 
+        try {
+          Field idField = Order.class.getDeclaredField("id");
+          idField.setAccessible(true);
+          idField.set(order, TestUtils.nextId());
+        } catch (Exception e) {
+          throw new RuntimeException(e);
+        }
+
         return order;
     }
 }
diff --git a/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/UserApiTest.java b/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/UserApiTest.java
index a3f257f568b..195e5c1e861 100644
--- a/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/UserApiTest.java
+++ b/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/UserApiTest.java
@@ -1,5 +1,7 @@
 package io.swagger.petstore.test;
 
+import io.swagger.TestUtils;
+
 import io.swagger.client.api.*;
 import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
@@ -33,9 +35,9 @@ public class UserApiTest {
     @Test
     public void testCreateUsersWithArray() throws Exception {
         User user1 = createUser();
-        user1.setUsername("abc123");
+        user1.setUsername("user" + user1.getId());
         User user2 = createUser();
-        user2.setUsername("123abc");
+        user2.setUsername("user" + user2.getId());
 
         api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2}));
 
@@ -46,9 +48,9 @@ public class UserApiTest {
     @Test
     public void testCreateUsersWithList() throws Exception {
         User user1 = createUser();
-        user1.setUsername("abc123");
+        user1.setUsername("user" + user1.getId());
         User user2 = createUser();
-        user2.setUsername("123abc");
+        user2.setUsername("user" + user2.getId());
 
         api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2}));
 
@@ -72,7 +74,7 @@ public class UserApiTest {
 
     private User createUser() {
         User user = new User();
-        user.setId(System.currentTimeMillis());
+        user.setId(TestUtils.nextId());
         user.setUsername("fred" + user.getId());
         user.setFirstName("Fred");
         user.setLastName("Meyer");
diff --git a/samples/client/petstore/java/feign/.gitignore b/samples/client/petstore/java/feign/.gitignore
new file mode 100644
index 00000000000..32858aad3c3
--- /dev/null
+++ b/samples/client/petstore/java/feign/.gitignore
@@ -0,0 +1,12 @@
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
diff --git a/samples/client/petstore/java/feign/build.gradle b/samples/client/petstore/java/feign/build.gradle
index 0bfcfbec71f..ee920fbc7ca 100644
--- a/samples/client/petstore/java/feign/build.gradle
+++ b/samples/client/petstore/java/feign/build.gradle
@@ -1,3 +1,6 @@
+apply plugin: 'idea'
+apply plugin: 'eclipse'
+
 group = 'io.swagger'
 version = '1.0.0'
 
diff --git a/samples/client/petstore/java/feign/git_push.sh b/samples/client/petstore/java/feign/git_push.sh
new file mode 100644
index 00000000000..1a36388db02
--- /dev/null
+++ b/samples/client/petstore/java/feign/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="YOUR_GIT_USR_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="YOUR_GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/client/petstore/java/feign/hello.txt b/samples/client/petstore/java/feign/hello.txt
new file mode 100644
index 00000000000..6769dd60bdf
--- /dev/null
+++ b/samples/client/petstore/java/feign/hello.txt
@@ -0,0 +1 @@
+Hello world!
\ No newline at end of file
diff --git a/samples/client/petstore/java/feign/pom.xml b/samples/client/petstore/java/feign/pom.xml
index 5f7e9551862..d7ad6ee49b9 100644
--- a/samples/client/petstore/java/feign/pom.xml
+++ b/samples/client/petstore/java/feign/pom.xml
@@ -164,6 +164,12 @@
       <version>2.2</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.oltu.oauth2</groupId>
+      <artifactId>org.apache.oltu.oauth2.client</artifactId>
+      <version>${oltu-version}</version>
+    </dependency>
+
     <!-- test dependencies -->
     <dependency>
       <groupId>junit</groupId>
@@ -179,5 +185,6 @@
     <jodatime-version>2.5</jodatime-version>
     <junit-version>4.12</junit-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
+    <oltu-version>1.0.0</oltu-version>
   </properties>
 </project>
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/ApiClient.java
index a2959f6ef9f..303927d064e 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/ApiClient.java
@@ -1,24 +1,110 @@
 package io.swagger.client;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder;
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder;
+
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+
 import feign.Feign;
+import feign.RequestInterceptor;
 import feign.jackson.JacksonDecoder;
 import feign.jackson.JacksonEncoder;
 import feign.slf4j.Slf4jLogger;
+import io.swagger.client.auth.*;
+import io.swagger.client.auth.OAuth.AccessTokenListener;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:18.888+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-02-17T17:16:23.375+08:00")
 public class ApiClient {
   public interface Api {}
 
   private ObjectMapper objectMapper;
   private String basePath = "http://petstore.swagger.io/v2";
+  private Map<String, RequestInterceptor> apiAuthorizations;
+  private Feign.Builder feignBuilder;
 
   public ApiClient() {
     objectMapper = createObjectMapper();
+    apiAuthorizations = new LinkedHashMap<String, RequestInterceptor>();
+    feignBuilder = Feign.builder()
+                .encoder(new FormAwareEncoder(new JacksonEncoder(objectMapper)))
+                .decoder(new JacksonDecoder(objectMapper))
+                .logger(new Slf4jLogger());
   }
 
+  public ApiClient(String[] authNames) {
+    this();
+    for(String authName : authNames) { 
+      RequestInterceptor auth;
+      if (authName == "petstore_auth") { 
+        auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets");
+      } else if (authName == "test_api_client_id") { 
+        auth = new ApiKeyAuth("header", "x-test_api_client_id");
+      } else if (authName == "test_api_client_secret") { 
+        auth = new ApiKeyAuth("header", "x-test_api_client_secret");
+      } else if (authName == "api_key") { 
+        auth = new ApiKeyAuth("header", "api_key");
+      } else if (authName == "test_api_key_query") { 
+        auth = new ApiKeyAuth("query", "test_api_key_query");
+      } else if (authName == "test_api_key_header") { 
+        auth = new ApiKeyAuth("header", "test_api_key_header");
+      } else {
+        throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");
+      }
+      addAuthorization(authName, auth);
+    }
+  }
+
+  /**
+   * Basic constructor for single auth name
+   * @param authName
+   */
+  public ApiClient(String authName) {
+    this(new String[]{authName});
+  }
+
+  /**
+   * Helper constructor for single api key
+   * @param authName
+   * @param apiKey
+   */
+  public ApiClient(String authName, String apiKey) {
+    this(authName);
+    this.setApiKey(apiKey);
+  }
+
+  /**
+   * Helper constructor for single basic auth or password oauth2
+   * @param authName
+   * @param username
+   * @param password
+   */
+  public ApiClient(String authName, String username, String password) {
+    this(authName);
+    this.setCredentials(username,  password);
+  }
+
+  /**
+   * Helper constructor for single password oauth2
+   * @param authName
+   * @param clientId
+   * @param secret
+   * @param username
+   * @param password
+   */
+   public ApiClient(String authName, String clientId, String secret, String username, String password) {
+     this(authName);
+     this.getTokenEndPoint()
+            .setClientId(clientId)
+            .setClientSecret(secret)
+            .setUsername(username)
+            .setPassword(password);
+   }
+
   public String getBasePath() {
     return basePath;
   }
@@ -28,6 +114,23 @@ public class ApiClient {
     return this;
   }
 
+  public Map<String, RequestInterceptor> getApiAuthorizations() {
+    return apiAuthorizations;
+  }
+
+  public void setApiAuthorizations(Map<String, RequestInterceptor> apiAuthorizations) {
+    this.apiAuthorizations = apiAuthorizations;
+  }
+
+  public Feign.Builder getFeignBuilder() {
+    return feignBuilder;
+  }
+
+  public ApiClient setFeignBuilder(Feign.Builder feignBuilder) {
+    this.feignBuilder = feignBuilder;
+    return this;
+  }
+
   private ObjectMapper createObjectMapper() {
     ObjectMapper objectMapper = new ObjectMapper();
     objectMapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
@@ -45,13 +148,7 @@ public class ApiClient {
    *    XYZResponse response = api.someMethod(...);
    */
   public <T extends Api> T buildClient(Class<T> clientClass) {
-        return Feign.builder()
-                .encoder(new FormAwareEncoder(new JacksonEncoder(objectMapper)))
-                .decoder(new JacksonDecoder(objectMapper))
-// enable for basic auth:
-//                .requestInterceptor(new feign.auth.BasicAuthRequestInterceptor(username, password))
-                .logger(new Slf4jLogger())
-                .target(clientClass, basePath);
+    return feignBuilder.target(clientClass, basePath);
   }
 
   /**
@@ -83,4 +180,137 @@ public class ApiClient {
     if (StringUtil.containsIgnoreCase(contentTypes, "application/json")) return "application/json";
     return contentTypes[0];
   }
+
+  /**
+   * Helper method to configure the first api key found
+   * @param apiKey
+   */
+  public void setApiKey(String apiKey) {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof ApiKeyAuth) {
+        ApiKeyAuth keyAuth = (ApiKeyAuth) apiAuthorization;
+        keyAuth.setApiKey(apiKey);
+        return ;
+      }
+    }
+    throw new RuntimeException("No API key authentication configured!");
+  }
+
+  /**
+   * Helper method to configure the username/password for basic auth or password OAuth
+   * @param username
+   * @param password
+   */
+  public void setCredentials(String username, String password) {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof HttpBasicAuth) {
+        HttpBasicAuth basicAuth = (HttpBasicAuth) apiAuthorization;
+        basicAuth.setCredentials(username, password);
+        return;
+      }
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        oauth.getTokenRequestBuilder().setUsername(username).setPassword(password);
+        return;
+      }
+    }
+    throw new RuntimeException("No Basic authentication or OAuth configured!");
+  }
+
+  /**
+   * Helper method to configure the token endpoint of the first oauth found in the apiAuthorizations (there should be only one)
+   * @return
+   */
+  public TokenRequestBuilder getTokenEndPoint() {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        return oauth.getTokenRequestBuilder();
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Helper method to configure authorization endpoint of the first oauth found in the apiAuthorizations (there should be only one)
+   * @return
+   */
+  public AuthenticationRequestBuilder getAuthorizationEndPoint() {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        return oauth.getAuthenticationRequestBuilder();
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Helper method to pre-set the oauth access token of the first oauth found in the apiAuthorizations (there should be only one)
+   * @param accessToken
+   * @param expiresIn : validity period in seconds
+   */
+  public void setAccessToken(String accessToken, Long expiresIn) {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        oauth.setAccessToken(accessToken, expiresIn);
+        return;
+      }
+    }
+  }
+
+  /**
+   * Helper method to configure the oauth accessCode/implicit flow parameters
+   * @param clientId
+   * @param clientSecret
+   * @param redirectURI
+   */
+  public void configureAuthorizationFlow(String clientId, String clientSecret, String redirectURI) {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        oauth.getTokenRequestBuilder()
+                .setClientId(clientId)
+                .setClientSecret(clientSecret)
+                .setRedirectURI(redirectURI);
+        oauth.getAuthenticationRequestBuilder()
+                .setClientId(clientId)
+                .setRedirectURI(redirectURI);
+        return;
+      }
+    }
+  }
+
+  /**
+   * Configures a listener which is notified when a new access token is received.
+   * @param accessTokenListener
+   */
+  public void registerAccessTokenListener(AccessTokenListener accessTokenListener) {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        oauth.registerAccessTokenListener(accessTokenListener);
+        return;
+      }
+    }
+  }
+
+  public RequestInterceptor getAuthorization(String authName) {
+    return apiAuthorizations.get(authName);
+  }
+
+  /**
+   * Adds an authorization to be used by the client
+   * @param authName
+   * @param authorization
+   */
+  public void addAuthorization(String authName, RequestInterceptor authorization) {
+    if (apiAuthorizations.containsKey(authName)) {
+      throw new RuntimeException("auth name \"" + authName + "\" already in api authorizations");
+    }
+    apiAuthorizations.put(authName, authorization);
+    feignBuilder.requestInterceptor(authorization);
+  }
+
 }
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/FormAwareEncoder.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/FormAwareEncoder.java
index eab17f660ef..f8c7170f44e 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/FormAwareEncoder.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/FormAwareEncoder.java
@@ -14,7 +14,7 @@ import feign.codec.EncodeException;
 import feign.codec.Encoder;
 import feign.RequestTemplate;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:18.888+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:50.356+08:00")
 public class FormAwareEncoder implements Encoder {
   public static final String UTF_8 = "utf-8";
   private static final String LINE_FEED = "\r\n";
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/StringUtil.java
index 9a27c73e12f..88aff61bf68 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/StringUtil.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/StringUtil.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:18.888+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:50.356+08:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java
index f53ac745037..51f6c2358c7 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java
@@ -3,32 +3,26 @@ package io.swagger.client.api;
 import io.swagger.client.ApiClient;
 
 import io.swagger.client.model.Pet;
+import io.swagger.client.model.InlineResponse200;
 import java.io.File;
 
-import java.util.*;
+
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:18.888+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-19T15:53:31.820+08:00")
 public interface PetApi extends ApiClient.Api {
 
 
-  /**
-   * Update an existing pet
-   * 
-   * @param body Pet object that needs to be added to the store
-   * @return void
-   */
-  @RequestLine("PUT /pet")
-  @Headers({
-    "Content-type: application/json",
-    "Accepts: application/json",
-  })
-  void updatePet(Pet body);
-  
   /**
    * Add a new pet to the store
    * 
-   * @param body Pet object that needs to be added to the store
+   * @param body Pet object that needs to be added to the store (optional)
    * @return void
    */
   @RequestLine("POST /pet")
@@ -38,10 +32,38 @@ public interface PetApi extends ApiClient.Api {
   })
   void addPet(Pet body);
   
+  /**
+   * Fake endpoint to test byte array in body parameter for adding a new pet to the store
+   * 
+   * @param body Pet object in the form of byte array (optional)
+   * @return void
+   */
+  @RequestLine("POST /pet?testing_byte_array=true")
+  @Headers({
+    "Content-type: application/json",
+    "Accepts: application/json",
+  })
+  void addPetUsingByteArray(byte[] body);
+  
+  /**
+   * Deletes a pet
+   * 
+   * @param petId Pet id to delete (required)
+   * @param apiKey  (optional)
+   * @return void
+   */
+  @RequestLine("DELETE /pet/{petId}")
+  @Headers({
+    "Content-type: application/json",
+    "Accepts: application/json",
+    "apiKey: {apiKey}"
+  })
+  void deletePet(@Param("petId") Long petId, @Param("apiKey") String apiKey);
+  
   /**
    * Finds Pets by status
-   * Multiple status values can be provided with comma seperated strings
-   * @param status Status values that need to be considered for filter
+   * Multiple status values can be provided with comma separated strings
+   * @param status Status values that need to be considered for query (optional, default to available)
    * @return List<Pet>
    */
   @RequestLine("GET /pet/findByStatus?status={status}")
@@ -54,7 +76,7 @@ public interface PetApi extends ApiClient.Api {
   /**
    * Finds Pets by tags
    * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-   * @param tags Tags to filter by
+   * @param tags Tags to filter by (optional)
    * @return List<Pet>
    */
   @RequestLine("GET /pet/findByTags?tags={tags}")
@@ -67,7 +89,7 @@ public interface PetApi extends ApiClient.Api {
   /**
    * Find pet by ID
    * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-   * @param petId ID of pet that needs to be fetched
+   * @param petId ID of pet that needs to be fetched (required)
    * @return Pet
    */
   @RequestLine("GET /pet/{petId}")
@@ -77,12 +99,51 @@ public interface PetApi extends ApiClient.Api {
   })
   Pet getPetById(@Param("petId") Long petId);
   
+  /**
+   * Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched (required)
+   * @return InlineResponse200
+   */
+  @RequestLine("GET /pet/{petId}?response=inline_arbitrary_object")
+  @Headers({
+    "Content-type: application/json",
+    "Accepts: application/json",
+  })
+  InlineResponse200 getPetByIdInObject(@Param("petId") Long petId);
+  
+  /**
+   * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched (required)
+   * @return byte[]
+   */
+  @RequestLine("GET /pet/{petId}?testing_byte_array=true")
+  @Headers({
+    "Content-type: application/json",
+    "Accepts: application/json",
+  })
+  byte[] petPetIdtestingByteArraytrueGet(@Param("petId") Long petId);
+  
+  /**
+   * Update an existing pet
+   * 
+   * @param body Pet object that needs to be added to the store (optional)
+   * @return void
+   */
+  @RequestLine("PUT /pet")
+  @Headers({
+    "Content-type: application/json",
+    "Accepts: application/json",
+  })
+  void updatePet(Pet body);
+  
   /**
    * Updates a pet in the store with form data
    * 
-   * @param petId ID of pet that needs to be updated
-   * @param name Updated name of the pet
-   * @param status Updated status of the pet
+   * @param petId ID of pet that needs to be updated (required)
+   * @param name Updated name of the pet (optional)
+   * @param status Updated status of the pet (optional)
    * @return void
    */
   @RequestLine("POST /pet/{petId}")
@@ -92,27 +153,12 @@ public interface PetApi extends ApiClient.Api {
   })
   void updatePetWithForm(@Param("petId") String petId, @Param("name") String name, @Param("status") String status);
   
-  /**
-   * Deletes a pet
-   * 
-   * @param petId Pet id to delete
-   * @param apiKey 
-   * @return void
-   */
-  @RequestLine("DELETE /pet/{petId}")
-  @Headers({
-    "Content-type: application/json",
-    "Accepts: application/json",
-    "apiKey: {apiKey}"
-  })
-  void deletePet(@Param("petId") Long petId, @Param("apiKey") String apiKey);
-  
   /**
    * uploads an image
    * 
-   * @param petId ID of pet to update
-   * @param additionalMetadata Additional data to pass to server
-   * @param file file to upload
+   * @param petId ID of pet to update (required)
+   * @param additionalMetadata Additional data to pass to server (optional)
+   * @param file file to upload (optional)
    * @return void
    */
   @RequestLine("POST /pet/{petId}/uploadImage")
@@ -122,4 +168,5 @@ public interface PetApi extends ApiClient.Api {
   })
   void uploadFile(@Param("petId") Long petId, @Param("additionalMetadata") String additionalMetadata, @Param("file") File file);
   
+
 }
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/StoreApi.java
index 66644ad9469..97c3ad3ec16 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/StoreApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/StoreApi.java
@@ -2,16 +2,47 @@ package io.swagger.client.api;
 
 import io.swagger.client.ApiClient;
 
-import java.util.Map;
 import io.swagger.client.model.Order;
 
-import java.util.*;
+
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:18.888+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-19T15:53:31.820+08:00")
 public interface StoreApi extends ApiClient.Api {
 
 
+  /**
+   * Delete purchase order by ID
+   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+   * @param orderId ID of the order that needs to be deleted (required)
+   * @return void
+   */
+  @RequestLine("DELETE /store/order/{orderId}")
+  @Headers({
+    "Content-type: application/json",
+    "Accepts: application/json",
+  })
+  void deleteOrder(@Param("orderId") String orderId);
+  
+  /**
+   * Finds orders by status
+   * A single status value can be provided as a string
+   * @param status Status value that needs to be considered for query (optional, default to placed)
+   * @return List<Order>
+   */
+  @RequestLine("GET /store/findByStatus?status={status}")
+  @Headers({
+    "Content-type: application/json",
+    "Accepts: application/json",
+  })
+  List<Order> findOrdersByStatus(@Param("status") String status);
+  
   /**
    * Returns pet inventories by status
    * Returns a map of status codes to quantities
@@ -25,22 +56,21 @@ public interface StoreApi extends ApiClient.Api {
   Map<String, Integer> getInventory();
   
   /**
-   * Place an order for a pet
-   * 
-   * @param body order placed for purchasing the pet
-   * @return Order
+   * Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+   * Returns an arbitrary object which is actually a map of status codes to quantities
+   * @return Object
    */
-  @RequestLine("POST /store/order")
+  @RequestLine("GET /store/inventory?response=arbitrary_object")
   @Headers({
     "Content-type: application/json",
     "Accepts: application/json",
   })
-  Order placeOrder(Order body);
+  Object getInventoryInObject();
   
   /**
    * Find purchase order by ID
    * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-   * @param orderId ID of pet that needs to be fetched
+   * @param orderId ID of pet that needs to be fetched (required)
    * @return Order
    */
   @RequestLine("GET /store/order/{orderId}")
@@ -51,16 +81,17 @@ public interface StoreApi extends ApiClient.Api {
   Order getOrderById(@Param("orderId") String orderId);
   
   /**
-   * Delete purchase order by ID
-   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-   * @param orderId ID of the order that needs to be deleted
-   * @return void
+   * Place an order for a pet
+   * 
+   * @param body order placed for purchasing the pet (optional)
+   * @return Order
    */
-  @RequestLine("DELETE /store/order/{orderId}")
+  @RequestLine("POST /store/order")
   @Headers({
     "Content-type: application/json",
     "Accepts: application/json",
   })
-  void deleteOrder(@Param("orderId") String orderId);
+  Order placeOrder(Order body);
   
+
 }
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/UserApi.java
index 5400f5cace4..3fef00a41f0 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/UserApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/UserApi.java
@@ -3,19 +3,24 @@ package io.swagger.client.api;
 import io.swagger.client.ApiClient;
 
 import io.swagger.client.model.User;
-import java.util.*;
 
-import java.util.*;
+
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:18.888+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-19T15:53:31.820+08:00")
 public interface UserApi extends ApiClient.Api {
 
 
   /**
    * Create user
    * This can only be done by the logged in user.
-   * @param body Created user object
+   * @param body Created user object (optional)
    * @return void
    */
   @RequestLine("POST /user")
@@ -28,7 +33,7 @@ public interface UserApi extends ApiClient.Api {
   /**
    * Creates list of users with given input array
    * 
-   * @param body List of user object
+   * @param body List of user object (optional)
    * @return void
    */
   @RequestLine("POST /user/createWithArray")
@@ -41,7 +46,7 @@ public interface UserApi extends ApiClient.Api {
   /**
    * Creates list of users with given input array
    * 
-   * @param body List of user object
+   * @param body List of user object (optional)
    * @return void
    */
   @RequestLine("POST /user/createWithList")
@@ -51,11 +56,37 @@ public interface UserApi extends ApiClient.Api {
   })
   void createUsersWithListInput(List<User> body);
   
+  /**
+   * Delete user
+   * This can only be done by the logged in user.
+   * @param username The name that needs to be deleted (required)
+   * @return void
+   */
+  @RequestLine("DELETE /user/{username}")
+  @Headers({
+    "Content-type: application/json",
+    "Accepts: application/json",
+  })
+  void deleteUser(@Param("username") String username);
+  
+  /**
+   * Get user by user name
+   * 
+   * @param username The name that needs to be fetched. Use user1 for testing. (required)
+   * @return User
+   */
+  @RequestLine("GET /user/{username}")
+  @Headers({
+    "Content-type: application/json",
+    "Accepts: application/json",
+  })
+  User getUserByName(@Param("username") String username);
+  
   /**
    * Logs user into the system
    * 
-   * @param username The user name for login
-   * @param password The password for login in clear text
+   * @param username The user name for login (optional)
+   * @param password The password for login in clear text (optional)
    * @return String
    */
   @RequestLine("GET /user/login?username={username}&password={password}")
@@ -77,24 +108,11 @@ public interface UserApi extends ApiClient.Api {
   })
   void logoutUser();
   
-  /**
-   * Get user by user name
-   * 
-   * @param username The name that needs to be fetched. Use user1 for testing.
-   * @return User
-   */
-  @RequestLine("GET /user/{username}")
-  @Headers({
-    "Content-type: application/json",
-    "Accepts: application/json",
-  })
-  User getUserByName(@Param("username") String username);
-  
   /**
    * Updated user
    * This can only be done by the logged in user.
-   * @param username name that need to be deleted
-   * @param body Updated user object
+   * @param username name that need to be deleted (required)
+   * @param body Updated user object (optional)
    * @return void
    */
   @RequestLine("PUT /user/{username}")
@@ -104,17 +122,5 @@ public interface UserApi extends ApiClient.Api {
   })
   void updateUser(@Param("username") String username, User body);
   
-  /**
-   * Delete user
-   * This can only be done by the logged in user.
-   * @param username The name that needs to be deleted
-   * @return void
-   */
-  @RequestLine("DELETE /user/{username}")
-  @Headers({
-    "Content-type: application/json",
-    "Accepts: application/json",
-  })
-  void deleteUser(@Param("username") String username);
-  
+
 }
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
new file mode 100644
index 00000000000..067672104a9
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
@@ -0,0 +1,41 @@
+package io.swagger.client.auth;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+
+public class ApiKeyAuth implements RequestInterceptor {
+    private final String location;
+    private final String paramName;
+
+    private String apiKey;
+
+    public ApiKeyAuth(String location, String paramName) {
+        this.location = location;
+        this.paramName = paramName;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public String getParamName() {
+        return paramName;
+    }
+
+    public String getApiKey() {
+        return apiKey;
+    }
+
+    public void setApiKey(String apiKey) {
+        this.apiKey = apiKey;
+    }
+
+    @Override
+    public void apply(RequestTemplate template) {
+        if (location == "query") {
+            template.query(paramName, apiKey);
+        } else if (location == "header") {
+            template.header(paramName, apiKey);
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
new file mode 100644
index 00000000000..26a97039879
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
@@ -0,0 +1,41 @@
+package io.swagger.client.auth;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import feign.auth.BasicAuthRequestInterceptor;
+
+/**
+ * An interceptor that adds the request header needed to use HTTP basic authentication.
+ */
+public class HttpBasicAuth implements RequestInterceptor {
+
+    private String username;
+    private String password;
+    
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public void setCredentials(String username, String password) {
+        this.username = username;
+        this.password = password;
+    }
+
+  @Override
+  public void apply(RequestTemplate template) {
+      RequestInterceptor requestInterceptor = new BasicAuthRequestInterceptor(username, password);
+      requestInterceptor.apply(template);
+  }
+}
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/auth/OAuth.java
new file mode 100644
index 00000000000..5aafbf81a2f
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/auth/OAuth.java
@@ -0,0 +1,203 @@
+package io.swagger.client.auth;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.apache.oltu.oauth2.client.HttpClient;
+import org.apache.oltu.oauth2.client.OAuthClient;
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest;
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder;
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder;
+import org.apache.oltu.oauth2.client.response.OAuthClientResponse;
+import org.apache.oltu.oauth2.client.response.OAuthClientResponseFactory;
+import org.apache.oltu.oauth2.client.response.OAuthJSONAccessTokenResponse;
+import org.apache.oltu.oauth2.common.exception.OAuthProblemException;
+import org.apache.oltu.oauth2.common.exception.OAuthSystemException;
+import org.apache.oltu.oauth2.common.message.types.GrantType;
+import org.apache.oltu.oauth2.common.token.BasicOAuthToken;
+
+import feign.Client;
+import feign.Request.Options;
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import feign.Response;
+import feign.Util;
+import io.swagger.client.StringUtil;
+
+
+public class OAuth implements RequestInterceptor {
+
+    public interface AccessTokenListener {
+        public void notify(BasicOAuthToken token);
+    }
+
+    private volatile String accessToken;
+    private Long expirationTimeMillis;
+    private OAuthClient oauthClient;
+    private TokenRequestBuilder tokenRequestBuilder;
+    private AuthenticationRequestBuilder authenticationRequestBuilder;
+    private AccessTokenListener accessTokenListener;
+
+    public OAuth(Client client, TokenRequestBuilder requestBuilder) {
+        setOauthClient(client);
+        this.tokenRequestBuilder = requestBuilder;
+    }
+
+    public OAuth(Client client, OAuthFlow flow, String authorizationUrl, String tokenUrl, String scopes) {
+        this(client, OAuthClientRequest.tokenLocation(tokenUrl).setScope(scopes));
+        setFlow(flow);
+        authenticationRequestBuilder = OAuthClientRequest.authorizationLocation(authorizationUrl);
+    }
+
+    public OAuth(OAuthFlow flow, String authorizationUrl, String tokenUrl, String scopes) {
+        this(new Client.Default(null, null), flow, authorizationUrl, tokenUrl, scopes);
+    }
+
+    public void setFlow(OAuthFlow flow) {
+        switch(flow) {
+        case accessCode:
+        case implicit:
+            tokenRequestBuilder.setGrantType(GrantType.AUTHORIZATION_CODE);
+            break;
+        case password:
+            tokenRequestBuilder.setGrantType(GrantType.PASSWORD);
+            break;
+        case application:
+            tokenRequestBuilder.setGrantType(GrantType.CLIENT_CREDENTIALS);
+            break;
+        default:
+            break;
+        }
+    }
+
+    @Override
+    public void apply(RequestTemplate template) {
+        // If the request already have an authorization (eg. Basic auth), do nothing
+        if (template.headers().containsKey("Authorization")) {
+            return;
+        }
+        // If first time, get the token
+        if (expirationTimeMillis == null || System.currentTimeMillis() >= expirationTimeMillis) {
+            try {
+                updateAccessToken();
+            } catch (OAuthSystemException e) {
+                e.printStackTrace();
+                return;
+            } catch (OAuthProblemException e) {
+                e.printStackTrace();
+                return;
+            }
+        }
+        if (getAccessToken() != null) {
+            template.header("Authorization", "Bearer " + getAccessToken());
+        }
+    }
+
+    public synchronized void updateAccessToken() throws OAuthSystemException, OAuthProblemException {
+        if (getAccessToken() == null) {
+            OAuthJSONAccessTokenResponse accessTokenResponse = oauthClient.accessToken(tokenRequestBuilder.buildBodyMessage());
+            if (accessTokenResponse != null && accessTokenResponse.getAccessToken() != null) {
+                setAccessToken(accessTokenResponse.getAccessToken(), accessTokenResponse.getExpiresIn());
+                if (accessTokenListener != null) {
+                    accessTokenListener.notify((BasicOAuthToken) accessTokenResponse.getOAuthToken());
+                }
+            }
+        }
+    }
+
+    public void registerAccessTokenListener(AccessTokenListener accessTokenListener) {
+        this.accessTokenListener = accessTokenListener;
+    }
+
+    public synchronized String getAccessToken() {
+        return accessToken;
+    }
+
+    public synchronized void setAccessToken(String accessToken, Long expiresIn) {
+        this.accessToken = accessToken;
+        this.expirationTimeMillis = System.currentTimeMillis() + expiresIn * 1000;
+    }
+
+    public TokenRequestBuilder getTokenRequestBuilder() {
+        return tokenRequestBuilder;
+    }
+
+    public void setTokenRequestBuilder(TokenRequestBuilder tokenRequestBuilder) {
+        this.tokenRequestBuilder = tokenRequestBuilder;
+    }
+
+    public AuthenticationRequestBuilder getAuthenticationRequestBuilder() {
+        return authenticationRequestBuilder;
+    }
+
+    public void setAuthenticationRequestBuilder(AuthenticationRequestBuilder authenticationRequestBuilder) {
+        this.authenticationRequestBuilder = authenticationRequestBuilder;
+    }
+
+    public OAuthClient getOauthClient() {
+        return oauthClient;
+    }
+
+    public void setOauthClient(OAuthClient oauthClient) {
+        this.oauthClient = oauthClient;
+    }
+
+    public void setOauthClient(Client client) {
+        this.oauthClient = new OAuthClient( new OAuthFeignClient(client));
+    }
+
+    public class OAuthFeignClient implements HttpClient {
+
+        private Client client;
+
+        public OAuthFeignClient() {
+            this.client = new Client.Default(null, null);
+        }
+
+        public OAuthFeignClient(Client client) {
+            this.client = client;
+        }
+
+        public <T extends OAuthClientResponse> T execute(OAuthClientRequest request, Map<String, String> headers,
+                String requestMethod, Class<T> responseClass)
+                        throws OAuthSystemException, OAuthProblemException {
+
+            RequestTemplate req = new RequestTemplate()
+                    .append(request.getLocationUri())
+                    .method(requestMethod)
+                    .body(request.getBody());
+
+            for (Entry<String, String> entry : headers.entrySet()) {
+                req.header(entry.getKey(), entry.getValue());
+            }
+            Response feignResponse;
+            String body = "";
+            try {
+                feignResponse = client.execute(req.request(), new Options());
+                body = Util.toString(feignResponse.body().asReader());
+            } catch (IOException e) {
+                throw new OAuthSystemException(e);
+            }
+
+            String contentType = null;
+            Collection<String> contentTypeHeader =  feignResponse.headers().get("Content-Type");
+            if(contentTypeHeader != null) {
+                contentType = StringUtil.join(contentTypeHeader.toArray(new String[0]), ";");
+            }
+
+            return OAuthClientResponseFactory.createCustomResponse(
+                    body,
+                    contentType,
+                    feignResponse.status(),
+                    responseClass
+            );
+        }
+
+        public void shutdown() {
+            // Nothing to do here
+        }
+
+    }
+}
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/auth/OAuthFlow.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/auth/OAuthFlow.java
new file mode 100644
index 00000000000..597ec99b48b
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/auth/OAuthFlow.java
@@ -0,0 +1,5 @@
+package io.swagger.client.auth;
+
+public enum OAuthFlow {
+    accessCode, implicit, password, application
+}
\ No newline at end of file
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Category.java
index 52bff46824c..ca030ff6c48 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Category.java
@@ -2,7 +2,6 @@ package io.swagger.client.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -10,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:18.888+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:50.356+08:00")
 public class Category   {
   
   private Long id = null;
@@ -19,8 +18,12 @@ public class Category   {
   
   /**
    **/
+  public Category id(Long id) {
+    this.id = id;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
@@ -32,8 +35,12 @@ public class Category   {
   
   /**
    **/
+  public Category name(String name) {
+    this.name = name;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("name")
   public String getName() {
     return name;
@@ -45,7 +52,7 @@ public class Category   {
   
 
   @Override
-  public boolean equals(Object o) {
+  public boolean equals(java.lang.Object o) {
     if (this == o) {
       return true;
     }
@@ -53,8 +60,8 @@ public class Category   {
       return false;
     }
     Category category = (Category) o;
-    return Objects.equals(id, category.id) &&
-        Objects.equals(name, category.name);
+    return Objects.equals(this.id, category.id) &&
+        Objects.equals(this.name, category.name);
   }
 
   @Override
@@ -77,7 +84,7 @@ public class Category   {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(Object o) {
+  private String toIndentedString(java.lang.Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/InlineResponse200.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/InlineResponse200.java
new file mode 100644
index 00000000000..117d23f61f6
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/InlineResponse200.java
@@ -0,0 +1,203 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.client.model.Tag;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-19T15:53:31.820+08:00")
+public class InlineResponse200   {
+  
+  private List<String> photoUrls = new ArrayList<String>();
+  private String name = null;
+  private Long id = null;
+  private Object category = null;
+  private List<Tag> tags = new ArrayList<Tag>();
+
+
+  public enum StatusEnum {
+    AVAILABLE("available"),
+    PENDING("pending"),
+    SOLD("sold");
+
+    private String value;
+
+    StatusEnum(String value) {
+      this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+      return value;
+    }
+  }
+
+  private StatusEnum status = null;
+
+  
+  /**
+   **/
+  public InlineResponse200 photoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("photoUrls")
+  public List<String> getPhotoUrls() {
+    return photoUrls;
+  }
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
+  
+  /**
+   **/
+  public InlineResponse200 name(String name) {
+    this.name = name;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "doggie", value = "")
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  
+  /**
+   **/
+  public InlineResponse200 id(Long id) {
+    this.id = id;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", required = true, value = "")
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  public InlineResponse200 category(Object category) {
+    this.category = category;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("category")
+  public Object getCategory() {
+    return category;
+  }
+  public void setCategory(Object category) {
+    this.category = category;
+  }
+
+  
+  /**
+   **/
+  public InlineResponse200 tags(List<Tag> tags) {
+    this.tags = tags;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("tags")
+  public List<Tag> getTags() {
+    return tags;
+  }
+  public void setTags(List<Tag> tags) {
+    this.tags = tags;
+  }
+
+  
+  /**
+   * pet status in the store
+   **/
+  public InlineResponse200 status(StatusEnum status) {
+    this.status = status;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "pet status in the store")
+  @JsonProperty("status")
+  public StatusEnum getStatus() {
+    return status;
+  }
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+  
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    InlineResponse200 inlineResponse200 = (InlineResponse200) o;
+    return Objects.equals(this.photoUrls, inlineResponse200.photoUrls) &&
+        Objects.equals(this.name, inlineResponse200.name) &&
+        Objects.equals(this.id, inlineResponse200.id) &&
+        Objects.equals(this.category, inlineResponse200.category) &&
+        Objects.equals(this.tags, inlineResponse200.tags) &&
+        Objects.equals(this.status, inlineResponse200.status);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(photoUrls, name, id, category, tags, status);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class InlineResponse200 {\n");
+    
+    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    category: ").append(toIndentedString(category)).append("\n");
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
+
+
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Model200Response.java
new file mode 100644
index 00000000000..882dd6017c9
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Model200Response.java
@@ -0,0 +1,78 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-19T15:53:31.820+08:00")
+public class Model200Response   {
+  
+  private Integer name = null;
+
+  
+  /**
+   **/
+  public Model200Response name(Integer name) {
+    this.name = name;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("name")
+  public Integer getName() {
+    return name;
+  }
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+  
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Model200Response _200Response = (Model200Response) o;
+    return Objects.equals(this.name, _200Response.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Model200Response {\n");
+    
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
+
+
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelReturn.java
new file mode 100644
index 00000000000..d4be9479686
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -0,0 +1,78 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-19T15:53:31.820+08:00")
+public class ModelReturn   {
+  
+  private Integer _return = null;
+
+  
+  /**
+   **/
+  public ModelReturn _return(Integer _return) {
+    this._return = _return;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("return")
+  public Integer getReturn() {
+    return _return;
+  }
+  public void setReturn(Integer _return) {
+    this._return = _return;
+  }
+
+  
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ModelReturn _return = (ModelReturn) o;
+    return Objects.equals(this._return, _return._return);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(_return);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ModelReturn {\n");
+    
+    sb.append("    _return: ").append(toIndentedString(_return)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
+
+
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Name.java
new file mode 100644
index 00000000000..a10c13ef806
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Name.java
@@ -0,0 +1,98 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-19T15:53:31.820+08:00")
+public class Name   {
+  
+  private Integer name = null;
+  private Integer snakeCase = null;
+
+  
+  /**
+   **/
+  public Name name(Integer name) {
+    this.name = name;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("name")
+  public Integer getName() {
+    return name;
+  }
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+  
+  /**
+   **/
+  public Name snakeCase(Integer snakeCase) {
+    this.snakeCase = snakeCase;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("snake_case")
+  public Integer getSnakeCase() {
+    return snakeCase;
+  }
+  public void setSnakeCase(Integer snakeCase) {
+    this.snakeCase = snakeCase;
+  }
+
+  
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Name name = (Name) o;
+    return Objects.equals(this.name, name.name) &&
+        Objects.equals(this.snakeCase, name.snakeCase);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, snakeCase);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Name {\n");
+    
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
+
+
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java
index 8c5d349d105..a6ae8c7aea8 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java
@@ -11,7 +11,7 @@ import java.util.Date;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:18.888+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:50.356+08:00")
 public class Order   {
   
   private Long id = null;
@@ -42,23 +42,21 @@ public class Order   {
   private Boolean complete = null;
 
   
-  /**
-   **/
-  
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
   }
-  public void setId(Long id) {
-    this.id = id;
-  }
 
   
   /**
    **/
+  public Order petId(Long petId) {
+    this.petId = petId;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("petId")
   public Long getPetId() {
     return petId;
@@ -70,8 +68,12 @@ public class Order   {
   
   /**
    **/
+  public Order quantity(Integer quantity) {
+    this.quantity = quantity;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
@@ -83,8 +85,12 @@ public class Order   {
   
   /**
    **/
+  public Order shipDate(Date shipDate) {
+    this.shipDate = shipDate;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("shipDate")
   public Date getShipDate() {
     return shipDate;
@@ -97,8 +103,12 @@ public class Order   {
   /**
    * Order Status
    **/
+  public Order status(StatusEnum status) {
+    this.status = status;
+    return this;
+  }
   
-  @ApiModelProperty(value = "Order Status")
+  @ApiModelProperty(example = "null", value = "Order Status")
   @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
@@ -110,8 +120,12 @@ public class Order   {
   
   /**
    **/
+  public Order complete(Boolean complete) {
+    this.complete = complete;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
@@ -123,7 +137,7 @@ public class Order   {
   
 
   @Override
-  public boolean equals(Object o) {
+  public boolean equals(java.lang.Object o) {
     if (this == o) {
       return true;
     }
@@ -131,12 +145,12 @@ public class Order   {
       return false;
     }
     Order order = (Order) o;
-    return Objects.equals(id, order.id) &&
-        Objects.equals(petId, order.petId) &&
-        Objects.equals(quantity, order.quantity) &&
-        Objects.equals(shipDate, order.shipDate) &&
-        Objects.equals(status, order.status) &&
-        Objects.equals(complete, order.complete);
+    return Objects.equals(this.id, order.id) &&
+        Objects.equals(this.petId, order.petId) &&
+        Objects.equals(this.quantity, order.quantity) &&
+        Objects.equals(this.shipDate, order.shipDate) &&
+        Objects.equals(this.status, order.status) &&
+        Objects.equals(this.complete, order.complete);
   }
 
   @Override
@@ -163,7 +177,7 @@ public class Order   {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(Object o) {
+  private String toIndentedString(java.lang.Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java
index df7d37173fb..af5ed59eba3 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java
@@ -7,13 +7,14 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.client.model.Category;
 import io.swagger.client.model.Tag;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:18.888+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:50.356+08:00")
 public class Pet   {
   
   private Long id = null;
@@ -46,8 +47,12 @@ public class Pet   {
   
   /**
    **/
+  public Pet id(Long id) {
+    this.id = id;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
@@ -59,8 +64,12 @@ public class Pet   {
   
   /**
    **/
+  public Pet category(Category category) {
+    this.category = category;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("category")
   public Category getCategory() {
     return category;
@@ -72,8 +81,12 @@ public class Pet   {
   
   /**
    **/
+  public Pet name(String name) {
+    this.name = name;
+    return this;
+  }
   
-  @ApiModelProperty(required = true, value = "")
+  @ApiModelProperty(example = "doggie", required = true, value = "")
   @JsonProperty("name")
   public String getName() {
     return name;
@@ -85,8 +98,12 @@ public class Pet   {
   
   /**
    **/
+  public Pet photoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+    return this;
+  }
   
-  @ApiModelProperty(required = true, value = "")
+  @ApiModelProperty(example = "null", required = true, value = "")
   @JsonProperty("photoUrls")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -98,8 +115,12 @@ public class Pet   {
   
   /**
    **/
+  public Pet tags(List<Tag> tags) {
+    this.tags = tags;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("tags")
   public List<Tag> getTags() {
     return tags;
@@ -112,8 +133,12 @@ public class Pet   {
   /**
    * pet status in the store
    **/
+  public Pet status(StatusEnum status) {
+    this.status = status;
+    return this;
+  }
   
-  @ApiModelProperty(value = "pet status in the store")
+  @ApiModelProperty(example = "null", value = "pet status in the store")
   @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
@@ -125,7 +150,7 @@ public class Pet   {
   
 
   @Override
-  public boolean equals(Object o) {
+  public boolean equals(java.lang.Object o) {
     if (this == o) {
       return true;
     }
@@ -133,12 +158,12 @@ public class Pet   {
       return false;
     }
     Pet pet = (Pet) o;
-    return Objects.equals(id, pet.id) &&
-        Objects.equals(category, pet.category) &&
-        Objects.equals(name, pet.name) &&
-        Objects.equals(photoUrls, pet.photoUrls) &&
-        Objects.equals(tags, pet.tags) &&
-        Objects.equals(status, pet.status);
+    return Objects.equals(this.id, pet.id) &&
+        Objects.equals(this.category, pet.category) &&
+        Objects.equals(this.name, pet.name) &&
+        Objects.equals(this.photoUrls, pet.photoUrls) &&
+        Objects.equals(this.tags, pet.tags) &&
+        Objects.equals(this.status, pet.status);
   }
 
   @Override
@@ -165,7 +190,7 @@ public class Pet   {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(Object o) {
+  private String toIndentedString(java.lang.Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java
new file mode 100644
index 00000000000..254f9be4828
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -0,0 +1,78 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-19T15:53:31.820+08:00")
+public class SpecialModelName   {
+  
+  private Long specialPropertyName = null;
+
+  
+  /**
+   **/
+  public SpecialModelName specialPropertyName(Long specialPropertyName) {
+    this.specialPropertyName = specialPropertyName;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("$special[property.name]")
+  public Long getSpecialPropertyName() {
+    return specialPropertyName;
+  }
+  public void setSpecialPropertyName(Long specialPropertyName) {
+    this.specialPropertyName = specialPropertyName;
+  }
+
+  
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    SpecialModelName specialModelName = (SpecialModelName) o;
+    return Objects.equals(this.specialPropertyName, specialModelName.specialPropertyName);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(specialPropertyName);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class SpecialModelName {\n");
+    
+    sb.append("    specialPropertyName: ").append(toIndentedString(specialPropertyName)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
+
+
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Tag.java
index 5f6b24d052c..30263bf28ae 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Tag.java
@@ -2,7 +2,6 @@ package io.swagger.client.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -10,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:18.888+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:50.356+08:00")
 public class Tag   {
   
   private Long id = null;
@@ -19,8 +18,12 @@ public class Tag   {
   
   /**
    **/
+  public Tag id(Long id) {
+    this.id = id;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
@@ -32,8 +35,12 @@ public class Tag   {
   
   /**
    **/
+  public Tag name(String name) {
+    this.name = name;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("name")
   public String getName() {
     return name;
@@ -45,7 +52,7 @@ public class Tag   {
   
 
   @Override
-  public boolean equals(Object o) {
+  public boolean equals(java.lang.Object o) {
     if (this == o) {
       return true;
     }
@@ -53,8 +60,8 @@ public class Tag   {
       return false;
     }
     Tag tag = (Tag) o;
-    return Objects.equals(id, tag.id) &&
-        Objects.equals(name, tag.name);
+    return Objects.equals(this.id, tag.id) &&
+        Objects.equals(this.name, tag.name);
   }
 
   @Override
@@ -77,7 +84,7 @@ public class Tag   {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(Object o) {
+  private String toIndentedString(java.lang.Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java
index 7ebd78e6ea8..b3c1d22d367 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java
@@ -2,7 +2,6 @@ package io.swagger.client.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -10,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:18.888+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:50.356+08:00")
 public class User   {
   
   private Long id = null;
@@ -25,8 +24,12 @@ public class User   {
   
   /**
    **/
+  public User id(Long id) {
+    this.id = id;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
@@ -38,8 +41,12 @@ public class User   {
   
   /**
    **/
+  public User username(String username) {
+    this.username = username;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("username")
   public String getUsername() {
     return username;
@@ -51,8 +58,12 @@ public class User   {
   
   /**
    **/
+  public User firstName(String firstName) {
+    this.firstName = firstName;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
@@ -64,8 +75,12 @@ public class User   {
   
   /**
    **/
+  public User lastName(String lastName) {
+    this.lastName = lastName;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
@@ -77,8 +92,12 @@ public class User   {
   
   /**
    **/
+  public User email(String email) {
+    this.email = email;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("email")
   public String getEmail() {
     return email;
@@ -90,8 +109,12 @@ public class User   {
   
   /**
    **/
+  public User password(String password) {
+    this.password = password;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("password")
   public String getPassword() {
     return password;
@@ -103,8 +126,12 @@ public class User   {
   
   /**
    **/
+  public User phone(String phone) {
+    this.phone = phone;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("phone")
   public String getPhone() {
     return phone;
@@ -117,8 +144,12 @@ public class User   {
   /**
    * User Status
    **/
+  public User userStatus(Integer userStatus) {
+    this.userStatus = userStatus;
+    return this;
+  }
   
-  @ApiModelProperty(value = "User Status")
+  @ApiModelProperty(example = "null", value = "User Status")
   @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
@@ -130,7 +161,7 @@ public class User   {
   
 
   @Override
-  public boolean equals(Object o) {
+  public boolean equals(java.lang.Object o) {
     if (this == o) {
       return true;
     }
@@ -138,14 +169,14 @@ public class User   {
       return false;
     }
     User user = (User) o;
-    return Objects.equals(id, user.id) &&
-        Objects.equals(username, user.username) &&
-        Objects.equals(firstName, user.firstName) &&
-        Objects.equals(lastName, user.lastName) &&
-        Objects.equals(email, user.email) &&
-        Objects.equals(password, user.password) &&
-        Objects.equals(phone, user.phone) &&
-        Objects.equals(userStatus, user.userStatus);
+    return Objects.equals(this.id, user.id) &&
+        Objects.equals(this.username, user.username) &&
+        Objects.equals(this.firstName, user.firstName) &&
+        Objects.equals(this.lastName, user.lastName) &&
+        Objects.equals(this.email, user.email) &&
+        Objects.equals(this.password, user.password) &&
+        Objects.equals(this.phone, user.phone) &&
+        Objects.equals(this.userStatus, user.userStatus);
   }
 
   @Override
@@ -174,7 +205,7 @@ public class User   {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(Object o) {
+  private String toIndentedString(java.lang.Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/samples/client/petstore/java/feign/src/test/java/io/swagger/TestUtils.java b/samples/client/petstore/java/feign/src/test/java/io/swagger/TestUtils.java
new file mode 100644
index 00000000000..7ddf142426e
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/io/swagger/TestUtils.java
@@ -0,0 +1,17 @@
+package io.swagger;
+
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicLong;
+
+public class TestUtils {
+    private static final AtomicLong atomicId = createAtomicId();
+
+    public static long nextId() {
+      return atomicId.getAndIncrement();
+    }
+
+    private static AtomicLong createAtomicId() {
+        int baseId = new Random(System.currentTimeMillis()).nextInt(1000000) + 20000;
+        return new AtomicLong((long) baseId);
+    }
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/PetApiTest.java
index aef8ab25610..bf068652905 100644
--- a/samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/PetApiTest.java
+++ b/samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/PetApiTest.java
@@ -1,7 +1,8 @@
 package io.swagger.petstore.test;
 
-import io.swagger.client.ApiClient;
+import io.swagger.TestUtils;
 
+import io.swagger.client.ApiClient;
 import io.swagger.client.api.*;
 import io.swagger.client.model.*;
 
@@ -183,7 +184,7 @@ public class PetApiTest {
 
     private Pet createRandomPet() {
         Pet pet = new Pet();
-        pet.setId(System.currentTimeMillis());
+        pet.setId(TestUtils.nextId());
         pet.setName("gorilla");
 
         Category category = new Category();
diff --git a/samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/StoreApiTest.java
index dd5bf4e71f4..32dcd6d0c0e 100644
--- a/samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/StoreApiTest.java
+++ b/samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/StoreApiTest.java
@@ -1,9 +1,14 @@
 package io.swagger.petstore.test;
 
+import feign.FeignException;
+
+import io.swagger.TestUtils;
+
 import io.swagger.client.*;
 import io.swagger.client.api.*;
 import io.swagger.client.model.*;
 
+import java.lang.reflect.Field;
 import java.util.Map;
 
 import org.junit.*;
@@ -44,21 +49,32 @@ public class StoreApiTest {
         Order fetched = api.getOrderById(order.getId().toString());
         assertEquals(fetched.getId(), order.getId());
 
-        api.deleteOrder(String.valueOf(order.getId()));
+        api.deleteOrder(order.getId().toString());
 
-        api.getOrderById(order.getId().toString());
-//        fail("expected an error");
+        try {
+            api.getOrderById(order.getId().toString());
+            fail("expected an error");
+        } catch (FeignException e) {
+            assertTrue(e.getMessage().startsWith("status 404 "));
+        }
     }
 
     private Order createOrder() {
         Order order = new Order();
-        order.setId(new Long(System.currentTimeMillis()));
         order.setPetId(new Long(200));
         order.setQuantity(new Integer(13));
         order.setShipDate(new java.util.Date());
         order.setStatus(Order.StatusEnum.PLACED);
         order.setComplete(true);
 
+        try {
+          Field idField = Order.class.getDeclaredField("id");
+          idField.setAccessible(true);
+          idField.set(order, TestUtils.nextId());
+        } catch (Exception e) {
+          throw new RuntimeException(e);
+        }
+
         return order;
     }
 }
diff --git a/samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/UserApiTest.java b/samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/UserApiTest.java
index 1615dbf1dce..de3cd73dd9c 100644
--- a/samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/UserApiTest.java
+++ b/samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/UserApiTest.java
@@ -1,5 +1,7 @@
 package io.swagger.petstore.test;
 
+import io.swagger.TestUtils;
+
 import io.swagger.client.ApiClient;
 import io.swagger.client.api.*;
 import io.swagger.client.model.*;
@@ -32,9 +34,9 @@ public class UserApiTest {
     @Test
     public void testCreateUsersWithArray() throws Exception {
         User user1 = createUser();
-        user1.setUsername("abc123");
+        user1.setUsername("user" + user1.getId());
         User user2 = createUser();
-        user2.setUsername("123abc");
+        user2.setUsername("user" + user2.getId());
 
         api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2}));
 
@@ -45,9 +47,9 @@ public class UserApiTest {
     @Test
     public void testCreateUsersWithList() throws Exception {
         User user1 = createUser();
-        user1.setUsername("abc123");
+        user1.setUsername("user" + user1.getId());
         User user2 = createUser();
-        user2.setUsername("123abc");
+        user2.setUsername("user" + user2.getId());
 
         api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2}));
 
@@ -73,7 +75,7 @@ public class UserApiTest {
 
     private User createUser() {
         User user = new User();
-        user.setId(System.currentTimeMillis());
+        user.setId(TestUtils.nextId());
         user.setUsername("fred" + user.getId());
         user.setFirstName("Fred");
         user.setLastName("Meyer");
diff --git a/samples/client/petstore/java/jersey2/.gitignore b/samples/client/petstore/java/jersey2/.gitignore
new file mode 100644
index 00000000000..32858aad3c3
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/.gitignore
@@ -0,0 +1,12 @@
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
diff --git a/samples/client/petstore/java/jersey2/README.md b/samples/client/petstore/java/jersey2/README.md
index 473892d2321..930a4f28c55 100644
--- a/samples/client/petstore/java/jersey2/README.md
+++ b/samples/client/petstore/java/jersey2/README.md
@@ -20,7 +20,7 @@ mvn deploy
 
 Refer to the [official documentation](https://maven.apache.org/plugins/maven-deploy-plugin/usage.html) for more information.
 
-After the client libarary is installed/deployed, you can use it in your Maven project by adding the following to your *pom.xml*:
+After the client library is installed/deployed, you can use it in your Maven project by adding the following to your *pom.xml*:
 
 ```xml
 <dependency>
diff --git a/samples/client/petstore/java/jersey2/build.gradle b/samples/client/petstore/java/jersey2/build.gradle
index 85ad4f048b9..72fc75b04f2 100644
--- a/samples/client/petstore/java/jersey2/build.gradle
+++ b/samples/client/petstore/java/jersey2/build.gradle
@@ -1,3 +1,6 @@
+apply plugin: 'idea'
+apply plugin: 'eclipse'
+
 group = 'io.swagger'
 version = '1.0.0'
 
@@ -20,7 +23,7 @@ if(hasProperty('target') && target == 'android') {
 
     apply plugin: 'com.android.library'
     apply plugin: 'com.github.dcendents.android-maven'
-    
+
     android {
         compileSdkVersion 22
         buildToolsVersion '22.0.0'
@@ -32,7 +35,7 @@ if(hasProperty('target') && target == 'android') {
             sourceCompatibility JavaVersion.VERSION_1_7
             targetCompatibility JavaVersion.VERSION_1_7
         }
-    
+
         // Rename the aar correctly
         libraryVariants.all { variant ->
             variant.outputs.each { output ->
@@ -48,7 +51,7 @@ if(hasProperty('target') && target == 'android') {
             provided 'javax.annotation:jsr250-api:1.0'
         }
     }
-    
+
     afterEvaluate {
         android.libraryVariants.all { variant ->
             def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
@@ -60,12 +63,12 @@ if(hasProperty('target') && target == 'android') {
             artifacts.add('archives', task);
         }
     }
-    
+
     task sourcesJar(type: Jar) {
         from android.sourceSets.main.java.srcDirs
         classifier = 'sources'
     }
-    
+
     artifacts {
         archives sourcesJar
     }
@@ -74,16 +77,16 @@ if(hasProperty('target') && target == 'android') {
 
     apply plugin: 'java'
     apply plugin: 'maven'
-    
+
     sourceCompatibility = JavaVersion.VERSION_1_7
     targetCompatibility = JavaVersion.VERSION_1_7
-    
+
     install {
         repositories.mavenInstaller {
             pom.artifactId = 'swagger-petstore-jersey2'
         }
     }
-    
+
     task execute(type:JavaExec) {
        main = System.getProperty('mainClass')
        classpath = sourceSets.main.runtimeClasspath
@@ -93,19 +96,21 @@ if(hasProperty('target') && target == 'android') {
 ext {
     swagger_annotations_version = "1.5.0"
     jackson_version = "2.4.2"
-    jersey_version = "2.6"
+    jersey_version = "2.22"
     jodatime_version = "2.3"
-    junit_version = "4.8.1"
+    junit_version = "4.12"
 }
 
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "org.glassfish.jersey.core:jersey-client:$jersey_version"
     compile "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version"
+    compile "org.glassfish.jersey.media:jersey-media-json-jackson:2.22.1"
     compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
     compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.1.5"
     compile "joda-time:joda-time:$jodatime_version"
+    compile "com.brsanthu:migbase64:2.2"
     testCompile "junit:junit:$junit_version"
 }
diff --git a/samples/client/petstore/java/jersey2/git_push.sh b/samples/client/petstore/java/jersey2/git_push.sh
new file mode 100644
index 00000000000..1a36388db02
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="YOUR_GIT_USR_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="YOUR_GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/client/petstore/java/jersey2/pom.xml b/samples/client/petstore/java/jersey2/pom.xml
index 6b0ba2cba08..216caa5675b 100644
--- a/samples/client/petstore/java/jersey2/pom.xml
+++ b/samples/client/petstore/java/jersey2/pom.xml
@@ -104,6 +104,27 @@
           <target>1.6</target>
         </configuration>
       </plugin>
+      <!-- For testing build.gradle -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.2.1</version>
+        <executions>
+          <execution>
+            <id>gradle-test</id>
+            <phase>integration-test</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>gradle</executable>
+              <arguments>
+                <argument>check</argument>
+              </arguments>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <dependencies>
@@ -129,7 +150,7 @@
       <artifactId>jersey-media-json-jackson</artifactId>
       <version>2.22.1</version>
     </dependency>
-    
+
     <!-- JSON processing: jackson -->
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
@@ -174,10 +195,10 @@
   </dependencies>
   <properties>
     <swagger-annotations-version>1.5.0</swagger-annotations-version>
-    <jersey-version>2.12</jersey-version>
+    <jersey-version>2.22</jersey-version>
     <jackson-version>2.4.2</jackson-version>
     <jodatime-version>2.3</jodatime-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
-    <junit-version>4.8.1</junit-version>
+    <junit-version>4.12</junit-version>
   </properties>
 </project>
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java
index 73deed7fad8..bc43cfe670e 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java
@@ -12,12 +12,17 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 
 import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.filter.LoggingFilter;
+import org.glassfish.jersey.jackson.JacksonFeature;
 import org.glassfish.jersey.media.multipart.FormDataBodyPart;
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import org.glassfish.jersey.media.multipart.MultiPart;
 import org.glassfish.jersey.media.multipart.MultiPartFeature;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
@@ -35,20 +40,24 @@ import java.io.UnsupportedEncodingException;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import io.swagger.client.auth.Authentication;
 import io.swagger.client.auth.HttpBasicAuth;
 import io.swagger.client.auth.ApiKeyAuth;
 import io.swagger.client.auth.OAuth;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:17.660+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-17T17:22:31.147+08:00")
 public class ApiClient {
-  private Client client;
-  private Map<String, Client> hostMap = new HashMap<String, Client>();
   private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
-  private boolean debugging = false;
   private String basePath = "http://petstore.swagger.io/v2";
-  private JSON json = new JSON();
+  private boolean debugging = false;
+  private int connectionTimeout = 0;
+
+  private Client httpClient;
+  private JSON json;
+  private String tempFolderPath = null;
 
   private Map<String, Authentication> authentications;
 
@@ -58,6 +67,9 @@ public class ApiClient {
   private DateFormat dateFormat;
 
   public ApiClient() {
+    json = new JSON();
+    httpClient = buildHttpClient(debugging);
+
     // Use RFC3339 format for date and datetime.
     // See http://xml2rfc.ietf.org/public/rfc/html/rfc3339.html#anchor14
     this.dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
@@ -68,14 +80,17 @@ public class ApiClient {
     this.json.setDateFormat((DateFormat) dateFormat.clone());
 
     // Set default User-Agent.
-    setUserAgent("Java-Swagger");
-
-    buildClient();
+    setUserAgent("Swagger-Codegen/1.0.0/java");
 
     // Setup authentications (key: authentication name, value: authentication).
     authentications = new HashMap<String, Authentication>();
-    authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
     authentications.put("petstore_auth", new OAuth());
+    authentications.put("test_api_client_id", new ApiKeyAuth("header", "x-test_api_client_id"));
+    authentications.put("test_api_client_secret", new ApiKeyAuth("header", "x-test_api_client_secret"));
+    authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
+    authentications.put("test_http_basic", new HttpBasicAuth());
+    authentications.put("test_api_key_query", new ApiKeyAuth("query", "test_api_key_query"));
+    authentications.put("test_api_key_header", new ApiKeyAuth("header", "test_api_key_header"));
     // Prevent the authentications from being modified.
     authentications = Collections.unmodifiableMap(authentications);
   }
@@ -225,7 +240,42 @@ public class ApiClient {
    */
   public ApiClient setDebugging(boolean debugging) {
     this.debugging = debugging;
-    buildClient();
+    // Rebuild HTTP Client according to the new "debugging" value.
+    this.httpClient = buildHttpClient(debugging);
+    return this;
+  }
+
+  /**
+   * The path of temporary folder used to store downloaded files from endpoints
+   * with file response. The default value is <code>null</code>, i.e. using
+   * the system's default tempopary folder.
+   *
+   * @see https://docs.oracle.com/javase/7/docs/api/java/io/File.html#createTempFile(java.lang.String,%20java.lang.String,%20java.io.File)
+   */
+  public String getTempFolderPath() {
+    return tempFolderPath;
+  }
+
+  public ApiClient setTempFolderPath(String tempFolderPath) {
+    this.tempFolderPath = tempFolderPath;
+    return this;
+  }
+
+  /**
+   * Connect timeout (in milliseconds).
+   */
+  public int getConnectTimeout() {
+    return connectionTimeout;
+  }
+
+  /**
+   * Set the connect timeout (in milliseconds).
+   * A value of 0 means no timeout, otherwise values must be between 1 and
+   * {@link Integer#MAX_VALUE}.
+   */
+  public ApiClient setConnectTimeout(int connectionTimeout) {
+    this.connectionTimeout = connectionTimeout;
+    httpClient.property(ClientProperties.CONNECT_TIMEOUT, connectionTimeout);
     return this;
   }
 
@@ -443,6 +493,13 @@ public class ApiClient {
    * Deserialize response body to Java object according to the Content-Type.
    */
   public <T> T deserialize(Response response, GenericType<T> returnType) throws ApiException {
+    // Handle file downloading.
+    if (returnType.equals(File.class)) {
+      @SuppressWarnings("unchecked")
+      T file = (T) downloadFileFromResponse(response);
+      return file;
+    }
+
     String contentType = null;
     List<Object> contentTypes = response.getHeaders().get("Content-Type");
     if (contentTypes != null && !contentTypes.isEmpty())
@@ -453,6 +510,55 @@ public class ApiClient {
     return response.readEntity(returnType);
   }
 
+  /**
+   * Download file from the given response.
+   * @throws ApiException If fail to read file content from response and write to disk
+   */
+  public File downloadFileFromResponse(Response response) throws ApiException {
+    try {
+      File file = prepareDownloadFile(response);
+      Files.copy(response.readEntity(InputStream.class), file.toPath());
+      return file;
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+  }
+
+  public File prepareDownloadFile(Response response) throws IOException {
+    String filename = null;
+    String contentDisposition = (String) response.getHeaders().getFirst("Content-Disposition");
+    if (contentDisposition != null && !"".equals(contentDisposition)) {
+      // Get filename from the Content-Disposition header.
+      Pattern pattern = Pattern.compile("filename=['\"]?([^'\"\\s]+)['\"]?");
+      Matcher matcher = pattern.matcher(contentDisposition);
+      if (matcher.find())
+        filename = matcher.group(1);
+    }
+
+    String prefix = null;
+    String suffix = null;
+    if (filename == null) {
+      prefix = "download-";
+      suffix = "";
+    } else {
+      int pos = filename.lastIndexOf(".");
+      if (pos == -1) {
+        prefix = filename + "-";
+      } else {
+        prefix = filename.substring(0, pos) + "-";
+        suffix = filename.substring(pos);
+      }
+      // File.createTempFile requires the prefix to be at least three characters long
+      if (prefix.length() < 3)
+        prefix = "download-";
+    }
+
+    if (tempFolderPath == null)
+      return File.createTempFile(prefix, suffix);
+    else
+      return File.createTempFile(prefix, suffix, new File(tempFolderPath));
+  }
+
   /**
    * Invoke API by sending HTTP request with the given options.
    *
@@ -471,7 +577,9 @@ public class ApiClient {
   public <T> T invokeAPI(String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, Object> formParams, String accept, String contentType, String[] authNames, GenericType<T> returnType) throws ApiException {
     updateParamsForAuth(authNames, queryParams, headerParams);
 
-    WebTarget target = client.target(this.basePath).path(path);
+    // Not using `.target(this.basePath).path(path)` below,
+    // to support (constant) query string in `path`, e.g. "/posts?draft=1"
+    WebTarget target = httpClient.target(this.basePath + path);
 
     if (queryParams != null) {
       for (Pair queryParam : queryParams) {
@@ -544,15 +652,18 @@ public class ApiClient {
     }
   }
 
-  private void buildClient() {
+  /**
+   * Build the Client used to make HTTP requests.
+   */
+  private Client buildHttpClient(boolean debugging) {
     final ClientConfig clientConfig = new ClientConfig();
     clientConfig.register(MultiPartFeature.class);
     clientConfig.register(json);
-    clientConfig.register(org.glassfish.jersey.jackson.JacksonFeature.class);
+    clientConfig.register(JacksonFeature.class);
     if (debugging) {
       clientConfig.register(LoggingFilter.class);
     }
-    this.client = ClientBuilder.newClient(clientConfig);
+    return ClientBuilder.newClient(clientConfig);
   }
 
   private Map<String, List<String>> buildResponseHeaders(Response response) {
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiException.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiException.java
index 7143b32e51c..2f7ef6e3286 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiException.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiException.java
@@ -3,7 +3,7 @@ package io.swagger.client;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:17.660+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:48.808+08:00")
 public class ApiException extends Exception {
   private int code = 0;
   private Map<String, List<String>> responseHeaders = null;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Configuration.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Configuration.java
index 09d0c0f09f3..b06f6a4f6a4 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Configuration.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Configuration.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:17.660+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:48.808+08:00")
 public class Configuration {
   private static ApiClient defaultApiClient = new ApiClient();
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/JSON.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/JSON.java
index fd58be8fc05..ff3a5cb782a 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/JSON.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/JSON.java
@@ -8,7 +8,7 @@ import java.text.DateFormat;
 
 import javax.ws.rs.ext.ContextResolver;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:17.660+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:48.808+08:00")
 public class JSON implements ContextResolver<ObjectMapper> {
   private ObjectMapper mapper;
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Pair.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Pair.java
index 477bd023bc9..a83256c3b3d 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Pair.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Pair.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:17.660+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:48.808+08:00")
 public class Pair {
     private String name = "";
     private String value = "";
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/StringUtil.java
index 24e13f49022..513c655bd4d 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/StringUtil.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/StringUtil.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:17.660+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:48.808+08:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/PetApi.java
index 09b7bdba247..dff33b11fc4 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/PetApi.java
@@ -8,11 +8,15 @@ import io.swagger.client.Pair;
 import javax.ws.rs.core.GenericType;
 
 import io.swagger.client.model.Pet;
+import io.swagger.client.model.InlineResponse200;
 import java.io.File;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:17.660+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-17T16:00:50.657+08:00")
 public class PetApi {
   private ApiClient apiClient;
 
@@ -33,62 +37,22 @@ public class PetApi {
   }
 
   
-  /**
-   * Update an existing pet
-   * 
-   * @param body Pet object that needs to be added to the store
-   * @return void
-   */
-  public void updatePet(Pet body) throws ApiException {
-    Object postBody = body;
-    
-    // create path and map variables
-    String path = "/pet".replaceAll("\\{format\\}","json");
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
-
-    
-
-    
-
-    
-
-    final String[] accepts = {
-      "application/json", "application/xml"
-    };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-
-    final String[] contentTypes = {
-      "application/json", "application/xml"
-    };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-
-    String[] authNames = new String[] { "petstore_auth" };
-
-    
-    apiClient.invokeAPI(path, "PUT", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
-    
-  }
-  
   /**
    * Add a new pet to the store
    * 
-   * @param body Pet object that needs to be added to the store
-   * @return void
+   * @param body Pet object that needs to be added to the store (optional)
+   * @throws ApiException if fails to make API call
    */
   public void addPet(Pet body) throws ApiException {
-    Object postBody = body;
+    Object localVarPostBody = body;
     
     // create path and map variables
-    String path = "/pet".replaceAll("\\{format\\}","json");
+    String localVarPath = "/pet".replaceAll("\\{format\\}","json");
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
     
 
@@ -96,217 +60,72 @@ public class PetApi {
 
     
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       "application/json", "application/xml"
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
-    String[] authNames = new String[] { "petstore_auth" };
+    String[] localVarAuthNames = new String[] { "petstore_auth" };
 
     
-    apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
     
   }
   
   /**
-   * Finds Pets by status
-   * Multiple status values can be provided with comma seperated strings
-   * @param status Status values that need to be considered for filter
-   * @return List<Pet>
-   */
-  public List<Pet> findPetsByStatus(List<String> status) throws ApiException {
-    Object postBody = null;
-    
-    // create path and map variables
-    String path = "/pet/findByStatus".replaceAll("\\{format\\}","json");
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
-
-    
-    queryParams.addAll(apiClient.parameterToPairs("multi", "status", status));
-    
-
-    
-
-    
-
-    final String[] accepts = {
-      "application/json", "application/xml"
-    };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-
-    final String[] contentTypes = {
-      
-    };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-
-    String[] authNames = new String[] { "petstore_auth" };
-
-    
-    GenericType<List<Pet>> returnType = new GenericType<List<Pet>>() {};
-    return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
-    
-  }
-  
-  /**
-   * Finds Pets by tags
-   * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-   * @param tags Tags to filter by
-   * @return List<Pet>
-   */
-  public List<Pet> findPetsByTags(List<String> tags) throws ApiException {
-    Object postBody = null;
-    
-    // create path and map variables
-    String path = "/pet/findByTags".replaceAll("\\{format\\}","json");
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
-
-    
-    queryParams.addAll(apiClient.parameterToPairs("multi", "tags", tags));
-    
-
-    
-
-    
-
-    final String[] accepts = {
-      "application/json", "application/xml"
-    };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-
-    final String[] contentTypes = {
-      
-    };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-
-    String[] authNames = new String[] { "petstore_auth" };
-
-    
-    GenericType<List<Pet>> returnType = new GenericType<List<Pet>>() {};
-    return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
-    
-  }
-  
-  /**
-   * Find pet by ID
-   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-   * @param petId ID of pet that needs to be fetched
-   * @return Pet
-   */
-  public Pet getPetById(Long petId) throws ApiException {
-    Object postBody = null;
-    
-    // verify the required parameter 'petId' is set
-    if (petId == null) {
-      throw new ApiException(400, "Missing the required parameter 'petId' when calling getPetById");
-    }
-    
-    // create path and map variables
-    String path = "/pet/{petId}".replaceAll("\\{format\\}","json")
-      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
-
-    
-
-    
-
-    
-
-    final String[] accepts = {
-      "application/json", "application/xml"
-    };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-
-    final String[] contentTypes = {
-      
-    };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-
-    String[] authNames = new String[] { "api_key" };
-
-    
-    GenericType<Pet> returnType = new GenericType<Pet>() {};
-    return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
-    
-  }
-  
-  /**
-   * Updates a pet in the store with form data
+   * Fake endpoint to test byte array in body parameter for adding a new pet to the store
    * 
-   * @param petId ID of pet that needs to be updated
-   * @param name Updated name of the pet
-   * @param status Updated status of the pet
-   * @return void
+   * @param body Pet object in the form of byte array (optional)
+   * @throws ApiException if fails to make API call
    */
-  public void updatePetWithForm(String petId, String name, String status) throws ApiException {
-    Object postBody = null;
-    
-    // verify the required parameter 'petId' is set
-    if (petId == null) {
-      throw new ApiException(400, "Missing the required parameter 'petId' when calling updatePetWithForm");
-    }
+  public void addPetUsingByteArray(byte[] body) throws ApiException {
+    Object localVarPostBody = body;
     
     // create path and map variables
-    String path = "/pet/{petId}".replaceAll("\\{format\\}","json")
-      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
+    String localVarPath = "/pet?testing_byte_array=true".replaceAll("\\{format\\}","json");
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
     
 
     
 
-    if (name != null)
-      formParams.put("name", name);
-    if (status != null)
-      formParams.put("status", status);
     
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
 
-    final String[] contentTypes = {
-      "application/x-www-form-urlencoded"
+    final String[] localVarContentTypes = {
+      "application/json", "application/xml"
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
-    String[] authNames = new String[] { "petstore_auth" };
+    String[] localVarAuthNames = new String[] { "petstore_auth" };
 
     
-    apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
     
   }
   
   /**
    * Deletes a pet
    * 
-   * @param petId Pet id to delete
-   * @param apiKey 
-   * @return void
+   * @param petId Pet id to delete (required)
+   * @param apiKey  (optional)
+   * @throws ApiException if fails to make API call
    */
   public void deletePet(Long petId, String apiKey) throws ApiException {
-    Object postBody = null;
+    Object localVarPostBody = null;
     
     // verify the required parameter 'petId' is set
     if (petId == null) {
@@ -314,49 +133,373 @@ public class PetApi {
     }
     
     // create path and map variables
-    String path = "/pet/{petId}".replaceAll("\\{format\\}","json")
+    String localVarPath = "/pet/{petId}".replaceAll("\\{format\\}","json")
       .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
     
 
     if (apiKey != null)
-    headerParams.put("api_key", apiClient.parameterToString(apiKey));
+      localVarHeaderParams.put("api_key", apiClient.parameterToString(apiKey));
     
 
     
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
-    String[] authNames = new String[] { "petstore_auth" };
+    String[] localVarAuthNames = new String[] { "petstore_auth" };
 
     
-    apiClient.invokeAPI(path, "DELETE", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    apiClient.invokeAPI(localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
+    
+  }
+  
+  /**
+   * Finds Pets by status
+   * Multiple status values can be provided with comma separated strings
+   * @param status Status values that need to be considered for query (optional, default to available)
+   * @return List<Pet>
+   * @throws ApiException if fails to make API call
+   */
+  public List<Pet> findPetsByStatus(List<String> status) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // create path and map variables
+    String localVarPath = "/pet/findByStatus".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+    localVarQueryParams.addAll(apiClient.parameterToPairs("multi", "status", status));
+    
+
+    
+
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] { "petstore_auth" };
+
+    
+    GenericType<List<Pet>> localVarReturnType = new GenericType<List<Pet>>() {};
+    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
+    
+  }
+  
+  /**
+   * Finds Pets by tags
+   * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+   * @param tags Tags to filter by (optional)
+   * @return List<Pet>
+   * @throws ApiException if fails to make API call
+   */
+  public List<Pet> findPetsByTags(List<String> tags) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // create path and map variables
+    String localVarPath = "/pet/findByTags".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+    localVarQueryParams.addAll(apiClient.parameterToPairs("multi", "tags", tags));
+    
+
+    
+
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] { "petstore_auth" };
+
+    
+    GenericType<List<Pet>> localVarReturnType = new GenericType<List<Pet>>() {};
+    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
+    
+  }
+  
+  /**
+   * Find pet by ID
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched (required)
+   * @return Pet
+   * @throws ApiException if fails to make API call
+   */
+  public Pet getPetById(Long petId) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'petId' is set
+    if (petId == null) {
+      throw new ApiException(400, "Missing the required parameter 'petId' when calling getPetById");
+    }
+    
+    // create path and map variables
+    String localVarPath = "/pet/{petId}".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+
+    
+
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] { "petstore_auth", "api_key" };
+
+    
+    GenericType<Pet> localVarReturnType = new GenericType<Pet>() {};
+    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
+    
+  }
+  
+  /**
+   * Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched (required)
+   * @return InlineResponse200
+   * @throws ApiException if fails to make API call
+   */
+  public InlineResponse200 getPetByIdInObject(Long petId) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'petId' is set
+    if (petId == null) {
+      throw new ApiException(400, "Missing the required parameter 'petId' when calling getPetByIdInObject");
+    }
+    
+    // create path and map variables
+    String localVarPath = "/pet/{petId}?response=inline_arbitrary_object".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+
+    
+
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] { "petstore_auth", "api_key" };
+
+    
+    GenericType<InlineResponse200> localVarReturnType = new GenericType<InlineResponse200>() {};
+    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
+    
+  }
+  
+  /**
+   * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched (required)
+   * @return byte[]
+   * @throws ApiException if fails to make API call
+   */
+  public byte[] petPetIdtestingByteArraytrueGet(Long petId) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'petId' is set
+    if (petId == null) {
+      throw new ApiException(400, "Missing the required parameter 'petId' when calling petPetIdtestingByteArraytrueGet");
+    }
+    
+    // create path and map variables
+    String localVarPath = "/pet/{petId}?testing_byte_array=true".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+
+    
+
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] { "petstore_auth", "api_key" };
+
+    
+    GenericType<byte[]> localVarReturnType = new GenericType<byte[]>() {};
+    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
+    
+  }
+  
+  /**
+   * Update an existing pet
+   * 
+   * @param body Pet object that needs to be added to the store (optional)
+   * @throws ApiException if fails to make API call
+   */
+  public void updatePet(Pet body) throws ApiException {
+    Object localVarPostBody = body;
+    
+    // create path and map variables
+    String localVarPath = "/pet".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+
+    
+
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      "application/json", "application/xml"
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] { "petstore_auth" };
+
+    
+    apiClient.invokeAPI(localVarPath, "PUT", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
+    
+  }
+  
+  /**
+   * Updates a pet in the store with form data
+   * 
+   * @param petId ID of pet that needs to be updated (required)
+   * @param name Updated name of the pet (optional)
+   * @param status Updated status of the pet (optional)
+   * @throws ApiException if fails to make API call
+   */
+  public void updatePetWithForm(String petId, String name, String status) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'petId' is set
+    if (petId == null) {
+      throw new ApiException(400, "Missing the required parameter 'petId' when calling updatePetWithForm");
+    }
+    
+    // create path and map variables
+    String localVarPath = "/pet/{petId}".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+
+    
+
+    if (name != null)
+      localVarFormParams.put("name", name);
+    if (status != null)
+      localVarFormParams.put("status", status);
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      "application/x-www-form-urlencoded"
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] { "petstore_auth" };
+
+    
+    apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
     
   }
   
   /**
    * uploads an image
    * 
-   * @param petId ID of pet to update
-   * @param additionalMetadata Additional data to pass to server
-   * @param file file to upload
-   * @return void
+   * @param petId ID of pet to update (required)
+   * @param additionalMetadata Additional data to pass to server (optional)
+   * @param file file to upload (optional)
+   * @throws ApiException if fails to make API call
    */
   public void uploadFile(Long petId, String additionalMetadata, File file) throws ApiException {
-    Object postBody = null;
+    Object localVarPostBody = null;
     
     // verify the required parameter 'petId' is set
     if (petId == null) {
@@ -364,38 +507,38 @@ public class PetApi {
     }
     
     // create path and map variables
-    String path = "/pet/{petId}/uploadImage".replaceAll("\\{format\\}","json")
+    String localVarPath = "/pet/{petId}/uploadImage".replaceAll("\\{format\\}","json")
       .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
     
 
     
 
     if (additionalMetadata != null)
-      formParams.put("additionalMetadata", additionalMetadata);
+      localVarFormParams.put("additionalMetadata", additionalMetadata);
     if (file != null)
-      formParams.put("file", file);
+      localVarFormParams.put("file", file);
     
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       "multipart/form-data"
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
-    String[] authNames = new String[] { "petstore_auth" };
+    String[] localVarAuthNames = new String[] { "petstore_auth" };
 
     
-    apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
     
   }
   
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/StoreApi.java
index 8b2f86b70ab..9b7bf83fea4 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/StoreApi.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/StoreApi.java
@@ -7,12 +7,14 @@ import io.swagger.client.Pair;
 
 import javax.ws.rs.core.GenericType;
 
-import java.util.Map;
 import io.swagger.client.model.Order;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:17.660+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-17T16:00:50.657+08:00")
 public class StoreApi {
   private ApiClient apiClient;
 
@@ -33,142 +35,14 @@ public class StoreApi {
   }
 
   
-  /**
-   * Returns pet inventories by status
-   * Returns a map of status codes to quantities
-   * @return Map<String, Integer>
-   */
-  public Map<String, Integer> getInventory() throws ApiException {
-    Object postBody = null;
-    
-    // create path and map variables
-    String path = "/store/inventory".replaceAll("\\{format\\}","json");
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
-
-    
-
-    
-
-    
-
-    final String[] accepts = {
-      "application/json", "application/xml"
-    };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-
-    final String[] contentTypes = {
-      
-    };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-
-    String[] authNames = new String[] { "api_key" };
-
-    
-    GenericType<Map<String, Integer>> returnType = new GenericType<Map<String, Integer>>() {};
-    return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
-    
-  }
-  
-  /**
-   * Place an order for a pet
-   * 
-   * @param body order placed for purchasing the pet
-   * @return Order
-   */
-  public Order placeOrder(Order body) throws ApiException {
-    Object postBody = body;
-    
-    // create path and map variables
-    String path = "/store/order".replaceAll("\\{format\\}","json");
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
-
-    
-
-    
-
-    
-
-    final String[] accepts = {
-      "application/json", "application/xml"
-    };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-
-    final String[] contentTypes = {
-      
-    };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-
-    String[] authNames = new String[] {  };
-
-    
-    GenericType<Order> returnType = new GenericType<Order>() {};
-    return apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
-    
-  }
-  
-  /**
-   * Find purchase order by ID
-   * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-   * @param orderId ID of pet that needs to be fetched
-   * @return Order
-   */
-  public Order getOrderById(String orderId) throws ApiException {
-    Object postBody = null;
-    
-    // verify the required parameter 'orderId' is set
-    if (orderId == null) {
-      throw new ApiException(400, "Missing the required parameter 'orderId' when calling getOrderById");
-    }
-    
-    // create path and map variables
-    String path = "/store/order/{orderId}".replaceAll("\\{format\\}","json")
-      .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString()));
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
-
-    
-
-    
-
-    
-
-    final String[] accepts = {
-      "application/json", "application/xml"
-    };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-
-    final String[] contentTypes = {
-      
-    };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-
-    String[] authNames = new String[] {  };
-
-    
-    GenericType<Order> returnType = new GenericType<Order>() {};
-    return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
-    
-  }
-  
   /**
    * Delete purchase order by ID
    * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-   * @param orderId ID of the order that needs to be deleted
-   * @return void
+   * @param orderId ID of the order that needs to be deleted (required)
+   * @throws ApiException if fails to make API call
    */
   public void deleteOrder(String orderId) throws ApiException {
-    Object postBody = null;
+    Object localVarPostBody = null;
     
     // verify the required parameter 'orderId' is set
     if (orderId == null) {
@@ -176,13 +50,13 @@ public class StoreApi {
     }
     
     // create path and map variables
-    String path = "/store/order/{orderId}".replaceAll("\\{format\\}","json")
+    String localVarPath = "/store/order/{orderId}".replaceAll("\\{format\\}","json")
       .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString()));
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
     
 
@@ -190,20 +64,236 @@ public class StoreApi {
 
     
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
-    String[] authNames = new String[] {  };
+    String[] localVarAuthNames = new String[] {  };
 
     
-    apiClient.invokeAPI(path, "DELETE", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    apiClient.invokeAPI(localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
+    
+  }
+  
+  /**
+   * Finds orders by status
+   * A single status value can be provided as a string
+   * @param status Status value that needs to be considered for query (optional, default to placed)
+   * @return List<Order>
+   * @throws ApiException if fails to make API call
+   */
+  public List<Order> findOrdersByStatus(String status) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // create path and map variables
+    String localVarPath = "/store/findByStatus".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "status", status));
+    
+
+    
+
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] { "test_api_client_id", "test_api_client_secret" };
+
+    
+    GenericType<List<Order>> localVarReturnType = new GenericType<List<Order>>() {};
+    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
+    
+  }
+  
+  /**
+   * Returns pet inventories by status
+   * Returns a map of status codes to quantities
+   * @return Map<String, Integer>
+   * @throws ApiException if fails to make API call
+   */
+  public Map<String, Integer> getInventory() throws ApiException {
+    Object localVarPostBody = null;
+    
+    // create path and map variables
+    String localVarPath = "/store/inventory".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+
+    
+
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] { "api_key" };
+
+    
+    GenericType<Map<String, Integer>> localVarReturnType = new GenericType<Map<String, Integer>>() {};
+    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
+    
+  }
+  
+  /**
+   * Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+   * Returns an arbitrary object which is actually a map of status codes to quantities
+   * @return Object
+   * @throws ApiException if fails to make API call
+   */
+  public Object getInventoryInObject() throws ApiException {
+    Object localVarPostBody = null;
+    
+    // create path and map variables
+    String localVarPath = "/store/inventory?response=arbitrary_object".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+
+    
+
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] { "api_key" };
+
+    
+    GenericType<Object> localVarReturnType = new GenericType<Object>() {};
+    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
+    
+  }
+  
+  /**
+   * Find purchase order by ID
+   * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+   * @param orderId ID of pet that needs to be fetched (required)
+   * @return Order
+   * @throws ApiException if fails to make API call
+   */
+  public Order getOrderById(String orderId) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'orderId' is set
+    if (orderId == null) {
+      throw new ApiException(400, "Missing the required parameter 'orderId' when calling getOrderById");
+    }
+    
+    // create path and map variables
+    String localVarPath = "/store/order/{orderId}".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString()));
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+
+    
+
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] { "test_api_key_query", "test_api_key_header" };
+
+    
+    GenericType<Order> localVarReturnType = new GenericType<Order>() {};
+    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
+    
+  }
+  
+  /**
+   * Place an order for a pet
+   * 
+   * @param body order placed for purchasing the pet (optional)
+   * @return Order
+   * @throws ApiException if fails to make API call
+   */
+  public Order placeOrder(Order body) throws ApiException {
+    Object localVarPostBody = body;
+    
+    // create path and map variables
+    String localVarPath = "/store/order".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+
+    
+
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] { "test_api_client_id", "test_api_client_secret" };
+
+    
+    GenericType<Order> localVarReturnType = new GenericType<Order>() {};
+    return apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
     
   }
   
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/UserApi.java
index 575cd5753d8..47334096488 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/UserApi.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/UserApi.java
@@ -8,11 +8,13 @@ import io.swagger.client.Pair;
 import javax.ws.rs.core.GenericType;
 
 import io.swagger.client.model.User;
-import java.util.*;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:17.660+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-17T16:00:50.657+08:00")
 public class UserApi {
   private ApiClient apiClient;
 
@@ -36,19 +38,19 @@ public class UserApi {
   /**
    * Create user
    * This can only be done by the logged in user.
-   * @param body Created user object
-   * @return void
+   * @param body Created user object (optional)
+   * @throws ApiException if fails to make API call
    */
   public void createUser(User body) throws ApiException {
-    Object postBody = body;
+    Object localVarPostBody = body;
     
     // create path and map variables
-    String path = "/user".replaceAll("\\{format\\}","json");
+    String localVarPath = "/user".replaceAll("\\{format\\}","json");
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
     
 
@@ -56,39 +58,39 @@ public class UserApi {
 
     
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
-    String[] authNames = new String[] {  };
+    String[] localVarAuthNames = new String[] {  };
 
     
-    apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
     
   }
   
   /**
    * Creates list of users with given input array
    * 
-   * @param body List of user object
-   * @return void
+   * @param body List of user object (optional)
+   * @throws ApiException if fails to make API call
    */
   public void createUsersWithArrayInput(List<User> body) throws ApiException {
-    Object postBody = body;
+    Object localVarPostBody = body;
     
     // create path and map variables
-    String path = "/user/createWithArray".replaceAll("\\{format\\}","json");
+    String localVarPath = "/user/createWithArray".replaceAll("\\{format\\}","json");
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
     
 
@@ -96,39 +98,39 @@ public class UserApi {
 
     
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
-    String[] authNames = new String[] {  };
+    String[] localVarAuthNames = new String[] {  };
 
     
-    apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
     
   }
   
   /**
    * Creates list of users with given input array
    * 
-   * @param body List of user object
-   * @return void
+   * @param body List of user object (optional)
+   * @throws ApiException if fails to make API call
    */
   public void createUsersWithListInput(List<User> body) throws ApiException {
-    Object postBody = body;
+    Object localVarPostBody = body;
     
     // create path and map variables
-    String path = "/user/createWithList".replaceAll("\\{format\\}","json");
+    String localVarPath = "/user/createWithList".replaceAll("\\{format\\}","json");
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
     
 
@@ -136,210 +138,31 @@ public class UserApi {
 
     
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
-    String[] authNames = new String[] {  };
+    String[] localVarAuthNames = new String[] {  };
 
     
-    apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
-    
-  }
-  
-  /**
-   * Logs user into the system
-   * 
-   * @param username The user name for login
-   * @param password The password for login in clear text
-   * @return String
-   */
-  public String loginUser(String username, String password) throws ApiException {
-    Object postBody = null;
-    
-    // create path and map variables
-    String path = "/user/login".replaceAll("\\{format\\}","json");
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
-
-    
-    queryParams.addAll(apiClient.parameterToPairs("", "username", username));
-    
-    queryParams.addAll(apiClient.parameterToPairs("", "password", password));
-    
-
-    
-
-    
-
-    final String[] accepts = {
-      "application/json", "application/xml"
-    };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-
-    final String[] contentTypes = {
-      
-    };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-
-    String[] authNames = new String[] {  };
-
-    
-    GenericType<String> returnType = new GenericType<String>() {};
-    return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
-    
-  }
-  
-  /**
-   * Logs out current logged in user session
-   * 
-   * @return void
-   */
-  public void logoutUser() throws ApiException {
-    Object postBody = null;
-    
-    // create path and map variables
-    String path = "/user/logout".replaceAll("\\{format\\}","json");
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
-
-    
-
-    
-
-    
-
-    final String[] accepts = {
-      "application/json", "application/xml"
-    };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-
-    final String[] contentTypes = {
-      
-    };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-
-    String[] authNames = new String[] {  };
-
-    
-    apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
-    
-  }
-  
-  /**
-   * Get user by user name
-   * 
-   * @param username The name that needs to be fetched. Use user1 for testing.
-   * @return User
-   */
-  public User getUserByName(String username) throws ApiException {
-    Object postBody = null;
-    
-    // verify the required parameter 'username' is set
-    if (username == null) {
-      throw new ApiException(400, "Missing the required parameter 'username' when calling getUserByName");
-    }
-    
-    // create path and map variables
-    String path = "/user/{username}".replaceAll("\\{format\\}","json")
-      .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
-
-    
-
-    
-
-    
-
-    final String[] accepts = {
-      "application/json", "application/xml"
-    };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-
-    final String[] contentTypes = {
-      
-    };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-
-    String[] authNames = new String[] {  };
-
-    
-    GenericType<User> returnType = new GenericType<User>() {};
-    return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
-    
-  }
-  
-  /**
-   * Updated user
-   * This can only be done by the logged in user.
-   * @param username name that need to be deleted
-   * @param body Updated user object
-   * @return void
-   */
-  public void updateUser(String username, User body) throws ApiException {
-    Object postBody = body;
-    
-    // verify the required parameter 'username' is set
-    if (username == null) {
-      throw new ApiException(400, "Missing the required parameter 'username' when calling updateUser");
-    }
-    
-    // create path and map variables
-    String path = "/user/{username}".replaceAll("\\{format\\}","json")
-      .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
-
-    // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
-
-    
-
-    
-
-    
-
-    final String[] accepts = {
-      "application/json", "application/xml"
-    };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-
-    final String[] contentTypes = {
-      
-    };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-
-    String[] authNames = new String[] {  };
-
-    
-    apiClient.invokeAPI(path, "PUT", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
     
   }
   
   /**
    * Delete user
    * This can only be done by the logged in user.
-   * @param username The name that needs to be deleted
-   * @return void
+   * @param username The name that needs to be deleted (required)
+   * @throws ApiException if fails to make API call
    */
   public void deleteUser(String username) throws ApiException {
-    Object postBody = null;
+    Object localVarPostBody = null;
     
     // verify the required parameter 'username' is set
     if (username == null) {
@@ -347,13 +170,13 @@ public class UserApi {
     }
     
     // create path and map variables
-    String path = "/user/{username}".replaceAll("\\{format\\}","json")
+    String localVarPath = "/user/{username}".replaceAll("\\{format\\}","json")
       .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
 
     // query params
-    List<Pair> queryParams = new ArrayList<Pair>();
-    Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
     
 
@@ -361,20 +184,201 @@ public class UserApi {
 
     
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
-    String[] authNames = new String[] {  };
+    String[] localVarAuthNames = new String[] { "test_http_basic" };
 
     
-    apiClient.invokeAPI(path, "DELETE", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    apiClient.invokeAPI(localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
+    
+  }
+  
+  /**
+   * Get user by user name
+   * 
+   * @param username The name that needs to be fetched. Use user1 for testing. (required)
+   * @return User
+   * @throws ApiException if fails to make API call
+   */
+  public User getUserByName(String username) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'username' is set
+    if (username == null) {
+      throw new ApiException(400, "Missing the required parameter 'username' when calling getUserByName");
+    }
+    
+    // create path and map variables
+    String localVarPath = "/user/{username}".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+
+    
+
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] {  };
+
+    
+    GenericType<User> localVarReturnType = new GenericType<User>() {};
+    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
+    
+  }
+  
+  /**
+   * Logs user into the system
+   * 
+   * @param username The user name for login (optional)
+   * @param password The password for login in clear text (optional)
+   * @return String
+   * @throws ApiException if fails to make API call
+   */
+  public String loginUser(String username, String password) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // create path and map variables
+    String localVarPath = "/user/login".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "username", username));
+    
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "password", password));
+    
+
+    
+
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] {  };
+
+    
+    GenericType<String> localVarReturnType = new GenericType<String>() {};
+    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
+    
+  }
+  
+  /**
+   * Logs out current logged in user session
+   * 
+   * @throws ApiException if fails to make API call
+   */
+  public void logoutUser() throws ApiException {
+    Object localVarPostBody = null;
+    
+    // create path and map variables
+    String localVarPath = "/user/logout".replaceAll("\\{format\\}","json");
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+
+    
+
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] {  };
+
+    
+    apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
+    
+  }
+  
+  /**
+   * Updated user
+   * This can only be done by the logged in user.
+   * @param username name that need to be deleted (required)
+   * @param body Updated user object (optional)
+   * @throws ApiException if fails to make API call
+   */
+  public void updateUser(String username, User body) throws ApiException {
+    Object localVarPostBody = body;
+    
+    // verify the required parameter 'username' is set
+    if (username == null) {
+      throw new ApiException(400, "Missing the required parameter 'username' when calling updateUser");
+    }
+    
+    // create path and map variables
+    String localVarPath = "/user/{username}".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
+
+    // query params
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    
+
+    
+
+    
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+
+    String[] localVarAuthNames = new String[] {  };
+
+    
+    apiClient.invokeAPI(localVarPath, "PUT", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
     
   }
   
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
index d589b808904..4687d6782e1 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
@@ -5,7 +5,7 @@ import io.swagger.client.Pair;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:17.660+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:48.808+08:00")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
index d8e26f6e520..0b20480ec95 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
@@ -9,7 +9,7 @@ import java.util.List;
 
 import java.io.UnsupportedEncodingException;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:17.660+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:48.808+08:00")
 public class HttpBasicAuth implements Authentication {
   private String username;
   private String password;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/OAuth.java
index b78c6a3b718..15a655f826c 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/OAuth.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/OAuth.java
@@ -5,7 +5,7 @@ import io.swagger.client.Pair;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:17.660+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:48.808+08:00")
 public class OAuth implements Authentication {
   private String accessToken;
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Category.java
index 4a66bec68d3..0a81b468c6e 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Category.java
@@ -2,7 +2,6 @@ package io.swagger.client.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -10,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:17.660+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:48.808+08:00")
 public class Category   {
   
   private Long id = null;
@@ -19,8 +18,12 @@ public class Category   {
   
   /**
    **/
+  public Category id(Long id) {
+    this.id = id;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
@@ -32,8 +35,12 @@ public class Category   {
   
   /**
    **/
+  public Category name(String name) {
+    this.name = name;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("name")
   public String getName() {
     return name;
@@ -45,7 +52,7 @@ public class Category   {
   
 
   @Override
-  public boolean equals(Object o) {
+  public boolean equals(java.lang.Object o) {
     if (this == o) {
       return true;
     }
@@ -53,8 +60,8 @@ public class Category   {
       return false;
     }
     Category category = (Category) o;
-    return Objects.equals(id, category.id) &&
-        Objects.equals(name, category.name);
+    return Objects.equals(this.id, category.id) &&
+        Objects.equals(this.name, category.name);
   }
 
   @Override
@@ -77,7 +84,7 @@ public class Category   {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(Object o) {
+  private String toIndentedString(java.lang.Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/InlineResponse200.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/InlineResponse200.java
new file mode 100644
index 00000000000..36019aa9c4b
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/InlineResponse200.java
@@ -0,0 +1,199 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.client.model.Tag;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:48.808+08:00")
+public class InlineResponse200   {
+  
+  private List<Tag> tags = new ArrayList<Tag>();
+  private Long id = null;
+  private Object category = null;
+
+
+  public enum StatusEnum {
+    AVAILABLE("available"),
+    PENDING("pending"),
+    SOLD("sold");
+
+    private String value;
+
+    StatusEnum(String value) {
+      this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+      return value;
+    }
+  }
+
+  private StatusEnum status = null;
+  private String name = null;
+  private List<String> photoUrls = new ArrayList<String>();
+
+  
+  /**
+   **/
+  public InlineResponse200 tags(List<Tag> tags) {
+    this.tags = tags;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("tags")
+  public List<Tag> getTags() {
+    return tags;
+  }
+  public void setTags(List<Tag> tags) {
+    this.tags = tags;
+  }
+
+  
+  /**
+   **/
+  public InlineResponse200 id(Long id) {
+    this.id = id;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", required = true, value = "")
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  public InlineResponse200 category(Object category) {
+    this.category = category;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("category")
+  public Object getCategory() {
+    return category;
+  }
+  public void setCategory(Object category) {
+    this.category = category;
+  }
+
+  
+  /**
+   * pet status in the store
+   **/
+  public InlineResponse200 status(StatusEnum status) {
+    this.status = status;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "pet status in the store")
+  @JsonProperty("status")
+  public StatusEnum getStatus() {
+    return status;
+  }
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+  
+  /**
+   **/
+  public InlineResponse200 name(String name) {
+    this.name = name;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "doggie", value = "")
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  
+  /**
+   **/
+  public InlineResponse200 photoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("photoUrls")
+  public List<String> getPhotoUrls() {
+    return photoUrls;
+  }
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
+  
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    InlineResponse200 inlineResponse200 = (InlineResponse200) o;
+    return Objects.equals(this.tags, inlineResponse200.tags) &&
+        Objects.equals(this.id, inlineResponse200.id) &&
+        Objects.equals(this.category, inlineResponse200.category) &&
+        Objects.equals(this.status, inlineResponse200.status) &&
+        Objects.equals(this.name, inlineResponse200.name) &&
+        Objects.equals(this.photoUrls, inlineResponse200.photoUrls);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(tags, id, category, status, name, photoUrls);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class InlineResponse200 {\n");
+    
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    category: ").append(toIndentedString(category)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Model200Response.java
new file mode 100644
index 00000000000..a05d493feb6
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Model200Response.java
@@ -0,0 +1,74 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-17T16:00:50.657+08:00")
+public class Model200Response   {
+  
+  private Integer name = null;
+
+  
+  /**
+   **/
+  public Model200Response name(Integer name) {
+    this.name = name;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("name")
+  public Integer getName() {
+    return name;
+  }
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+  
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Model200Response _200Response = (Model200Response) o;
+    return Objects.equals(this.name, _200Response.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Model200Response {\n");
+    
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelReturn.java
new file mode 100644
index 00000000000..e2e95fd0f77
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -0,0 +1,74 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-17T16:00:50.657+08:00")
+public class ModelReturn   {
+  
+  private Integer _return = null;
+
+  
+  /**
+   **/
+  public ModelReturn _return(Integer _return) {
+    this._return = _return;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("return")
+  public Integer getReturn() {
+    return _return;
+  }
+  public void setReturn(Integer _return) {
+    this._return = _return;
+  }
+
+  
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ModelReturn _return = (ModelReturn) o;
+    return Objects.equals(this._return, _return._return);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(_return);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ModelReturn {\n");
+    
+    sb.append("    _return: ").append(toIndentedString(_return)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Name.java
new file mode 100644
index 00000000000..fc0985915ce
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Name.java
@@ -0,0 +1,74 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-17T16:00:50.657+08:00")
+public class Name   {
+  
+  private Integer name = null;
+
+  
+  /**
+   **/
+  public Name name(Integer name) {
+    this.name = name;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("name")
+  public Integer getName() {
+    return name;
+  }
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+  
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Name name = (Name) o;
+    return Objects.equals(this.name, name.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Name {\n");
+    
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java
index 29d0a70616d..943ddd37306 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java
@@ -11,7 +11,7 @@ import java.util.Date;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:17.660+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:48.808+08:00")
 public class Order   {
   
   private Long id = null;
@@ -42,23 +42,21 @@ public class Order   {
   private Boolean complete = null;
 
   
-  /**
-   **/
-  
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
   }
-  public void setId(Long id) {
-    this.id = id;
-  }
 
   
   /**
    **/
+  public Order petId(Long petId) {
+    this.petId = petId;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("petId")
   public Long getPetId() {
     return petId;
@@ -70,8 +68,12 @@ public class Order   {
   
   /**
    **/
+  public Order quantity(Integer quantity) {
+    this.quantity = quantity;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
@@ -83,8 +85,12 @@ public class Order   {
   
   /**
    **/
+  public Order shipDate(Date shipDate) {
+    this.shipDate = shipDate;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("shipDate")
   public Date getShipDate() {
     return shipDate;
@@ -97,8 +103,12 @@ public class Order   {
   /**
    * Order Status
    **/
+  public Order status(StatusEnum status) {
+    this.status = status;
+    return this;
+  }
   
-  @ApiModelProperty(value = "Order Status")
+  @ApiModelProperty(example = "null", value = "Order Status")
   @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
@@ -110,8 +120,12 @@ public class Order   {
   
   /**
    **/
+  public Order complete(Boolean complete) {
+    this.complete = complete;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
@@ -123,7 +137,7 @@ public class Order   {
   
 
   @Override
-  public boolean equals(Object o) {
+  public boolean equals(java.lang.Object o) {
     if (this == o) {
       return true;
     }
@@ -131,12 +145,12 @@ public class Order   {
       return false;
     }
     Order order = (Order) o;
-    return Objects.equals(id, order.id) &&
-        Objects.equals(petId, order.petId) &&
-        Objects.equals(quantity, order.quantity) &&
-        Objects.equals(shipDate, order.shipDate) &&
-        Objects.equals(status, order.status) &&
-        Objects.equals(complete, order.complete);
+    return Objects.equals(this.id, order.id) &&
+        Objects.equals(this.petId, order.petId) &&
+        Objects.equals(this.quantity, order.quantity) &&
+        Objects.equals(this.shipDate, order.shipDate) &&
+        Objects.equals(this.status, order.status) &&
+        Objects.equals(this.complete, order.complete);
   }
 
   @Override
@@ -163,7 +177,7 @@ public class Order   {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(Object o) {
+  private String toIndentedString(java.lang.Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java
index 8ded8bc4cb2..1c434aa687d 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java
@@ -7,13 +7,14 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.client.model.Category;
 import io.swagger.client.model.Tag;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:17.660+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:48.808+08:00")
 public class Pet   {
   
   private Long id = null;
@@ -46,8 +47,12 @@ public class Pet   {
   
   /**
    **/
+  public Pet id(Long id) {
+    this.id = id;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
@@ -59,8 +64,12 @@ public class Pet   {
   
   /**
    **/
+  public Pet category(Category category) {
+    this.category = category;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("category")
   public Category getCategory() {
     return category;
@@ -72,8 +81,12 @@ public class Pet   {
   
   /**
    **/
+  public Pet name(String name) {
+    this.name = name;
+    return this;
+  }
   
-  @ApiModelProperty(required = true, value = "")
+  @ApiModelProperty(example = "doggie", required = true, value = "")
   @JsonProperty("name")
   public String getName() {
     return name;
@@ -85,8 +98,12 @@ public class Pet   {
   
   /**
    **/
+  public Pet photoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+    return this;
+  }
   
-  @ApiModelProperty(required = true, value = "")
+  @ApiModelProperty(example = "null", required = true, value = "")
   @JsonProperty("photoUrls")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -98,8 +115,12 @@ public class Pet   {
   
   /**
    **/
+  public Pet tags(List<Tag> tags) {
+    this.tags = tags;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("tags")
   public List<Tag> getTags() {
     return tags;
@@ -112,8 +133,12 @@ public class Pet   {
   /**
    * pet status in the store
    **/
+  public Pet status(StatusEnum status) {
+    this.status = status;
+    return this;
+  }
   
-  @ApiModelProperty(value = "pet status in the store")
+  @ApiModelProperty(example = "null", value = "pet status in the store")
   @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
@@ -125,7 +150,7 @@ public class Pet   {
   
 
   @Override
-  public boolean equals(Object o) {
+  public boolean equals(java.lang.Object o) {
     if (this == o) {
       return true;
     }
@@ -133,12 +158,12 @@ public class Pet   {
       return false;
     }
     Pet pet = (Pet) o;
-    return Objects.equals(id, pet.id) &&
-        Objects.equals(category, pet.category) &&
-        Objects.equals(name, pet.name) &&
-        Objects.equals(photoUrls, pet.photoUrls) &&
-        Objects.equals(tags, pet.tags) &&
-        Objects.equals(status, pet.status);
+    return Objects.equals(this.id, pet.id) &&
+        Objects.equals(this.category, pet.category) &&
+        Objects.equals(this.name, pet.name) &&
+        Objects.equals(this.photoUrls, pet.photoUrls) &&
+        Objects.equals(this.tags, pet.tags) &&
+        Objects.equals(this.status, pet.status);
   }
 
   @Override
@@ -165,7 +190,7 @@ public class Pet   {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(Object o) {
+  private String toIndentedString(java.lang.Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/SpecialModelName.java
new file mode 100644
index 00000000000..0349889b190
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -0,0 +1,74 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-17T16:00:50.657+08:00")
+public class SpecialModelName   {
+  
+  private Long specialPropertyName = null;
+
+  
+  /**
+   **/
+  public SpecialModelName specialPropertyName(Long specialPropertyName) {
+    this.specialPropertyName = specialPropertyName;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("$special[property.name]")
+  public Long getSpecialPropertyName() {
+    return specialPropertyName;
+  }
+  public void setSpecialPropertyName(Long specialPropertyName) {
+    this.specialPropertyName = specialPropertyName;
+  }
+
+  
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    SpecialModelName specialModelName = (SpecialModelName) o;
+    return Objects.equals(this.specialPropertyName, specialModelName.specialPropertyName);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(specialPropertyName);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class SpecialModelName {\n");
+    
+    sb.append("    specialPropertyName: ").append(toIndentedString(specialPropertyName)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Tag.java
index cbdca57888f..437b42c44be 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Tag.java
@@ -2,7 +2,6 @@ package io.swagger.client.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -10,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:17.660+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:48.808+08:00")
 public class Tag   {
   
   private Long id = null;
@@ -19,8 +18,12 @@ public class Tag   {
   
   /**
    **/
+  public Tag id(Long id) {
+    this.id = id;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
@@ -32,8 +35,12 @@ public class Tag   {
   
   /**
    **/
+  public Tag name(String name) {
+    this.name = name;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("name")
   public String getName() {
     return name;
@@ -45,7 +52,7 @@ public class Tag   {
   
 
   @Override
-  public boolean equals(Object o) {
+  public boolean equals(java.lang.Object o) {
     if (this == o) {
       return true;
     }
@@ -53,8 +60,8 @@ public class Tag   {
       return false;
     }
     Tag tag = (Tag) o;
-    return Objects.equals(id, tag.id) &&
-        Objects.equals(name, tag.name);
+    return Objects.equals(this.id, tag.id) &&
+        Objects.equals(this.name, tag.name);
   }
 
   @Override
@@ -77,7 +84,7 @@ public class Tag   {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(Object o) {
+  private String toIndentedString(java.lang.Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java
index ae1dff618fc..f6299149305 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java
@@ -2,7 +2,6 @@ package io.swagger.client.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -10,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:17.660+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:48.808+08:00")
 public class User   {
   
   private Long id = null;
@@ -25,8 +24,12 @@ public class User   {
   
   /**
    **/
+  public User id(Long id) {
+    this.id = id;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
@@ -38,8 +41,12 @@ public class User   {
   
   /**
    **/
+  public User username(String username) {
+    this.username = username;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("username")
   public String getUsername() {
     return username;
@@ -51,8 +58,12 @@ public class User   {
   
   /**
    **/
+  public User firstName(String firstName) {
+    this.firstName = firstName;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
@@ -64,8 +75,12 @@ public class User   {
   
   /**
    **/
+  public User lastName(String lastName) {
+    this.lastName = lastName;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
@@ -77,8 +92,12 @@ public class User   {
   
   /**
    **/
+  public User email(String email) {
+    this.email = email;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("email")
   public String getEmail() {
     return email;
@@ -90,8 +109,12 @@ public class User   {
   
   /**
    **/
+  public User password(String password) {
+    this.password = password;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("password")
   public String getPassword() {
     return password;
@@ -103,8 +126,12 @@ public class User   {
   
   /**
    **/
+  public User phone(String phone) {
+    this.phone = phone;
+    return this;
+  }
   
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(example = "null", value = "")
   @JsonProperty("phone")
   public String getPhone() {
     return phone;
@@ -117,8 +144,12 @@ public class User   {
   /**
    * User Status
    **/
+  public User userStatus(Integer userStatus) {
+    this.userStatus = userStatus;
+    return this;
+  }
   
-  @ApiModelProperty(value = "User Status")
+  @ApiModelProperty(example = "null", value = "User Status")
   @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
@@ -130,7 +161,7 @@ public class User   {
   
 
   @Override
-  public boolean equals(Object o) {
+  public boolean equals(java.lang.Object o) {
     if (this == o) {
       return true;
     }
@@ -138,14 +169,14 @@ public class User   {
       return false;
     }
     User user = (User) o;
-    return Objects.equals(id, user.id) &&
-        Objects.equals(username, user.username) &&
-        Objects.equals(firstName, user.firstName) &&
-        Objects.equals(lastName, user.lastName) &&
-        Objects.equals(email, user.email) &&
-        Objects.equals(password, user.password) &&
-        Objects.equals(phone, user.phone) &&
-        Objects.equals(userStatus, user.userStatus);
+    return Objects.equals(this.id, user.id) &&
+        Objects.equals(this.username, user.username) &&
+        Objects.equals(this.firstName, user.firstName) &&
+        Objects.equals(this.lastName, user.lastName) &&
+        Objects.equals(this.email, user.email) &&
+        Objects.equals(this.password, user.password) &&
+        Objects.equals(this.phone, user.phone) &&
+        Objects.equals(this.userStatus, user.userStatus);
   }
 
   @Override
@@ -174,7 +205,7 @@ public class User   {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(Object o) {
+  private String toIndentedString(java.lang.Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/TestUtils.java b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/TestUtils.java
new file mode 100644
index 00000000000..7ddf142426e
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/TestUtils.java
@@ -0,0 +1,17 @@
+package io.swagger;
+
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicLong;
+
+public class TestUtils {
+    private static final AtomicLong atomicId = createAtomicId();
+
+    public static long nextId() {
+      return atomicId.getAndIncrement();
+    }
+
+    private static AtomicLong createAtomicId() {
+        int baseId = new Random(System.currentTimeMillis()).nextInt(1000000) + 20000;
+        return new AtomicLong((long) baseId);
+    }
+}
diff --git a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/ApiClientTest.java b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/ApiClientTest.java
index 29eae3d017e..47f004c283b 100644
--- a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/ApiClientTest.java
+++ b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/ApiClientTest.java
@@ -112,26 +112,36 @@ public class ApiClientTest {
     }
 
     @Test
-    public void testSetUsername() {
-        try {
-            apiClient.setUsername("my-username");
-            fail("there should be no HTTP basic authentications");
-        } catch (RuntimeException e) {
+    public void testSetUsernameAndPassword() {
+        HttpBasicAuth auth = null;
+        for (Authentication _auth : apiClient.getAuthentications().values()) {
+            if (_auth instanceof HttpBasicAuth) {
+                auth = (HttpBasicAuth) _auth;
+                break;
+            }
         }
-    }
+        auth.setUsername(null);
+        auth.setPassword(null);
 
-    @Test
-    public void testSetPassword() {
-        try {
-            apiClient.setPassword("my-password");
-            fail("there should be no HTTP basic authentications");
-        } catch (RuntimeException e) {
-        }
+        apiClient.setUsername("my-username");
+        apiClient.setPassword("my-password");
+        assertEquals("my-username", auth.getUsername());
+        assertEquals("my-password", auth.getPassword());
+
+        // reset values
+        auth.setUsername(null);
+        auth.setPassword(null);
     }
 
     @Test
     public void testSetApiKeyAndPrefix() {
-        ApiKeyAuth auth = (ApiKeyAuth) apiClient.getAuthentications().get("api_key");
+        ApiKeyAuth auth = null;
+        for (Authentication _auth : apiClient.getAuthentications().values()) {
+            if (_auth instanceof ApiKeyAuth) {
+                auth = (ApiKeyAuth) _auth;
+                break;
+            }
+        }
         auth.setApiKey(null);
         auth.setApiKeyPrefix(null);
 
diff --git a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/PetApiTest.java
index c0bee9328d5..9af7c537877 100644
--- a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/PetApiTest.java
+++ b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/PetApiTest.java
@@ -1,9 +1,10 @@
 package io.swagger.petstore.test;
 
-import io.swagger.client.ApiClient;
-import io.swagger.client.ApiException;
-import io.swagger.client.Configuration;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
+import io.swagger.TestUtils;
+
+import io.swagger.client.*;
 import io.swagger.client.api.*;
 import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
@@ -14,6 +15,7 @@ import java.io.FileWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 import org.junit.*;
 import static org.junit.Assert.*;
@@ -68,6 +70,53 @@ public class PetApiTest {
         assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
     }
 
+    @Test
+    public void testCreateAndGetPetWithByteArray() throws Exception {
+        Pet pet = createRandomPet();
+        byte[] bytes = serializeJson(pet, api.getApiClient()).getBytes();
+        api.addPetUsingByteArray(bytes);
+
+        byte[] fetchedBytes = api.petPetIdtestingByteArraytrueGet(pet.getId());
+        Pet fetched = deserializeJson(new String(fetchedBytes), Pet.class, api.getApiClient());
+        assertNotNull(fetched);
+        assertEquals(pet.getId(), fetched.getId());
+        assertNotNull(fetched.getCategory());
+        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
+    }
+
+    @Test
+    public void testGetPetByIdInObject() throws Exception {
+        Pet pet = new Pet();
+        pet.setId(TestUtils.nextId());
+        pet.setName("pet " + pet.getId());
+
+        Category category = new Category();
+        category.setId(TestUtils.nextId());
+        category.setName("category " + category.getId());
+        pet.setCategory(category);
+
+        pet.setStatus(Pet.StatusEnum.PENDING);
+        List<String> photos = Arrays.asList(new String[]{"http://foo.bar.com/1"});
+        pet.setPhotoUrls(photos);
+
+        api.addPet(pet);
+
+        InlineResponse200 fetched = api.getPetByIdInObject(pet.getId());
+        assertEquals(pet.getId(), fetched.getId());
+        assertEquals(pet.getName(), fetched.getName());
+
+        Object categoryObj = fetched.getCategory();
+        assertNotNull(categoryObj);
+        assertTrue(categoryObj instanceof Map);
+
+        Map categoryMap = (Map) categoryObj;
+        Object categoryIdObj = categoryMap.get("id");
+        assertTrue(categoryIdObj instanceof Integer);
+        Integer categoryIdInt = (Integer) categoryIdObj;
+        assertEquals(category.getId(), Long.valueOf(categoryIdInt));
+        assertEquals(category.getName(), categoryMap.get("name"));
+    }
+
     @Test
     public void testUpdatePet() throws Exception {
         Pet pet = createRandomPet();
@@ -203,7 +252,7 @@ public class PetApiTest {
 
     private Pet createRandomPet() {
         Pet pet = new Pet();
-        pet.setId(System.currentTimeMillis());
+        pet.setId(TestUtils.nextId());
         pet.setName("gorilla");
 
         Category category = new Category();
@@ -216,4 +265,22 @@ public class PetApiTest {
 
         return pet;
     }
+
+    private String serializeJson(Object o, ApiClient apiClient) {
+        ObjectMapper mapper = apiClient.getJSON().getContext(null);
+        try {
+            return mapper.writeValueAsString(o);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private <T> T deserializeJson(String json, Class<T> klass, ApiClient apiClient) {
+        ObjectMapper mapper = apiClient.getJSON().getContext(null);
+        try {
+            return mapper.readValue(json, klass);
+        } catch (Exception e) {
+          throw new RuntimeException(e);
+        }
+    }
 }
diff --git a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/StoreApiTest.java
index 6094f2242e1..b0106d2f4c6 100644
--- a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/StoreApiTest.java
+++ b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/StoreApiTest.java
@@ -1,12 +1,13 @@
 package io.swagger.petstore.test;
 
-import io.swagger.client.ApiException;
+import io.swagger.TestUtils;
 
 import io.swagger.client.*;
 import io.swagger.client.api.*;
 import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
 
+import java.lang.reflect.Field;
 import java.util.Map;
 import java.text.SimpleDateFormat;
 
@@ -32,6 +33,19 @@ public class StoreApiTest {
         assertTrue(inventory.keySet().size() > 0);
     }
 
+    @Test
+    public void testGetInventoryInObject() throws Exception {
+        Object inventoryObj = api.getInventoryInObject();
+        assertTrue(inventoryObj instanceof Map);
+
+        Map inventoryMap = (Map) inventoryObj;
+        assertTrue(inventoryMap.keySet().size() > 0);
+
+        Map.Entry firstEntry = (Map.Entry) inventoryMap.entrySet().iterator().next();
+        assertTrue(firstEntry.getKey() instanceof String);
+        assertTrue(firstEntry.getValue() instanceof Integer);
+    }
+
     @Test
     public void testPlaceOrder() throws Exception {
         Order order = createOrder();
@@ -63,13 +77,20 @@ public class StoreApiTest {
 
     private Order createOrder() {
         Order order = new Order();
-        order.setId(new Long(System.currentTimeMillis()));
         order.setPetId(new Long(200));
         order.setQuantity(new Integer(13));
         order.setShipDate(new java.util.Date());
         order.setStatus(Order.StatusEnum.PLACED);
         order.setComplete(true);
 
+        try {
+          Field idField = Order.class.getDeclaredField("id");
+          idField.setAccessible(true);
+          idField.set(order, TestUtils.nextId());
+        } catch (Exception e) {
+          throw new RuntimeException(e);
+        }
+
         return order;
     }
 }
diff --git a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/UserApiTest.java b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/UserApiTest.java
index a3f257f568b..195e5c1e861 100644
--- a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/UserApiTest.java
+++ b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/UserApiTest.java
@@ -1,5 +1,7 @@
 package io.swagger.petstore.test;
 
+import io.swagger.TestUtils;
+
 import io.swagger.client.api.*;
 import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
@@ -33,9 +35,9 @@ public class UserApiTest {
     @Test
     public void testCreateUsersWithArray() throws Exception {
         User user1 = createUser();
-        user1.setUsername("abc123");
+        user1.setUsername("user" + user1.getId());
         User user2 = createUser();
-        user2.setUsername("123abc");
+        user2.setUsername("user" + user2.getId());
 
         api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2}));
 
@@ -46,9 +48,9 @@ public class UserApiTest {
     @Test
     public void testCreateUsersWithList() throws Exception {
         User user1 = createUser();
-        user1.setUsername("abc123");
+        user1.setUsername("user" + user1.getId());
         User user2 = createUser();
-        user2.setUsername("123abc");
+        user2.setUsername("user" + user2.getId());
 
         api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2}));
 
@@ -72,7 +74,7 @@ public class UserApiTest {
 
     private User createUser() {
         User user = new User();
-        user.setId(System.currentTimeMillis());
+        user.setId(TestUtils.nextId());
         user.setUsername("fred" + user.getId());
         user.setFirstName("Fred");
         user.setLastName("Meyer");
diff --git a/samples/client/petstore/java/okhttp-gson/.gitignore b/samples/client/petstore/java/okhttp-gson/.gitignore
new file mode 100644
index 00000000000..32858aad3c3
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/.gitignore
@@ -0,0 +1,12 @@
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
diff --git a/samples/client/petstore/java/okhttp-gson/README.md b/samples/client/petstore/java/okhttp-gson/README.md
index be7ff686b7a..fd85a16cd07 100644
--- a/samples/client/petstore/java/okhttp-gson/README.md
+++ b/samples/client/petstore/java/okhttp-gson/README.md
@@ -20,7 +20,7 @@ mvn deploy
 
 Refer to the [official documentation](https://maven.apache.org/plugins/maven-deploy-plugin/usage.html) for more information.
 
-After the client libarary is installed/deployed, you can use it in your Maven project by adding the following to your *pom.xml*:
+After the client library is installed/deployed, you can use it in your Maven project by adding the following to your *pom.xml*:
 
 ```xml
 <dependency>
diff --git a/samples/client/petstore/java/okhttp-gson/build.gradle b/samples/client/petstore/java/okhttp-gson/build.gradle
index c739b5e1a23..b81de6dbf3a 100644
--- a/samples/client/petstore/java/okhttp-gson/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson/build.gradle
@@ -1,3 +1,6 @@
+apply plugin: 'idea'
+apply plugin: 'eclipse'
+
 group = 'io.swagger'
 version = '1.0.0'
 
@@ -20,7 +23,7 @@ if(hasProperty('target') && target == 'android') {
 
     apply plugin: 'com.android.library'
     apply plugin: 'com.github.dcendents.android-maven'
-    
+
     android {
         compileSdkVersion 22
         buildToolsVersion '22.0.0'
@@ -32,7 +35,7 @@ if(hasProperty('target') && target == 'android') {
             sourceCompatibility JavaVersion.VERSION_1_7
             targetCompatibility JavaVersion.VERSION_1_7
         }
-    
+
         // Rename the aar correctly
         libraryVariants.all { variant ->
             variant.outputs.each { output ->
@@ -48,7 +51,7 @@ if(hasProperty('target') && target == 'android') {
             provided 'javax.annotation:jsr250-api:1.0'
         }
     }
-    
+
     afterEvaluate {
         android.libraryVariants.all { variant ->
             def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
@@ -60,12 +63,12 @@ if(hasProperty('target') && target == 'android') {
             artifacts.add('archives', task);
         }
     }
-    
+
     task sourcesJar(type: Jar) {
         from android.sourceSets.main.java.srcDirs
         classifier = 'sources'
     }
-    
+
     artifacts {
         archives sourcesJar
     }
@@ -74,16 +77,16 @@ if(hasProperty('target') && target == 'android') {
 
     apply plugin: 'java'
     apply plugin: 'maven'
-    
+
     sourceCompatibility = JavaVersion.VERSION_1_7
     targetCompatibility = JavaVersion.VERSION_1_7
-    
+
     install {
         repositories.mavenInstaller {
             pom.artifactId = 'swagger-petstore-okhttp-gson'
         }
     }
-    
+
     task execute(type:JavaExec) {
        main = System.getProperty('mainClass')
        classpath = sourceSets.main.runtimeClasspath
@@ -92,8 +95,8 @@ if(hasProperty('target') && target == 'android') {
 
 dependencies {
     compile 'io.swagger:swagger-annotations:1.5.0'
-    compile 'com.squareup.okhttp:okhttp:2.4.0'
+    compile 'com.squareup.okhttp:okhttp:2.7.2'
+    compile 'com.squareup.okhttp:logging-interceptor:2.7.2'
     compile 'com.google.code.gson:gson:2.3.1'
-    compile 'com.brsanthu:migbase64:2.2'
     testCompile 'junit:junit:4.8.1'
 }
diff --git a/samples/client/petstore/java/okhttp-gson/build.sbt b/samples/client/petstore/java/okhttp-gson/build.sbt
index f70c7ea41c7..873affa9604 100644
--- a/samples/client/petstore/java/okhttp-gson/build.sbt
+++ b/samples/client/petstore/java/okhttp-gson/build.sbt
@@ -10,9 +10,9 @@ lazy val root = (project in file(".")).
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       "io.swagger" % "swagger-annotations" % "1.5.0",
-      "com.squareup.okhttp" % "okhttp" % "2.4.0",
+      "com.squareup.okhttp" % "okhttp" % "2.7.2",
+      "com.squareup.okhttp" % "logging-interceptor" % "2.7.2",
       "com.google.code.gson" % "gson" % "2.3.1",
-      "com.brsanthu" % "migbase64" % "2.2",
       "junit" % "junit" % "4.8.1" % "test"
     )
   )
diff --git a/samples/client/petstore/java/okhttp-gson/git_push.sh b/samples/client/petstore/java/okhttp-gson/git_push.sh
new file mode 100644
index 00000000000..1a36388db02
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="YOUR_GIT_USR_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="YOUR_GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/client/petstore/java/okhttp-gson/pom.xml b/samples/client/petstore/java/okhttp-gson/pom.xml
index 9fa057be939..0e9dbe72685 100644
--- a/samples/client/petstore/java/okhttp-gson/pom.xml
+++ b/samples/client/petstore/java/okhttp-gson/pom.xml
@@ -104,6 +104,26 @@
           <target>1.6</target>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.2.1</version>
+        <executions>
+          <execution>
+            <id>gradle-test</id>
+            <phase>integration-test</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>gradle</executable>
+              <arguments>
+                <argument>check</argument>
+              </arguments>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <dependencies>
@@ -117,6 +137,11 @@
       <artifactId>okhttp</artifactId>
       <version>${okhttp-version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp</groupId>
+      <artifactId>logging-interceptor</artifactId>
+      <version>${okhttp-version}</version>
+    </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
@@ -133,7 +158,7 @@
   </dependencies>
   <properties>
     <swagger-annotations-version>1.5.0</swagger-annotations-version>
-    <okhttp-version>2.4.0</okhttp-version>
+    <okhttp-version>2.7.2</okhttp-version>
     <gson-version>2.3.1</gson-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <junit-version>4.8.1</junit-version>
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java
index 7fb4cc49bf3..ef5ae6fa25d 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java
@@ -11,6 +11,8 @@ import com.squareup.okhttp.MultipartBuilder;
 import com.squareup.okhttp.MediaType;
 import com.squareup.okhttp.Headers;
 import com.squareup.okhttp.internal.http.HttpMethod;
+import com.squareup.okhttp.logging.HttpLoggingInterceptor;
+import com.squareup.okhttp.logging.HttpLoggingInterceptor.Level;
 
 import java.lang.reflect.Type;
 
@@ -116,6 +118,8 @@ public class ApiClient {
   private OkHttpClient httpClient;
   private JSON json;
 
+  private HttpLoggingInterceptor loggingInterceptor;
+
   public ApiClient() {
     httpClient = new OkHttpClient();
 
@@ -137,12 +141,17 @@ public class ApiClient {
     this.lenientDatetimeFormat = true;
 
     // Set default User-Agent.
-    setUserAgent("Java-Swagger");
+    setUserAgent("Swagger-Codegen/1.0.0/java");
 
     // Setup authentications (key: authentication name, value: authentication).
     authentications = new HashMap<String, Authentication>();
-    authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
     authentications.put("petstore_auth", new OAuth());
+    authentications.put("test_api_client_id", new ApiKeyAuth("header", "x-test_api_client_id"));
+    authentications.put("test_api_client_secret", new ApiKeyAuth("header", "x-test_api_client_secret"));
+    authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
+    authentications.put("test_http_basic", new HttpBasicAuth());
+    authentications.put("test_api_key_query", new ApiKeyAuth("query", "test_api_key_query"));
+    authentications.put("test_api_key_header", new ApiKeyAuth("header", "test_api_key_header"));
     // Prevent the authentications from being modified.
     authentications = Collections.unmodifiableMap(authentications);
   }
@@ -451,6 +460,16 @@ public class ApiClient {
    * @param debugging To enable (true) or disable (false) debugging
    */
   public ApiClient setDebugging(boolean debugging) {
+    if (debugging != this.debugging) {
+      if (debugging) {
+        loggingInterceptor = new HttpLoggingInterceptor();
+        loggingInterceptor.setLevel(Level.BODY);
+        httpClient.interceptors().add(loggingInterceptor);
+      } else {
+        httpClient.interceptors().remove(loggingInterceptor);
+        loggingInterceptor = null;
+      }
+    }
     this.debugging = debugging;
     return this;
   }
@@ -566,6 +585,17 @@ public class ApiClient {
     return params;
   }
 
+  /**
+   * Sanitize filename by removing path.
+   * e.g. ../../sun.gif becomes sun.gif
+   *
+   * @param filename The filename to be sanitized
+   * @return The sanitized filename
+   */
+  public String sanitizeFilename(String filename) {
+    return filename.replaceAll(".*[/\\\\]", "");
+  }
+
   /**
    * Check if the given MIME is a JSON MIME.
    * JSON MIME examples:
@@ -631,8 +661,8 @@ public class ApiClient {
   }
 
   /**
-   * Deserialize response body to Java object, according to the Content-Type
-   * response header.
+   * Deserialize response body to Java object, according to the return type and
+   * the Content-Type response header.
    *
    * @param response HTTP response
    * @param returnType The type of the Java object
@@ -641,12 +671,21 @@ public class ApiClient {
    *   or the Content-Type of the response is not supported.
    */
   public <T> T deserialize(Response response, Type returnType) throws ApiException {
-    if (response == null || returnType == null)
+    if (response == null || returnType == null) {
       return null;
+    }
 
-    // Handle file downloading.
-    if (returnType.equals(File.class))
+    if ("byte[]".equals(returnType.toString())) {
+      // Handle binary response (byte array).
+      try {
+        return (T) response.body().bytes();
+      } catch (IOException e) {
+        throw new ApiException(e);
+      }
+    } else if (returnType.equals(File.class)) {
+      // Handle file downloading.
       return (T) downloadFileFromResponse(response);
+    }
 
     String respBody;
     try {
@@ -658,8 +697,9 @@ public class ApiClient {
       throw new ApiException(e);
     }
 
-    if (respBody == null || "".equals(respBody))
+    if (respBody == null || "".equals(respBody)) {
       return null;
+    }
 
     String contentType = response.headers().get("Content-Type");
     if (contentType == null) {
@@ -681,20 +721,29 @@ public class ApiClient {
   }
 
   /**
-   * Serialize the given Java object into request body string, according to the
-   * request Content-Type.
+   * Serialize the given Java object into request body according to the object's
+   * class and the request Content-Type.
    *
    * @param obj The Java object
    * @param contentType The request Content-Type
-   * @return The serialized string
+   * @return The serialized request body
    * @throws ApiException If fail to serialize the given object
    */
-  public String serialize(Object obj, String contentType) throws ApiException {
-    if (isJsonMime(contentType)) {
-      if (obj != null)
-        return json.serialize(obj);
-      else
-        return null;
+  public RequestBody serialize(Object obj, String contentType) throws ApiException {
+    if (obj instanceof byte[]) {
+      // Binary (byte array) body parameter support.
+      return RequestBody.create(MediaType.parse(contentType), (byte[]) obj);
+    } else if (obj instanceof File) {
+      // File body parameter support.
+      return RequestBody.create(MediaType.parse(contentType), (File) obj);
+    } else if (isJsonMime(contentType)) {
+      String content;
+      if (obj != null) {
+        content = json.serialize(obj);
+      } else {
+        content = null;
+      }
+      return RequestBody.create(MediaType.parse(contentType), content);
     } else {
       throw new ApiException("Content type \"" + contentType + "\" is not supported");
     }
@@ -723,8 +772,9 @@ public class ApiClient {
       // Get filename from the Content-Disposition header.
       Pattern pattern = Pattern.compile("filename=['\"]?([^'\"\\s]+)['\"]?");
       Matcher matcher = pattern.matcher(contentDisposition);
-      if (matcher.find())
-        filename = matcher.group(1);
+      if (matcher.find()) {
+        filename = sanitizeFilename(matcher.group(1));
+      }
     }
 
     String prefix = null;
@@ -882,7 +932,7 @@ public class ApiClient {
         reqBody = RequestBody.create(MediaType.parse(contentType), "");
       }
     } else {
-      reqBody = RequestBody.create(MediaType.parse(contentType), serialize(body, contentType));
+      reqBody = serialize(body, contentType);
     }
 
     Request request = null;
@@ -905,20 +955,27 @@ public class ApiClient {
    * @return The full URL
    */
   public String buildUrl(String path, List<Pair> queryParams) {
-    StringBuilder query = new StringBuilder();
-    if (queryParams != null) {
+    final StringBuilder url = new StringBuilder();
+    url.append(basePath).append(path);
+
+    if (queryParams != null && !queryParams.isEmpty()) {
+      // support (constant) query string in `path`, e.g. "/posts?draft=1"
+      String prefix = path.contains("?") ? "&" : "?";
       for (Pair param : queryParams) {
         if (param.getValue() != null) {
-          if (query.toString().length() == 0)
-            query.append("?");
-          else
-            query.append("&");
+          if (prefix != null) {
+            url.append(prefix);
+            prefix = null;
+          } else {
+            url.append("&");
+          }
           String value = parameterToString(param.getValue());
-          query.append(escapeString(param.getName())).append("=").append(escapeString(value));
+          url.append(escapeString(param.getName())).append("=").append(escapeString(value));
         }
       }
     }
-    return basePath + path + query.toString();
+
+    return url.toString();
   }
 
   /**
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiException.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiException.java
index 5433c9e6822..529f9fff8dd 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiException.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiException.java
@@ -3,7 +3,7 @@ package io.swagger.client;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:20.056+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:51.831+08:00")
 public class ApiException extends Exception {
   private int code = 0;
   private Map<String, List<String>> responseHeaders = null;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Configuration.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Configuration.java
index c0ee5bc29b5..c4c80febb52 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Configuration.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Configuration.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:20.056+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:51.831+08:00")
 public class Configuration {
   private static ApiClient defaultApiClient = new ApiClient();
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Pair.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Pair.java
index ae87b55cb55..86d8f1de128 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Pair.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Pair.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:20.056+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:51.831+08:00")
 public class Pair {
     private String name = "";
     private String value = "";
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/StringUtil.java
index f656ce8477b..f9f52549100 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/StringUtil.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/StringUtil.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:20.056+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:51.831+08:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/PetApi.java
index 460cd0f4c4d..507f838e341 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/PetApi.java
@@ -18,10 +18,14 @@ import com.squareup.okhttp.Response;
 import java.io.IOException;
 
 import io.swagger.client.model.Pet;
+import io.swagger.client.model.InlineResponse200;
 import java.io.File;
 
 import java.lang.reflect.Type;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class PetApi {
   private ApiClient apiClient;
@@ -43,129 +47,31 @@ public class PetApi {
   }
 
   
-  /* Build call for updatePet */
-  private Call updatePetCall(Pet body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object postBody = body;
-    
-
-    // create path and map variables
-    String path = "/pet".replaceAll("\\{format\\}","json");
-
-    List<Pair> queryParams = new ArrayList<Pair>();
-
-    Map<String, String> headerParams = new HashMap<String, String>();
-
-    Map<String, Object> formParams = new HashMap<String, Object>();
-
-    final String[] accepts = {
-      "application/json", "application/xml"
-    };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-    if (accept != null) headerParams.put("Accept", accept);
-
-    final String[] contentTypes = {
-      "application/json", "application/xml"
-    };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-    headerParams.put("Content-Type", contentType);
-
-    if(progressListener != null) {
-      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
-      @Override
-      public Response intercept(Interceptor.Chain chain) throws IOException {
-        Response originalResponse = chain.proceed(chain.request());
-        return originalResponse.newBuilder()
-                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                .build();
-        }
-      });
-    }
-
-    String[] authNames = new String[] { "petstore_auth" };
-    return apiClient.buildCall(path, "PUT", queryParams, postBody, headerParams, formParams, authNames, progressRequestListener);
-  }
-
-  /**
-   * Update an existing pet
-   * 
-   * @param body Pet object that needs to be added to the store
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public void updatePet(Pet body) throws ApiException {
-    updatePetWithHttpInfo(body);
-  }
-
-  /**
-   * Update an existing pet
-   * 
-   * @param body Pet object that needs to be added to the store
-   * @return ApiResponse<Void>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ApiResponse<Void> updatePetWithHttpInfo(Pet body) throws ApiException {
-    Call call = updatePetCall(body, null, null);
-    return apiClient.execute(call);
-  }
-
-  /**
-   * Update an existing pet (asynchronously)
-   * 
-   * @param body Pet object that needs to be added to the store
-   * @param callback The callback to be executed when the API call finishes
-   * @return The request call
-   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-   */
-  public Call updatePetAsync(Pet body, final ApiCallback<Void> callback) throws ApiException {
-
-    ProgressResponseBody.ProgressListener progressListener = null;
-    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-    if (callback != null) {
-      progressListener = new ProgressResponseBody.ProgressListener() {
-        @Override
-        public void update(long bytesRead, long contentLength, boolean done) {
-          callback.onDownloadProgress(bytesRead, contentLength, done);
-        } 
-      };
-
-      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-        @Override
-        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-          callback.onUploadProgress(bytesWritten, contentLength, done);
-        }
-      };
-    }
-
-    Call call = updatePetCall(body, progressListener, progressRequestListener);
-    apiClient.executeAsync(call, callback);
-    return call;
-  }
-  
   /* Build call for addPet */
   private Call addPetCall(Pet body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object postBody = body;
+    Object localVarPostBody = body;
     
 
     // create path and map variables
-    String path = "/pet".replaceAll("\\{format\\}","json");
+    String localVarPath = "/pet".replaceAll("\\{format\\}","json");
 
-    List<Pair> queryParams = new ArrayList<Pair>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
 
-    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-    if (accept != null) headerParams.put("Accept", accept);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       "application/json", "application/xml"
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-    headerParams.put("Content-Type", contentType);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+    localVarHeaderParams.put("Content-Type", localVarContentType);
 
     if(progressListener != null) {
       apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
@@ -179,14 +85,14 @@ public class PetApi {
       });
     }
 
-    String[] authNames = new String[] { "petstore_auth" };
-    return apiClient.buildCall(path, "POST", queryParams, postBody, headerParams, formParams, authNames, progressRequestListener);
+    String[] localVarAuthNames = new String[] { "petstore_auth" };
+    return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
   }
 
   /**
    * Add a new pet to the store
    * 
-   * @param body Pet object that needs to be added to the store
+   * @param body Pet object that needs to be added to the store (optional)
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
   public void addPet(Pet body) throws ApiException {
@@ -196,7 +102,7 @@ public class PetApi {
   /**
    * Add a new pet to the store
    * 
-   * @param body Pet object that needs to be added to the store
+   * @param body Pet object that needs to be added to the store (optional)
    * @return ApiResponse<Void>
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
@@ -208,7 +114,7 @@ public class PetApi {
   /**
    * Add a new pet to the store (asynchronously)
    * 
-   * @param body Pet object that needs to be added to the store
+   * @param body Pet object that needs to be added to the store (optional)
    * @param callback The callback to be executed when the API call finishes
    * @return The request call
    * @throws ApiException If fail to process the API call, e.g. serializing the request body object
@@ -223,7 +129,7 @@ public class PetApi {
         @Override
         public void update(long bytesRead, long contentLength, boolean done) {
           callback.onDownloadProgress(bytesRead, contentLength, done);
-        } 
+        }
       };
 
       progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
@@ -239,33 +145,31 @@ public class PetApi {
     return call;
   }
   
-  /* Build call for findPetsByStatus */
-  private Call findPetsByStatusCall(List<String> status, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object postBody = null;
+  /* Build call for addPetUsingByteArray */
+  private Call addPetUsingByteArrayCall(byte[] body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    Object localVarPostBody = body;
     
 
     // create path and map variables
-    String path = "/pet/findByStatus".replaceAll("\\{format\\}","json");
+    String localVarPath = "/pet?testing_byte_array=true".replaceAll("\\{format\\}","json");
 
-    List<Pair> queryParams = new ArrayList<Pair>();
-    if (status != null)
-      queryParams.addAll(apiClient.parameterToPairs("multi", "status", status));
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
 
-    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-    if (accept != null) headerParams.put("Accept", accept);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
 
-    final String[] contentTypes = {
-      
+    final String[] localVarContentTypes = {
+      "application/json", "application/xml"
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-    headerParams.put("Content-Type", contentType);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+    localVarHeaderParams.put("Content-Type", localVarContentType);
 
     if(progressListener != null) {
       apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
@@ -279,371 +183,41 @@ public class PetApi {
       });
     }
 
-    String[] authNames = new String[] { "petstore_auth" };
-    return apiClient.buildCall(path, "GET", queryParams, postBody, headerParams, formParams, authNames, progressRequestListener);
+    String[] localVarAuthNames = new String[] { "petstore_auth" };
+    return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
   }
 
   /**
-   * Finds Pets by status
-   * Multiple status values can be provided with comma seperated strings
-   * @param status Status values that need to be considered for filter
-   * @return List<Pet>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public List<Pet> findPetsByStatus(List<String> status) throws ApiException {
-    ApiResponse<List<Pet>> resp = findPetsByStatusWithHttpInfo(status);
-    return resp.getData();
-  }
-
-  /**
-   * Finds Pets by status
-   * Multiple status values can be provided with comma seperated strings
-   * @param status Status values that need to be considered for filter
-   * @return ApiResponse<List<Pet>>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(List<String> status) throws ApiException {
-    Call call = findPetsByStatusCall(status, null, null);
-    Type returnType = new TypeToken<List<Pet>>(){}.getType();
-    return apiClient.execute(call, returnType);
-  }
-
-  /**
-   * Finds Pets by status (asynchronously)
-   * Multiple status values can be provided with comma seperated strings
-   * @param status Status values that need to be considered for filter
-   * @param callback The callback to be executed when the API call finishes
-   * @return The request call
-   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-   */
-  public Call findPetsByStatusAsync(List<String> status, final ApiCallback<List<Pet>> callback) throws ApiException {
-
-    ProgressResponseBody.ProgressListener progressListener = null;
-    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-    if (callback != null) {
-      progressListener = new ProgressResponseBody.ProgressListener() {
-        @Override
-        public void update(long bytesRead, long contentLength, boolean done) {
-          callback.onDownloadProgress(bytesRead, contentLength, done);
-        } 
-      };
-
-      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-        @Override
-        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-          callback.onUploadProgress(bytesWritten, contentLength, done);
-        }
-      };
-    }
-
-    Call call = findPetsByStatusCall(status, progressListener, progressRequestListener);
-    Type returnType = new TypeToken<List<Pet>>(){}.getType();
-    apiClient.executeAsync(call, returnType, callback);
-    return call;
-  }
-  
-  /* Build call for findPetsByTags */
-  private Call findPetsByTagsCall(List<String> tags, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object postBody = null;
-    
-
-    // create path and map variables
-    String path = "/pet/findByTags".replaceAll("\\{format\\}","json");
-
-    List<Pair> queryParams = new ArrayList<Pair>();
-    if (tags != null)
-      queryParams.addAll(apiClient.parameterToPairs("multi", "tags", tags));
-
-    Map<String, String> headerParams = new HashMap<String, String>();
-
-    Map<String, Object> formParams = new HashMap<String, Object>();
-
-    final String[] accepts = {
-      "application/json", "application/xml"
-    };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-    if (accept != null) headerParams.put("Accept", accept);
-
-    final String[] contentTypes = {
-      
-    };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-    headerParams.put("Content-Type", contentType);
-
-    if(progressListener != null) {
-      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
-      @Override
-      public Response intercept(Interceptor.Chain chain) throws IOException {
-        Response originalResponse = chain.proceed(chain.request());
-        return originalResponse.newBuilder()
-                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                .build();
-        }
-      });
-    }
-
-    String[] authNames = new String[] { "petstore_auth" };
-    return apiClient.buildCall(path, "GET", queryParams, postBody, headerParams, formParams, authNames, progressRequestListener);
-  }
-
-  /**
-   * Finds Pets by tags
-   * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-   * @param tags Tags to filter by
-   * @return List<Pet>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public List<Pet> findPetsByTags(List<String> tags) throws ApiException {
-    ApiResponse<List<Pet>> resp = findPetsByTagsWithHttpInfo(tags);
-    return resp.getData();
-  }
-
-  /**
-   * Finds Pets by tags
-   * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-   * @param tags Tags to filter by
-   * @return ApiResponse<List<Pet>>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ApiResponse<List<Pet>> findPetsByTagsWithHttpInfo(List<String> tags) throws ApiException {
-    Call call = findPetsByTagsCall(tags, null, null);
-    Type returnType = new TypeToken<List<Pet>>(){}.getType();
-    return apiClient.execute(call, returnType);
-  }
-
-  /**
-   * Finds Pets by tags (asynchronously)
-   * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-   * @param tags Tags to filter by
-   * @param callback The callback to be executed when the API call finishes
-   * @return The request call
-   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-   */
-  public Call findPetsByTagsAsync(List<String> tags, final ApiCallback<List<Pet>> callback) throws ApiException {
-
-    ProgressResponseBody.ProgressListener progressListener = null;
-    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-    if (callback != null) {
-      progressListener = new ProgressResponseBody.ProgressListener() {
-        @Override
-        public void update(long bytesRead, long contentLength, boolean done) {
-          callback.onDownloadProgress(bytesRead, contentLength, done);
-        } 
-      };
-
-      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-        @Override
-        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-          callback.onUploadProgress(bytesWritten, contentLength, done);
-        }
-      };
-    }
-
-    Call call = findPetsByTagsCall(tags, progressListener, progressRequestListener);
-    Type returnType = new TypeToken<List<Pet>>(){}.getType();
-    apiClient.executeAsync(call, returnType, callback);
-    return call;
-  }
-  
-  /* Build call for getPetById */
-  private Call getPetByIdCall(Long petId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object postBody = null;
-    
-    // verify the required parameter 'petId' is set
-    if (petId == null) {
-       throw new ApiException("Missing the required parameter 'petId' when calling getPetById(Async)");
-    }
-    
-
-    // create path and map variables
-    String path = "/pet/{petId}".replaceAll("\\{format\\}","json")
-      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
-
-    List<Pair> queryParams = new ArrayList<Pair>();
-
-    Map<String, String> headerParams = new HashMap<String, String>();
-
-    Map<String, Object> formParams = new HashMap<String, Object>();
-
-    final String[] accepts = {
-      "application/json", "application/xml"
-    };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-    if (accept != null) headerParams.put("Accept", accept);
-
-    final String[] contentTypes = {
-      
-    };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-    headerParams.put("Content-Type", contentType);
-
-    if(progressListener != null) {
-      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
-      @Override
-      public Response intercept(Interceptor.Chain chain) throws IOException {
-        Response originalResponse = chain.proceed(chain.request());
-        return originalResponse.newBuilder()
-                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                .build();
-        }
-      });
-    }
-
-    String[] authNames = new String[] { "api_key" };
-    return apiClient.buildCall(path, "GET", queryParams, postBody, headerParams, formParams, authNames, progressRequestListener);
-  }
-
-  /**
-   * Find pet by ID
-   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-   * @param petId ID of pet that needs to be fetched
-   * @return Pet
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public Pet getPetById(Long petId) throws ApiException {
-    ApiResponse<Pet> resp = getPetByIdWithHttpInfo(petId);
-    return resp.getData();
-  }
-
-  /**
-   * Find pet by ID
-   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-   * @param petId ID of pet that needs to be fetched
-   * @return ApiResponse<Pet>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ApiResponse<Pet> getPetByIdWithHttpInfo(Long petId) throws ApiException {
-    Call call = getPetByIdCall(petId, null, null);
-    Type returnType = new TypeToken<Pet>(){}.getType();
-    return apiClient.execute(call, returnType);
-  }
-
-  /**
-   * Find pet by ID (asynchronously)
-   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-   * @param petId ID of pet that needs to be fetched
-   * @param callback The callback to be executed when the API call finishes
-   * @return The request call
-   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-   */
-  public Call getPetByIdAsync(Long petId, final ApiCallback<Pet> callback) throws ApiException {
-
-    ProgressResponseBody.ProgressListener progressListener = null;
-    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-    if (callback != null) {
-      progressListener = new ProgressResponseBody.ProgressListener() {
-        @Override
-        public void update(long bytesRead, long contentLength, boolean done) {
-          callback.onDownloadProgress(bytesRead, contentLength, done);
-        } 
-      };
-
-      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-        @Override
-        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-          callback.onUploadProgress(bytesWritten, contentLength, done);
-        }
-      };
-    }
-
-    Call call = getPetByIdCall(petId, progressListener, progressRequestListener);
-    Type returnType = new TypeToken<Pet>(){}.getType();
-    apiClient.executeAsync(call, returnType, callback);
-    return call;
-  }
-  
-  /* Build call for updatePetWithForm */
-  private Call updatePetWithFormCall(String petId, String name, String status, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object postBody = null;
-    
-    // verify the required parameter 'petId' is set
-    if (petId == null) {
-       throw new ApiException("Missing the required parameter 'petId' when calling updatePetWithForm(Async)");
-    }
-    
-
-    // create path and map variables
-    String path = "/pet/{petId}".replaceAll("\\{format\\}","json")
-      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
-
-    List<Pair> queryParams = new ArrayList<Pair>();
-
-    Map<String, String> headerParams = new HashMap<String, String>();
-
-    Map<String, Object> formParams = new HashMap<String, Object>();
-    if (name != null)
-      formParams.put("name", name);
-    if (status != null)
-      formParams.put("status", status);
-
-    final String[] accepts = {
-      "application/json", "application/xml"
-    };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-    if (accept != null) headerParams.put("Accept", accept);
-
-    final String[] contentTypes = {
-      "application/x-www-form-urlencoded"
-    };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-    headerParams.put("Content-Type", contentType);
-
-    if(progressListener != null) {
-      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
-      @Override
-      public Response intercept(Interceptor.Chain chain) throws IOException {
-        Response originalResponse = chain.proceed(chain.request());
-        return originalResponse.newBuilder()
-                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                .build();
-        }
-      });
-    }
-
-    String[] authNames = new String[] { "petstore_auth" };
-    return apiClient.buildCall(path, "POST", queryParams, postBody, headerParams, formParams, authNames, progressRequestListener);
-  }
-
-  /**
-   * Updates a pet in the store with form data
+   * Fake endpoint to test byte array in body parameter for adding a new pet to the store
    * 
-   * @param petId ID of pet that needs to be updated
-   * @param name Updated name of the pet
-   * @param status Updated status of the pet
+   * @param body Pet object in the form of byte array (optional)
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
-  public void updatePetWithForm(String petId, String name, String status) throws ApiException {
-    updatePetWithFormWithHttpInfo(petId, name, status);
+  public void addPetUsingByteArray(byte[] body) throws ApiException {
+    addPetUsingByteArrayWithHttpInfo(body);
   }
 
   /**
-   * Updates a pet in the store with form data
+   * Fake endpoint to test byte array in body parameter for adding a new pet to the store
    * 
-   * @param petId ID of pet that needs to be updated
-   * @param name Updated name of the pet
-   * @param status Updated status of the pet
+   * @param body Pet object in the form of byte array (optional)
    * @return ApiResponse<Void>
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
-  public ApiResponse<Void> updatePetWithFormWithHttpInfo(String petId, String name, String status) throws ApiException {
-    Call call = updatePetWithFormCall(petId, name, status, null, null);
+  public ApiResponse<Void> addPetUsingByteArrayWithHttpInfo(byte[] body) throws ApiException {
+    Call call = addPetUsingByteArrayCall(body, null, null);
     return apiClient.execute(call);
   }
 
   /**
-   * Updates a pet in the store with form data (asynchronously)
+   * Fake endpoint to test byte array in body parameter for adding a new pet to the store (asynchronously)
    * 
-   * @param petId ID of pet that needs to be updated
-   * @param name Updated name of the pet
-   * @param status Updated status of the pet
+   * @param body Pet object in the form of byte array (optional)
    * @param callback The callback to be executed when the API call finishes
    * @return The request call
    * @throws ApiException If fail to process the API call, e.g. serializing the request body object
    */
-  public Call updatePetWithFormAsync(String petId, String name, String status, final ApiCallback<Void> callback) throws ApiException {
+  public Call addPetUsingByteArrayAsync(byte[] body, final ApiCallback<Void> callback) throws ApiException {
 
     ProgressResponseBody.ProgressListener progressListener = null;
     ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -653,7 +227,7 @@ public class PetApi {
         @Override
         public void update(long bytesRead, long contentLength, boolean done) {
           callback.onDownloadProgress(bytesRead, contentLength, done);
-        } 
+        }
       };
 
       progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
@@ -664,14 +238,14 @@ public class PetApi {
       };
     }
 
-    Call call = updatePetWithFormCall(petId, name, status, progressListener, progressRequestListener);
+    Call call = addPetUsingByteArrayCall(body, progressListener, progressRequestListener);
     apiClient.executeAsync(call, callback);
     return call;
   }
   
   /* Build call for deletePet */
   private Call deletePetCall(Long petId, String apiKey, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object postBody = null;
+    Object localVarPostBody = null;
     
     // verify the required parameter 'petId' is set
     if (petId == null) {
@@ -680,28 +254,28 @@ public class PetApi {
     
 
     // create path and map variables
-    String path = "/pet/{petId}".replaceAll("\\{format\\}","json")
+    String localVarPath = "/pet/{petId}".replaceAll("\\{format\\}","json")
       .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
 
-    List<Pair> queryParams = new ArrayList<Pair>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
 
-    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     if (apiKey != null)
-      headerParams.put("api_key", apiClient.parameterToString(apiKey));
+      localVarHeaderParams.put("api_key", apiClient.parameterToString(apiKey));
 
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-    if (accept != null) headerParams.put("Accept", accept);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-    headerParams.put("Content-Type", contentType);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+    localVarHeaderParams.put("Content-Type", localVarContentType);
 
     if(progressListener != null) {
       apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
@@ -715,15 +289,15 @@ public class PetApi {
       });
     }
 
-    String[] authNames = new String[] { "petstore_auth" };
-    return apiClient.buildCall(path, "DELETE", queryParams, postBody, headerParams, formParams, authNames, progressRequestListener);
+    String[] localVarAuthNames = new String[] { "petstore_auth" };
+    return apiClient.buildCall(localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
   }
 
   /**
    * Deletes a pet
    * 
-   * @param petId Pet id to delete
-   * @param apiKey 
+   * @param petId Pet id to delete (required)
+   * @param apiKey  (optional)
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
   public void deletePet(Long petId, String apiKey) throws ApiException {
@@ -733,8 +307,8 @@ public class PetApi {
   /**
    * Deletes a pet
    * 
-   * @param petId Pet id to delete
-   * @param apiKey 
+   * @param petId Pet id to delete (required)
+   * @param apiKey  (optional)
    * @return ApiResponse<Void>
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
@@ -746,8 +320,8 @@ public class PetApi {
   /**
    * Deletes a pet (asynchronously)
    * 
-   * @param petId Pet id to delete
-   * @param apiKey 
+   * @param petId Pet id to delete (required)
+   * @param apiKey  (optional)
    * @param callback The callback to be executed when the API call finishes
    * @return The request call
    * @throws ApiException If fail to process the API call, e.g. serializing the request body object
@@ -762,7 +336,7 @@ public class PetApi {
         @Override
         public void update(long bytesRead, long contentLength, boolean done) {
           callback.onDownloadProgress(bytesRead, contentLength, done);
-        } 
+        }
       };
 
       progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
@@ -778,41 +352,33 @@ public class PetApi {
     return call;
   }
   
-  /* Build call for uploadFile */
-  private Call uploadFileCall(Long petId, String additionalMetadata, File file, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object postBody = null;
-    
-    // verify the required parameter 'petId' is set
-    if (petId == null) {
-       throw new ApiException("Missing the required parameter 'petId' when calling uploadFile(Async)");
-    }
+  /* Build call for findPetsByStatus */
+  private Call findPetsByStatusCall(List<String> status, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    Object localVarPostBody = null;
     
 
     // create path and map variables
-    String path = "/pet/{petId}/uploadImage".replaceAll("\\{format\\}","json")
-      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
+    String localVarPath = "/pet/findByStatus".replaceAll("\\{format\\}","json");
 
-    List<Pair> queryParams = new ArrayList<Pair>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    if (status != null)
+      localVarQueryParams.addAll(apiClient.parameterToPairs("multi", "status", status));
 
-    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
-    Map<String, Object> formParams = new HashMap<String, Object>();
-    if (additionalMetadata != null)
-      formParams.put("additionalMetadata", additionalMetadata);
-    if (file != null)
-      formParams.put("file", file);
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-    if (accept != null) headerParams.put("Accept", accept);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
 
-    final String[] contentTypes = {
-      "multipart/form-data"
+    final String[] localVarContentTypes = {
+      
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-    headerParams.put("Content-Type", contentType);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+    localVarHeaderParams.put("Content-Type", localVarContentType);
 
     if(progressListener != null) {
       apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
@@ -826,16 +392,768 @@ public class PetApi {
       });
     }
 
-    String[] authNames = new String[] { "petstore_auth" };
-    return apiClient.buildCall(path, "POST", queryParams, postBody, headerParams, formParams, authNames, progressRequestListener);
+    String[] localVarAuthNames = new String[] { "petstore_auth" };
+    return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
+  }
+
+  /**
+   * Finds Pets by status
+   * Multiple status values can be provided with comma separated strings
+   * @param status Status values that need to be considered for query (optional, default to available)
+   * @return List<Pet>
+   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+   */
+  public List<Pet> findPetsByStatus(List<String> status) throws ApiException {
+    ApiResponse<List<Pet>> resp = findPetsByStatusWithHttpInfo(status);
+    return resp.getData();
+  }
+
+  /**
+   * Finds Pets by status
+   * Multiple status values can be provided with comma separated strings
+   * @param status Status values that need to be considered for query (optional, default to available)
+   * @return ApiResponse<List<Pet>>
+   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+   */
+  public ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(List<String> status) throws ApiException {
+    Call call = findPetsByStatusCall(status, null, null);
+    Type localVarReturnType = new TypeToken<List<Pet>>(){}.getType();
+    return apiClient.execute(call, localVarReturnType);
+  }
+
+  /**
+   * Finds Pets by status (asynchronously)
+   * Multiple status values can be provided with comma separated strings
+   * @param status Status values that need to be considered for query (optional, default to available)
+   * @param callback The callback to be executed when the API call finishes
+   * @return The request call
+   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+   */
+  public Call findPetsByStatusAsync(List<String> status, final ApiCallback<List<Pet>> callback) throws ApiException {
+
+    ProgressResponseBody.ProgressListener progressListener = null;
+    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+    if (callback != null) {
+      progressListener = new ProgressResponseBody.ProgressListener() {
+        @Override
+        public void update(long bytesRead, long contentLength, boolean done) {
+          callback.onDownloadProgress(bytesRead, contentLength, done);
+        }
+      };
+
+      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+        @Override
+        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+          callback.onUploadProgress(bytesWritten, contentLength, done);
+        }
+      };
+    }
+
+    Call call = findPetsByStatusCall(status, progressListener, progressRequestListener);
+    Type localVarReturnType = new TypeToken<List<Pet>>(){}.getType();
+    apiClient.executeAsync(call, localVarReturnType, callback);
+    return call;
+  }
+  
+  /* Build call for findPetsByTags */
+  private Call findPetsByTagsCall(List<String> tags, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    Object localVarPostBody = null;
+    
+
+    // create path and map variables
+    String localVarPath = "/pet/findByTags".replaceAll("\\{format\\}","json");
+
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    if (tags != null)
+      localVarQueryParams.addAll(apiClient.parameterToPairs("multi", "tags", tags));
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+    localVarHeaderParams.put("Content-Type", localVarContentType);
+
+    if(progressListener != null) {
+      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+      @Override
+      public Response intercept(Interceptor.Chain chain) throws IOException {
+        Response originalResponse = chain.proceed(chain.request());
+        return originalResponse.newBuilder()
+                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                .build();
+        }
+      });
+    }
+
+    String[] localVarAuthNames = new String[] { "petstore_auth" };
+    return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
+  }
+
+  /**
+   * Finds Pets by tags
+   * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+   * @param tags Tags to filter by (optional)
+   * @return List<Pet>
+   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+   */
+  public List<Pet> findPetsByTags(List<String> tags) throws ApiException {
+    ApiResponse<List<Pet>> resp = findPetsByTagsWithHttpInfo(tags);
+    return resp.getData();
+  }
+
+  /**
+   * Finds Pets by tags
+   * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+   * @param tags Tags to filter by (optional)
+   * @return ApiResponse<List<Pet>>
+   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+   */
+  public ApiResponse<List<Pet>> findPetsByTagsWithHttpInfo(List<String> tags) throws ApiException {
+    Call call = findPetsByTagsCall(tags, null, null);
+    Type localVarReturnType = new TypeToken<List<Pet>>(){}.getType();
+    return apiClient.execute(call, localVarReturnType);
+  }
+
+  /**
+   * Finds Pets by tags (asynchronously)
+   * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+   * @param tags Tags to filter by (optional)
+   * @param callback The callback to be executed when the API call finishes
+   * @return The request call
+   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+   */
+  public Call findPetsByTagsAsync(List<String> tags, final ApiCallback<List<Pet>> callback) throws ApiException {
+
+    ProgressResponseBody.ProgressListener progressListener = null;
+    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+    if (callback != null) {
+      progressListener = new ProgressResponseBody.ProgressListener() {
+        @Override
+        public void update(long bytesRead, long contentLength, boolean done) {
+          callback.onDownloadProgress(bytesRead, contentLength, done);
+        }
+      };
+
+      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+        @Override
+        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+          callback.onUploadProgress(bytesWritten, contentLength, done);
+        }
+      };
+    }
+
+    Call call = findPetsByTagsCall(tags, progressListener, progressRequestListener);
+    Type localVarReturnType = new TypeToken<List<Pet>>(){}.getType();
+    apiClient.executeAsync(call, localVarReturnType, callback);
+    return call;
+  }
+  
+  /* Build call for getPetById */
+  private Call getPetByIdCall(Long petId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'petId' is set
+    if (petId == null) {
+       throw new ApiException("Missing the required parameter 'petId' when calling getPetById(Async)");
+    }
+    
+
+    // create path and map variables
+    String localVarPath = "/pet/{petId}".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
+
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+    localVarHeaderParams.put("Content-Type", localVarContentType);
+
+    if(progressListener != null) {
+      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+      @Override
+      public Response intercept(Interceptor.Chain chain) throws IOException {
+        Response originalResponse = chain.proceed(chain.request());
+        return originalResponse.newBuilder()
+                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                .build();
+        }
+      });
+    }
+
+    String[] localVarAuthNames = new String[] { "petstore_auth", "api_key" };
+    return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
+  }
+
+  /**
+   * Find pet by ID
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched (required)
+   * @return Pet
+   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+   */
+  public Pet getPetById(Long petId) throws ApiException {
+    ApiResponse<Pet> resp = getPetByIdWithHttpInfo(petId);
+    return resp.getData();
+  }
+
+  /**
+   * Find pet by ID
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched (required)
+   * @return ApiResponse<Pet>
+   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+   */
+  public ApiResponse<Pet> getPetByIdWithHttpInfo(Long petId) throws ApiException {
+    Call call = getPetByIdCall(petId, null, null);
+    Type localVarReturnType = new TypeToken<Pet>(){}.getType();
+    return apiClient.execute(call, localVarReturnType);
+  }
+
+  /**
+   * Find pet by ID (asynchronously)
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched (required)
+   * @param callback The callback to be executed when the API call finishes
+   * @return The request call
+   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+   */
+  public Call getPetByIdAsync(Long petId, final ApiCallback<Pet> callback) throws ApiException {
+
+    ProgressResponseBody.ProgressListener progressListener = null;
+    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+    if (callback != null) {
+      progressListener = new ProgressResponseBody.ProgressListener() {
+        @Override
+        public void update(long bytesRead, long contentLength, boolean done) {
+          callback.onDownloadProgress(bytesRead, contentLength, done);
+        }
+      };
+
+      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+        @Override
+        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+          callback.onUploadProgress(bytesWritten, contentLength, done);
+        }
+      };
+    }
+
+    Call call = getPetByIdCall(petId, progressListener, progressRequestListener);
+    Type localVarReturnType = new TypeToken<Pet>(){}.getType();
+    apiClient.executeAsync(call, localVarReturnType, callback);
+    return call;
+  }
+  
+  /* Build call for getPetByIdInObject */
+  private Call getPetByIdInObjectCall(Long petId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'petId' is set
+    if (petId == null) {
+       throw new ApiException("Missing the required parameter 'petId' when calling getPetByIdInObject(Async)");
+    }
+    
+
+    // create path and map variables
+    String localVarPath = "/pet/{petId}?response=inline_arbitrary_object".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
+
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+    localVarHeaderParams.put("Content-Type", localVarContentType);
+
+    if(progressListener != null) {
+      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+      @Override
+      public Response intercept(Interceptor.Chain chain) throws IOException {
+        Response originalResponse = chain.proceed(chain.request());
+        return originalResponse.newBuilder()
+                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                .build();
+        }
+      });
+    }
+
+    String[] localVarAuthNames = new String[] { "petstore_auth", "api_key" };
+    return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
+  }
+
+  /**
+   * Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched (required)
+   * @return InlineResponse200
+   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+   */
+  public InlineResponse200 getPetByIdInObject(Long petId) throws ApiException {
+    ApiResponse<InlineResponse200> resp = getPetByIdInObjectWithHttpInfo(petId);
+    return resp.getData();
+  }
+
+  /**
+   * Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched (required)
+   * @return ApiResponse<InlineResponse200>
+   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+   */
+  public ApiResponse<InlineResponse200> getPetByIdInObjectWithHttpInfo(Long petId) throws ApiException {
+    Call call = getPetByIdInObjectCall(petId, null, null);
+    Type localVarReturnType = new TypeToken<InlineResponse200>(){}.getType();
+    return apiClient.execute(call, localVarReturnType);
+  }
+
+  /**
+   * Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39; (asynchronously)
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched (required)
+   * @param callback The callback to be executed when the API call finishes
+   * @return The request call
+   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+   */
+  public Call getPetByIdInObjectAsync(Long petId, final ApiCallback<InlineResponse200> callback) throws ApiException {
+
+    ProgressResponseBody.ProgressListener progressListener = null;
+    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+    if (callback != null) {
+      progressListener = new ProgressResponseBody.ProgressListener() {
+        @Override
+        public void update(long bytesRead, long contentLength, boolean done) {
+          callback.onDownloadProgress(bytesRead, contentLength, done);
+        }
+      };
+
+      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+        @Override
+        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+          callback.onUploadProgress(bytesWritten, contentLength, done);
+        }
+      };
+    }
+
+    Call call = getPetByIdInObjectCall(petId, progressListener, progressRequestListener);
+    Type localVarReturnType = new TypeToken<InlineResponse200>(){}.getType();
+    apiClient.executeAsync(call, localVarReturnType, callback);
+    return call;
+  }
+  
+  /* Build call for petPetIdtestingByteArraytrueGet */
+  private Call petPetIdtestingByteArraytrueGetCall(Long petId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'petId' is set
+    if (petId == null) {
+       throw new ApiException("Missing the required parameter 'petId' when calling petPetIdtestingByteArraytrueGet(Async)");
+    }
+    
+
+    // create path and map variables
+    String localVarPath = "/pet/{petId}?testing_byte_array=true".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
+
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+    localVarHeaderParams.put("Content-Type", localVarContentType);
+
+    if(progressListener != null) {
+      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+      @Override
+      public Response intercept(Interceptor.Chain chain) throws IOException {
+        Response originalResponse = chain.proceed(chain.request());
+        return originalResponse.newBuilder()
+                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                .build();
+        }
+      });
+    }
+
+    String[] localVarAuthNames = new String[] { "petstore_auth", "api_key" };
+    return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
+  }
+
+  /**
+   * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched (required)
+   * @return byte[]
+   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+   */
+  public byte[] petPetIdtestingByteArraytrueGet(Long petId) throws ApiException {
+    ApiResponse<byte[]> resp = petPetIdtestingByteArraytrueGetWithHttpInfo(petId);
+    return resp.getData();
+  }
+
+  /**
+   * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched (required)
+   * @return ApiResponse<byte[]>
+   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+   */
+  public ApiResponse<byte[]> petPetIdtestingByteArraytrueGetWithHttpInfo(Long petId) throws ApiException {
+    Call call = petPetIdtestingByteArraytrueGetCall(petId, null, null);
+    Type localVarReturnType = new TypeToken<byte[]>(){}.getType();
+    return apiClient.execute(call, localVarReturnType);
+  }
+
+  /**
+   * Fake endpoint to test byte array return by &#39;Find pet by ID&#39; (asynchronously)
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched (required)
+   * @param callback The callback to be executed when the API call finishes
+   * @return The request call
+   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+   */
+  public Call petPetIdtestingByteArraytrueGetAsync(Long petId, final ApiCallback<byte[]> callback) throws ApiException {
+
+    ProgressResponseBody.ProgressListener progressListener = null;
+    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+    if (callback != null) {
+      progressListener = new ProgressResponseBody.ProgressListener() {
+        @Override
+        public void update(long bytesRead, long contentLength, boolean done) {
+          callback.onDownloadProgress(bytesRead, contentLength, done);
+        }
+      };
+
+      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+        @Override
+        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+          callback.onUploadProgress(bytesWritten, contentLength, done);
+        }
+      };
+    }
+
+    Call call = petPetIdtestingByteArraytrueGetCall(petId, progressListener, progressRequestListener);
+    Type localVarReturnType = new TypeToken<byte[]>(){}.getType();
+    apiClient.executeAsync(call, localVarReturnType, callback);
+    return call;
+  }
+  
+  /* Build call for updatePet */
+  private Call updatePetCall(Pet body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    Object localVarPostBody = body;
+    
+
+    // create path and map variables
+    String localVarPath = "/pet".replaceAll("\\{format\\}","json");
+
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+    final String[] localVarContentTypes = {
+      "application/json", "application/xml"
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+    localVarHeaderParams.put("Content-Type", localVarContentType);
+
+    if(progressListener != null) {
+      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+      @Override
+      public Response intercept(Interceptor.Chain chain) throws IOException {
+        Response originalResponse = chain.proceed(chain.request());
+        return originalResponse.newBuilder()
+                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                .build();
+        }
+      });
+    }
+
+    String[] localVarAuthNames = new String[] { "petstore_auth" };
+    return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
+  }
+
+  /**
+   * Update an existing pet
+   * 
+   * @param body Pet object that needs to be added to the store (optional)
+   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+   */
+  public void updatePet(Pet body) throws ApiException {
+    updatePetWithHttpInfo(body);
+  }
+
+  /**
+   * Update an existing pet
+   * 
+   * @param body Pet object that needs to be added to the store (optional)
+   * @return ApiResponse<Void>
+   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+   */
+  public ApiResponse<Void> updatePetWithHttpInfo(Pet body) throws ApiException {
+    Call call = updatePetCall(body, null, null);
+    return apiClient.execute(call);
+  }
+
+  /**
+   * Update an existing pet (asynchronously)
+   * 
+   * @param body Pet object that needs to be added to the store (optional)
+   * @param callback The callback to be executed when the API call finishes
+   * @return The request call
+   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+   */
+  public Call updatePetAsync(Pet body, final ApiCallback<Void> callback) throws ApiException {
+
+    ProgressResponseBody.ProgressListener progressListener = null;
+    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+    if (callback != null) {
+      progressListener = new ProgressResponseBody.ProgressListener() {
+        @Override
+        public void update(long bytesRead, long contentLength, boolean done) {
+          callback.onDownloadProgress(bytesRead, contentLength, done);
+        }
+      };
+
+      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+        @Override
+        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+          callback.onUploadProgress(bytesWritten, contentLength, done);
+        }
+      };
+    }
+
+    Call call = updatePetCall(body, progressListener, progressRequestListener);
+    apiClient.executeAsync(call, callback);
+    return call;
+  }
+  
+  /* Build call for updatePetWithForm */
+  private Call updatePetWithFormCall(String petId, String name, String status, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'petId' is set
+    if (petId == null) {
+       throw new ApiException("Missing the required parameter 'petId' when calling updatePetWithForm(Async)");
+    }
+    
+
+    // create path and map variables
+    String localVarPath = "/pet/{petId}".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
+
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+    if (name != null)
+      localVarFormParams.put("name", name);
+    if (status != null)
+      localVarFormParams.put("status", status);
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+    final String[] localVarContentTypes = {
+      "application/x-www-form-urlencoded"
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+    localVarHeaderParams.put("Content-Type", localVarContentType);
+
+    if(progressListener != null) {
+      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+      @Override
+      public Response intercept(Interceptor.Chain chain) throws IOException {
+        Response originalResponse = chain.proceed(chain.request());
+        return originalResponse.newBuilder()
+                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                .build();
+        }
+      });
+    }
+
+    String[] localVarAuthNames = new String[] { "petstore_auth" };
+    return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
+  }
+
+  /**
+   * Updates a pet in the store with form data
+   * 
+   * @param petId ID of pet that needs to be updated (required)
+   * @param name Updated name of the pet (optional)
+   * @param status Updated status of the pet (optional)
+   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+   */
+  public void updatePetWithForm(String petId, String name, String status) throws ApiException {
+    updatePetWithFormWithHttpInfo(petId, name, status);
+  }
+
+  /**
+   * Updates a pet in the store with form data
+   * 
+   * @param petId ID of pet that needs to be updated (required)
+   * @param name Updated name of the pet (optional)
+   * @param status Updated status of the pet (optional)
+   * @return ApiResponse<Void>
+   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+   */
+  public ApiResponse<Void> updatePetWithFormWithHttpInfo(String petId, String name, String status) throws ApiException {
+    Call call = updatePetWithFormCall(petId, name, status, null, null);
+    return apiClient.execute(call);
+  }
+
+  /**
+   * Updates a pet in the store with form data (asynchronously)
+   * 
+   * @param petId ID of pet that needs to be updated (required)
+   * @param name Updated name of the pet (optional)
+   * @param status Updated status of the pet (optional)
+   * @param callback The callback to be executed when the API call finishes
+   * @return The request call
+   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+   */
+  public Call updatePetWithFormAsync(String petId, String name, String status, final ApiCallback<Void> callback) throws ApiException {
+
+    ProgressResponseBody.ProgressListener progressListener = null;
+    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+    if (callback != null) {
+      progressListener = new ProgressResponseBody.ProgressListener() {
+        @Override
+        public void update(long bytesRead, long contentLength, boolean done) {
+          callback.onDownloadProgress(bytesRead, contentLength, done);
+        }
+      };
+
+      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+        @Override
+        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+          callback.onUploadProgress(bytesWritten, contentLength, done);
+        }
+      };
+    }
+
+    Call call = updatePetWithFormCall(petId, name, status, progressListener, progressRequestListener);
+    apiClient.executeAsync(call, callback);
+    return call;
+  }
+  
+  /* Build call for uploadFile */
+  private Call uploadFileCall(Long petId, String additionalMetadata, File file, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'petId' is set
+    if (petId == null) {
+       throw new ApiException("Missing the required parameter 'petId' when calling uploadFile(Async)");
+    }
+    
+
+    // create path and map variables
+    String localVarPath = "/pet/{petId}/uploadImage".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
+
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+    if (additionalMetadata != null)
+      localVarFormParams.put("additionalMetadata", additionalMetadata);
+    if (file != null)
+      localVarFormParams.put("file", file);
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+    final String[] localVarContentTypes = {
+      "multipart/form-data"
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+    localVarHeaderParams.put("Content-Type", localVarContentType);
+
+    if(progressListener != null) {
+      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+      @Override
+      public Response intercept(Interceptor.Chain chain) throws IOException {
+        Response originalResponse = chain.proceed(chain.request());
+        return originalResponse.newBuilder()
+                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                .build();
+        }
+      });
+    }
+
+    String[] localVarAuthNames = new String[] { "petstore_auth" };
+    return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
   }
 
   /**
    * uploads an image
    * 
-   * @param petId ID of pet to update
-   * @param additionalMetadata Additional data to pass to server
-   * @param file file to upload
+   * @param petId ID of pet to update (required)
+   * @param additionalMetadata Additional data to pass to server (optional)
+   * @param file file to upload (optional)
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
   public void uploadFile(Long petId, String additionalMetadata, File file) throws ApiException {
@@ -845,9 +1163,9 @@ public class PetApi {
   /**
    * uploads an image
    * 
-   * @param petId ID of pet to update
-   * @param additionalMetadata Additional data to pass to server
-   * @param file file to upload
+   * @param petId ID of pet to update (required)
+   * @param additionalMetadata Additional data to pass to server (optional)
+   * @param file file to upload (optional)
    * @return ApiResponse<Void>
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
@@ -859,9 +1177,9 @@ public class PetApi {
   /**
    * uploads an image (asynchronously)
    * 
-   * @param petId ID of pet to update
-   * @param additionalMetadata Additional data to pass to server
-   * @param file file to upload
+   * @param petId ID of pet to update (required)
+   * @param additionalMetadata Additional data to pass to server (optional)
+   * @param file file to upload (optional)
    * @param callback The callback to be executed when the API call finishes
    * @return The request call
    * @throws ApiException If fail to process the API call, e.g. serializing the request body object
@@ -876,7 +1194,7 @@ public class PetApi {
         @Override
         public void update(long bytesRead, long contentLength, boolean done) {
           callback.onDownloadProgress(bytesRead, contentLength, done);
-        } 
+        }
       };
 
       progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/StoreApi.java
index 5e6c7c48c6b..086db3000d8 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/StoreApi.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/StoreApi.java
@@ -17,11 +17,13 @@ import com.squareup.okhttp.Response;
 
 import java.io.IOException;
 
-import java.util.Map;
 import io.swagger.client.model.Order;
 
 import java.lang.reflect.Type;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class StoreApi {
   private ApiClient apiClient;
@@ -43,31 +45,37 @@ public class StoreApi {
   }
 
   
-  /* Build call for getInventory */
-  private Call getInventoryCall(final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object postBody = null;
+  /* Build call for deleteOrder */
+  private Call deleteOrderCall(String orderId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'orderId' is set
+    if (orderId == null) {
+       throw new ApiException("Missing the required parameter 'orderId' when calling deleteOrder(Async)");
+    }
     
 
     // create path and map variables
-    String path = "/store/inventory".replaceAll("\\{format\\}","json");
+    String localVarPath = "/store/order/{orderId}".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString()));
 
-    List<Pair> queryParams = new ArrayList<Pair>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
 
-    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-    if (accept != null) headerParams.put("Accept", accept);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-    headerParams.put("Content-Type", contentType);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+    localVarHeaderParams.put("Content-Type", localVarContentType);
 
     if(progressListener != null) {
       apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
@@ -81,8 +89,210 @@ public class StoreApi {
       });
     }
 
-    String[] authNames = new String[] { "api_key" };
-    return apiClient.buildCall(path, "GET", queryParams, postBody, headerParams, formParams, authNames, progressRequestListener);
+    String[] localVarAuthNames = new String[] {  };
+    return apiClient.buildCall(localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
+  }
+
+  /**
+   * Delete purchase order by ID
+   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+   * @param orderId ID of the order that needs to be deleted (required)
+   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+   */
+  public void deleteOrder(String orderId) throws ApiException {
+    deleteOrderWithHttpInfo(orderId);
+  }
+
+  /**
+   * Delete purchase order by ID
+   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+   * @param orderId ID of the order that needs to be deleted (required)
+   * @return ApiResponse<Void>
+   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+   */
+  public ApiResponse<Void> deleteOrderWithHttpInfo(String orderId) throws ApiException {
+    Call call = deleteOrderCall(orderId, null, null);
+    return apiClient.execute(call);
+  }
+
+  /**
+   * Delete purchase order by ID (asynchronously)
+   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+   * @param orderId ID of the order that needs to be deleted (required)
+   * @param callback The callback to be executed when the API call finishes
+   * @return The request call
+   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+   */
+  public Call deleteOrderAsync(String orderId, final ApiCallback<Void> callback) throws ApiException {
+
+    ProgressResponseBody.ProgressListener progressListener = null;
+    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+    if (callback != null) {
+      progressListener = new ProgressResponseBody.ProgressListener() {
+        @Override
+        public void update(long bytesRead, long contentLength, boolean done) {
+          callback.onDownloadProgress(bytesRead, contentLength, done);
+        }
+      };
+
+      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+        @Override
+        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+          callback.onUploadProgress(bytesWritten, contentLength, done);
+        }
+      };
+    }
+
+    Call call = deleteOrderCall(orderId, progressListener, progressRequestListener);
+    apiClient.executeAsync(call, callback);
+    return call;
+  }
+  
+  /* Build call for findOrdersByStatus */
+  private Call findOrdersByStatusCall(String status, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    Object localVarPostBody = null;
+    
+
+    // create path and map variables
+    String localVarPath = "/store/findByStatus".replaceAll("\\{format\\}","json");
+
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    if (status != null)
+      localVarQueryParams.addAll(apiClient.parameterToPairs("", "status", status));
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+    localVarHeaderParams.put("Content-Type", localVarContentType);
+
+    if(progressListener != null) {
+      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+      @Override
+      public Response intercept(Interceptor.Chain chain) throws IOException {
+        Response originalResponse = chain.proceed(chain.request());
+        return originalResponse.newBuilder()
+                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                .build();
+        }
+      });
+    }
+
+    String[] localVarAuthNames = new String[] { "test_api_client_id", "test_api_client_secret" };
+    return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
+  }
+
+  /**
+   * Finds orders by status
+   * A single status value can be provided as a string
+   * @param status Status value that needs to be considered for query (optional, default to placed)
+   * @return List<Order>
+   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+   */
+  public List<Order> findOrdersByStatus(String status) throws ApiException {
+    ApiResponse<List<Order>> resp = findOrdersByStatusWithHttpInfo(status);
+    return resp.getData();
+  }
+
+  /**
+   * Finds orders by status
+   * A single status value can be provided as a string
+   * @param status Status value that needs to be considered for query (optional, default to placed)
+   * @return ApiResponse<List<Order>>
+   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+   */
+  public ApiResponse<List<Order>> findOrdersByStatusWithHttpInfo(String status) throws ApiException {
+    Call call = findOrdersByStatusCall(status, null, null);
+    Type localVarReturnType = new TypeToken<List<Order>>(){}.getType();
+    return apiClient.execute(call, localVarReturnType);
+  }
+
+  /**
+   * Finds orders by status (asynchronously)
+   * A single status value can be provided as a string
+   * @param status Status value that needs to be considered for query (optional, default to placed)
+   * @param callback The callback to be executed when the API call finishes
+   * @return The request call
+   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+   */
+  public Call findOrdersByStatusAsync(String status, final ApiCallback<List<Order>> callback) throws ApiException {
+
+    ProgressResponseBody.ProgressListener progressListener = null;
+    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+    if (callback != null) {
+      progressListener = new ProgressResponseBody.ProgressListener() {
+        @Override
+        public void update(long bytesRead, long contentLength, boolean done) {
+          callback.onDownloadProgress(bytesRead, contentLength, done);
+        }
+      };
+
+      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+        @Override
+        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+          callback.onUploadProgress(bytesWritten, contentLength, done);
+        }
+      };
+    }
+
+    Call call = findOrdersByStatusCall(status, progressListener, progressRequestListener);
+    Type localVarReturnType = new TypeToken<List<Order>>(){}.getType();
+    apiClient.executeAsync(call, localVarReturnType, callback);
+    return call;
+  }
+  
+  /* Build call for getInventory */
+  private Call getInventoryCall(final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    Object localVarPostBody = null;
+    
+
+    // create path and map variables
+    String localVarPath = "/store/inventory".replaceAll("\\{format\\}","json");
+
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+    localVarHeaderParams.put("Content-Type", localVarContentType);
+
+    if(progressListener != null) {
+      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+      @Override
+      public Response intercept(Interceptor.Chain chain) throws IOException {
+        Response originalResponse = chain.proceed(chain.request());
+        return originalResponse.newBuilder()
+                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                .build();
+        }
+      });
+    }
+
+    String[] localVarAuthNames = new String[] { "api_key" };
+    return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
   }
 
   /**
@@ -104,8 +314,8 @@ public class StoreApi {
    */
   public ApiResponse<Map<String, Integer>> getInventoryWithHttpInfo() throws ApiException {
     Call call = getInventoryCall(null, null);
-    Type returnType = new TypeToken<Map<String, Integer>>(){}.getType();
-    return apiClient.execute(call, returnType);
+    Type localVarReturnType = new TypeToken<Map<String, Integer>>(){}.getType();
+    return apiClient.execute(call, localVarReturnType);
   }
 
   /**
@@ -125,7 +335,7 @@ public class StoreApi {
         @Override
         public void update(long bytesRead, long contentLength, boolean done) {
           callback.onDownloadProgress(bytesRead, contentLength, done);
-        } 
+        }
       };
 
       progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
@@ -137,36 +347,36 @@ public class StoreApi {
     }
 
     Call call = getInventoryCall(progressListener, progressRequestListener);
-    Type returnType = new TypeToken<Map<String, Integer>>(){}.getType();
-    apiClient.executeAsync(call, returnType, callback);
+    Type localVarReturnType = new TypeToken<Map<String, Integer>>(){}.getType();
+    apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
   
-  /* Build call for placeOrder */
-  private Call placeOrderCall(Order body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object postBody = body;
+  /* Build call for getInventoryInObject */
+  private Call getInventoryInObjectCall(final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    Object localVarPostBody = null;
     
 
     // create path and map variables
-    String path = "/store/order".replaceAll("\\{format\\}","json");
+    String localVarPath = "/store/inventory?response=arbitrary_object".replaceAll("\\{format\\}","json");
 
-    List<Pair> queryParams = new ArrayList<Pair>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
 
-    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-    if (accept != null) headerParams.put("Accept", accept);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-    headerParams.put("Content-Type", contentType);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+    localVarHeaderParams.put("Content-Type", localVarContentType);
 
     if(progressListener != null) {
       apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
@@ -180,44 +390,41 @@ public class StoreApi {
       });
     }
 
-    String[] authNames = new String[] {  };
-    return apiClient.buildCall(path, "POST", queryParams, postBody, headerParams, formParams, authNames, progressRequestListener);
+    String[] localVarAuthNames = new String[] { "api_key" };
+    return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
   }
 
   /**
-   * Place an order for a pet
-   * 
-   * @param body order placed for purchasing the pet
-   * @return Order
+   * Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+   * Returns an arbitrary object which is actually a map of status codes to quantities
+   * @return Object
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
-  public Order placeOrder(Order body) throws ApiException {
-    ApiResponse<Order> resp = placeOrderWithHttpInfo(body);
+  public Object getInventoryInObject() throws ApiException {
+    ApiResponse<Object> resp = getInventoryInObjectWithHttpInfo();
     return resp.getData();
   }
 
   /**
-   * Place an order for a pet
-   * 
-   * @param body order placed for purchasing the pet
-   * @return ApiResponse<Order>
+   * Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+   * Returns an arbitrary object which is actually a map of status codes to quantities
+   * @return ApiResponse<Object>
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
-  public ApiResponse<Order> placeOrderWithHttpInfo(Order body) throws ApiException {
-    Call call = placeOrderCall(body, null, null);
-    Type returnType = new TypeToken<Order>(){}.getType();
-    return apiClient.execute(call, returnType);
+  public ApiResponse<Object> getInventoryInObjectWithHttpInfo() throws ApiException {
+    Call call = getInventoryInObjectCall(null, null);
+    Type localVarReturnType = new TypeToken<Object>(){}.getType();
+    return apiClient.execute(call, localVarReturnType);
   }
 
   /**
-   * Place an order for a pet (asynchronously)
-   * 
-   * @param body order placed for purchasing the pet
+   * Fake endpoint to test arbitrary object return by &#39;Get inventory&#39; (asynchronously)
+   * Returns an arbitrary object which is actually a map of status codes to quantities
    * @param callback The callback to be executed when the API call finishes
    * @return The request call
    * @throws ApiException If fail to process the API call, e.g. serializing the request body object
    */
-  public Call placeOrderAsync(Order body, final ApiCallback<Order> callback) throws ApiException {
+  public Call getInventoryInObjectAsync(final ApiCallback<Object> callback) throws ApiException {
 
     ProgressResponseBody.ProgressListener progressListener = null;
     ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -227,7 +434,7 @@ public class StoreApi {
         @Override
         public void update(long bytesRead, long contentLength, boolean done) {
           callback.onDownloadProgress(bytesRead, contentLength, done);
-        } 
+        }
       };
 
       progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
@@ -238,15 +445,15 @@ public class StoreApi {
       };
     }
 
-    Call call = placeOrderCall(body, progressListener, progressRequestListener);
-    Type returnType = new TypeToken<Order>(){}.getType();
-    apiClient.executeAsync(call, returnType, callback);
+    Call call = getInventoryInObjectCall(progressListener, progressRequestListener);
+    Type localVarReturnType = new TypeToken<Object>(){}.getType();
+    apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
   
   /* Build call for getOrderById */
   private Call getOrderByIdCall(String orderId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object postBody = null;
+    Object localVarPostBody = null;
     
     // verify the required parameter 'orderId' is set
     if (orderId == null) {
@@ -255,26 +462,26 @@ public class StoreApi {
     
 
     // create path and map variables
-    String path = "/store/order/{orderId}".replaceAll("\\{format\\}","json")
+    String localVarPath = "/store/order/{orderId}".replaceAll("\\{format\\}","json")
       .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString()));
 
-    List<Pair> queryParams = new ArrayList<Pair>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
 
-    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-    if (accept != null) headerParams.put("Accept", accept);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-    headerParams.put("Content-Type", contentType);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+    localVarHeaderParams.put("Content-Type", localVarContentType);
 
     if(progressListener != null) {
       apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
@@ -288,14 +495,14 @@ public class StoreApi {
       });
     }
 
-    String[] authNames = new String[] {  };
-    return apiClient.buildCall(path, "GET", queryParams, postBody, headerParams, formParams, authNames, progressRequestListener);
+    String[] localVarAuthNames = new String[] { "test_api_key_query", "test_api_key_header" };
+    return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
   }
 
   /**
    * Find purchase order by ID
    * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-   * @param orderId ID of pet that needs to be fetched
+   * @param orderId ID of pet that needs to be fetched (required)
    * @return Order
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
@@ -307,20 +514,20 @@ public class StoreApi {
   /**
    * Find purchase order by ID
    * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-   * @param orderId ID of pet that needs to be fetched
+   * @param orderId ID of pet that needs to be fetched (required)
    * @return ApiResponse<Order>
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
   public ApiResponse<Order> getOrderByIdWithHttpInfo(String orderId) throws ApiException {
     Call call = getOrderByIdCall(orderId, null, null);
-    Type returnType = new TypeToken<Order>(){}.getType();
-    return apiClient.execute(call, returnType);
+    Type localVarReturnType = new TypeToken<Order>(){}.getType();
+    return apiClient.execute(call, localVarReturnType);
   }
 
   /**
    * Find purchase order by ID (asynchronously)
    * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-   * @param orderId ID of pet that needs to be fetched
+   * @param orderId ID of pet that needs to be fetched (required)
    * @param callback The callback to be executed when the API call finishes
    * @return The request call
    * @throws ApiException If fail to process the API call, e.g. serializing the request body object
@@ -335,7 +542,7 @@ public class StoreApi {
         @Override
         public void update(long bytesRead, long contentLength, boolean done) {
           callback.onDownloadProgress(bytesRead, contentLength, done);
-        } 
+        }
       };
 
       progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
@@ -347,42 +554,36 @@ public class StoreApi {
     }
 
     Call call = getOrderByIdCall(orderId, progressListener, progressRequestListener);
-    Type returnType = new TypeToken<Order>(){}.getType();
-    apiClient.executeAsync(call, returnType, callback);
+    Type localVarReturnType = new TypeToken<Order>(){}.getType();
+    apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
   
-  /* Build call for deleteOrder */
-  private Call deleteOrderCall(String orderId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object postBody = null;
-    
-    // verify the required parameter 'orderId' is set
-    if (orderId == null) {
-       throw new ApiException("Missing the required parameter 'orderId' when calling deleteOrder(Async)");
-    }
+  /* Build call for placeOrder */
+  private Call placeOrderCall(Order body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    Object localVarPostBody = body;
     
 
     // create path and map variables
-    String path = "/store/order/{orderId}".replaceAll("\\{format\\}","json")
-      .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString()));
+    String localVarPath = "/store/order".replaceAll("\\{format\\}","json");
 
-    List<Pair> queryParams = new ArrayList<Pair>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
 
-    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-    if (accept != null) headerParams.put("Accept", accept);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-    headerParams.put("Content-Type", contentType);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+    localVarHeaderParams.put("Content-Type", localVarContentType);
 
     if(progressListener != null) {
       apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
@@ -396,41 +597,44 @@ public class StoreApi {
       });
     }
 
-    String[] authNames = new String[] {  };
-    return apiClient.buildCall(path, "DELETE", queryParams, postBody, headerParams, formParams, authNames, progressRequestListener);
+    String[] localVarAuthNames = new String[] { "test_api_client_id", "test_api_client_secret" };
+    return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
   }
 
   /**
-   * Delete purchase order by ID
-   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-   * @param orderId ID of the order that needs to be deleted
+   * Place an order for a pet
+   * 
+   * @param body order placed for purchasing the pet (optional)
+   * @return Order
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
-  public void deleteOrder(String orderId) throws ApiException {
-    deleteOrderWithHttpInfo(orderId);
+  public Order placeOrder(Order body) throws ApiException {
+    ApiResponse<Order> resp = placeOrderWithHttpInfo(body);
+    return resp.getData();
   }
 
   /**
-   * Delete purchase order by ID
-   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-   * @param orderId ID of the order that needs to be deleted
-   * @return ApiResponse<Void>
+   * Place an order for a pet
+   * 
+   * @param body order placed for purchasing the pet (optional)
+   * @return ApiResponse<Order>
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
-  public ApiResponse<Void> deleteOrderWithHttpInfo(String orderId) throws ApiException {
-    Call call = deleteOrderCall(orderId, null, null);
-    return apiClient.execute(call);
+  public ApiResponse<Order> placeOrderWithHttpInfo(Order body) throws ApiException {
+    Call call = placeOrderCall(body, null, null);
+    Type localVarReturnType = new TypeToken<Order>(){}.getType();
+    return apiClient.execute(call, localVarReturnType);
   }
 
   /**
-   * Delete purchase order by ID (asynchronously)
-   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-   * @param orderId ID of the order that needs to be deleted
+   * Place an order for a pet (asynchronously)
+   * 
+   * @param body order placed for purchasing the pet (optional)
    * @param callback The callback to be executed when the API call finishes
    * @return The request call
    * @throws ApiException If fail to process the API call, e.g. serializing the request body object
    */
-  public Call deleteOrderAsync(String orderId, final ApiCallback<Void> callback) throws ApiException {
+  public Call placeOrderAsync(Order body, final ApiCallback<Order> callback) throws ApiException {
 
     ProgressResponseBody.ProgressListener progressListener = null;
     ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -440,7 +644,7 @@ public class StoreApi {
         @Override
         public void update(long bytesRead, long contentLength, boolean done) {
           callback.onDownloadProgress(bytesRead, contentLength, done);
-        } 
+        }
       };
 
       progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
@@ -451,8 +655,9 @@ public class StoreApi {
       };
     }
 
-    Call call = deleteOrderCall(orderId, progressListener, progressRequestListener);
-    apiClient.executeAsync(call, callback);
+    Call call = placeOrderCall(body, progressListener, progressRequestListener);
+    Type localVarReturnType = new TypeToken<Order>(){}.getType();
+    apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
   
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/UserApi.java
index ab043bdbe3b..6da2483722b 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/UserApi.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/UserApi.java
@@ -18,10 +18,12 @@ import com.squareup.okhttp.Response;
 import java.io.IOException;
 
 import io.swagger.client.model.User;
-import java.util.*;
 
 import java.lang.reflect.Type;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class UserApi {
   private ApiClient apiClient;
@@ -45,29 +47,29 @@ public class UserApi {
   
   /* Build call for createUser */
   private Call createUserCall(User body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object postBody = body;
+    Object localVarPostBody = body;
     
 
     // create path and map variables
-    String path = "/user".replaceAll("\\{format\\}","json");
+    String localVarPath = "/user".replaceAll("\\{format\\}","json");
 
-    List<Pair> queryParams = new ArrayList<Pair>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
 
-    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-    if (accept != null) headerParams.put("Accept", accept);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-    headerParams.put("Content-Type", contentType);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+    localVarHeaderParams.put("Content-Type", localVarContentType);
 
     if(progressListener != null) {
       apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
@@ -81,14 +83,14 @@ public class UserApi {
       });
     }
 
-    String[] authNames = new String[] {  };
-    return apiClient.buildCall(path, "POST", queryParams, postBody, headerParams, formParams, authNames, progressRequestListener);
+    String[] localVarAuthNames = new String[] {  };
+    return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
   }
 
   /**
    * Create user
    * This can only be done by the logged in user.
-   * @param body Created user object
+   * @param body Created user object (optional)
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
   public void createUser(User body) throws ApiException {
@@ -98,7 +100,7 @@ public class UserApi {
   /**
    * Create user
    * This can only be done by the logged in user.
-   * @param body Created user object
+   * @param body Created user object (optional)
    * @return ApiResponse<Void>
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
@@ -110,7 +112,7 @@ public class UserApi {
   /**
    * Create user (asynchronously)
    * This can only be done by the logged in user.
-   * @param body Created user object
+   * @param body Created user object (optional)
    * @param callback The callback to be executed when the API call finishes
    * @return The request call
    * @throws ApiException If fail to process the API call, e.g. serializing the request body object
@@ -125,7 +127,7 @@ public class UserApi {
         @Override
         public void update(long bytesRead, long contentLength, boolean done) {
           callback.onDownloadProgress(bytesRead, contentLength, done);
-        } 
+        }
       };
 
       progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
@@ -143,29 +145,29 @@ public class UserApi {
   
   /* Build call for createUsersWithArrayInput */
   private Call createUsersWithArrayInputCall(List<User> body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object postBody = body;
+    Object localVarPostBody = body;
     
 
     // create path and map variables
-    String path = "/user/createWithArray".replaceAll("\\{format\\}","json");
+    String localVarPath = "/user/createWithArray".replaceAll("\\{format\\}","json");
 
-    List<Pair> queryParams = new ArrayList<Pair>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
 
-    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-    if (accept != null) headerParams.put("Accept", accept);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-    headerParams.put("Content-Type", contentType);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+    localVarHeaderParams.put("Content-Type", localVarContentType);
 
     if(progressListener != null) {
       apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
@@ -179,14 +181,14 @@ public class UserApi {
       });
     }
 
-    String[] authNames = new String[] {  };
-    return apiClient.buildCall(path, "POST", queryParams, postBody, headerParams, formParams, authNames, progressRequestListener);
+    String[] localVarAuthNames = new String[] {  };
+    return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
   }
 
   /**
    * Creates list of users with given input array
    * 
-   * @param body List of user object
+   * @param body List of user object (optional)
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
   public void createUsersWithArrayInput(List<User> body) throws ApiException {
@@ -196,7 +198,7 @@ public class UserApi {
   /**
    * Creates list of users with given input array
    * 
-   * @param body List of user object
+   * @param body List of user object (optional)
    * @return ApiResponse<Void>
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
@@ -208,7 +210,7 @@ public class UserApi {
   /**
    * Creates list of users with given input array (asynchronously)
    * 
-   * @param body List of user object
+   * @param body List of user object (optional)
    * @param callback The callback to be executed when the API call finishes
    * @return The request call
    * @throws ApiException If fail to process the API call, e.g. serializing the request body object
@@ -223,7 +225,7 @@ public class UserApi {
         @Override
         public void update(long bytesRead, long contentLength, boolean done) {
           callback.onDownloadProgress(bytesRead, contentLength, done);
-        } 
+        }
       };
 
       progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
@@ -241,29 +243,29 @@ public class UserApi {
   
   /* Build call for createUsersWithListInput */
   private Call createUsersWithListInputCall(List<User> body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object postBody = body;
+    Object localVarPostBody = body;
     
 
     // create path and map variables
-    String path = "/user/createWithList".replaceAll("\\{format\\}","json");
+    String localVarPath = "/user/createWithList".replaceAll("\\{format\\}","json");
 
-    List<Pair> queryParams = new ArrayList<Pair>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
 
-    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-    if (accept != null) headerParams.put("Accept", accept);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-    headerParams.put("Content-Type", contentType);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+    localVarHeaderParams.put("Content-Type", localVarContentType);
 
     if(progressListener != null) {
       apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
@@ -277,14 +279,14 @@ public class UserApi {
       });
     }
 
-    String[] authNames = new String[] {  };
-    return apiClient.buildCall(path, "POST", queryParams, postBody, headerParams, formParams, authNames, progressRequestListener);
+    String[] localVarAuthNames = new String[] {  };
+    return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
   }
 
   /**
    * Creates list of users with given input array
    * 
-   * @param body List of user object
+   * @param body List of user object (optional)
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
   public void createUsersWithListInput(List<User> body) throws ApiException {
@@ -294,7 +296,7 @@ public class UserApi {
   /**
    * Creates list of users with given input array
    * 
-   * @param body List of user object
+   * @param body List of user object (optional)
    * @return ApiResponse<Void>
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
@@ -306,7 +308,7 @@ public class UserApi {
   /**
    * Creates list of users with given input array (asynchronously)
    * 
-   * @param body List of user object
+   * @param body List of user object (optional)
    * @param callback The callback to be executed when the API call finishes
    * @return The request call
    * @throws ApiException If fail to process the API call, e.g. serializing the request body object
@@ -321,7 +323,7 @@ public class UserApi {
         @Override
         public void update(long bytesRead, long contentLength, boolean done) {
           callback.onDownloadProgress(bytesRead, contentLength, done);
-        } 
+        }
       };
 
       progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
@@ -337,35 +339,37 @@ public class UserApi {
     return call;
   }
   
-  /* Build call for loginUser */
-  private Call loginUserCall(String username, String password, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object postBody = null;
+  /* Build call for deleteUser */
+  private Call deleteUserCall(String username, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'username' is set
+    if (username == null) {
+       throw new ApiException("Missing the required parameter 'username' when calling deleteUser(Async)");
+    }
     
 
     // create path and map variables
-    String path = "/user/login".replaceAll("\\{format\\}","json");
+    String localVarPath = "/user/{username}".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
 
-    List<Pair> queryParams = new ArrayList<Pair>();
-    if (username != null)
-      queryParams.addAll(apiClient.parameterToPairs("", "username", username));
-    if (password != null)
-      queryParams.addAll(apiClient.parameterToPairs("", "password", password));
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
 
-    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-    if (accept != null) headerParams.put("Accept", accept);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-    headerParams.put("Content-Type", contentType);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+    localVarHeaderParams.put("Content-Type", localVarContentType);
 
     if(progressListener != null) {
       apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
@@ -379,15 +383,225 @@ public class UserApi {
       });
     }
 
-    String[] authNames = new String[] {  };
-    return apiClient.buildCall(path, "GET", queryParams, postBody, headerParams, formParams, authNames, progressRequestListener);
+    String[] localVarAuthNames = new String[] { "test_http_basic" };
+    return apiClient.buildCall(localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
+  }
+
+  /**
+   * Delete user
+   * This can only be done by the logged in user.
+   * @param username The name that needs to be deleted (required)
+   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+   */
+  public void deleteUser(String username) throws ApiException {
+    deleteUserWithHttpInfo(username);
+  }
+
+  /**
+   * Delete user
+   * This can only be done by the logged in user.
+   * @param username The name that needs to be deleted (required)
+   * @return ApiResponse<Void>
+   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+   */
+  public ApiResponse<Void> deleteUserWithHttpInfo(String username) throws ApiException {
+    Call call = deleteUserCall(username, null, null);
+    return apiClient.execute(call);
+  }
+
+  /**
+   * Delete user (asynchronously)
+   * This can only be done by the logged in user.
+   * @param username The name that needs to be deleted (required)
+   * @param callback The callback to be executed when the API call finishes
+   * @return The request call
+   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+   */
+  public Call deleteUserAsync(String username, final ApiCallback<Void> callback) throws ApiException {
+
+    ProgressResponseBody.ProgressListener progressListener = null;
+    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+    if (callback != null) {
+      progressListener = new ProgressResponseBody.ProgressListener() {
+        @Override
+        public void update(long bytesRead, long contentLength, boolean done) {
+          callback.onDownloadProgress(bytesRead, contentLength, done);
+        }
+      };
+
+      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+        @Override
+        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+          callback.onUploadProgress(bytesWritten, contentLength, done);
+        }
+      };
+    }
+
+    Call call = deleteUserCall(username, progressListener, progressRequestListener);
+    apiClient.executeAsync(call, callback);
+    return call;
+  }
+  
+  /* Build call for getUserByName */
+  private Call getUserByNameCall(String username, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    Object localVarPostBody = null;
+    
+    // verify the required parameter 'username' is set
+    if (username == null) {
+       throw new ApiException("Missing the required parameter 'username' when calling getUserByName(Async)");
+    }
+    
+
+    // create path and map variables
+    String localVarPath = "/user/{username}".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
+
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+    localVarHeaderParams.put("Content-Type", localVarContentType);
+
+    if(progressListener != null) {
+      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+      @Override
+      public Response intercept(Interceptor.Chain chain) throws IOException {
+        Response originalResponse = chain.proceed(chain.request());
+        return originalResponse.newBuilder()
+                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                .build();
+        }
+      });
+    }
+
+    String[] localVarAuthNames = new String[] {  };
+    return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
+  }
+
+  /**
+   * Get user by user name
+   * 
+   * @param username The name that needs to be fetched. Use user1 for testing. (required)
+   * @return User
+   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+   */
+  public User getUserByName(String username) throws ApiException {
+    ApiResponse<User> resp = getUserByNameWithHttpInfo(username);
+    return resp.getData();
+  }
+
+  /**
+   * Get user by user name
+   * 
+   * @param username The name that needs to be fetched. Use user1 for testing. (required)
+   * @return ApiResponse<User>
+   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+   */
+  public ApiResponse<User> getUserByNameWithHttpInfo(String username) throws ApiException {
+    Call call = getUserByNameCall(username, null, null);
+    Type localVarReturnType = new TypeToken<User>(){}.getType();
+    return apiClient.execute(call, localVarReturnType);
+  }
+
+  /**
+   * Get user by user name (asynchronously)
+   * 
+   * @param username The name that needs to be fetched. Use user1 for testing. (required)
+   * @param callback The callback to be executed when the API call finishes
+   * @return The request call
+   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+   */
+  public Call getUserByNameAsync(String username, final ApiCallback<User> callback) throws ApiException {
+
+    ProgressResponseBody.ProgressListener progressListener = null;
+    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+    if (callback != null) {
+      progressListener = new ProgressResponseBody.ProgressListener() {
+        @Override
+        public void update(long bytesRead, long contentLength, boolean done) {
+          callback.onDownloadProgress(bytesRead, contentLength, done);
+        }
+      };
+
+      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+        @Override
+        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+          callback.onUploadProgress(bytesWritten, contentLength, done);
+        }
+      };
+    }
+
+    Call call = getUserByNameCall(username, progressListener, progressRequestListener);
+    Type localVarReturnType = new TypeToken<User>(){}.getType();
+    apiClient.executeAsync(call, localVarReturnType, callback);
+    return call;
+  }
+  
+  /* Build call for loginUser */
+  private Call loginUserCall(String username, String password, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    Object localVarPostBody = null;
+    
+
+    // create path and map variables
+    String localVarPath = "/user/login".replaceAll("\\{format\\}","json");
+
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    if (username != null)
+      localVarQueryParams.addAll(apiClient.parameterToPairs("", "username", username));
+    if (password != null)
+      localVarQueryParams.addAll(apiClient.parameterToPairs("", "password", password));
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+    final String[] localVarAccepts = {
+      "application/json", "application/xml"
+    };
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+    final String[] localVarContentTypes = {
+      
+    };
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+    localVarHeaderParams.put("Content-Type", localVarContentType);
+
+    if(progressListener != null) {
+      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+      @Override
+      public Response intercept(Interceptor.Chain chain) throws IOException {
+        Response originalResponse = chain.proceed(chain.request());
+        return originalResponse.newBuilder()
+                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                .build();
+        }
+      });
+    }
+
+    String[] localVarAuthNames = new String[] {  };
+    return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
   }
 
   /**
    * Logs user into the system
    * 
-   * @param username The user name for login
-   * @param password The password for login in clear text
+   * @param username The user name for login (optional)
+   * @param password The password for login in clear text (optional)
    * @return String
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
@@ -399,22 +613,22 @@ public class UserApi {
   /**
    * Logs user into the system
    * 
-   * @param username The user name for login
-   * @param password The password for login in clear text
+   * @param username The user name for login (optional)
+   * @param password The password for login in clear text (optional)
    * @return ApiResponse<String>
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
   public ApiResponse<String> loginUserWithHttpInfo(String username, String password) throws ApiException {
     Call call = loginUserCall(username, password, null, null);
-    Type returnType = new TypeToken<String>(){}.getType();
-    return apiClient.execute(call, returnType);
+    Type localVarReturnType = new TypeToken<String>(){}.getType();
+    return apiClient.execute(call, localVarReturnType);
   }
 
   /**
    * Logs user into the system (asynchronously)
    * 
-   * @param username The user name for login
-   * @param password The password for login in clear text
+   * @param username The user name for login (optional)
+   * @param password The password for login in clear text (optional)
    * @param callback The callback to be executed when the API call finishes
    * @return The request call
    * @throws ApiException If fail to process the API call, e.g. serializing the request body object
@@ -429,7 +643,7 @@ public class UserApi {
         @Override
         public void update(long bytesRead, long contentLength, boolean done) {
           callback.onDownloadProgress(bytesRead, contentLength, done);
-        } 
+        }
       };
 
       progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
@@ -441,36 +655,36 @@ public class UserApi {
     }
 
     Call call = loginUserCall(username, password, progressListener, progressRequestListener);
-    Type returnType = new TypeToken<String>(){}.getType();
-    apiClient.executeAsync(call, returnType, callback);
+    Type localVarReturnType = new TypeToken<String>(){}.getType();
+    apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
   
   /* Build call for logoutUser */
   private Call logoutUserCall(final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object postBody = null;
+    Object localVarPostBody = null;
     
 
     // create path and map variables
-    String path = "/user/logout".replaceAll("\\{format\\}","json");
+    String localVarPath = "/user/logout".replaceAll("\\{format\\}","json");
 
-    List<Pair> queryParams = new ArrayList<Pair>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
 
-    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-    if (accept != null) headerParams.put("Accept", accept);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-    headerParams.put("Content-Type", contentType);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+    localVarHeaderParams.put("Content-Type", localVarContentType);
 
     if(progressListener != null) {
       apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
@@ -484,8 +698,8 @@ public class UserApi {
       });
     }
 
-    String[] authNames = new String[] {  };
-    return apiClient.buildCall(path, "GET", queryParams, postBody, headerParams, formParams, authNames, progressRequestListener);
+    String[] localVarAuthNames = new String[] {  };
+    return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
   }
 
   /**
@@ -525,7 +739,7 @@ public class UserApi {
         @Override
         public void update(long bytesRead, long contentLength, boolean done) {
           callback.onDownloadProgress(bytesRead, contentLength, done);
-        } 
+        }
       };
 
       progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
@@ -541,117 +755,9 @@ public class UserApi {
     return call;
   }
   
-  /* Build call for getUserByName */
-  private Call getUserByNameCall(String username, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object postBody = null;
-    
-    // verify the required parameter 'username' is set
-    if (username == null) {
-       throw new ApiException("Missing the required parameter 'username' when calling getUserByName(Async)");
-    }
-    
-
-    // create path and map variables
-    String path = "/user/{username}".replaceAll("\\{format\\}","json")
-      .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
-
-    List<Pair> queryParams = new ArrayList<Pair>();
-
-    Map<String, String> headerParams = new HashMap<String, String>();
-
-    Map<String, Object> formParams = new HashMap<String, Object>();
-
-    final String[] accepts = {
-      "application/json", "application/xml"
-    };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-    if (accept != null) headerParams.put("Accept", accept);
-
-    final String[] contentTypes = {
-      
-    };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-    headerParams.put("Content-Type", contentType);
-
-    if(progressListener != null) {
-      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
-      @Override
-      public Response intercept(Interceptor.Chain chain) throws IOException {
-        Response originalResponse = chain.proceed(chain.request());
-        return originalResponse.newBuilder()
-                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                .build();
-        }
-      });
-    }
-
-    String[] authNames = new String[] {  };
-    return apiClient.buildCall(path, "GET", queryParams, postBody, headerParams, formParams, authNames, progressRequestListener);
-  }
-
-  /**
-   * Get user by user name
-   * 
-   * @param username The name that needs to be fetched. Use user1 for testing.
-   * @return User
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public User getUserByName(String username) throws ApiException {
-    ApiResponse<User> resp = getUserByNameWithHttpInfo(username);
-    return resp.getData();
-  }
-
-  /**
-   * Get user by user name
-   * 
-   * @param username The name that needs to be fetched. Use user1 for testing.
-   * @return ApiResponse<User>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ApiResponse<User> getUserByNameWithHttpInfo(String username) throws ApiException {
-    Call call = getUserByNameCall(username, null, null);
-    Type returnType = new TypeToken<User>(){}.getType();
-    return apiClient.execute(call, returnType);
-  }
-
-  /**
-   * Get user by user name (asynchronously)
-   * 
-   * @param username The name that needs to be fetched. Use user1 for testing.
-   * @param callback The callback to be executed when the API call finishes
-   * @return The request call
-   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-   */
-  public Call getUserByNameAsync(String username, final ApiCallback<User> callback) throws ApiException {
-
-    ProgressResponseBody.ProgressListener progressListener = null;
-    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-    if (callback != null) {
-      progressListener = new ProgressResponseBody.ProgressListener() {
-        @Override
-        public void update(long bytesRead, long contentLength, boolean done) {
-          callback.onDownloadProgress(bytesRead, contentLength, done);
-        } 
-      };
-
-      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-        @Override
-        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-          callback.onUploadProgress(bytesWritten, contentLength, done);
-        }
-      };
-    }
-
-    Call call = getUserByNameCall(username, progressListener, progressRequestListener);
-    Type returnType = new TypeToken<User>(){}.getType();
-    apiClient.executeAsync(call, returnType, callback);
-    return call;
-  }
-  
   /* Build call for updateUser */
   private Call updateUserCall(String username, User body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object postBody = body;
+    Object localVarPostBody = body;
     
     // verify the required parameter 'username' is set
     if (username == null) {
@@ -660,26 +766,26 @@ public class UserApi {
     
 
     // create path and map variables
-    String path = "/user/{username}".replaceAll("\\{format\\}","json")
+    String localVarPath = "/user/{username}".replaceAll("\\{format\\}","json")
       .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
 
-    List<Pair> queryParams = new ArrayList<Pair>();
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
 
-    Map<String, String> headerParams = new HashMap<String, String>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
-    Map<String, Object> formParams = new HashMap<String, Object>();
+    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    final String[] accepts = {
+    final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-    if (accept != null) headerParams.put("Accept", accept);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
 
-    final String[] contentTypes = {
+    final String[] localVarContentTypes = {
       
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-    headerParams.put("Content-Type", contentType);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+    localVarHeaderParams.put("Content-Type", localVarContentType);
 
     if(progressListener != null) {
       apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
@@ -693,15 +799,15 @@ public class UserApi {
       });
     }
 
-    String[] authNames = new String[] {  };
-    return apiClient.buildCall(path, "PUT", queryParams, postBody, headerParams, formParams, authNames, progressRequestListener);
+    String[] localVarAuthNames = new String[] {  };
+    return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
   }
 
   /**
    * Updated user
    * This can only be done by the logged in user.
-   * @param username name that need to be deleted
-   * @param body Updated user object
+   * @param username name that need to be deleted (required)
+   * @param body Updated user object (optional)
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
   public void updateUser(String username, User body) throws ApiException {
@@ -711,8 +817,8 @@ public class UserApi {
   /**
    * Updated user
    * This can only be done by the logged in user.
-   * @param username name that need to be deleted
-   * @param body Updated user object
+   * @param username name that need to be deleted (required)
+   * @param body Updated user object (optional)
    * @return ApiResponse<Void>
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
@@ -724,8 +830,8 @@ public class UserApi {
   /**
    * Updated user (asynchronously)
    * This can only be done by the logged in user.
-   * @param username name that need to be deleted
-   * @param body Updated user object
+   * @param username name that need to be deleted (required)
+   * @param body Updated user object (optional)
    * @param callback The callback to be executed when the API call finishes
    * @return The request call
    * @throws ApiException If fail to process the API call, e.g. serializing the request body object
@@ -740,7 +846,7 @@ public class UserApi {
         @Override
         public void update(long bytesRead, long contentLength, boolean done) {
           callback.onDownloadProgress(bytesRead, contentLength, done);
-        } 
+        }
       };
 
       progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
@@ -756,108 +862,4 @@ public class UserApi {
     return call;
   }
   
-  /* Build call for deleteUser */
-  private Call deleteUserCall(String username, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object postBody = null;
-    
-    // verify the required parameter 'username' is set
-    if (username == null) {
-       throw new ApiException("Missing the required parameter 'username' when calling deleteUser(Async)");
-    }
-    
-
-    // create path and map variables
-    String path = "/user/{username}".replaceAll("\\{format\\}","json")
-      .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
-
-    List<Pair> queryParams = new ArrayList<Pair>();
-
-    Map<String, String> headerParams = new HashMap<String, String>();
-
-    Map<String, Object> formParams = new HashMap<String, Object>();
-
-    final String[] accepts = {
-      "application/json", "application/xml"
-    };
-    final String accept = apiClient.selectHeaderAccept(accepts);
-    if (accept != null) headerParams.put("Accept", accept);
-
-    final String[] contentTypes = {
-      
-    };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-    headerParams.put("Content-Type", contentType);
-
-    if(progressListener != null) {
-      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
-      @Override
-      public Response intercept(Interceptor.Chain chain) throws IOException {
-        Response originalResponse = chain.proceed(chain.request());
-        return originalResponse.newBuilder()
-                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                .build();
-        }
-      });
-    }
-
-    String[] authNames = new String[] {  };
-    return apiClient.buildCall(path, "DELETE", queryParams, postBody, headerParams, formParams, authNames, progressRequestListener);
-  }
-
-  /**
-   * Delete user
-   * This can only be done by the logged in user.
-   * @param username The name that needs to be deleted
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public void deleteUser(String username) throws ApiException {
-    deleteUserWithHttpInfo(username);
-  }
-
-  /**
-   * Delete user
-   * This can only be done by the logged in user.
-   * @param username The name that needs to be deleted
-   * @return ApiResponse<Void>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ApiResponse<Void> deleteUserWithHttpInfo(String username) throws ApiException {
-    Call call = deleteUserCall(username, null, null);
-    return apiClient.execute(call);
-  }
-
-  /**
-   * Delete user (asynchronously)
-   * This can only be done by the logged in user.
-   * @param username The name that needs to be deleted
-   * @param callback The callback to be executed when the API call finishes
-   * @return The request call
-   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-   */
-  public Call deleteUserAsync(String username, final ApiCallback<Void> callback) throws ApiException {
-
-    ProgressResponseBody.ProgressListener progressListener = null;
-    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-    if (callback != null) {
-      progressListener = new ProgressResponseBody.ProgressListener() {
-        @Override
-        public void update(long bytesRead, long contentLength, boolean done) {
-          callback.onDownloadProgress(bytesRead, contentLength, done);
-        } 
-      };
-
-      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-        @Override
-        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-          callback.onUploadProgress(bytesWritten, contentLength, done);
-        }
-      };
-    }
-
-    Call call = deleteUserCall(username, progressListener, progressRequestListener);
-    apiClient.executeAsync(call, callback);
-    return call;
-  }
-  
 }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
index 3cd68b67e4f..491c9ec75b8 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
@@ -5,7 +5,7 @@ import io.swagger.client.Pair;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:20.056+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:51.831+08:00")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java
index 467f4afd4c3..03e1e10cce1 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java
@@ -5,7 +5,7 @@ import io.swagger.client.Pair;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:20.056+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:51.831+08:00")
 public class OAuth implements Authentication {
   private String accessToken;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Category.java
index d0908afd9e1..5aa82b23415 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Category.java
@@ -9,7 +9,7 @@ import com.google.gson.annotations.SerializedName;
 
 
 
-@ApiModel(description = "")
+
 public class Category   {
   
   @SerializedName("id")
@@ -52,8 +52,8 @@ public class Category   {
       return false;
     }
     Category category = (Category) o;
-    return Objects.equals(id, category.id) &&
-        Objects.equals(name, category.name);
+    return Objects.equals(this.id, category.id) &&
+        Objects.equals(this.name, category.name);
   }
 
   @Override
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/InlineResponse200.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/InlineResponse200.java
new file mode 100644
index 00000000000..41d02b8a23f
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/InlineResponse200.java
@@ -0,0 +1,176 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.client.model.Tag;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class InlineResponse200   {
+  
+  @SerializedName("photoUrls")
+  private List<String> photoUrls = new ArrayList<String>();
+  
+  @SerializedName("name")
+  private String name = null;
+  
+  @SerializedName("id")
+  private Long id = null;
+  
+  @SerializedName("category")
+  private Object category = null;
+  
+  @SerializedName("tags")
+  private List<Tag> tags = new ArrayList<Tag>();
+  
+
+public enum StatusEnum {
+  @SerializedName("available")
+  AVAILABLE("available"),
+
+  @SerializedName("pending")
+  PENDING("pending"),
+
+  @SerializedName("sold")
+  SOLD("sold");
+
+  private String value;
+
+  StatusEnum(String value) {
+    this.value = value;
+  }
+
+  @Override
+  public String toString() {
+    return value;
+  }
+}
+
+  @SerializedName("status")
+  private StatusEnum status = null;
+  
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<String> getPhotoUrls() {
+    return photoUrls;
+  }
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Object getCategory() {
+    return category;
+  }
+  public void setCategory(Object category) {
+    this.category = category;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<Tag> getTags() {
+    return tags;
+  }
+  public void setTags(List<Tag> tags) {
+    this.tags = tags;
+  }
+
+  
+  /**
+   * pet status in the store
+   **/
+  @ApiModelProperty(value = "pet status in the store")
+  public StatusEnum getStatus() {
+    return status;
+  }
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    InlineResponse200 inlineResponse200 = (InlineResponse200) o;
+    return Objects.equals(this.photoUrls, inlineResponse200.photoUrls) &&
+        Objects.equals(this.name, inlineResponse200.name) &&
+        Objects.equals(this.id, inlineResponse200.id) &&
+        Objects.equals(this.category, inlineResponse200.category) &&
+        Objects.equals(this.tags, inlineResponse200.tags) &&
+        Objects.equals(this.status, inlineResponse200.status);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(photoUrls, name, id, category, tags, status);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class InlineResponse200 {\n");
+    
+    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    category: ").append(toIndentedString(category)).append("\n");
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Model200Response.java
new file mode 100644
index 00000000000..3afae36dbfe
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Model200Response.java
@@ -0,0 +1,69 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class Model200Response   {
+  
+  @SerializedName("name")
+  private Integer name = null;
+  
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getName() {
+    return name;
+  }
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Model200Response _200Response = (Model200Response) o;
+    return Objects.equals(this.name, _200Response.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Model200Response {\n");
+    
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelReturn.java
new file mode 100644
index 00000000000..60da9b8e181
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -0,0 +1,69 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class ModelReturn   {
+  
+  @SerializedName("return")
+  private Integer _return = null;
+  
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getReturn() {
+    return _return;
+  }
+  public void setReturn(Integer _return) {
+    this._return = _return;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ModelReturn _return = (ModelReturn) o;
+    return Objects.equals(this._return, _return._return);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(_return);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ModelReturn {\n");
+    
+    sb.append("    _return: ").append(toIndentedString(_return)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Name.java
new file mode 100644
index 00000000000..a65b8fda614
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Name.java
@@ -0,0 +1,69 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class Name   {
+  
+  @SerializedName("name")
+  private Integer name = null;
+  
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getName() {
+    return name;
+  }
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Name name = (Name) o;
+    return Objects.equals(this.name, name.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Name {\n");
+    
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Order.java
index 59c5238b626..31097ea438d 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Order.java
@@ -10,7 +10,7 @@ import com.google.gson.annotations.SerializedName;
 
 
 
-@ApiModel(description = "")
+
 public class Order   {
   
   @SerializedName("id")
@@ -62,9 +62,6 @@ public enum StatusEnum {
   public Long getId() {
     return id;
   }
-  public void setId(Long id) {
-    this.id = id;
-  }
 
   
   /**
@@ -133,12 +130,12 @@ public enum StatusEnum {
       return false;
     }
     Order order = (Order) o;
-    return Objects.equals(id, order.id) &&
-        Objects.equals(petId, order.petId) &&
-        Objects.equals(quantity, order.quantity) &&
-        Objects.equals(shipDate, order.shipDate) &&
-        Objects.equals(status, order.status) &&
-        Objects.equals(complete, order.complete);
+    return Objects.equals(this.id, order.id) &&
+        Objects.equals(this.petId, order.petId) &&
+        Objects.equals(this.quantity, order.quantity) &&
+        Objects.equals(this.shipDate, order.shipDate) &&
+        Objects.equals(this.status, order.status) &&
+        Objects.equals(this.complete, order.complete);
   }
 
   @Override
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Pet.java
index 1f9462ddc3a..7895e23ba13 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Pet.java
@@ -5,14 +5,15 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.client.model.Category;
 import io.swagger.client.model.Tag;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 import com.google.gson.annotations.SerializedName;
 
 
 
 
-@ApiModel(description = "")
+
 public class Pet   {
   
   @SerializedName("id")
@@ -135,12 +136,12 @@ public enum StatusEnum {
       return false;
     }
     Pet pet = (Pet) o;
-    return Objects.equals(id, pet.id) &&
-        Objects.equals(category, pet.category) &&
-        Objects.equals(name, pet.name) &&
-        Objects.equals(photoUrls, pet.photoUrls) &&
-        Objects.equals(tags, pet.tags) &&
-        Objects.equals(status, pet.status);
+    return Objects.equals(this.id, pet.id) &&
+        Objects.equals(this.category, pet.category) &&
+        Objects.equals(this.name, pet.name) &&
+        Objects.equals(this.photoUrls, pet.photoUrls) &&
+        Objects.equals(this.tags, pet.tags) &&
+        Objects.equals(this.status, pet.status);
   }
 
   @Override
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/SpecialModelName.java
new file mode 100644
index 00000000000..9a0c166186c
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -0,0 +1,69 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class SpecialModelName   {
+  
+  @SerializedName("$special[property.name]")
+  private Long specialPropertyName = null;
+  
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Long getSpecialPropertyName() {
+    return specialPropertyName;
+  }
+  public void setSpecialPropertyName(Long specialPropertyName) {
+    this.specialPropertyName = specialPropertyName;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    SpecialModelName specialModelName = (SpecialModelName) o;
+    return Objects.equals(this.specialPropertyName, specialModelName.specialPropertyName);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(specialPropertyName);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class SpecialModelName {\n");
+    
+    sb.append("    specialPropertyName: ").append(toIndentedString(specialPropertyName)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Tag.java
index a4ca1074ca1..f5a148ecc36 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Tag.java
@@ -9,7 +9,7 @@ import com.google.gson.annotations.SerializedName;
 
 
 
-@ApiModel(description = "")
+
 public class Tag   {
   
   @SerializedName("id")
@@ -52,8 +52,8 @@ public class Tag   {
       return false;
     }
     Tag tag = (Tag) o;
-    return Objects.equals(id, tag.id) &&
-        Objects.equals(name, tag.name);
+    return Objects.equals(this.id, tag.id) &&
+        Objects.equals(this.name, tag.name);
   }
 
   @Override
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/User.java
index 072f510081a..9b71b457d15 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/User.java
@@ -9,7 +9,7 @@ import com.google.gson.annotations.SerializedName;
 
 
 
-@ApiModel(description = "")
+
 public class User   {
   
   @SerializedName("id")
@@ -137,14 +137,14 @@ public class User   {
       return false;
     }
     User user = (User) o;
-    return Objects.equals(id, user.id) &&
-        Objects.equals(username, user.username) &&
-        Objects.equals(firstName, user.firstName) &&
-        Objects.equals(lastName, user.lastName) &&
-        Objects.equals(email, user.email) &&
-        Objects.equals(password, user.password) &&
-        Objects.equals(phone, user.phone) &&
-        Objects.equals(userStatus, user.userStatus);
+    return Objects.equals(this.id, user.id) &&
+        Objects.equals(this.username, user.username) &&
+        Objects.equals(this.firstName, user.firstName) &&
+        Objects.equals(this.lastName, user.lastName) &&
+        Objects.equals(this.email, user.email) &&
+        Objects.equals(this.password, user.password) &&
+        Objects.equals(this.phone, user.phone) &&
+        Objects.equals(this.userStatus, user.userStatus);
   }
 
   @Override
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/TestUtils.java b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/TestUtils.java
new file mode 100644
index 00000000000..7ddf142426e
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/TestUtils.java
@@ -0,0 +1,17 @@
+package io.swagger;
+
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicLong;
+
+public class TestUtils {
+    private static final AtomicLong atomicId = createAtomicId();
+
+    public static long nextId() {
+      return atomicId.getAndIncrement();
+    }
+
+    private static AtomicLong createAtomicId() {
+        int baseId = new Random(System.currentTimeMillis()).nextInt(1000000) + 20000;
+        return new AtomicLong((long) baseId);
+    }
+}
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/ApiClientTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/ApiClientTest.java
index ba143470c9a..000dbd96bfb 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/ApiClientTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/ApiClientTest.java
@@ -151,26 +151,36 @@ public class ApiClientTest {
     }
 
     @Test
-    public void testSetUsername() {
-        try {
-            apiClient.setUsername("my-username");
-            fail("there should be no HTTP basic authentications");
-        } catch (RuntimeException e) {
+    public void testSetUsernameAndPassword() {
+        HttpBasicAuth auth = null;
+        for (Authentication _auth : apiClient.getAuthentications().values()) {
+            if (_auth instanceof HttpBasicAuth) {
+                auth = (HttpBasicAuth) _auth;
+                break;
+            }
         }
-    }
+        auth.setUsername(null);
+        auth.setPassword(null);
 
-    @Test
-    public void testSetPassword() {
-        try {
-            apiClient.setPassword("my-password");
-            fail("there should be no HTTP basic authentications");
-        } catch (RuntimeException e) {
-        }
+        apiClient.setUsername("my-username");
+        apiClient.setPassword("my-password");
+        assertEquals("my-username", auth.getUsername());
+        assertEquals("my-password", auth.getPassword());
+
+        // reset values
+        auth.setUsername(null);
+        auth.setPassword(null);
     }
 
     @Test
     public void testSetApiKeyAndPrefix() {
-        ApiKeyAuth auth = (ApiKeyAuth) apiClient.getAuthentications().get("api_key");
+        ApiKeyAuth auth = null;
+        for (Authentication _auth : apiClient.getAuthentications().values()) {
+            if (_auth instanceof ApiKeyAuth) {
+                auth = (ApiKeyAuth) _auth;
+                break;
+            }
+        }
         auth.setApiKey(null);
         auth.setApiKeyPrefix(null);
 
@@ -186,14 +196,15 @@ public class ApiClientTest {
 
     @Test
     public void testGetAndSetConnectTimeout() {
-        assertEquals(0, apiClient.getConnectTimeout());
-        assertEquals(0, apiClient.getHttpClient().getConnectTimeout());
-
-        apiClient.setConnectTimeout(10000);
+        // connect timeout defaults to 10 seconds
         assertEquals(10000, apiClient.getConnectTimeout());
         assertEquals(10000, apiClient.getHttpClient().getConnectTimeout());
 
         apiClient.setConnectTimeout(0);
+        assertEquals(0, apiClient.getConnectTimeout());
+        assertEquals(0, apiClient.getHttpClient().getConnectTimeout());
+
+        apiClient.setConnectTimeout(10000);
     }
 
     @Test
@@ -276,4 +287,17 @@ public class ApiClientTest {
             assertEquals(values.size(), pairValueSplit.length);
         }
     }
+
+    @Test
+    public void testSanitizeFilename() {
+        assertEquals("sun", apiClient.sanitizeFilename("sun"));
+        assertEquals("sun.gif", apiClient.sanitizeFilename("sun.gif"));
+        assertEquals("sun.gif", apiClient.sanitizeFilename("../sun.gif"));
+        assertEquals("sun.gif", apiClient.sanitizeFilename("/var/tmp/sun.gif"));
+        assertEquals("sun.gif", apiClient.sanitizeFilename("./sun.gif"));
+        assertEquals("sun.gif", apiClient.sanitizeFilename("..\\sun.gif"));
+        assertEquals("sun.gif", apiClient.sanitizeFilename("\\var\\tmp\\sun.gif"));
+        assertEquals("sun.gif", apiClient.sanitizeFilename("c:\\var\\tmp\\sun.gif"));
+        assertEquals("sun.gif", apiClient.sanitizeFilename(".\\sun.gif"));
+    }
 }
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/PetApiTest.java
index 56cc8073984..97e708fb2ec 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/PetApiTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/PetApiTest.java
@@ -1,5 +1,9 @@
 package io.swagger.petstore.test;
 
+import com.google.gson.reflect.TypeToken;
+
+import io.swagger.TestUtils;
+
 import io.swagger.client.*;
 import io.swagger.client.api.*;
 import io.swagger.client.auth.*;
@@ -8,6 +12,7 @@ import io.swagger.client.model.*;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
+import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -67,6 +72,21 @@ public class PetApiTest {
         assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
     }
 
+    @Test
+    public void testCreateAndGetPetWithByteArray() throws Exception {
+        Pet pet = createRandomPet();
+        byte[] bytes = serializeJson(pet, api.getApiClient()).getBytes();
+        api.addPetUsingByteArray(bytes);
+
+        byte[] fetchedBytes = api.petPetIdtestingByteArraytrueGet(pet.getId());
+        Type type = new TypeToken<Pet>(){}.getType();
+        Pet fetched = deserializeJson(new String(fetchedBytes), type, api.getApiClient());
+        assertNotNull(fetched);
+        assertEquals(pet.getId(), fetched.getId());
+        assertNotNull(fetched.getCategory());
+        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
+    }
+
     @Test
     public void testCreateAndGetPetWithHttpInfo() throws Exception {
         Pet pet = createRandomPet();
@@ -177,6 +197,40 @@ public class PetApiTest {
         assertEquals("application/json", exception.getResponseHeaders().get("Content-Type").get(0));
     }
 
+    @Test
+    public void testGetPetByIdInObject() throws Exception {
+        Pet pet = new Pet();
+        pet.setId(TestUtils.nextId());
+        pet.setName("pet " + pet.getId());
+
+        Category category = new Category();
+        category.setId(TestUtils.nextId());
+        category.setName("category " + category.getId());
+        pet.setCategory(category);
+
+        pet.setStatus(Pet.StatusEnum.PENDING);
+        List<String> photos = Arrays.asList(new String[]{"http://foo.bar.com/1"});
+        pet.setPhotoUrls(photos);
+
+        api.addPet(pet);
+
+        InlineResponse200 fetched = api.getPetByIdInObject(pet.getId());
+        assertEquals(pet.getId(), fetched.getId());
+        assertEquals(pet.getName(), fetched.getName());
+
+        Object categoryObj = fetched.getCategory();
+        assertNotNull(categoryObj);
+        assertTrue(categoryObj instanceof Map);
+
+        Map categoryMap = (Map) categoryObj;
+        Object categoryIdObj = categoryMap.get("id");
+        // NOTE: Gson parses integer value to double.
+        assertTrue(categoryIdObj instanceof Double);
+        Long categoryIdLong = ((Double) categoryIdObj).longValue();
+        assertEquals(category.getId(), categoryIdLong);
+        assertEquals(category.getName(), categoryMap.get("name"));
+    }
+
     @Test
     public void testUpdatePet() throws Exception {
         Pet pet = createRandomPet();
@@ -195,11 +249,11 @@ public class PetApiTest {
     public void testFindPetsByStatus() throws Exception {
         Pet pet = createRandomPet();
         pet.setName("programmer");
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
+        pet.setStatus(Pet.StatusEnum.PENDING);
 
         api.updatePet(pet);
 
-        List<Pet> pets = api.findPetsByStatus(Arrays.asList(new String[]{"available"}));
+        List<Pet> pets = api.findPetsByStatus(Arrays.asList(new String[]{"pending"}));
         assertNotNull(pets);
 
         boolean found = false;
@@ -211,6 +265,8 @@ public class PetApiTest {
         }
 
         assertTrue(found);
+
+        api.deletePet(pet.getId(), null);
     }
 
     @Test
@@ -238,6 +294,8 @@ public class PetApiTest {
             }
         }
         assertTrue(found);
+
+        api.deletePet(pet.getId(), null);
     }
 
     @Test
@@ -312,7 +370,7 @@ public class PetApiTest {
 
     private Pet createRandomPet() {
         Pet pet = new Pet();
-        pet.setId(System.currentTimeMillis());
+        pet.setId(TestUtils.nextId());
         pet.setName("gorilla");
 
         Category category = new Category();
@@ -325,4 +383,12 @@ public class PetApiTest {
 
         return pet;
     }
+
+    private String serializeJson(Object o, ApiClient apiClient) {
+        return apiClient.getJSON().serialize(o);
+    }
+
+    private <T> T deserializeJson(String json, Type type, ApiClient apiClient) {
+        return (T) apiClient.getJSON().deserialize(json, type);
+    }
 }
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/StoreApiTest.java
index 589dae1a3ca..2f4c4297250 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/StoreApiTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/StoreApiTest.java
@@ -1,5 +1,6 @@
 package io.swagger.petstore.test;
 
+import io.swagger.TestUtils;
 import io.swagger.client.ApiException;
 
 import io.swagger.client.*;
@@ -7,6 +8,7 @@ import io.swagger.client.api.*;
 import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
 
+import java.lang.reflect.Field;
 import java.util.Map;
 import java.text.SimpleDateFormat;
 
@@ -36,6 +38,20 @@ public class StoreApiTest {
         assertTrue(inventory.keySet().size() > 0);
     }
 
+    @Test
+    public void testGetInventoryInObject() throws Exception {
+        Object inventoryObj = api.getInventoryInObject();
+        assertTrue(inventoryObj instanceof Map);
+
+        Map inventoryMap = (Map) inventoryObj;
+        assertTrue(inventoryMap.keySet().size() > 0);
+
+        Map.Entry firstEntry = (Map.Entry) inventoryMap.entrySet().iterator().next();
+        assertTrue(firstEntry.getKey() instanceof String);
+        // NOTE: Gson parses integer value to double.
+        assertTrue(firstEntry.getValue() instanceof Double);
+    }
+
     @Test
     public void testPlaceOrder() throws Exception {
         Order order = createOrder();
@@ -67,13 +83,20 @@ public class StoreApiTest {
 
     private Order createOrder() {
         Order order = new Order();
-        order.setId(new Long(System.currentTimeMillis()));
         order.setPetId(new Long(200));
         order.setQuantity(new Integer(13));
         order.setShipDate(new java.util.Date());
         order.setStatus(Order.StatusEnum.PLACED);
         order.setComplete(true);
 
+        try {
+          Field idField = Order.class.getDeclaredField("id");
+          idField.setAccessible(true);
+          idField.set(order, TestUtils.nextId());
+        } catch (Exception e) {
+          throw new RuntimeException(e);
+        }
+
         return order;
     }
 }
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/UserApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/UserApiTest.java
index a3f257f568b..195e5c1e861 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/UserApiTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/UserApiTest.java
@@ -1,5 +1,7 @@
 package io.swagger.petstore.test;
 
+import io.swagger.TestUtils;
+
 import io.swagger.client.api.*;
 import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
@@ -33,9 +35,9 @@ public class UserApiTest {
     @Test
     public void testCreateUsersWithArray() throws Exception {
         User user1 = createUser();
-        user1.setUsername("abc123");
+        user1.setUsername("user" + user1.getId());
         User user2 = createUser();
-        user2.setUsername("123abc");
+        user2.setUsername("user" + user2.getId());
 
         api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2}));
 
@@ -46,9 +48,9 @@ public class UserApiTest {
     @Test
     public void testCreateUsersWithList() throws Exception {
         User user1 = createUser();
-        user1.setUsername("abc123");
+        user1.setUsername("user" + user1.getId());
         User user2 = createUser();
-        user2.setUsername("123abc");
+        user2.setUsername("user" + user2.getId());
 
         api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2}));
 
@@ -72,7 +74,7 @@ public class UserApiTest {
 
     private User createUser() {
         User user = new User();
-        user.setId(System.currentTimeMillis());
+        user.setId(TestUtils.nextId());
         user.setUsername("fred" + user.getId());
         user.setFirstName("Fred");
         user.setLastName("Meyer");
diff --git a/samples/client/petstore/java/retrofit/.gitignore b/samples/client/petstore/java/retrofit/.gitignore
new file mode 100644
index 00000000000..32858aad3c3
--- /dev/null
+++ b/samples/client/petstore/java/retrofit/.gitignore
@@ -0,0 +1,12 @@
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
diff --git a/samples/client/petstore/java/retrofit/git_push.sh b/samples/client/petstore/java/retrofit/git_push.sh
new file mode 100644
index 00000000000..1a36388db02
--- /dev/null
+++ b/samples/client/petstore/java/retrofit/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="YOUR_GIT_USR_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="YOUR_GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/client/petstore/java/retrofit/hello.txt b/samples/client/petstore/java/retrofit/hello.txt
new file mode 100644
index 00000000000..6769dd60bdf
--- /dev/null
+++ b/samples/client/petstore/java/retrofit/hello.txt
@@ -0,0 +1 @@
+Hello world!
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/StringUtil.java
index de61255cb25..0eec085e2a4 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/StringUtil.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/StringUtil.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:21.255+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:53.252+08:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java
index 1746009aa77..92147932bac 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java
@@ -7,43 +7,25 @@ import retrofit.http.*;
 import retrofit.mime.*;
 
 import io.swagger.client.model.Pet;
+import io.swagger.client.model.InlineResponse200;
 import java.io.File;
 
-import java.util.*;
+
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
 
 public interface PetApi {
   
-  /**
-   * Update an existing pet
-   * Sync method
-   * 
-   * @param body Pet object that needs to be added to the store
-   * @return Void
-   */
-  
-  @PUT("/pet")
-  Void updatePet(
-    @Body Pet body
-  );
-
-  /**
-   * Update an existing pet
-   * Async method
-   * @param body Pet object that needs to be added to the store
-   * @param cb callback method
-   * @return void
-   */
-  
-  @PUT("/pet")
-  void updatePet(
-    @Body Pet body, Callback<Void> cb
-  );
-  
   /**
    * Add a new pet to the store
    * Sync method
    * 
-   * @param body Pet object that needs to be added to the store
+   * @param body Pet object that needs to be added to the store (optional)
    * @return Void
    */
   
@@ -55,7 +37,7 @@ public interface PetApi {
   /**
    * Add a new pet to the store
    * Async method
-   * @param body Pet object that needs to be added to the store
+   * @param body Pet object that needs to be added to the store (optional)
    * @param cb callback method
    * @return void
    */
@@ -65,11 +47,65 @@ public interface PetApi {
     @Body Pet body, Callback<Void> cb
   );
   
+  /**
+   * Fake endpoint to test byte array in body parameter for adding a new pet to the store
+   * Sync method
+   * 
+   * @param body Pet object in the form of byte array (optional)
+   * @return Void
+   */
+  
+  @POST("/pet?testing_byte_array=true")
+  Void addPetUsingByteArray(
+    @Body byte[] body
+  );
+
+  /**
+   * Fake endpoint to test byte array in body parameter for adding a new pet to the store
+   * Async method
+   * @param body Pet object in the form of byte array (optional)
+   * @param cb callback method
+   * @return void
+   */
+  
+  @POST("/pet?testing_byte_array=true")
+  void addPetUsingByteArray(
+    @Body byte[] body, Callback<Void> cb
+  );
+  
+  /**
+   * Deletes a pet
+   * Sync method
+   * 
+   * @param petId Pet id to delete (required)
+   * @param apiKey  (optional)
+   * @return Void
+   */
+  
+  @DELETE("/pet/{petId}")
+  Void deletePet(
+    @Path("petId") Long petId, @Header("api_key") String apiKey
+  );
+
+  /**
+   * Deletes a pet
+   * Async method
+   * @param petId Pet id to delete (required)
+   * @param apiKey  (optional)
+   * @param cb callback method
+   * @return void
+   */
+  
+  @DELETE("/pet/{petId}")
+  void deletePet(
+    @Path("petId") Long petId, @Header("api_key") String apiKey, Callback<Void> cb
+  );
+  
   /**
    * Finds Pets by status
    * Sync method
-   * Multiple status values can be provided with comma seperated strings
-   * @param status Status values that need to be considered for filter
+   * Multiple status values can be provided with comma separated strings
+   * @param status Status values that need to be considered for query (optional, default to available)
    * @return List<Pet>
    */
   
@@ -81,7 +117,7 @@ public interface PetApi {
   /**
    * Finds Pets by status
    * Async method
-   * @param status Status values that need to be considered for filter
+   * @param status Status values that need to be considered for query (optional, default to available)
    * @param cb callback method
    * @return void
    */
@@ -95,7 +131,7 @@ public interface PetApi {
    * Finds Pets by tags
    * Sync method
    * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-   * @param tags Tags to filter by
+   * @param tags Tags to filter by (optional)
    * @return List<Pet>
    */
   
@@ -107,7 +143,7 @@ public interface PetApi {
   /**
    * Finds Pets by tags
    * Async method
-   * @param tags Tags to filter by
+   * @param tags Tags to filter by (optional)
    * @param cb callback method
    * @return void
    */
@@ -121,7 +157,7 @@ public interface PetApi {
    * Find pet by ID
    * Sync method
    * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-   * @param petId ID of pet that needs to be fetched
+   * @param petId ID of pet that needs to be fetched (required)
    * @return Pet
    */
   
@@ -133,7 +169,7 @@ public interface PetApi {
   /**
    * Find pet by ID
    * Async method
-   * @param petId ID of pet that needs to be fetched
+   * @param petId ID of pet that needs to be fetched (required)
    * @param cb callback method
    * @return void
    */
@@ -143,13 +179,91 @@ public interface PetApi {
     @Path("petId") Long petId, Callback<Pet> cb
   );
   
+  /**
+   * Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+   * Sync method
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched (required)
+   * @return InlineResponse200
+   */
+  
+  @GET("/pet/{petId}?response=inline_arbitrary_object")
+  InlineResponse200 getPetByIdInObject(
+    @Path("petId") Long petId
+  );
+
+  /**
+   * Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+   * Async method
+   * @param petId ID of pet that needs to be fetched (required)
+   * @param cb callback method
+   * @return void
+   */
+  
+  @GET("/pet/{petId}?response=inline_arbitrary_object")
+  void getPetByIdInObject(
+    @Path("petId") Long petId, Callback<InlineResponse200> cb
+  );
+  
+  /**
+   * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+   * Sync method
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched (required)
+   * @return byte[]
+   */
+  
+  @GET("/pet/{petId}?testing_byte_array=true")
+  byte[] petPetIdtestingByteArraytrueGet(
+    @Path("petId") Long petId
+  );
+
+  /**
+   * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+   * Async method
+   * @param petId ID of pet that needs to be fetched (required)
+   * @param cb callback method
+   * @return void
+   */
+  
+  @GET("/pet/{petId}?testing_byte_array=true")
+  void petPetIdtestingByteArraytrueGet(
+    @Path("petId") Long petId, Callback<byte[]> cb
+  );
+  
+  /**
+   * Update an existing pet
+   * Sync method
+   * 
+   * @param body Pet object that needs to be added to the store (optional)
+   * @return Void
+   */
+  
+  @PUT("/pet")
+  Void updatePet(
+    @Body Pet body
+  );
+
+  /**
+   * Update an existing pet
+   * Async method
+   * @param body Pet object that needs to be added to the store (optional)
+   * @param cb callback method
+   * @return void
+   */
+  
+  @PUT("/pet")
+  void updatePet(
+    @Body Pet body, Callback<Void> cb
+  );
+  
   /**
    * Updates a pet in the store with form data
    * Sync method
    * 
-   * @param petId ID of pet that needs to be updated
-   * @param name Updated name of the pet
-   * @param status Updated status of the pet
+   * @param petId ID of pet that needs to be updated (required)
+   * @param name Updated name of the pet (optional)
+   * @param status Updated status of the pet (optional)
    * @return Void
    */
   
@@ -162,9 +276,9 @@ public interface PetApi {
   /**
    * Updates a pet in the store with form data
    * Async method
-   * @param petId ID of pet that needs to be updated
-   * @param name Updated name of the pet
-   * @param status Updated status of the pet
+   * @param petId ID of pet that needs to be updated (required)
+   * @param name Updated name of the pet (optional)
+   * @param status Updated status of the pet (optional)
    * @param cb callback method
    * @return void
    */
@@ -175,41 +289,13 @@ public interface PetApi {
     @Path("petId") String petId, @Field("name") String name, @Field("status") String status, Callback<Void> cb
   );
   
-  /**
-   * Deletes a pet
-   * Sync method
-   * 
-   * @param petId Pet id to delete
-   * @param apiKey 
-   * @return Void
-   */
-  
-  @DELETE("/pet/{petId}")
-  Void deletePet(
-    @Path("petId") Long petId, @Header("api_key") String apiKey
-  );
-
-  /**
-   * Deletes a pet
-   * Async method
-   * @param petId Pet id to delete
-   * @param apiKey 
-   * @param cb callback method
-   * @return void
-   */
-  
-  @DELETE("/pet/{petId}")
-  void deletePet(
-    @Path("petId") Long petId, @Header("api_key") String apiKey, Callback<Void> cb
-  );
-  
   /**
    * uploads an image
    * Sync method
    * 
-   * @param petId ID of pet to update
-   * @param additionalMetadata Additional data to pass to server
-   * @param file file to upload
+   * @param petId ID of pet to update (required)
+   * @param additionalMetadata Additional data to pass to server (optional)
+   * @param file file to upload (optional)
    * @return Void
    */
   
@@ -222,9 +308,9 @@ public interface PetApi {
   /**
    * uploads an image
    * Async method
-   * @param petId ID of pet to update
-   * @param additionalMetadata Additional data to pass to server
-   * @param file file to upload
+   * @param petId ID of pet to update (required)
+   * @param additionalMetadata Additional data to pass to server (optional)
+   * @param file file to upload (optional)
    * @param cb callback method
    * @return void
    */
@@ -236,3 +322,4 @@ public interface PetApi {
   );
   
 }
+
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/StoreApi.java
index 4d6d3aa7c00..815d067c967 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/StoreApi.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/StoreApi.java
@@ -6,13 +6,71 @@ import retrofit.Callback;
 import retrofit.http.*;
 import retrofit.mime.*;
 
-import java.util.Map;
 import io.swagger.client.model.Order;
 
-import java.util.*;
+
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
 
 public interface StoreApi {
   
+  /**
+   * Delete purchase order by ID
+   * Sync method
+   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+   * @param orderId ID of the order that needs to be deleted (required)
+   * @return Void
+   */
+  
+  @DELETE("/store/order/{orderId}")
+  Void deleteOrder(
+    @Path("orderId") String orderId
+  );
+
+  /**
+   * Delete purchase order by ID
+   * Async method
+   * @param orderId ID of the order that needs to be deleted (required)
+   * @param cb callback method
+   * @return void
+   */
+  
+  @DELETE("/store/order/{orderId}")
+  void deleteOrder(
+    @Path("orderId") String orderId, Callback<Void> cb
+  );
+  
+  /**
+   * Finds orders by status
+   * Sync method
+   * A single status value can be provided as a string
+   * @param status Status value that needs to be considered for query (optional, default to placed)
+   * @return List<Order>
+   */
+  
+  @GET("/store/findByStatus")
+  List<Order> findOrdersByStatus(
+    @Query("status") String status
+  );
+
+  /**
+   * Finds orders by status
+   * Async method
+   * @param status Status value that needs to be considered for query (optional, default to placed)
+   * @param cb callback method
+   * @return void
+   */
+  
+  @GET("/store/findByStatus")
+  void findOrdersByStatus(
+    @Query("status") String status, Callback<List<Order>> cb
+  );
+  
   /**
    * Returns pet inventories by status
    * Sync method
@@ -37,36 +95,33 @@ public interface StoreApi {
   );
   
   /**
-   * Place an order for a pet
+   * Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
    * Sync method
-   * 
-   * @param body order placed for purchasing the pet
-   * @return Order
+   * Returns an arbitrary object which is actually a map of status codes to quantities
+   * @return Object
    */
   
-  @POST("/store/order")
-  Order placeOrder(
-    @Body Order body
-  );
+  @GET("/store/inventory?response=arbitrary_object")
+  Object getInventoryInObject();
+    
 
   /**
-   * Place an order for a pet
+   * Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
    * Async method
-   * @param body order placed for purchasing the pet
    * @param cb callback method
    * @return void
    */
   
-  @POST("/store/order")
-  void placeOrder(
-    @Body Order body, Callback<Order> cb
+  @GET("/store/inventory?response=arbitrary_object")
+  void getInventoryInObject(
+    Callback<Object> cb
   );
   
   /**
    * Find purchase order by ID
    * Sync method
    * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-   * @param orderId ID of pet that needs to be fetched
+   * @param orderId ID of pet that needs to be fetched (required)
    * @return Order
    */
   
@@ -78,7 +133,7 @@ public interface StoreApi {
   /**
    * Find purchase order by ID
    * Async method
-   * @param orderId ID of pet that needs to be fetched
+   * @param orderId ID of pet that needs to be fetched (required)
    * @param cb callback method
    * @return void
    */
@@ -89,29 +144,30 @@ public interface StoreApi {
   );
   
   /**
-   * Delete purchase order by ID
+   * Place an order for a pet
    * Sync method
-   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-   * @param orderId ID of the order that needs to be deleted
-   * @return Void
+   * 
+   * @param body order placed for purchasing the pet (optional)
+   * @return Order
    */
   
-  @DELETE("/store/order/{orderId}")
-  Void deleteOrder(
-    @Path("orderId") String orderId
+  @POST("/store/order")
+  Order placeOrder(
+    @Body Order body
   );
 
   /**
-   * Delete purchase order by ID
+   * Place an order for a pet
    * Async method
-   * @param orderId ID of the order that needs to be deleted
+   * @param body order placed for purchasing the pet (optional)
    * @param cb callback method
    * @return void
    */
   
-  @DELETE("/store/order/{orderId}")
-  void deleteOrder(
-    @Path("orderId") String orderId, Callback<Void> cb
+  @POST("/store/order")
+  void placeOrder(
+    @Body Order body, Callback<Order> cb
   );
   
 }
+
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/UserApi.java
index ff4b4562977..a0d913e071f 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/UserApi.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/UserApi.java
@@ -7,9 +7,15 @@ import retrofit.http.*;
 import retrofit.mime.*;
 
 import io.swagger.client.model.User;
-import java.util.*;
 
-import java.util.*;
+
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
 
 public interface UserApi {
   
@@ -17,7 +23,7 @@ public interface UserApi {
    * Create user
    * Sync method
    * This can only be done by the logged in user.
-   * @param body Created user object
+   * @param body Created user object (optional)
    * @return Void
    */
   
@@ -29,7 +35,7 @@ public interface UserApi {
   /**
    * Create user
    * Async method
-   * @param body Created user object
+   * @param body Created user object (optional)
    * @param cb callback method
    * @return void
    */
@@ -43,7 +49,7 @@ public interface UserApi {
    * Creates list of users with given input array
    * Sync method
    * 
-   * @param body List of user object
+   * @param body List of user object (optional)
    * @return Void
    */
   
@@ -55,7 +61,7 @@ public interface UserApi {
   /**
    * Creates list of users with given input array
    * Async method
-   * @param body List of user object
+   * @param body List of user object (optional)
    * @param cb callback method
    * @return void
    */
@@ -69,7 +75,7 @@ public interface UserApi {
    * Creates list of users with given input array
    * Sync method
    * 
-   * @param body List of user object
+   * @param body List of user object (optional)
    * @return Void
    */
   
@@ -81,7 +87,7 @@ public interface UserApi {
   /**
    * Creates list of users with given input array
    * Async method
-   * @param body List of user object
+   * @param body List of user object (optional)
    * @param cb callback method
    * @return void
    */
@@ -91,12 +97,64 @@ public interface UserApi {
     @Body List<User> body, Callback<Void> cb
   );
   
+  /**
+   * Delete user
+   * Sync method
+   * This can only be done by the logged in user.
+   * @param username The name that needs to be deleted (required)
+   * @return Void
+   */
+  
+  @DELETE("/user/{username}")
+  Void deleteUser(
+    @Path("username") String username
+  );
+
+  /**
+   * Delete user
+   * Async method
+   * @param username The name that needs to be deleted (required)
+   * @param cb callback method
+   * @return void
+   */
+  
+  @DELETE("/user/{username}")
+  void deleteUser(
+    @Path("username") String username, Callback<Void> cb
+  );
+  
+  /**
+   * Get user by user name
+   * Sync method
+   * 
+   * @param username The name that needs to be fetched. Use user1 for testing. (required)
+   * @return User
+   */
+  
+  @GET("/user/{username}")
+  User getUserByName(
+    @Path("username") String username
+  );
+
+  /**
+   * Get user by user name
+   * Async method
+   * @param username The name that needs to be fetched. Use user1 for testing. (required)
+   * @param cb callback method
+   * @return void
+   */
+  
+  @GET("/user/{username}")
+  void getUserByName(
+    @Path("username") String username, Callback<User> cb
+  );
+  
   /**
    * Logs user into the system
    * Sync method
    * 
-   * @param username The user name for login
-   * @param password The password for login in clear text
+   * @param username The user name for login (optional)
+   * @param password The password for login in clear text (optional)
    * @return String
    */
   
@@ -108,8 +166,8 @@ public interface UserApi {
   /**
    * Logs user into the system
    * Async method
-   * @param username The user name for login
-   * @param password The password for login in clear text
+   * @param username The user name for login (optional)
+   * @param password The password for login in clear text (optional)
    * @param cb callback method
    * @return void
    */
@@ -142,38 +200,12 @@ public interface UserApi {
     Callback<Void> cb
   );
   
-  /**
-   * Get user by user name
-   * Sync method
-   * 
-   * @param username The name that needs to be fetched. Use user1 for testing.
-   * @return User
-   */
-  
-  @GET("/user/{username}")
-  User getUserByName(
-    @Path("username") String username
-  );
-
-  /**
-   * Get user by user name
-   * Async method
-   * @param username The name that needs to be fetched. Use user1 for testing.
-   * @param cb callback method
-   * @return void
-   */
-  
-  @GET("/user/{username}")
-  void getUserByName(
-    @Path("username") String username, Callback<User> cb
-  );
-  
   /**
    * Updated user
    * Sync method
    * This can only be done by the logged in user.
-   * @param username name that need to be deleted
-   * @param body Updated user object
+   * @param username name that need to be deleted (required)
+   * @param body Updated user object (optional)
    * @return Void
    */
   
@@ -185,8 +217,8 @@ public interface UserApi {
   /**
    * Updated user
    * Async method
-   * @param username name that need to be deleted
-   * @param body Updated user object
+   * @param username name that need to be deleted (required)
+   * @param body Updated user object (optional)
    * @param cb callback method
    * @return void
    */
@@ -196,30 +228,5 @@ public interface UserApi {
     @Path("username") String username, @Body User body, Callback<Void> cb
   );
   
-  /**
-   * Delete user
-   * Sync method
-   * This can only be done by the logged in user.
-   * @param username The name that needs to be deleted
-   * @return Void
-   */
-  
-  @DELETE("/user/{username}")
-  Void deleteUser(
-    @Path("username") String username
-  );
-
-  /**
-   * Delete user
-   * Async method
-   * @param username The name that needs to be deleted
-   * @param cb callback method
-   * @return void
-   */
-  
-  @DELETE("/user/{username}")
-  void deleteUser(
-    @Path("username") String username, Callback<Void> cb
-  );
-  
 }
+
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Category.java
index d0908afd9e1..67de63eb179 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Category.java
@@ -4,12 +4,14 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+
 import com.google.gson.annotations.SerializedName;
 
 
 
 
-@ApiModel(description = "")
+
+
 public class Category   {
   
   @SerializedName("id")
@@ -83,3 +85,5 @@ public class Category   {
     return o.toString().replace("\n", "\n    ");
   }
 }
+
+
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/InlineResponse200.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/InlineResponse200.java
new file mode 100644
index 00000000000..165f069a05b
--- /dev/null
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/InlineResponse200.java
@@ -0,0 +1,180 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.client.model.Tag;
+import java.util.ArrayList;
+import java.util.List;
+
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+
+public class InlineResponse200   {
+  
+  @SerializedName("photoUrls")
+  private List<String> photoUrls = new ArrayList<String>();
+  
+  @SerializedName("name")
+  private String name = null;
+  
+  @SerializedName("id")
+  private Long id = null;
+  
+  @SerializedName("category")
+  private Object category = null;
+  
+  @SerializedName("tags")
+  private List<Tag> tags = new ArrayList<Tag>();
+  
+
+public enum StatusEnum {
+  @SerializedName("available")
+  AVAILABLE("available"),
+
+  @SerializedName("pending")
+  PENDING("pending"),
+
+  @SerializedName("sold")
+  SOLD("sold");
+
+  private String value;
+
+  StatusEnum(String value) {
+    this.value = value;
+  }
+
+  @Override
+  public String toString() {
+    return value;
+  }
+}
+
+  @SerializedName("status")
+  private StatusEnum status = null;
+  
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<String> getPhotoUrls() {
+    return photoUrls;
+  }
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Object getCategory() {
+    return category;
+  }
+  public void setCategory(Object category) {
+    this.category = category;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<Tag> getTags() {
+    return tags;
+  }
+  public void setTags(List<Tag> tags) {
+    this.tags = tags;
+  }
+
+  
+  /**
+   * pet status in the store
+   **/
+  @ApiModelProperty(value = "pet status in the store")
+  public StatusEnum getStatus() {
+    return status;
+  }
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    InlineResponse200 inlineResponse200 = (InlineResponse200) o;
+    return Objects.equals(photoUrls, inlineResponse200.photoUrls) &&
+        Objects.equals(name, inlineResponse200.name) &&
+        Objects.equals(id, inlineResponse200.id) &&
+        Objects.equals(category, inlineResponse200.category) &&
+        Objects.equals(tags, inlineResponse200.tags) &&
+        Objects.equals(status, inlineResponse200.status);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(photoUrls, name, id, category, tags, status);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class InlineResponse200 {\n");
+    
+    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    category: ").append(toIndentedString(category)).append("\n");
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
+
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Model200Response.java
new file mode 100644
index 00000000000..80b0aed92a8
--- /dev/null
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Model200Response.java
@@ -0,0 +1,73 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+
+public class Model200Response   {
+  
+  @SerializedName("name")
+  private Integer name = null;
+  
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getName() {
+    return name;
+  }
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Model200Response _200Response = (Model200Response) o;
+    return Objects.equals(name, _200Response.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Model200Response {\n");
+    
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
+
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ModelReturn.java
new file mode 100644
index 00000000000..ce8c1238fdb
--- /dev/null
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -0,0 +1,73 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+
+public class ModelReturn   {
+  
+  @SerializedName("return")
+  private Integer _return = null;
+  
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getReturn() {
+    return _return;
+  }
+  public void setReturn(Integer _return) {
+    this._return = _return;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ModelReturn _return = (ModelReturn) o;
+    return Objects.equals(_return, _return._return);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(_return);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ModelReturn {\n");
+    
+    sb.append("    _return: ").append(toIndentedString(_return)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
+
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Name.java
new file mode 100644
index 00000000000..370214bd21c
--- /dev/null
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Name.java
@@ -0,0 +1,89 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+
+public class Name   {
+  
+  @SerializedName("name")
+  private Integer name = null;
+  
+  @SerializedName("snake_case")
+  private Integer snakeCase = null;
+  
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getName() {
+    return name;
+  }
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getSnakeCase() {
+    return snakeCase;
+  }
+  public void setSnakeCase(Integer snakeCase) {
+    this.snakeCase = snakeCase;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Name name = (Name) o;
+    return Objects.equals(name, name.name) &&
+        Objects.equals(snakeCase, name.snakeCase);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, snakeCase);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Name {\n");
+    
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
+
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Order.java
index 59c5238b626..e601bd7a15a 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Order.java
@@ -5,12 +5,14 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
 
+
 import com.google.gson.annotations.SerializedName;
 
 
 
 
-@ApiModel(description = "")
+
+
 public class Order   {
   
   @SerializedName("id")
@@ -62,9 +64,6 @@ public enum StatusEnum {
   public Long getId() {
     return id;
   }
-  public void setId(Long id) {
-    this.id = id;
-  }
 
   
   /**
@@ -172,3 +171,5 @@ public enum StatusEnum {
     return o.toString().replace("\n", "\n    ");
   }
 }
+
+
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Pet.java
index 1f9462ddc3a..5d1210dc55b 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Pet.java
@@ -5,14 +5,17 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.client.model.Category;
 import io.swagger.client.model.Tag;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+
 
 import com.google.gson.annotations.SerializedName;
 
 
 
 
-@ApiModel(description = "")
+
+
 public class Pet   {
   
   @SerializedName("id")
@@ -174,3 +177,5 @@ public enum StatusEnum {
     return o.toString().replace("\n", "\n    ");
   }
 }
+
+
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/SpecialModelName.java
new file mode 100644
index 00000000000..b5a96d5fc39
--- /dev/null
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -0,0 +1,73 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+
+public class SpecialModelName   {
+  
+  @SerializedName("$special[property.name]")
+  private Long specialPropertyName = null;
+  
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Long getSpecialPropertyName() {
+    return specialPropertyName;
+  }
+  public void setSpecialPropertyName(Long specialPropertyName) {
+    this.specialPropertyName = specialPropertyName;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    SpecialModelName specialModelName = (SpecialModelName) o;
+    return Objects.equals(specialPropertyName, specialModelName.specialPropertyName);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(specialPropertyName);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class SpecialModelName {\n");
+    
+    sb.append("    specialPropertyName: ").append(toIndentedString(specialPropertyName)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
+
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Tag.java
index a4ca1074ca1..6ee49ee2166 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Tag.java
@@ -4,12 +4,14 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+
 import com.google.gson.annotations.SerializedName;
 
 
 
 
-@ApiModel(description = "")
+
+
 public class Tag   {
   
   @SerializedName("id")
@@ -83,3 +85,5 @@ public class Tag   {
     return o.toString().replace("\n", "\n    ");
   }
 }
+
+
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/User.java
index 072f510081a..98196393ef1 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/User.java
@@ -4,12 +4,14 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+
 import com.google.gson.annotations.SerializedName;
 
 
 
 
-@ApiModel(description = "")
+
+
 public class User   {
   
   @SerializedName("id")
@@ -180,3 +182,5 @@ public class User   {
     return o.toString().replace("\n", "\n    ");
   }
 }
+
+
diff --git a/samples/client/petstore/java/retrofit/src/test/java/io/swagger/TestUtils.java b/samples/client/petstore/java/retrofit/src/test/java/io/swagger/TestUtils.java
new file mode 100644
index 00000000000..7ddf142426e
--- /dev/null
+++ b/samples/client/petstore/java/retrofit/src/test/java/io/swagger/TestUtils.java
@@ -0,0 +1,17 @@
+package io.swagger;
+
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicLong;
+
+public class TestUtils {
+    private static final AtomicLong atomicId = createAtomicId();
+
+    public static long nextId() {
+      return atomicId.getAndIncrement();
+    }
+
+    private static AtomicLong createAtomicId() {
+        int baseId = new Random(System.currentTimeMillis()).nextInt(1000000) + 20000;
+        return new AtomicLong((long) baseId);
+    }
+}
diff --git a/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/PetApiTest.java
index 1ff1dbb10e2..a943a8ffe6e 100644
--- a/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/PetApiTest.java
+++ b/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/PetApiTest.java
@@ -1,5 +1,7 @@
 package io.swagger.petstore.test;
 
+import io.swagger.TestUtils;
+
 import io.swagger.client.ApiClient;
 import io.swagger.client.api.*;
 import io.swagger.client.model.*;
@@ -172,7 +174,7 @@ public class PetApiTest {
 
     private Pet createRandomPet() {
         Pet pet = new Pet();
-        pet.setId(System.currentTimeMillis());
+        pet.setId(TestUtils.nextId());
         pet.setName("gorilla");
 
         Category category = new Category();
@@ -185,4 +187,4 @@ public class PetApiTest {
 
         return pet;
     }
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/StoreApiTest.java
index 95079f71afa..07d3b6a298d 100644
--- a/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/StoreApiTest.java
+++ b/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/StoreApiTest.java
@@ -1,11 +1,14 @@
 package io.swagger.petstore.test;
 
+import io.swagger.TestUtils;
+
 import io.swagger.client.ApiClient;
 import io.swagger.client.api.*;
 import io.swagger.client.model.*;
 
 import retrofit.RetrofitError;
 
+import java.lang.reflect.Field;
 import java.util.Map;
 
 import org.junit.*;
@@ -56,13 +59,20 @@ public class StoreApiTest {
 
     private Order createOrder() {
         Order order = new Order();
-        order.setId(new Long(System.currentTimeMillis()));
         order.setPetId(new Long(200));
         order.setQuantity(new Integer(13));
         order.setShipDate(new java.util.Date());
         order.setStatus(Order.StatusEnum.PLACED);
         order.setComplete(true);
 
+        try {
+          Field idField = Order.class.getDeclaredField("id");
+          idField.setAccessible(true);
+          idField.set(order, TestUtils.nextId());
+        } catch (Exception e) {
+          throw new RuntimeException(e);
+        }
+
         return order;
     }
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/UserApiTest.java b/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/UserApiTest.java
index f99d7f513cc..9b949445cc3 100644
--- a/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/UserApiTest.java
+++ b/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/UserApiTest.java
@@ -1,5 +1,7 @@
 package io.swagger.petstore.test;
 
+import io.swagger.TestUtils;
+
 import io.swagger.client.ApiClient;
 import io.swagger.client.api.*;
 import io.swagger.client.model.*;
@@ -31,9 +33,9 @@ public class UserApiTest {
     @Test
     public void testCreateUsersWithArray() throws Exception {
         User user1 = createUser();
-        user1.setUsername("abc123");
+        user1.setUsername("user" + user1.getId());
         User user2 = createUser();
-        user2.setUsername("123abc");
+        user2.setUsername("user" + user2.getId());
 
         api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2}));
 
@@ -44,9 +46,9 @@ public class UserApiTest {
     @Test
     public void testCreateUsersWithList() throws Exception {
         User user1 = createUser();
-        user1.setUsername("abc123");
+        user1.setUsername("user" + user1.getId());
         User user2 = createUser();
-        user2.setUsername("123abc");
+        user2.setUsername("user" + user2.getId());
 
         api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2}));
 
@@ -70,7 +72,7 @@ public class UserApiTest {
 
     private User createUser() {
         User user = new User();
-        user.setId(System.currentTimeMillis());
+        user.setId(TestUtils.nextId());
         user.setUsername("fred" + user.getId());
         user.setFirstName("Fred");
         user.setLastName("Meyer");
@@ -81,4 +83,4 @@ public class UserApiTest {
 
         return user;
     }
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/java/retrofit2/.gitignore b/samples/client/petstore/java/retrofit2/.gitignore
new file mode 100644
index 00000000000..32858aad3c3
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/.gitignore
@@ -0,0 +1,12 @@
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
diff --git a/samples/client/petstore/java/retrofit2/README.md b/samples/client/petstore/java/retrofit2/README.md
index 1a6255eb563..d5f7ec9f1ce 100644
--- a/samples/client/petstore/java/retrofit2/README.md
+++ b/samples/client/petstore/java/retrofit2/README.md
@@ -20,7 +20,7 @@ mvn deploy
 
 Refer to the [official documentation](https://maven.apache.org/plugins/maven-deploy-plugin/usage.html) for more information.
 
-After the client libarary is installed/deployed, you can use it in your Maven project by adding the following to your *pom.xml*:
+After the client library is installed/deployed, you can use it in your Maven project by adding the following to your *pom.xml*:
 
 ```xml
 <dependency>
diff --git a/samples/client/petstore/java/retrofit2/build.gradle b/samples/client/petstore/java/retrofit2/build.gradle
index 29e1737f3b3..ae27a595eb5 100644
--- a/samples/client/petstore/java/retrofit2/build.gradle
+++ b/samples/client/petstore/java/retrofit2/build.gradle
@@ -1,3 +1,6 @@
+apply plugin: 'idea'
+apply plugin: 'eclipse'
+
 group = 'io.swagger'
 version = '1.0.0'
 
@@ -20,7 +23,7 @@ if(hasProperty('target') && target == 'android') {
 
 	apply plugin: 'com.android.library'
 	apply plugin: 'com.github.dcendents.android-maven'
-	
+
 	android {
 	    compileSdkVersion 22
 	    buildToolsVersion '22.0.0'
@@ -32,7 +35,7 @@ if(hasProperty('target') && target == 'android') {
 	        sourceCompatibility JavaVersion.VERSION_1_7
 	        targetCompatibility JavaVersion.VERSION_1_7
 	    }
-	
+
 	    // Rename the aar correctly
 	    libraryVariants.all { variant ->
 	        variant.outputs.each { output ->
@@ -44,7 +47,7 @@ if(hasProperty('target') && target == 'android') {
 	        }
 	    }
 	}
-	
+
 	afterEvaluate {
 	    android.libraryVariants.all { variant ->
 	        def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
@@ -56,12 +59,12 @@ if(hasProperty('target') && target == 'android') {
 	        artifacts.add('archives', task);
 	    }
 	}
-	
+
 	task sourcesJar(type: Jar) {
 	    from android.sourceSets.main.java.srcDirs
 	    classifier = 'sources'
 	}
-	
+
 	artifacts {
 	    archives sourcesJar
 	}
@@ -70,16 +73,16 @@ if(hasProperty('target') && target == 'android') {
 
 	apply plugin: 'java'
 	apply plugin: 'maven'
-	
-	sourceCompatibility = JavaVersion.VERSION_1_7
-	targetCompatibility = JavaVersion.VERSION_1_7
-	
+
+    sourceCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_1_7
+
 	install {
 	    repositories.mavenInstaller {
 	        pom.artifactId = 'swagger-petstore-retrofit2'
 	    }
 	}
-	
+
 	task execute(type:JavaExec) {
 	   main = System.getProperty('mainClass')
 	   classpath = sourceSets.main.runtimeClasspath
@@ -87,20 +90,22 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    okhttp_version = "2.5.0"
     oltu_version = "1.0.0"
-    retrofit_version = "2.0.0-beta2"
+    retrofit_version = "2.0.0-beta4"
     gson_version = "2.4"
     swagger_annotations_version = "1.5.0"
     junit_version = "4.12"
+
 }
 
 dependencies {
-    compile "com.squareup.okhttp:okhttp:$okhttp_version"
-    compile "com.squareup.retrofit:retrofit:$retrofit_version"
-    compile "com.google.code.gson:gson:$gson_version"
-    compile "com.squareup.retrofit:converter-gson:$retrofit_version"
+    compile "com.squareup.retrofit2:retrofit:$retrofit_version"
+    compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
+    compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
+
+
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
+
     testCompile "junit:junit:$junit_version"
 }
diff --git a/samples/client/petstore/java/retrofit2/git_push.sh b/samples/client/petstore/java/retrofit2/git_push.sh
new file mode 100644
index 00000000000..1a36388db02
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="YOUR_GIT_USR_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="YOUR_GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/client/petstore/java/retrofit2/hello.txt b/samples/client/petstore/java/retrofit2/hello.txt
new file mode 100644
index 00000000000..6769dd60bdf
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/hello.txt
@@ -0,0 +1 @@
+Hello world!
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2/pom.xml b/samples/client/petstore/java/retrofit2/pom.xml
index 109cbc0d95c..2d8f0440161 100644
--- a/samples/client/petstore/java/retrofit2/pom.xml
+++ b/samples/client/petstore/java/retrofit2/pom.xml
@@ -100,8 +100,9 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.3.2</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+            <source>
+            1.7</source>
+            <target>1.7</target>
         </configuration>
       </plugin>
     </plugins>
@@ -113,30 +114,25 @@
       <version>${swagger-annotations-version}</version>
     </dependency>
     <dependency>
-      <groupId>com.squareup.retrofit</groupId>
+      <groupId>com.squareup.retrofit2</groupId>
       <artifactId>retrofit</artifactId>
       <version>${retrofit-version}</version>
     </dependency>
     <dependency>
-      <groupId>com.squareup.retrofit</groupId>
+      <groupId>com.squareup.retrofit2</groupId>
+      <artifactId>converter-scalars</artifactId>
+      <version>${retrofit-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.retrofit2</groupId>
       <artifactId>converter-gson</artifactId>
       <version>${retrofit-version}</version>
     </dependency>
-    <dependency>
-	  <groupId>com.google.code.gson</groupId>
-	  <artifactId>gson</artifactId>
-	  <version>${gson-version}</version>
-	</dependency>
     <dependency>
       <groupId>org.apache.oltu.oauth2</groupId>
       <artifactId>org.apache.oltu.oauth2.client</artifactId>
       <version>${oltu-version}</version>
     </dependency>
-      <dependency>
-      <groupId>com.squareup.okhttp</groupId>
-      <artifactId>okhttp</artifactId>
-      <version>${okhttp-version}</version>
-    </dependency>
 
     <!-- test dependencies -->
     <dependency>
@@ -148,9 +144,7 @@
   </dependencies>
   <properties>
     <swagger-annotations-version>1.5.0</swagger-annotations-version>
-    <retrofit-version>2.0.0-beta2</retrofit-version>
-    <okhttp-version>2.5.0</okhttp-version>
-    <gson-version>2.4</gson-version>
+    <retrofit-version>2.0.0-beta4</retrofit-version>
     <oltu-version>1.0.0</oltu-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <junit-version>4.12</junit-version>
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java
index 75e641c689c..ffff8c26d4f 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java
@@ -10,17 +10,20 @@ import java.util.Map;
 import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder;
 import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder;
 
-import retrofit.Converter;
-import retrofit.Retrofit;
-import retrofit.GsonConverterFactory;
+import retrofit2.Converter;
+import retrofit2.Retrofit;
+
+import retrofit2.converter.gson.GsonConverterFactory;
+import retrofit2.converter.scalars.ScalarsConverterFactory;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonParseException;
-import com.squareup.okhttp.Interceptor;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.RequestBody;
-import com.squareup.okhttp.ResponseBody;
+import okhttp3.Interceptor;
+import okhttp3.OkHttpClient;
+import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+
 
 import io.swagger.client.auth.HttpBasicAuth;
 import io.swagger.client.auth.ApiKeyAuth;
@@ -44,10 +47,18 @@ public class ApiClient {
         this();
         for(String authName : authNames) { 
             Interceptor auth;
-            if (authName == "api_key") { 
-                auth = new ApiKeyAuth("header", "api_key");
-            } else if (authName == "petstore_auth") { 
+            if (authName == "petstore_auth") { 
                 auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets");
+            } else if (authName == "test_api_client_id") { 
+                auth = new ApiKeyAuth("header", "x-test_api_client_id");
+            } else if (authName == "test_api_client_secret") { 
+                auth = new ApiKeyAuth("header", "x-test_api_client_secret");
+            } else if (authName == "api_key") { 
+                auth = new ApiKeyAuth("header", "api_key");
+            } else if (authName == "test_api_key_query") { 
+                auth = new ApiKeyAuth("query", "test_api_key_query");
+            } else if (authName == "test_api_key_header") { 
+                auth = new ApiKeyAuth("header", "test_api_key_header");
             } else {
                 throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");
             }
@@ -100,14 +111,14 @@ public class ApiClient {
                 .setUsername(username)
                 .setPassword(password);
     }
-    
+
    public void createDefaultAdapter() {
         Gson gson = new GsonBuilder()
                 .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
                 .create();
 
         okClient = new OkHttpClient();
-        
+
         String baseUrl = "http://petstore.swagger.io/v2";
         if(!baseUrl.endsWith("/"))
         	baseUrl = baseUrl + "/";
@@ -116,12 +127,14 @@ public class ApiClient {
                 .Builder()
                 .baseUrl(baseUrl)
                 .client(okClient)
+                
+                .addConverterFactory(ScalarsConverterFactory.create())
                 .addConverterFactory(GsonCustomConverterFactory.create(gson));
     }
 
     public <S> S createService(Class<S> serviceClass) {
         return adapterBuilder.build().create(serviceClass);
-        
+
     }
 
     /**
@@ -199,7 +212,7 @@ public class ApiClient {
             }
         }
     }
-    
+
     /**
      * Helper method to configure the oauth accessCode/implicit flow parameters
      * @param clientId
@@ -221,7 +234,7 @@ public class ApiClient {
             }
         }
     }
-    
+
     /**
      * Configures a listener which is notified when a new access token is received.
      * @param accessTokenListener
@@ -268,7 +281,7 @@ public class ApiClient {
     public OkHttpClient getOkClient() {
         return okClient;
     }
-    
+
     public void addAuthsToOkClient(OkHttpClient okClient) {
         for(Interceptor apiAuthorization : apiAuthorizations.values()) {
             okClient.interceptors().add(apiAuthorization);
@@ -280,7 +293,7 @@ public class ApiClient {
      * @param okClient
      */
     public void configureFromOkclient(OkHttpClient okClient) {
-        OkHttpClient clone = okClient.clone();
+        OkHttpClient clone = okClient.newBuilder().build();
         addAuthsToOkClient(clone);
         adapterBuilder.client(clone);
     }
@@ -304,14 +317,14 @@ class GsonResponseBodyConverterToString<T> implements Converter<ResponseBody, T>
 	    String returned = value.string();
 	    try {
 	      return gson.fromJson(returned, type);
-	    } 
+	    }
 	    catch (JsonParseException e) {
                 return (T) returned;
-        } 
+        }
 	 }
 }
 
-class GsonCustomConverterFactory extends Converter.Factory 
+class GsonCustomConverterFactory extends Converter.Factory
 {
 	public static GsonCustomConverterFactory create(Gson gson) {
 	    return new GsonCustomConverterFactory(gson);
@@ -326,17 +339,17 @@ class GsonCustomConverterFactory extends Converter.Factory
 	    this.gsonConverterFactory = GsonConverterFactory.create(gson);
 	  }
 
-	  @Override
-	  public Converter<ResponseBody, ?> fromResponseBody(Type type, Annotation[] annotations) {
-		  if(type.equals(String.class))
-			  return new GsonResponseBodyConverterToString<Object>(gson, type);
-		  else
-			  return gsonConverterFactory.fromResponseBody(type, annotations);
-	  }
+    @Override
+    public Converter<ResponseBody, ?> responseBodyConverter(Type type, Annotation[] annotations, Retrofit retrofit) {
+        if(type.equals(String.class))
+            return new GsonResponseBodyConverterToString<Object>(gson, type);
+        else
+            return gsonConverterFactory.responseBodyConverter(type, annotations, retrofit);
+    }
 
-	  @Override
-	  public Converter<?, RequestBody> toRequestBody(Type type, Annotation[] annotations) {
-	    return gsonConverterFactory.toRequestBody(type, annotations);
-	  }
+    @Override
+    public Converter<?, RequestBody> requestBodyConverter(Type type, Annotation[] parameterAnnotations, Annotation[] methodAnnotations, Retrofit retrofit) {
+            return gsonConverterFactory.requestBodyConverter(type, parameterAnnotations, methodAnnotations, retrofit);
+    }
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/CollectionFormats.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/CollectionFormats.java
index c3cf5257514..e96d1561a7c 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/CollectionFormats.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/CollectionFormats.java
@@ -4,18 +4,18 @@ import java.util.Arrays;
 import java.util.List;
 
 public class CollectionFormats {
-    
+
     public static class CSVParams {
 
         protected List<String> params;
-        
+
         public CSVParams() {
         }
-        
+
         public CSVParams(List<String> params) {
             this.params = params;
         }
-        
+
         public CSVParams(String... params) {
             this.params = Arrays.asList(params);
         }
@@ -27,19 +27,19 @@ public class CollectionFormats {
         public void setParams(List<String> params) {
             this.params = params;
         }
-        
+
         @Override
         public String toString() {
             return StringUtil.join(params.toArray(new String[0]), ",");
         }
-        
+
     }
-    
+
     public static class SSVParams extends CSVParams {
-        
+
         public SSVParams() {
         }
-        
+
         public SSVParams(List<String> params) {
             super(params);
         }
@@ -53,16 +53,16 @@ public class CollectionFormats {
             return StringUtil.join(params.toArray(new String[0]), " ");
         }
     }
-    
+
     public static class TSVParams extends CSVParams {
-        
+
         public TSVParams() {
         }
-        
+
         public TSVParams(List<String> params) {
             super(params);
         }
-        
+
         public TSVParams(String... params) {
             super(params);
         }
@@ -72,16 +72,16 @@ public class CollectionFormats {
             return StringUtil.join( params.toArray(new String[0]), "\t");
         }
     }
-    
+
     public static class PIPESParams extends CSVParams {
-        
+
         public PIPESParams() {
         }
-        
+
         public PIPESParams(List<String> params) {
             super(params);
         }
-        
+
         public PIPESParams(String... params) {
             super(params);
         }
@@ -91,5 +91,5 @@ public class CollectionFormats {
             return StringUtil.join(params.toArray(new String[0]), "|");
         }
     }
-    
+
 }
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java
index c3d32254540..d7254df29fc 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:22.425+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:54.660+08:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java
index a55cf74da76..2cc69238a6b 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java
@@ -2,34 +2,31 @@ package io.swagger.client.api;
 
 import io.swagger.client.CollectionFormats.*;
 
-import retrofit.Call;
-import retrofit.http.*;
-import com.squareup.okhttp.RequestBody;
+
+import retrofit2.Call;
+import retrofit2.http.*;
+
+import okhttp3.RequestBody;
 
 import io.swagger.client.model.Pet;
+import io.swagger.client.model.InlineResponse200;
 import java.io.File;
 
-import java.util.*;
+
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
 
 public interface PetApi {
   
-  /**
-   * Update an existing pet
-   * 
-   * @param body Pet object that needs to be added to the store
-   * @return Call<Void>
-   */
-  
-  @PUT("pet")
-  Call<Void> updatePet(
-    @Body Pet body
-  );
-
-  
   /**
    * Add a new pet to the store
    * 
-   * @param body Pet object that needs to be added to the store
+   * @param body Pet object that needs to be added to the store (optional)
    * @return Call<Void>
    */
   
@@ -39,10 +36,37 @@ public interface PetApi {
   );
 
   
+  /**
+   * Fake endpoint to test byte array in body parameter for adding a new pet to the store
+   * 
+   * @param body Pet object in the form of byte array (optional)
+   * @return Call<Void>
+   */
+  
+  @POST("pet?testing_byte_array=true")
+  Call<Void> addPetUsingByteArray(
+    @Body byte[] body
+  );
+
+  
+  /**
+   * Deletes a pet
+   * 
+   * @param petId Pet id to delete (required)
+   * @param apiKey  (optional)
+   * @return Call<Void>
+   */
+  
+  @DELETE("pet/{petId}")
+  Call<Void> deletePet(
+    @Path("petId") Long petId, @Header("api_key") String apiKey
+  );
+
+  
   /**
    * Finds Pets by status
-   * Multiple status values can be provided with comma seperated strings
-   * @param status Status values that need to be considered for filter
+   * Multiple status values can be provided with comma separated strings
+   * @param status Status values that need to be considered for query (optional, default to available)
    * @return Call<List<Pet>>
    */
   
@@ -55,7 +79,7 @@ public interface PetApi {
   /**
    * Finds Pets by tags
    * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-   * @param tags Tags to filter by
+   * @param tags Tags to filter by (optional)
    * @return Call<List<Pet>>
    */
   
@@ -68,7 +92,7 @@ public interface PetApi {
   /**
    * Find pet by ID
    * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-   * @param petId ID of pet that needs to be fetched
+   * @param petId ID of pet that needs to be fetched (required)
    * @return Call<Pet>
    */
   
@@ -78,12 +102,51 @@ public interface PetApi {
   );
 
   
+  /**
+   * Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched (required)
+   * @return Call<InlineResponse200>
+   */
+  
+  @GET("pet/{petId}?response=inline_arbitrary_object")
+  Call<InlineResponse200> getPetByIdInObject(
+    @Path("petId") Long petId
+  );
+
+  
+  /**
+   * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched (required)
+   * @return Call<byte[]>
+   */
+  
+  @GET("pet/{petId}?testing_byte_array=true")
+  Call<byte[]> petPetIdtestingByteArraytrueGet(
+    @Path("petId") Long petId
+  );
+
+  
+  /**
+   * Update an existing pet
+   * 
+   * @param body Pet object that needs to be added to the store (optional)
+   * @return Call<Void>
+   */
+  
+  @PUT("pet")
+  Call<Void> updatePet(
+    @Body Pet body
+  );
+
+  
   /**
    * Updates a pet in the store with form data
    * 
-   * @param petId ID of pet that needs to be updated
-   * @param name Updated name of the pet
-   * @param status Updated status of the pet
+   * @param petId ID of pet that needs to be updated (required)
+   * @param name Updated name of the pet (optional)
+   * @param status Updated status of the pet (optional)
    * @return Call<Void>
    */
   
@@ -94,26 +157,12 @@ public interface PetApi {
   );
 
   
-  /**
-   * Deletes a pet
-   * 
-   * @param petId Pet id to delete
-   * @param apiKey 
-   * @return Call<Void>
-   */
-  
-  @DELETE("pet/{petId}")
-  Call<Void> deletePet(
-    @Path("petId") Long petId, @Header("api_key") String apiKey
-  );
-
-  
   /**
    * uploads an image
    * 
-   * @param petId ID of pet to update
-   * @param additionalMetadata Additional data to pass to server
-   * @param file file to upload
+   * @param petId ID of pet to update (required)
+   * @param additionalMetadata Additional data to pass to server (optional)
+   * @param file file to upload (optional)
    * @return Call<Void>
    */
   
@@ -125,3 +174,4 @@ public interface PetApi {
 
   
 }
+
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java
index 2fca1e02e39..d023308c32e 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java
@@ -2,17 +2,51 @@ package io.swagger.client.api;
 
 import io.swagger.client.CollectionFormats.*;
 
-import retrofit.Call;
-import retrofit.http.*;
-import com.squareup.okhttp.RequestBody;
 
-import java.util.Map;
+import retrofit2.Call;
+import retrofit2.http.*;
+
+import okhttp3.RequestBody;
+
 import io.swagger.client.model.Order;
 
-import java.util.*;
+
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
 
 public interface StoreApi {
   
+  /**
+   * Delete purchase order by ID
+   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+   * @param orderId ID of the order that needs to be deleted (required)
+   * @return Call<Void>
+   */
+  
+  @DELETE("store/order/{orderId}")
+  Call<Void> deleteOrder(
+    @Path("orderId") String orderId
+  );
+
+  
+  /**
+   * Finds orders by status
+   * A single status value can be provided as a string
+   * @param status Status value that needs to be considered for query (optional, default to placed)
+   * @return Call<List<Order>>
+   */
+  
+  @GET("store/findByStatus")
+  Call<List<Order>> findOrdersByStatus(
+    @Query("status") String status
+  );
+
+  
   /**
    * Returns pet inventories by status
    * Returns a map of status codes to quantities
@@ -25,22 +59,20 @@ public interface StoreApi {
 
   
   /**
-   * Place an order for a pet
-   * 
-   * @param body order placed for purchasing the pet
-   * @return Call<Order>
+   * Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+   * Returns an arbitrary object which is actually a map of status codes to quantities
+   * @return Call<Object>
    */
   
-  @POST("store/order")
-  Call<Order> placeOrder(
-    @Body Order body
-  );
+  @GET("store/inventory?response=arbitrary_object")
+  Call<Object> getInventoryInObject();
+    
 
   
   /**
    * Find purchase order by ID
    * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-   * @param orderId ID of pet that needs to be fetched
+   * @param orderId ID of pet that needs to be fetched (required)
    * @return Call<Order>
    */
   
@@ -51,16 +83,17 @@ public interface StoreApi {
 
   
   /**
-   * Delete purchase order by ID
-   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-   * @param orderId ID of the order that needs to be deleted
-   * @return Call<Void>
+   * Place an order for a pet
+   * 
+   * @param body order placed for purchasing the pet (optional)
+   * @return Call<Order>
    */
   
-  @DELETE("store/order/{orderId}")
-  Call<Void> deleteOrder(
-    @Path("orderId") String orderId
+  @POST("store/order")
+  Call<Order> placeOrder(
+    @Body Order body
   );
 
   
 }
+
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java
index 928bd623020..08aeb90a583 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java
@@ -2,21 +2,29 @@ package io.swagger.client.api;
 
 import io.swagger.client.CollectionFormats.*;
 
-import retrofit.Call;
-import retrofit.http.*;
-import com.squareup.okhttp.RequestBody;
+
+import retrofit2.Call;
+import retrofit2.http.*;
+
+import okhttp3.RequestBody;
 
 import io.swagger.client.model.User;
-import java.util.*;
 
-import java.util.*;
+
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
 
 public interface UserApi {
   
   /**
    * Create user
    * This can only be done by the logged in user.
-   * @param body Created user object
+   * @param body Created user object (optional)
    * @return Call<Void>
    */
   
@@ -29,7 +37,7 @@ public interface UserApi {
   /**
    * Creates list of users with given input array
    * 
-   * @param body List of user object
+   * @param body List of user object (optional)
    * @return Call<Void>
    */
   
@@ -42,7 +50,7 @@ public interface UserApi {
   /**
    * Creates list of users with given input array
    * 
-   * @param body List of user object
+   * @param body List of user object (optional)
    * @return Call<Void>
    */
   
@@ -52,11 +60,37 @@ public interface UserApi {
   );
 
   
+  /**
+   * Delete user
+   * This can only be done by the logged in user.
+   * @param username The name that needs to be deleted (required)
+   * @return Call<Void>
+   */
+  
+  @DELETE("user/{username}")
+  Call<Void> deleteUser(
+    @Path("username") String username
+  );
+
+  
+  /**
+   * Get user by user name
+   * 
+   * @param username The name that needs to be fetched. Use user1 for testing. (required)
+   * @return Call<User>
+   */
+  
+  @GET("user/{username}")
+  Call<User> getUserByName(
+    @Path("username") String username
+  );
+
+  
   /**
    * Logs user into the system
    * 
-   * @param username The user name for login
-   * @param password The password for login in clear text
+   * @param username The user name for login (optional)
+   * @param password The password for login in clear text (optional)
    * @return Call<String>
    */
   
@@ -77,24 +111,11 @@ public interface UserApi {
     
 
   
-  /**
-   * Get user by user name
-   * 
-   * @param username The name that needs to be fetched. Use user1 for testing.
-   * @return Call<User>
-   */
-  
-  @GET("user/{username}")
-  Call<User> getUserByName(
-    @Path("username") String username
-  );
-
-  
   /**
    * Updated user
    * This can only be done by the logged in user.
-   * @param username name that need to be deleted
-   * @param body Updated user object
+   * @param username name that need to be deleted (required)
+   * @param body Updated user object (optional)
    * @return Call<Void>
    */
   
@@ -104,17 +125,5 @@ public interface UserApi {
   );
 
   
-  /**
-   * Delete user
-   * This can only be done by the logged in user.
-   * @param username The name that needs to be deleted
-   * @return Call<Void>
-   */
-  
-  @DELETE("user/{username}")
-  Call<Void> deleteUser(
-    @Path("username") String username
-  );
-
-  
 }
+
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
index 59d01238796..f210c2110b5 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
@@ -4,9 +4,9 @@ import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 
-import com.squareup.okhttp.Interceptor;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.Response;
+import okhttp3.Interceptor;
+import okhttp3.Request;
+import okhttp3.Response;
 
 public class ApiKeyAuth implements Interceptor {
     private final String location;
@@ -41,18 +41,18 @@ public class ApiKeyAuth implements Interceptor {
         Request request = chain.request();
 
         if (location == "query") {
-            String newQuery = request.uri().getQuery();
+            String newQuery = request.url().uri().getQuery();
             paramValue = paramName + "=" + apiKey;
             if (newQuery == null) {
                 newQuery = paramValue;
             } else {
-                newQuery += "&" + paramValue;  
+                newQuery += "&" + paramValue;
             }
 
             URI newUri;
             try {
-                newUri = new URI(request.uri().getScheme(), request.uri().getAuthority(),
-                        request.uri().getPath(), newQuery, request.uri().getFragment());
+                newUri = new URI(request.url().uri().getScheme(), request.url().uri().getAuthority(),
+                    request.url().uri().getPath(), newQuery, request.url().uri().getFragment());
             } catch (URISyntaxException e) {
                 throw new IOException(e);
             }
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
index cb7c617767b..c7b67e2d781 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
@@ -2,10 +2,11 @@ package io.swagger.client.auth;
 
 import java.io.IOException;
 
-import com.squareup.okhttp.Credentials;
-import com.squareup.okhttp.Interceptor;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.Response;
+import okhttp3.Interceptor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.Credentials;
 
 public class HttpBasicAuth implements Interceptor {
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuth.java
index 80614f0f56a..d9eed067a88 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuth.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuth.java
@@ -16,11 +16,11 @@ import org.apache.oltu.oauth2.common.exception.OAuthSystemException;
 import org.apache.oltu.oauth2.common.message.types.GrantType;
 import org.apache.oltu.oauth2.common.token.BasicOAuthToken;
 
-import com.squareup.okhttp.Interceptor;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.Request.Builder;
-import com.squareup.okhttp.Response;
+import okhttp3.Interceptor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Request.Builder;
+import okhttp3.Response;
 
 public class OAuth implements Interceptor {
 
@@ -90,9 +90,9 @@ public class OAuth implements Interceptor {
 
         String requestAccessToken = new String(getAccessToken());
         try {
-            oAuthRequest = new OAuthBearerClientRequest(request.urlString())
-            .setAccessToken(requestAccessToken)
-            .buildHeaderMessage();
+            oAuthRequest = new OAuthBearerClientRequest(request.url().toString())
+                .setAccessToken(requestAccessToken)
+                .buildHeaderMessage();
         } catch (OAuthSystemException e) {
             throw new IOException(e);
         }
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuthOkHttpClient.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuthOkHttpClient.java
index c872901ba24..c9b6e124d51 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuthOkHttpClient.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuthOkHttpClient.java
@@ -11,11 +11,14 @@ import org.apache.oltu.oauth2.client.response.OAuthClientResponseFactory;
 import org.apache.oltu.oauth2.common.exception.OAuthProblemException;
 import org.apache.oltu.oauth2.common.exception.OAuthSystemException;
 
-import com.squareup.okhttp.MediaType;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.RequestBody;
-import com.squareup.okhttp.Response;
+
+import okhttp3.Interceptor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Request.Builder;
+import okhttp3.Response;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
 
 
 public class OAuthOkHttpClient implements HttpClient {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Category.java
index d0908afd9e1..67de63eb179 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Category.java
@@ -4,12 +4,14 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+
 import com.google.gson.annotations.SerializedName;
 
 
 
 
-@ApiModel(description = "")
+
+
 public class Category   {
   
   @SerializedName("id")
@@ -83,3 +85,5 @@ public class Category   {
     return o.toString().replace("\n", "\n    ");
   }
 }
+
+
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/InlineResponse200.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/InlineResponse200.java
new file mode 100644
index 00000000000..165f069a05b
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/InlineResponse200.java
@@ -0,0 +1,180 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.client.model.Tag;
+import java.util.ArrayList;
+import java.util.List;
+
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+
+public class InlineResponse200   {
+  
+  @SerializedName("photoUrls")
+  private List<String> photoUrls = new ArrayList<String>();
+  
+  @SerializedName("name")
+  private String name = null;
+  
+  @SerializedName("id")
+  private Long id = null;
+  
+  @SerializedName("category")
+  private Object category = null;
+  
+  @SerializedName("tags")
+  private List<Tag> tags = new ArrayList<Tag>();
+  
+
+public enum StatusEnum {
+  @SerializedName("available")
+  AVAILABLE("available"),
+
+  @SerializedName("pending")
+  PENDING("pending"),
+
+  @SerializedName("sold")
+  SOLD("sold");
+
+  private String value;
+
+  StatusEnum(String value) {
+    this.value = value;
+  }
+
+  @Override
+  public String toString() {
+    return value;
+  }
+}
+
+  @SerializedName("status")
+  private StatusEnum status = null;
+  
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<String> getPhotoUrls() {
+    return photoUrls;
+  }
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Object getCategory() {
+    return category;
+  }
+  public void setCategory(Object category) {
+    this.category = category;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<Tag> getTags() {
+    return tags;
+  }
+  public void setTags(List<Tag> tags) {
+    this.tags = tags;
+  }
+
+  
+  /**
+   * pet status in the store
+   **/
+  @ApiModelProperty(value = "pet status in the store")
+  public StatusEnum getStatus() {
+    return status;
+  }
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    InlineResponse200 inlineResponse200 = (InlineResponse200) o;
+    return Objects.equals(photoUrls, inlineResponse200.photoUrls) &&
+        Objects.equals(name, inlineResponse200.name) &&
+        Objects.equals(id, inlineResponse200.id) &&
+        Objects.equals(category, inlineResponse200.category) &&
+        Objects.equals(tags, inlineResponse200.tags) &&
+        Objects.equals(status, inlineResponse200.status);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(photoUrls, name, id, category, tags, status);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class InlineResponse200 {\n");
+    
+    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    category: ").append(toIndentedString(category)).append("\n");
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
+
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Model200Response.java
new file mode 100644
index 00000000000..80b0aed92a8
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Model200Response.java
@@ -0,0 +1,73 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+
+public class Model200Response   {
+  
+  @SerializedName("name")
+  private Integer name = null;
+  
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getName() {
+    return name;
+  }
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Model200Response _200Response = (Model200Response) o;
+    return Objects.equals(name, _200Response.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Model200Response {\n");
+    
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
+
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ModelReturn.java
new file mode 100644
index 00000000000..ce8c1238fdb
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -0,0 +1,73 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+
+public class ModelReturn   {
+  
+  @SerializedName("return")
+  private Integer _return = null;
+  
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getReturn() {
+    return _return;
+  }
+  public void setReturn(Integer _return) {
+    this._return = _return;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ModelReturn _return = (ModelReturn) o;
+    return Objects.equals(_return, _return._return);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(_return);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ModelReturn {\n");
+    
+    sb.append("    _return: ").append(toIndentedString(_return)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
+
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Name.java
new file mode 100644
index 00000000000..370214bd21c
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Name.java
@@ -0,0 +1,89 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+
+public class Name   {
+  
+  @SerializedName("name")
+  private Integer name = null;
+  
+  @SerializedName("snake_case")
+  private Integer snakeCase = null;
+  
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getName() {
+    return name;
+  }
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getSnakeCase() {
+    return snakeCase;
+  }
+  public void setSnakeCase(Integer snakeCase) {
+    this.snakeCase = snakeCase;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Name name = (Name) o;
+    return Objects.equals(name, name.name) &&
+        Objects.equals(snakeCase, name.snakeCase);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, snakeCase);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Name {\n");
+    
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
+
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ObjectReturn.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ObjectReturn.java
new file mode 100644
index 00000000000..920640ad2cb
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ObjectReturn.java
@@ -0,0 +1,69 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+@ApiModel(description = "")
+public class ObjectReturn   {
+  
+  @SerializedName("return")
+  private Integer _return = null;
+  
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getReturn() {
+    return _return;
+  }
+  public void setReturn(Integer _return) {
+    this._return = _return;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ObjectReturn _return = (ObjectReturn) o;
+    return Objects.equals(_return, _return._return);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(_return);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ObjectReturn {\n");
+    
+    sb.append("    _return: ").append(toIndentedString(_return)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Order.java
index 59c5238b626..e601bd7a15a 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Order.java
@@ -5,12 +5,14 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
 
+
 import com.google.gson.annotations.SerializedName;
 
 
 
 
-@ApiModel(description = "")
+
+
 public class Order   {
   
   @SerializedName("id")
@@ -62,9 +64,6 @@ public enum StatusEnum {
   public Long getId() {
     return id;
   }
-  public void setId(Long id) {
-    this.id = id;
-  }
 
   
   /**
@@ -172,3 +171,5 @@ public enum StatusEnum {
     return o.toString().replace("\n", "\n    ");
   }
 }
+
+
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java
index 1f9462ddc3a..5d1210dc55b 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java
@@ -5,14 +5,17 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.client.model.Category;
 import io.swagger.client.model.Tag;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+
 
 import com.google.gson.annotations.SerializedName;
 
 
 
 
-@ApiModel(description = "")
+
+
 public class Pet   {
   
   @SerializedName("id")
@@ -174,3 +177,5 @@ public enum StatusEnum {
     return o.toString().replace("\n", "\n    ");
   }
 }
+
+
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/SpecialModelName.java
new file mode 100644
index 00000000000..b5a96d5fc39
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -0,0 +1,73 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+
+public class SpecialModelName   {
+  
+  @SerializedName("$special[property.name]")
+  private Long specialPropertyName = null;
+  
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Long getSpecialPropertyName() {
+    return specialPropertyName;
+  }
+  public void setSpecialPropertyName(Long specialPropertyName) {
+    this.specialPropertyName = specialPropertyName;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    SpecialModelName specialModelName = (SpecialModelName) o;
+    return Objects.equals(specialPropertyName, specialModelName.specialPropertyName);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(specialPropertyName);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class SpecialModelName {\n");
+    
+    sb.append("    specialPropertyName: ").append(toIndentedString(specialPropertyName)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
+
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Tag.java
index a4ca1074ca1..6ee49ee2166 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Tag.java
@@ -4,12 +4,14 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+
 import com.google.gson.annotations.SerializedName;
 
 
 
 
-@ApiModel(description = "")
+
+
 public class Tag   {
   
   @SerializedName("id")
@@ -83,3 +85,5 @@ public class Tag   {
     return o.toString().replace("\n", "\n    ");
   }
 }
+
+
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/User.java
index 072f510081a..98196393ef1 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/User.java
@@ -4,12 +4,14 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+
 import com.google.gson.annotations.SerializedName;
 
 
 
 
-@ApiModel(description = "")
+
+
 public class User   {
   
   @SerializedName("id")
@@ -180,3 +182,5 @@ public class User   {
     return o.toString().replace("\n", "\n    ");
   }
 }
+
+
diff --git a/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/TestUtils.java b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/TestUtils.java
new file mode 100644
index 00000000000..7ddf142426e
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/TestUtils.java
@@ -0,0 +1,17 @@
+package io.swagger;
+
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicLong;
+
+public class TestUtils {
+    private static final AtomicLong atomicId = createAtomicId();
+
+    public static long nextId() {
+      return atomicId.getAndIncrement();
+    }
+
+    private static AtomicLong createAtomicId() {
+        int baseId = new Random(System.currentTimeMillis()).nextInt(1000000) + 20000;
+        return new AtomicLong((long) baseId);
+    }
+}
diff --git a/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/PetApiTest.java
index 8506fc08f5c..3905fb962e3 100644
--- a/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/PetApiTest.java
+++ b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/PetApiTest.java
@@ -1,5 +1,7 @@
 package io.swagger.petstore.test;
 
+import io.swagger.TestUtils;
+
 import io.swagger.client.ApiClient;
 import io.swagger.client.api.*;
 import io.swagger.client.model.*;
@@ -13,10 +15,10 @@ import java.util.List;
 
 import org.junit.*;
 
-import retrofit.Response;
+import retrofit2.Response;
 
-import com.squareup.okhttp.MediaType;
-import com.squareup.okhttp.RequestBody;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
 
 import static org.junit.Assert.*;
 
@@ -32,7 +34,7 @@ public class PetApiTest {
     public void testCreateAndGetPet() throws Exception {
         Pet pet = createRandomPet();
         Response<Void> rp2 = api.addPet(pet).execute();
-        
+
         Response<Pet> rp = api.getPetById(pet.getId()).execute();
         Pet fetched = rp.body();
         assertNotNull(fetched);
@@ -139,7 +141,7 @@ public class PetApiTest {
         writer.write("Hello world!");
         writer.close();
 
-        api.uploadFile(pet.getId(), "a test file", RequestBody.create(MediaType.parse("text/plain"), file)).execute();
+        api.uploadFile(pet.getId(), null, RequestBody.create(MediaType.parse("text/plain"), file)).execute();
     }
 
     @Test
@@ -171,7 +173,7 @@ public class PetApiTest {
 
     private Pet createRandomPet() {
         Pet pet = new Pet();
-        pet.setId(System.currentTimeMillis());
+        pet.setId(TestUtils.nextId());
         pet.setName("gorilla");
 
         Category category = new Category();
@@ -184,4 +186,4 @@ public class PetApiTest {
 
         return pet;
     }
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/StoreApiTest.java
index 786b0708702..bda483d3fd4 100644
--- a/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/StoreApiTest.java
+++ b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/StoreApiTest.java
@@ -1,14 +1,17 @@
 package io.swagger.petstore.test;
 
+import io.swagger.TestUtils;
+
 import io.swagger.client.ApiClient;
 import io.swagger.client.api.*;
 import io.swagger.client.model.*;
 
+import java.lang.reflect.Field;
 import java.util.Map;
 
 import org.junit.*;
 
-import retrofit.Response;
+import retrofit2.Response;
 import static org.junit.Assert.*;
 
 public class StoreApiTest {
@@ -47,18 +50,25 @@ public class StoreApiTest {
         api.deleteOrder(String.valueOf(order.getId())).execute();
 
         api.getOrderById(String.valueOf(order.getId())).execute();
-        //also in retrofit 1 should return an error but don't, check server api impl.       
+        //also in retrofit 1 should return an error but don't, check server api impl.
     }
 
     private Order createOrder() {
         Order order = new Order();
-        order.setId(new Long(System.currentTimeMillis()));
         order.setPetId(new Long(200));
         order.setQuantity(new Integer(13));
         order.setShipDate(new java.util.Date());
         order.setStatus(Order.StatusEnum.PLACED);
         order.setComplete(true);
 
+        try {
+          Field idField = Order.class.getDeclaredField("id");
+          idField.setAccessible(true);
+          idField.set(order, TestUtils.nextId());
+        } catch (Exception e) {
+          throw new RuntimeException(e);
+        }
+
         return order;
     }
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/UserApiTest.java b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/UserApiTest.java
index d496144c9f2..6c35c94383a 100644
--- a/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/UserApiTest.java
+++ b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/petstore/test/UserApiTest.java
@@ -1,5 +1,7 @@
 package io.swagger.petstore.test;
 
+import io.swagger.TestUtils;
+
 import io.swagger.client.ApiClient;
 import io.swagger.client.api.*;
 import io.swagger.client.model.*;
@@ -31,9 +33,9 @@ public class UserApiTest {
     @Test
     public void testCreateUsersWithArray() throws Exception {
         User user1 = createUser();
-        user1.setUsername("abc123");
+        user1.setUsername("user" + user1.getId());
         User user2 = createUser();
-        user2.setUsername("123abc");
+        user2.setUsername("user" + user2.getId());
 
         api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2})).execute();
 
@@ -44,9 +46,9 @@ public class UserApiTest {
     @Test
     public void testCreateUsersWithList() throws Exception {
         User user1 = createUser();
-        user1.setUsername("abc123");
+        user1.setUsername("user" + user1.getId());
         User user2 = createUser();
-        user2.setUsername("123abc");
+        user2.setUsername("user" + user2.getId());
 
         api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2})).execute();
 
@@ -70,7 +72,7 @@ public class UserApiTest {
 
     private User createUser() {
         User user = new User();
-        user.setId(System.currentTimeMillis());
+        user.setId(TestUtils.nextId());
         user.setUsername("fred");
         user.setFirstName("Fred");
         user.setLastName("Meyer");
@@ -81,4 +83,4 @@ public class UserApiTest {
 
         return user;
     }
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/java/retrofit2rx/.gitignore b/samples/client/petstore/java/retrofit2rx/.gitignore
new file mode 100644
index 00000000000..32858aad3c3
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/.gitignore
@@ -0,0 +1,12 @@
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
diff --git a/samples/client/petstore/java/retrofit2rx/README.md b/samples/client/petstore/java/retrofit2rx/README.md
new file mode 100644
index 00000000000..a1f0b3468be
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/README.md
@@ -0,0 +1,43 @@
+# swagger-petstore-retrofit2-rx
+
+## Requirements
+
+Building the API client library requires [Maven](https://maven.apache.org/) to be installed.
+
+## Installation & Usage
+
+To install the API client library to your local Maven repository, simply execute:
+
+```shell
+mvn install
+```
+
+To deploy it to a remote Maven repository instead, configure the settings of the repository and execute:
+
+```shell
+mvn deploy
+```
+
+Refer to the [official documentation](https://maven.apache.org/plugins/maven-deploy-plugin/usage.html) for more information.
+
+After the client library is installed/deployed, you can use it in your Maven project by adding the following to your *pom.xml*:
+
+```xml
+<dependency>
+    <groupId>io.swagger</groupId>
+    <artifactId>swagger-petstore-retrofit2-rx</artifactId>
+    <version>1.0.0</version>
+    <scope>compile</scope>
+</dependency>
+
+```
+
+## Recommendation
+
+It's recommended to create an instance of `ApiClient` per thread in a multithreaded environment to avoid any potential issue.
+
+## Author
+
+apiteam@swagger.io
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/build.gradle b/samples/client/petstore/java/retrofit2rx/build.gradle
new file mode 100644
index 00000000000..c7139267298
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/build.gradle
@@ -0,0 +1,114 @@
+apply plugin: 'idea'
+apply plugin: 'eclipse'
+
+group = 'io.swagger'
+version = '1.0.0'
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.2.2'
+        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+    }
+}
+
+repositories {
+    jcenter()
+}
+
+
+if(hasProperty('target') && target == 'android') {
+
+	apply plugin: 'com.android.library'
+	apply plugin: 'com.github.dcendents.android-maven'
+
+	android {
+	    compileSdkVersion 22
+	    buildToolsVersion '22.0.0'
+	    defaultConfig {
+	        minSdkVersion 14
+	        targetSdkVersion 22
+	    }
+	    compileOptions {
+	        sourceCompatibility JavaVersion.VERSION_1_7
+	        targetCompatibility JavaVersion.VERSION_1_7
+	    }
+
+	    // Rename the aar correctly
+	    libraryVariants.all { variant ->
+	        variant.outputs.each { output ->
+	            def outputFile = output.outputFile
+	            if (outputFile != null && outputFile.name.endsWith('.aar')) {
+	                def fileName = "${project.name}-${variant.baseName}-${version}.aar"
+	                output.outputFile = new File(outputFile.parent, fileName)
+	            }
+	        }
+	    }
+	}
+
+	afterEvaluate {
+	    android.libraryVariants.all { variant ->
+	        def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
+	        task.description = "Create jar artifact for ${variant.name}"
+	        task.dependsOn variant.javaCompile
+	        task.from variant.javaCompile.destinationDir
+	        task.destinationDir = project.file("${project.buildDir}/outputs/jar")
+	        task.archiveName = "${project.name}-${variant.baseName}-${version}.jar"
+	        artifacts.add('archives', task);
+	    }
+	}
+
+	task sourcesJar(type: Jar) {
+	    from android.sourceSets.main.java.srcDirs
+	    classifier = 'sources'
+	}
+
+	artifacts {
+	    archives sourcesJar
+	}
+
+} else {
+
+	apply plugin: 'java'
+	apply plugin: 'maven'
+
+    sourceCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_1_7
+
+	install {
+	    repositories.mavenInstaller {
+	        pom.artifactId = 'swagger-petstore-retrofit2-rx'
+	    }
+	}
+
+	task execute(type:JavaExec) {
+	   main = System.getProperty('mainClass')
+	   classpath = sourceSets.main.runtimeClasspath
+	}
+}
+
+ext {
+    oltu_version = "1.0.0"
+    retrofit_version = "2.0.0-beta4"
+    gson_version = "2.4"
+    swagger_annotations_version = "1.5.0"
+    junit_version = "4.12"
+    rx_java_version = "1.0.16"
+
+}
+
+dependencies {
+    compile "com.squareup.retrofit2:retrofit:$retrofit_version"
+    compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
+    compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
+    compile "com.squareup.retrofit2:adapter-rxjava:$retrofit_version"
+    compile "io.reactivex:rxjava:$rx_java_version"
+
+
+    compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
+
+    testCompile "junit:junit:$junit_version"
+}
diff --git a/samples/client/petstore/java/retrofit2rx/git_push.sh b/samples/client/petstore/java/retrofit2rx/git_push.sh
new file mode 100644
index 00000000000..1a36388db02
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="YOUR_GIT_USR_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="YOUR_GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/client/petstore/java/retrofit2rx/gradle.properties b/samples/client/petstore/java/retrofit2rx/gradle.properties
new file mode 100644
index 00000000000..05644f0754a
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/gradle.properties
@@ -0,0 +1,2 @@
+# Uncomment to build for Android
+#target = android
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2rx/pom.xml b/samples/client/petstore/java/retrofit2rx/pom.xml
new file mode 100644
index 00000000000..b2cf9949578
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/pom.xml
@@ -0,0 +1,163 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>io.swagger</groupId>
+  <artifactId>swagger-petstore-retrofit2-rx</artifactId>
+  <packaging>jar</packaging>
+  <name>swagger-petstore-retrofit2-rx</name>
+  <version>1.0.0</version>
+  <scm>
+    <connection>scm:git:git@github.com:swagger-api/swagger-mustache.git</connection>
+    <developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection>
+    <url>https://github.com/swagger-api/swagger-codegen</url>
+  </scm>
+  <prerequisites>
+    <maven>2.2.0</maven>
+  </prerequisites>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.12</version>
+        <configuration>
+          <systemProperties>
+            <property>
+              <name>loggerPath</name>
+              <value>conf/log4j.properties</value>
+            </property>
+          </systemProperties>
+          <argLine>-Xms512m -Xmx1500m</argLine>
+          <parallel>methods</parallel>
+          <forkMode>pertest</forkMode>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/lib</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!-- attach test jar -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.2</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>jar</goal>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>add_sources</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>src/main/java</source>
+              </sources>
+            </configuration>
+          </execution>
+          <execution>
+            <id>add_test_sources</id>
+            <phase>generate-test-sources</phase>
+            <goals>
+              <goal>add-test-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>src/test/java</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.3.2</version>
+        <configuration>
+            <source>
+            1.7</source>
+            <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>io.swagger</groupId>
+      <artifactId>swagger-annotations</artifactId>
+      <version>${swagger-annotations-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.retrofit2</groupId>
+      <artifactId>retrofit</artifactId>
+      <version>${retrofit-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.retrofit2</groupId>
+      <artifactId>converter-scalars</artifactId>
+      <version>${retrofit-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.retrofit2</groupId>
+      <artifactId>converter-gson</artifactId>
+      <version>${retrofit-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.oltu.oauth2</groupId>
+      <artifactId>org.apache.oltu.oauth2.client</artifactId>
+      <version>${oltu-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.reactivex</groupId>
+      <artifactId>rxjava</artifactId>
+      <version>${rxjava-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.retrofit2</groupId>
+      <artifactId>adapter-rxjava</artifactId>
+      <version>${retrofit-version}</version>
+    </dependency>
+
+    <!-- test dependencies -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit-version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <properties>
+    <swagger-annotations-version>1.5.0</swagger-annotations-version>
+    <retrofit-version>2.0.0-beta4</retrofit-version>
+    <rxjava-version>1.0.16</rxjava-version>
+    <oltu-version>1.0.0</oltu-version>
+    <maven-plugin-version>1.0.0</maven-plugin-version>
+    <junit-version>4.12</junit-version>
+  </properties>
+</project>
diff --git a/samples/client/petstore/java/retrofit2rx/settings.gradle b/samples/client/petstore/java/retrofit2rx/settings.gradle
new file mode 100644
index 00000000000..6c54013a532
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = "swagger-petstore-retrofit2-rx"
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/AndroidManifest.xml b/samples/client/petstore/java/retrofit2rx/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000..465dcb520c4
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/AndroidManifest.xml
@@ -0,0 +1,3 @@
+<manifest package="io.swagger.client" xmlns:android="http://schemas.android.com/apk/res/android">
+    <application />
+</manifest>
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/ApiClient.java
new file mode 100644
index 00000000000..5582509be76
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/ApiClient.java
@@ -0,0 +1,355 @@
+package io.swagger.client;
+
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder;
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder;
+
+import retrofit2.Converter;
+import retrofit2.Retrofit;
+import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
+import retrofit2.converter.gson.GsonConverterFactory;
+import retrofit2.converter.scalars.ScalarsConverterFactory;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonParseException;
+import okhttp3.Interceptor;
+import okhttp3.OkHttpClient;
+import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+
+
+import io.swagger.client.auth.HttpBasicAuth;
+import io.swagger.client.auth.ApiKeyAuth;
+import io.swagger.client.auth.OAuth;
+import io.swagger.client.auth.OAuth.AccessTokenListener;
+import io.swagger.client.auth.OAuthFlow;
+
+
+public class ApiClient {
+
+    private Map<String, Interceptor> apiAuthorizations;
+    private OkHttpClient okClient;
+    private Retrofit.Builder adapterBuilder;
+
+    public ApiClient() {
+        apiAuthorizations = new LinkedHashMap<String, Interceptor>();
+        createDefaultAdapter();
+    }
+
+    public ApiClient(String[] authNames) {
+        this();
+        for(String authName : authNames) { 
+            Interceptor auth;
+            if (authName == "petstore_auth") { 
+                auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets");
+            } else if (authName == "test_api_client_id") { 
+                auth = new ApiKeyAuth("header", "x-test_api_client_id");
+            } else if (authName == "test_api_client_secret") { 
+                auth = new ApiKeyAuth("header", "x-test_api_client_secret");
+            } else if (authName == "api_key") { 
+                auth = new ApiKeyAuth("header", "api_key");
+            } else if (authName == "test_api_key_query") { 
+                auth = new ApiKeyAuth("query", "test_api_key_query");
+            } else if (authName == "test_api_key_header") { 
+                auth = new ApiKeyAuth("header", "test_api_key_header");
+            } else {
+                throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");
+            }
+            addAuthorization(authName, auth);
+        }
+    }
+
+    /**
+     * Basic constructor for single auth name
+     * @param authName
+     */
+    public ApiClient(String authName) {
+        this(new String[]{authName});
+    }
+
+    /**
+     * Helper constructor for single api key
+     * @param authName
+     * @param apiKey
+     */
+    public ApiClient(String authName, String apiKey) {
+        this(authName);
+        this.setApiKey(apiKey);
+    }
+
+    /**
+     * Helper constructor for single basic auth or password oauth2
+     * @param authName
+     * @param username
+     * @param password
+     */
+    public ApiClient(String authName, String username, String password) {
+        this(authName);
+        this.setCredentials(username,  password);
+    }
+
+    /**
+     * Helper constructor for single password oauth2
+     * @param authName
+     * @param clientId
+     * @param secret
+     * @param username
+     * @param password
+     */
+    public ApiClient(String authName, String clientId, String secret, String username, String password) {
+        this(authName);
+        this.getTokenEndPoint()
+                .setClientId(clientId)
+                .setClientSecret(secret)
+                .setUsername(username)
+                .setPassword(password);
+    }
+
+   public void createDefaultAdapter() {
+        Gson gson = new GsonBuilder()
+                .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
+                .create();
+
+        okClient = new OkHttpClient();
+
+        String baseUrl = "http://petstore.swagger.io/v2";
+        if(!baseUrl.endsWith("/"))
+        	baseUrl = baseUrl + "/";
+
+        adapterBuilder = new Retrofit
+                .Builder()
+                .baseUrl(baseUrl)
+                .client(okClient)
+                .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+                .addConverterFactory(ScalarsConverterFactory.create())
+                .addConverterFactory(GsonCustomConverterFactory.create(gson));
+    }
+
+    public <S> S createService(Class<S> serviceClass) {
+        return adapterBuilder.build().create(serviceClass);
+
+    }
+
+    /**
+     * Helper method to configure the first api key found
+     * @param apiKey
+     */
+    private void setApiKey(String apiKey) {
+        for(Interceptor apiAuthorization : apiAuthorizations.values()) {
+            if (apiAuthorization instanceof ApiKeyAuth) {
+                ApiKeyAuth keyAuth = (ApiKeyAuth) apiAuthorization;
+                keyAuth.setApiKey(apiKey);
+                return;
+            }
+        }
+    }
+
+    /**
+     * Helper method to configure the username/password for basic auth or password oauth
+     * @param username
+     * @param password
+     */
+    private void setCredentials(String username, String password) {
+        for(Interceptor apiAuthorization : apiAuthorizations.values()) {
+            if (apiAuthorization instanceof HttpBasicAuth) {
+                HttpBasicAuth basicAuth = (HttpBasicAuth) apiAuthorization;
+                basicAuth.setCredentials(username, password);
+                return;
+            }
+            if (apiAuthorization instanceof OAuth) {
+                OAuth oauth = (OAuth) apiAuthorization;
+                oauth.getTokenRequestBuilder().setUsername(username).setPassword(password);
+                return;
+            }
+        }
+    }
+
+    /**
+     * Helper method to configure the token endpoint of the first oauth found in the apiAuthorizations (there should be only one)
+     * @return
+     */
+    public TokenRequestBuilder getTokenEndPoint() {
+        for(Interceptor apiAuthorization : apiAuthorizations.values()) {
+            if (apiAuthorization instanceof OAuth) {
+                OAuth oauth = (OAuth) apiAuthorization;
+                return oauth.getTokenRequestBuilder();
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Helper method to configure authorization endpoint of the first oauth found in the apiAuthorizations (there should be only one)
+     * @return
+     */
+    public AuthenticationRequestBuilder getAuthorizationEndPoint() {
+        for(Interceptor apiAuthorization : apiAuthorizations.values()) {
+            if (apiAuthorization instanceof OAuth) {
+                OAuth oauth = (OAuth) apiAuthorization;
+                return oauth.getAuthenticationRequestBuilder();
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Helper method to pre-set the oauth access token of the first oauth found in the apiAuthorizations (there should be only one)
+     * @param accessToken
+     */
+    public void setAccessToken(String accessToken) {
+        for(Interceptor apiAuthorization : apiAuthorizations.values()) {
+            if (apiAuthorization instanceof OAuth) {
+                OAuth oauth = (OAuth) apiAuthorization;
+                oauth.setAccessToken(accessToken);
+                return;
+            }
+        }
+    }
+
+    /**
+     * Helper method to configure the oauth accessCode/implicit flow parameters
+     * @param clientId
+     * @param clientSecret
+     * @param redirectURI
+     */
+    public void configureAuthorizationFlow(String clientId, String clientSecret, String redirectURI) {
+        for(Interceptor apiAuthorization : apiAuthorizations.values()) {
+            if (apiAuthorization instanceof OAuth) {
+                OAuth oauth = (OAuth) apiAuthorization;
+                oauth.getTokenRequestBuilder()
+                        .setClientId(clientId)
+                        .setClientSecret(clientSecret)
+                        .setRedirectURI(redirectURI);
+                oauth.getAuthenticationRequestBuilder()
+                        .setClientId(clientId)
+                        .setRedirectURI(redirectURI);
+                return;
+            }
+        }
+    }
+
+    /**
+     * Configures a listener which is notified when a new access token is received.
+     * @param accessTokenListener
+     */
+    public void registerAccessTokenListener(AccessTokenListener accessTokenListener) {
+        for(Interceptor apiAuthorization : apiAuthorizations.values()) {
+            if (apiAuthorization instanceof OAuth) {
+                OAuth oauth = (OAuth) apiAuthorization;
+                oauth.registerAccessTokenListener(accessTokenListener);
+                return;
+            }
+        }
+    }
+
+    /**
+     * Adds an authorization to be used by the client
+     * @param authName
+     * @param authorization
+     */
+    public void addAuthorization(String authName, Interceptor authorization) {
+        if (apiAuthorizations.containsKey(authName)) {
+            throw new RuntimeException("auth name \"" + authName + "\" already in api authorizations");
+        }
+        apiAuthorizations.put(authName, authorization);
+        okClient.interceptors().add(authorization);
+    }
+
+    public Map<String, Interceptor> getApiAuthorizations() {
+        return apiAuthorizations;
+    }
+
+    public void setApiAuthorizations(Map<String, Interceptor> apiAuthorizations) {
+        this.apiAuthorizations = apiAuthorizations;
+    }
+
+    public Retrofit.Builder getAdapterBuilder() {
+        return adapterBuilder;
+    }
+
+    public void setAdapterBuilder(Retrofit.Builder adapterBuilder) {
+        this.adapterBuilder = adapterBuilder;
+    }
+
+    public OkHttpClient getOkClient() {
+        return okClient;
+    }
+
+    public void addAuthsToOkClient(OkHttpClient okClient) {
+        for(Interceptor apiAuthorization : apiAuthorizations.values()) {
+            okClient.interceptors().add(apiAuthorization);
+        }
+    }
+
+    /**
+     * Clones the okClient given in parameter, adds the auth interceptors and uses it to configure the Retrofit
+     * @param okClient
+     */
+    public void configureFromOkclient(OkHttpClient okClient) {
+        OkHttpClient clone = okClient.newBuilder().build();
+        addAuthsToOkClient(clone);
+        adapterBuilder.client(clone);
+    }
+}
+
+/**
+ * This wrapper is to take care of this case:
+ * when the deserialization fails due to JsonParseException and the
+ * expected type is String, then just return the body string.
+ */
+class GsonResponseBodyConverterToString<T> implements Converter<ResponseBody, T> {
+	  private final Gson gson;
+	  private final Type type;
+
+	  GsonResponseBodyConverterToString(Gson gson, Type type) {
+	    this.gson = gson;
+	    this.type = type;
+	  }
+
+	  @Override public T convert(ResponseBody value) throws IOException {
+	    String returned = value.string();
+	    try {
+	      return gson.fromJson(returned, type);
+	    }
+	    catch (JsonParseException e) {
+                return (T) returned;
+        }
+	 }
+}
+
+class GsonCustomConverterFactory extends Converter.Factory
+{
+	public static GsonCustomConverterFactory create(Gson gson) {
+	    return new GsonCustomConverterFactory(gson);
+	  }
+
+	  private final Gson gson;
+	  private final GsonConverterFactory gsonConverterFactory;
+
+	  private GsonCustomConverterFactory(Gson gson) {
+	    if (gson == null) throw new NullPointerException("gson == null");
+	    this.gson = gson;
+	    this.gsonConverterFactory = GsonConverterFactory.create(gson);
+	  }
+
+    @Override
+    public Converter<ResponseBody, ?> responseBodyConverter(Type type, Annotation[] annotations, Retrofit retrofit) {
+        if(type.equals(String.class))
+            return new GsonResponseBodyConverterToString<Object>(gson, type);
+        else
+            return gsonConverterFactory.responseBodyConverter(type, annotations, retrofit);
+    }
+
+    @Override
+    public Converter<?, RequestBody> requestBodyConverter(Type type, Annotation[] parameterAnnotations, Annotation[] methodAnnotations, Retrofit retrofit) {
+            return gsonConverterFactory.requestBodyConverter(type, parameterAnnotations, methodAnnotations, retrofit);
+    }
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/CollectionFormats.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/CollectionFormats.java
new file mode 100644
index 00000000000..e96d1561a7c
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/CollectionFormats.java
@@ -0,0 +1,95 @@
+package io.swagger.client;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class CollectionFormats {
+
+    public static class CSVParams {
+
+        protected List<String> params;
+
+        public CSVParams() {
+        }
+
+        public CSVParams(List<String> params) {
+            this.params = params;
+        }
+
+        public CSVParams(String... params) {
+            this.params = Arrays.asList(params);
+        }
+
+        public List<String> getParams() {
+            return params;
+        }
+
+        public void setParams(List<String> params) {
+            this.params = params;
+        }
+
+        @Override
+        public String toString() {
+            return StringUtil.join(params.toArray(new String[0]), ",");
+        }
+
+    }
+
+    public static class SSVParams extends CSVParams {
+
+        public SSVParams() {
+        }
+
+        public SSVParams(List<String> params) {
+            super(params);
+        }
+
+        public SSVParams(String... params) {
+            super(params);
+        }
+
+        @Override
+        public String toString() {
+            return StringUtil.join(params.toArray(new String[0]), " ");
+        }
+    }
+
+    public static class TSVParams extends CSVParams {
+
+        public TSVParams() {
+        }
+
+        public TSVParams(List<String> params) {
+            super(params);
+        }
+
+        public TSVParams(String... params) {
+            super(params);
+        }
+
+        @Override
+        public String toString() {
+            return StringUtil.join( params.toArray(new String[0]), "\t");
+        }
+    }
+
+    public static class PIPESParams extends CSVParams {
+
+        public PIPESParams() {
+        }
+
+        public PIPESParams(List<String> params) {
+            super(params);
+        }
+
+        public PIPESParams(String... params) {
+            super(params);
+        }
+
+        @Override
+        public String toString() {
+            return StringUtil.join(params.toArray(new String[0]), "|");
+        }
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/StringUtil.java
new file mode 100644
index 00000000000..e8c0dc4d062
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/StringUtil.java
@@ -0,0 +1,42 @@
+package io.swagger.client;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-07T09:11:59.834Z")
+public class StringUtil {
+  /**
+   * Check if the given array contains the given value (with case-insensitive comparison).
+   *
+   * @param array The array
+   * @param value The value to search
+   * @return true if the array contains the value
+   */
+  public static boolean containsIgnoreCase(String[] array, String value) {
+    for (String str : array) {
+      if (value == null && str == null) return true;
+      if (value != null && value.equalsIgnoreCase(str)) return true;
+    }
+    return false;
+  }
+
+  /**
+   * Join an array of strings with the given separator.
+   * <p>
+   * Note: This might be replaced by utility method from commons-lang or guava someday
+   * if one of those libraries is added as dependency.
+   * </p>
+   *
+   * @param array     The array of strings
+   * @param separator The separator
+   * @return the resulting string
+   */
+  public static String join(String[] array, String separator) {
+    int len = array.length;
+    if (len == 0) return "";
+
+    StringBuilder out = new StringBuilder();
+    out.append(array[0]);
+    for (int i = 1; i < len; i++) {
+      out.append(separator).append(array[i]);
+    }
+    return out.toString();
+  }
+}
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java
new file mode 100644
index 00000000000..33d4760a605
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java
@@ -0,0 +1,177 @@
+package io.swagger.client.api;
+
+import io.swagger.client.CollectionFormats.*;
+
+import rx.Observable;
+
+import retrofit2.http.*;
+
+import okhttp3.RequestBody;
+
+import io.swagger.client.model.Pet;
+import io.swagger.client.model.InlineResponse200;
+import java.io.File;
+
+
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+
+public interface PetApi {
+  
+  /**
+   * Add a new pet to the store
+   * 
+   * @param body Pet object that needs to be added to the store (optional)
+   * @return Call<Void>
+   */
+  
+  @POST("pet")
+  Observable<Void> addPet(
+    @Body Pet body
+  );
+
+  
+  /**
+   * Fake endpoint to test byte array in body parameter for adding a new pet to the store
+   * 
+   * @param body Pet object in the form of byte array (optional)
+   * @return Call<Void>
+   */
+  
+  @POST("pet?testing_byte_array=true")
+  Observable<Void> addPetUsingByteArray(
+    @Body byte[] body
+  );
+
+  
+  /**
+   * Deletes a pet
+   * 
+   * @param petId Pet id to delete (required)
+   * @param apiKey  (optional)
+   * @return Call<Void>
+   */
+  
+  @DELETE("pet/{petId}")
+  Observable<Void> deletePet(
+    @Path("petId") Long petId, @Header("api_key") String apiKey
+  );
+
+  
+  /**
+   * Finds Pets by status
+   * Multiple status values can be provided with comma separated strings
+   * @param status Status values that need to be considered for query (optional, default to available)
+   * @return Call<List<Pet>>
+   */
+  
+  @GET("pet/findByStatus")
+  Observable<List<Pet>> findPetsByStatus(
+    @Query("status") List<String> status
+  );
+
+  
+  /**
+   * Finds Pets by tags
+   * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+   * @param tags Tags to filter by (optional)
+   * @return Call<List<Pet>>
+   */
+  
+  @GET("pet/findByTags")
+  Observable<List<Pet>> findPetsByTags(
+    @Query("tags") List<String> tags
+  );
+
+  
+  /**
+   * Find pet by ID
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched (required)
+   * @return Call<Pet>
+   */
+  
+  @GET("pet/{petId}")
+  Observable<Pet> getPetById(
+    @Path("petId") Long petId
+  );
+
+  
+  /**
+   * Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched (required)
+   * @return Call<InlineResponse200>
+   */
+  
+  @GET("pet/{petId}?response=inline_arbitrary_object")
+  Observable<InlineResponse200> getPetByIdInObject(
+    @Path("petId") Long petId
+  );
+
+  
+  /**
+   * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched (required)
+   * @return Call<byte[]>
+   */
+  
+  @GET("pet/{petId}?testing_byte_array=true")
+  Observable<byte[]> petPetIdtestingByteArraytrueGet(
+    @Path("petId") Long petId
+  );
+
+  
+  /**
+   * Update an existing pet
+   * 
+   * @param body Pet object that needs to be added to the store (optional)
+   * @return Call<Void>
+   */
+  
+  @PUT("pet")
+  Observable<Void> updatePet(
+    @Body Pet body
+  );
+
+  
+  /**
+   * Updates a pet in the store with form data
+   * 
+   * @param petId ID of pet that needs to be updated (required)
+   * @param name Updated name of the pet (optional)
+   * @param status Updated status of the pet (optional)
+   * @return Call<Void>
+   */
+  
+  @FormUrlEncoded
+  @POST("pet/{petId}")
+  Observable<Void> updatePetWithForm(
+    @Path("petId") String petId, @Field("name") String name, @Field("status") String status
+  );
+
+  
+  /**
+   * uploads an image
+   * 
+   * @param petId ID of pet to update (required)
+   * @param additionalMetadata Additional data to pass to server (optional)
+   * @param file file to upload (optional)
+   * @return Call<Void>
+   */
+  
+  @Multipart
+  @POST("pet/{petId}/uploadImage")
+  Observable<Void> uploadFile(
+    @Path("petId") Long petId, @Part("additionalMetadata") String additionalMetadata, @Part("file\"; filename=\"file\"") RequestBody file
+  );
+
+  
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/StoreApi.java
new file mode 100644
index 00000000000..b4effc010df
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/StoreApi.java
@@ -0,0 +1,99 @@
+package io.swagger.client.api;
+
+import io.swagger.client.CollectionFormats.*;
+
+import rx.Observable;
+
+import retrofit2.http.*;
+
+import okhttp3.RequestBody;
+
+import io.swagger.client.model.Order;
+
+
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+
+public interface StoreApi {
+  
+  /**
+   * Delete purchase order by ID
+   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+   * @param orderId ID of the order that needs to be deleted (required)
+   * @return Call<Void>
+   */
+  
+  @DELETE("store/order/{orderId}")
+  Observable<Void> deleteOrder(
+    @Path("orderId") String orderId
+  );
+
+  
+  /**
+   * Finds orders by status
+   * A single status value can be provided as a string
+   * @param status Status value that needs to be considered for query (optional, default to placed)
+   * @return Call<List<Order>>
+   */
+  
+  @GET("store/findByStatus")
+  Observable<List<Order>> findOrdersByStatus(
+    @Query("status") String status
+  );
+
+  
+  /**
+   * Returns pet inventories by status
+   * Returns a map of status codes to quantities
+   * @return Call<Map<String, Integer>>
+   */
+  
+  @GET("store/inventory")
+  Observable<Map<String, Integer>> getInventory();
+    
+
+  
+  /**
+   * Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+   * Returns an arbitrary object which is actually a map of status codes to quantities
+   * @return Call<Object>
+   */
+  
+  @GET("store/inventory?response=arbitrary_object")
+  Observable<Object> getInventoryInObject();
+    
+
+  
+  /**
+   * Find purchase order by ID
+   * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+   * @param orderId ID of pet that needs to be fetched (required)
+   * @return Call<Order>
+   */
+  
+  @GET("store/order/{orderId}")
+  Observable<Order> getOrderById(
+    @Path("orderId") String orderId
+  );
+
+  
+  /**
+   * Place an order for a pet
+   * 
+   * @param body order placed for purchasing the pet (optional)
+   * @return Call<Order>
+   */
+  
+  @POST("store/order")
+  Observable<Order> placeOrder(
+    @Body Order body
+  );
+
+  
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/UserApi.java
new file mode 100644
index 00000000000..6019e10711d
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/UserApi.java
@@ -0,0 +1,129 @@
+package io.swagger.client.api;
+
+import io.swagger.client.CollectionFormats.*;
+
+import rx.Observable;
+
+import retrofit2.http.*;
+
+import okhttp3.RequestBody;
+
+import io.swagger.client.model.User;
+
+
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+
+public interface UserApi {
+  
+  /**
+   * Create user
+   * This can only be done by the logged in user.
+   * @param body Created user object (optional)
+   * @return Call<Void>
+   */
+  
+  @POST("user")
+  Observable<Void> createUser(
+    @Body User body
+  );
+
+  
+  /**
+   * Creates list of users with given input array
+   * 
+   * @param body List of user object (optional)
+   * @return Call<Void>
+   */
+  
+  @POST("user/createWithArray")
+  Observable<Void> createUsersWithArrayInput(
+    @Body List<User> body
+  );
+
+  
+  /**
+   * Creates list of users with given input array
+   * 
+   * @param body List of user object (optional)
+   * @return Call<Void>
+   */
+  
+  @POST("user/createWithList")
+  Observable<Void> createUsersWithListInput(
+    @Body List<User> body
+  );
+
+  
+  /**
+   * Delete user
+   * This can only be done by the logged in user.
+   * @param username The name that needs to be deleted (required)
+   * @return Call<Void>
+   */
+  
+  @DELETE("user/{username}")
+  Observable<Void> deleteUser(
+    @Path("username") String username
+  );
+
+  
+  /**
+   * Get user by user name
+   * 
+   * @param username The name that needs to be fetched. Use user1 for testing. (required)
+   * @return Call<User>
+   */
+  
+  @GET("user/{username}")
+  Observable<User> getUserByName(
+    @Path("username") String username
+  );
+
+  
+  /**
+   * Logs user into the system
+   * 
+   * @param username The user name for login (optional)
+   * @param password The password for login in clear text (optional)
+   * @return Call<String>
+   */
+  
+  @GET("user/login")
+  Observable<String> loginUser(
+    @Query("username") String username, @Query("password") String password
+  );
+
+  
+  /**
+   * Logs out current logged in user session
+   * 
+   * @return Call<Void>
+   */
+  
+  @GET("user/logout")
+  Observable<Void> logoutUser();
+    
+
+  
+  /**
+   * Updated user
+   * This can only be done by the logged in user.
+   * @param username name that need to be deleted (required)
+   * @param body Updated user object (optional)
+   * @return Call<Void>
+   */
+  
+  @PUT("user/{username}")
+  Observable<Void> updateUser(
+    @Path("username") String username, @Body User body
+  );
+
+  
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
new file mode 100644
index 00000000000..f210c2110b5
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
@@ -0,0 +1,68 @@
+package io.swagger.client.auth;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import okhttp3.Interceptor;
+import okhttp3.Request;
+import okhttp3.Response;
+
+public class ApiKeyAuth implements Interceptor {
+    private final String location;
+    private final String paramName;
+
+    private String apiKey;
+
+    public ApiKeyAuth(String location, String paramName) {
+        this.location = location;
+        this.paramName = paramName;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public String getParamName() {
+        return paramName;
+    }
+
+    public String getApiKey() {
+        return apiKey;
+    }
+
+    public void setApiKey(String apiKey) {
+        this.apiKey = apiKey;
+    }
+
+    @Override
+    public Response intercept(Chain chain) throws IOException {
+        String paramValue;
+        Request request = chain.request();
+
+        if (location == "query") {
+            String newQuery = request.url().uri().getQuery();
+            paramValue = paramName + "=" + apiKey;
+            if (newQuery == null) {
+                newQuery = paramValue;
+            } else {
+                newQuery += "&" + paramValue;
+            }
+
+            URI newUri;
+            try {
+                newUri = new URI(request.url().uri().getScheme(), request.url().uri().getAuthority(),
+                    request.url().uri().getPath(), newQuery, request.url().uri().getFragment());
+            } catch (URISyntaxException e) {
+                throw new IOException(e);
+            }
+
+            request = request.newBuilder().url(newUri.toURL()).build();
+        } else if (location == "header") {
+            request = request.newBuilder()
+                    .addHeader(paramName, apiKey)
+                    .build();
+        }
+        return chain.proceed(request);
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
new file mode 100644
index 00000000000..c7b67e2d781
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
@@ -0,0 +1,50 @@
+package io.swagger.client.auth;
+
+import java.io.IOException;
+
+import okhttp3.Interceptor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.Credentials;
+
+public class HttpBasicAuth implements Interceptor {
+
+    private String username;
+    private String password;
+    
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public void setCredentials(String username, String password) {
+        this.username = username;
+        this.password = password;
+    }
+
+    @Override
+    public Response intercept(Chain chain) throws IOException {
+        Request request = chain.request();
+
+        // If the request already have an authorization (eg. Basic auth), do nothing
+        if (request.header("Authorization") == null) {
+            String credentials = Credentials.basic(username, password);
+            request = request.newBuilder()
+                    .addHeader("Authorization", credentials)
+                    .build();
+        }
+        return chain.proceed(request);
+    }
+}
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/auth/OAuth.java
new file mode 100644
index 00000000000..d9eed067a88
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/auth/OAuth.java
@@ -0,0 +1,161 @@
+package io.swagger.client.auth;
+
+import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED;
+
+import java.io.IOException;
+import java.util.Map;
+
+import org.apache.oltu.oauth2.client.OAuthClient;
+import org.apache.oltu.oauth2.client.request.OAuthBearerClientRequest;
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest;
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder;
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder;
+import org.apache.oltu.oauth2.client.response.OAuthJSONAccessTokenResponse;
+import org.apache.oltu.oauth2.common.exception.OAuthProblemException;
+import org.apache.oltu.oauth2.common.exception.OAuthSystemException;
+import org.apache.oltu.oauth2.common.message.types.GrantType;
+import org.apache.oltu.oauth2.common.token.BasicOAuthToken;
+
+import okhttp3.Interceptor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Request.Builder;
+import okhttp3.Response;
+
+public class OAuth implements Interceptor {
+
+    public interface AccessTokenListener {
+        public void notify(BasicOAuthToken token);
+    }
+
+    private volatile String accessToken;
+    private OAuthClient oauthClient;
+
+    private TokenRequestBuilder tokenRequestBuilder;
+    private AuthenticationRequestBuilder authenticationRequestBuilder;
+
+    private AccessTokenListener accessTokenListener;
+
+    public OAuth( OkHttpClient client, TokenRequestBuilder requestBuilder ) {
+        this.oauthClient = new OAuthClient(new OAuthOkHttpClient(client));
+        this.tokenRequestBuilder = requestBuilder;
+    }
+
+    public OAuth(TokenRequestBuilder requestBuilder ) {
+        this(new OkHttpClient(), requestBuilder);
+    }
+
+    public OAuth(OAuthFlow flow, String authorizationUrl, String tokenUrl, String scopes) {
+        this(OAuthClientRequest.tokenLocation(tokenUrl).setScope(scopes));
+        setFlow(flow);
+        authenticationRequestBuilder = OAuthClientRequest.authorizationLocation(authorizationUrl);
+    }
+
+    public void setFlow(OAuthFlow flow) {
+        switch(flow) {
+        case accessCode:
+        case implicit:
+            tokenRequestBuilder.setGrantType(GrantType.AUTHORIZATION_CODE);
+            break;
+        case password:
+            tokenRequestBuilder.setGrantType(GrantType.PASSWORD);
+            break;
+        case application:
+            tokenRequestBuilder.setGrantType(GrantType.CLIENT_CREDENTIALS);
+            break;
+        default:
+            break;
+        }            
+    }
+
+    @Override
+    public Response intercept(Chain chain)
+            throws IOException {
+
+        Request request = chain.request();
+
+        // If the request already have an authorization (eg. Basic auth), do nothing
+        if (request.header("Authorization") != null) {
+            return chain.proceed(request);
+        }
+
+        // If first time, get the token
+        OAuthClientRequest oAuthRequest;
+        if (getAccessToken() == null) {
+            updateAccessToken(null);
+        }
+
+        // Build the request
+        Builder rb = request.newBuilder();
+
+        String requestAccessToken = new String(getAccessToken());
+        try {
+            oAuthRequest = new OAuthBearerClientRequest(request.url().toString())
+                .setAccessToken(requestAccessToken)
+                .buildHeaderMessage();
+        } catch (OAuthSystemException e) {
+            throw new IOException(e);
+        }
+
+        for ( Map.Entry<String, String> header : oAuthRequest.getHeaders().entrySet() ) {
+            rb.addHeader(header.getKey(), header.getValue());
+        }
+        rb.url( oAuthRequest.getLocationUri());
+
+        //Execute the request
+        Response response = chain.proceed(rb.build());
+
+        // 401 most likely indicates that access token has expired.
+        // Time to refresh and resend the request
+        if ( response.code() == HTTP_UNAUTHORIZED ) {
+            updateAccessToken(requestAccessToken);
+            return intercept( chain );
+        }
+        return response;    
+    }
+
+    public synchronized void updateAccessToken(String requestAccessToken) throws IOException {
+        if (getAccessToken() == null || getAccessToken().equals(requestAccessToken)) {    
+            try {
+                OAuthJSONAccessTokenResponse accessTokenResponse = oauthClient.accessToken(this.tokenRequestBuilder.buildBodyMessage());
+                setAccessToken(accessTokenResponse.getAccessToken());
+                if (accessTokenListener != null) {
+                    accessTokenListener.notify((BasicOAuthToken) accessTokenResponse.getOAuthToken());
+                }
+            } catch (OAuthSystemException e) {
+                throw new IOException(e);
+            } catch (OAuthProblemException e) {
+                throw new IOException(e);
+            }
+        }
+    }
+
+    public void registerAccessTokenListener(AccessTokenListener accessTokenListener) {
+        this.accessTokenListener = accessTokenListener;
+    }
+
+    public synchronized String getAccessToken() {
+        return accessToken;
+    }
+
+    public synchronized void setAccessToken(String accessToken) {
+        this.accessToken = accessToken;
+    }
+
+    public TokenRequestBuilder getTokenRequestBuilder() {
+        return tokenRequestBuilder;
+    }
+
+    public void setTokenRequestBuilder(TokenRequestBuilder tokenRequestBuilder) {
+        this.tokenRequestBuilder = tokenRequestBuilder;
+    }
+
+    public AuthenticationRequestBuilder getAuthenticationRequestBuilder() {
+        return authenticationRequestBuilder;
+    }
+
+    public void setAuthenticationRequestBuilder(AuthenticationRequestBuilder authenticationRequestBuilder) {
+        this.authenticationRequestBuilder = authenticationRequestBuilder;
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/auth/OAuthFlow.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/auth/OAuthFlow.java
new file mode 100644
index 00000000000..597ec99b48b
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/auth/OAuthFlow.java
@@ -0,0 +1,5 @@
+package io.swagger.client.auth;
+
+public enum OAuthFlow {
+    accessCode, implicit, password, application
+}
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/auth/OAuthOkHttpClient.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/auth/OAuthOkHttpClient.java
new file mode 100644
index 00000000000..c9b6e124d51
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/auth/OAuthOkHttpClient.java
@@ -0,0 +1,72 @@
+package io.swagger.client.auth;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.apache.oltu.oauth2.client.HttpClient;
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest;
+import org.apache.oltu.oauth2.client.response.OAuthClientResponse;
+import org.apache.oltu.oauth2.client.response.OAuthClientResponseFactory;
+import org.apache.oltu.oauth2.common.exception.OAuthProblemException;
+import org.apache.oltu.oauth2.common.exception.OAuthSystemException;
+
+
+import okhttp3.Interceptor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Request.Builder;
+import okhttp3.Response;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+
+
+public class OAuthOkHttpClient implements HttpClient {
+
+    private OkHttpClient client;
+
+    public OAuthOkHttpClient() {
+        this.client = new OkHttpClient();
+    }
+
+    public OAuthOkHttpClient(OkHttpClient client) {
+        this.client = client;
+    }
+
+    public <T extends OAuthClientResponse> T execute(OAuthClientRequest request, Map<String, String> headers,
+            String requestMethod, Class<T> responseClass)
+                    throws OAuthSystemException, OAuthProblemException {
+
+        MediaType mediaType = MediaType.parse("application/json");
+        Request.Builder requestBuilder = new Request.Builder().url(request.getLocationUri());
+
+        if(headers != null) {
+            for (Entry<String, String> entry : headers.entrySet()) {
+                if (entry.getKey().equalsIgnoreCase("Content-Type")) {
+                    mediaType = MediaType.parse(entry.getValue());
+                } else {
+                    requestBuilder.addHeader(entry.getKey(), entry.getValue());
+                }
+            }
+        }
+
+        RequestBody body = request.getBody() != null ? RequestBody.create(mediaType, request.getBody()) : null;
+        requestBuilder.method(requestMethod, body);
+
+        try {
+            Response response = client.newCall(requestBuilder.build()).execute();
+            return OAuthClientResponseFactory.createCustomResponse(
+                    response.body().string(), 
+                    response.body().contentType().toString(),
+                    response.code(),
+                    responseClass);
+        } catch (IOException e) {
+            throw new OAuthSystemException(e);
+        }
+    }
+
+    public void shutdown() {
+        // Nothing to do here
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Category.java
new file mode 100644
index 00000000000..67de63eb179
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Category.java
@@ -0,0 +1,89 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+
+public class Category   {
+  
+  @SerializedName("id")
+  private Long id = null;
+  
+  @SerializedName("name")
+  private String name = null;
+  
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Category category = (Category) o;
+    return Objects.equals(id, category.id) &&
+        Objects.equals(name, category.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, name);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Category {\n");
+    
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/InlineResponse200.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/InlineResponse200.java
new file mode 100644
index 00000000000..165f069a05b
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/InlineResponse200.java
@@ -0,0 +1,180 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.client.model.Tag;
+import java.util.ArrayList;
+import java.util.List;
+
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+
+public class InlineResponse200   {
+  
+  @SerializedName("photoUrls")
+  private List<String> photoUrls = new ArrayList<String>();
+  
+  @SerializedName("name")
+  private String name = null;
+  
+  @SerializedName("id")
+  private Long id = null;
+  
+  @SerializedName("category")
+  private Object category = null;
+  
+  @SerializedName("tags")
+  private List<Tag> tags = new ArrayList<Tag>();
+  
+
+public enum StatusEnum {
+  @SerializedName("available")
+  AVAILABLE("available"),
+
+  @SerializedName("pending")
+  PENDING("pending"),
+
+  @SerializedName("sold")
+  SOLD("sold");
+
+  private String value;
+
+  StatusEnum(String value) {
+    this.value = value;
+  }
+
+  @Override
+  public String toString() {
+    return value;
+  }
+}
+
+  @SerializedName("status")
+  private StatusEnum status = null;
+  
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<String> getPhotoUrls() {
+    return photoUrls;
+  }
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Object getCategory() {
+    return category;
+  }
+  public void setCategory(Object category) {
+    this.category = category;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<Tag> getTags() {
+    return tags;
+  }
+  public void setTags(List<Tag> tags) {
+    this.tags = tags;
+  }
+
+  
+  /**
+   * pet status in the store
+   **/
+  @ApiModelProperty(value = "pet status in the store")
+  public StatusEnum getStatus() {
+    return status;
+  }
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    InlineResponse200 inlineResponse200 = (InlineResponse200) o;
+    return Objects.equals(photoUrls, inlineResponse200.photoUrls) &&
+        Objects.equals(name, inlineResponse200.name) &&
+        Objects.equals(id, inlineResponse200.id) &&
+        Objects.equals(category, inlineResponse200.category) &&
+        Objects.equals(tags, inlineResponse200.tags) &&
+        Objects.equals(status, inlineResponse200.status);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(photoUrls, name, id, category, tags, status);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class InlineResponse200 {\n");
+    
+    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    category: ").append(toIndentedString(category)).append("\n");
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Model200Response.java
new file mode 100644
index 00000000000..80b0aed92a8
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Model200Response.java
@@ -0,0 +1,73 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+
+public class Model200Response   {
+  
+  @SerializedName("name")
+  private Integer name = null;
+  
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getName() {
+    return name;
+  }
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Model200Response _200Response = (Model200Response) o;
+    return Objects.equals(name, _200Response.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Model200Response {\n");
+    
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ModelReturn.java
new file mode 100644
index 00000000000..ce8c1238fdb
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -0,0 +1,73 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+
+public class ModelReturn   {
+  
+  @SerializedName("return")
+  private Integer _return = null;
+  
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getReturn() {
+    return _return;
+  }
+  public void setReturn(Integer _return) {
+    this._return = _return;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ModelReturn _return = (ModelReturn) o;
+    return Objects.equals(_return, _return._return);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(_return);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ModelReturn {\n");
+    
+    sb.append("    _return: ").append(toIndentedString(_return)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Name.java
new file mode 100644
index 00000000000..370214bd21c
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Name.java
@@ -0,0 +1,89 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+
+public class Name   {
+  
+  @SerializedName("name")
+  private Integer name = null;
+  
+  @SerializedName("snake_case")
+  private Integer snakeCase = null;
+  
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getName() {
+    return name;
+  }
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getSnakeCase() {
+    return snakeCase;
+  }
+  public void setSnakeCase(Integer snakeCase) {
+    this.snakeCase = snakeCase;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Name name = (Name) o;
+    return Objects.equals(name, name.name) &&
+        Objects.equals(snakeCase, name.snakeCase);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, snakeCase);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Name {\n");
+    
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ObjectReturn.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ObjectReturn.java
new file mode 100644
index 00000000000..920640ad2cb
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ObjectReturn.java
@@ -0,0 +1,69 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+@ApiModel(description = "")
+public class ObjectReturn   {
+  
+  @SerializedName("return")
+  private Integer _return = null;
+  
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getReturn() {
+    return _return;
+  }
+  public void setReturn(Integer _return) {
+    this._return = _return;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ObjectReturn _return = (ObjectReturn) o;
+    return Objects.equals(_return, _return._return);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(_return);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ObjectReturn {\n");
+    
+    sb.append("    _return: ").append(toIndentedString(_return)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Order.java
new file mode 100644
index 00000000000..e601bd7a15a
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Order.java
@@ -0,0 +1,175 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+
+public class Order   {
+  
+  @SerializedName("id")
+  private Long id = null;
+  
+  @SerializedName("petId")
+  private Long petId = null;
+  
+  @SerializedName("quantity")
+  private Integer quantity = null;
+  
+  @SerializedName("shipDate")
+  private Date shipDate = null;
+  
+
+public enum StatusEnum {
+  @SerializedName("placed")
+  PLACED("placed"),
+
+  @SerializedName("approved")
+  APPROVED("approved"),
+
+  @SerializedName("delivered")
+  DELIVERED("delivered");
+
+  private String value;
+
+  StatusEnum(String value) {
+    this.value = value;
+  }
+
+  @Override
+  public String toString() {
+    return value;
+  }
+}
+
+  @SerializedName("status")
+  private StatusEnum status = null;
+  
+  @SerializedName("complete")
+  private Boolean complete = null;
+  
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Long getId() {
+    return id;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Long getPetId() {
+    return petId;
+  }
+  public void setPetId(Long petId) {
+    this.petId = petId;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getQuantity() {
+    return quantity;
+  }
+  public void setQuantity(Integer quantity) {
+    this.quantity = quantity;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Date getShipDate() {
+    return shipDate;
+  }
+  public void setShipDate(Date shipDate) {
+    this.shipDate = shipDate;
+  }
+
+  
+  /**
+   * Order Status
+   **/
+  @ApiModelProperty(value = "Order Status")
+  public StatusEnum getStatus() {
+    return status;
+  }
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Boolean getComplete() {
+    return complete;
+  }
+  public void setComplete(Boolean complete) {
+    this.complete = complete;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Order order = (Order) o;
+    return Objects.equals(id, order.id) &&
+        Objects.equals(petId, order.petId) &&
+        Objects.equals(quantity, order.quantity) &&
+        Objects.equals(shipDate, order.shipDate) &&
+        Objects.equals(status, order.status) &&
+        Objects.equals(complete, order.complete);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Order {\n");
+    
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    petId: ").append(toIndentedString(petId)).append("\n");
+    sb.append("    quantity: ").append(toIndentedString(quantity)).append("\n");
+    sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Pet.java
new file mode 100644
index 00000000000..5d1210dc55b
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Pet.java
@@ -0,0 +1,181 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.client.model.Category;
+import io.swagger.client.model.Tag;
+import java.util.ArrayList;
+import java.util.List;
+
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+
+public class Pet   {
+  
+  @SerializedName("id")
+  private Long id = null;
+  
+  @SerializedName("category")
+  private Category category = null;
+  
+  @SerializedName("name")
+  private String name = null;
+  
+  @SerializedName("photoUrls")
+  private List<String> photoUrls = new ArrayList<String>();
+  
+  @SerializedName("tags")
+  private List<Tag> tags = new ArrayList<Tag>();
+  
+
+public enum StatusEnum {
+  @SerializedName("available")
+  AVAILABLE("available"),
+
+  @SerializedName("pending")
+  PENDING("pending"),
+
+  @SerializedName("sold")
+  SOLD("sold");
+
+  private String value;
+
+  StatusEnum(String value) {
+    this.value = value;
+  }
+
+  @Override
+  public String toString() {
+    return value;
+  }
+}
+
+  @SerializedName("status")
+  private StatusEnum status = null;
+  
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Category getCategory() {
+    return category;
+  }
+  public void setCategory(Category category) {
+    this.category = category;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public List<String> getPhotoUrls() {
+    return photoUrls;
+  }
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<Tag> getTags() {
+    return tags;
+  }
+  public void setTags(List<Tag> tags) {
+    this.tags = tags;
+  }
+
+  
+  /**
+   * pet status in the store
+   **/
+  @ApiModelProperty(value = "pet status in the store")
+  public StatusEnum getStatus() {
+    return status;
+  }
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Pet pet = (Pet) o;
+    return Objects.equals(id, pet.id) &&
+        Objects.equals(category, pet.category) &&
+        Objects.equals(name, pet.name) &&
+        Objects.equals(photoUrls, pet.photoUrls) &&
+        Objects.equals(tags, pet.tags) &&
+        Objects.equals(status, pet.status);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, category, name, photoUrls, tags, status);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Pet {\n");
+    
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    category: ").append(toIndentedString(category)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/SpecialModelName.java
new file mode 100644
index 00000000000..b5a96d5fc39
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -0,0 +1,73 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+
+public class SpecialModelName   {
+  
+  @SerializedName("$special[property.name]")
+  private Long specialPropertyName = null;
+  
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Long getSpecialPropertyName() {
+    return specialPropertyName;
+  }
+  public void setSpecialPropertyName(Long specialPropertyName) {
+    this.specialPropertyName = specialPropertyName;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    SpecialModelName specialModelName = (SpecialModelName) o;
+    return Objects.equals(specialPropertyName, specialModelName.specialPropertyName);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(specialPropertyName);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class SpecialModelName {\n");
+    
+    sb.append("    specialPropertyName: ").append(toIndentedString(specialPropertyName)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Tag.java
new file mode 100644
index 00000000000..6ee49ee2166
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Tag.java
@@ -0,0 +1,89 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+
+public class Tag   {
+  
+  @SerializedName("id")
+  private Long id = null;
+  
+  @SerializedName("name")
+  private String name = null;
+  
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Tag tag = (Tag) o;
+    return Objects.equals(id, tag.id) &&
+        Objects.equals(name, tag.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, name);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Tag {\n");
+    
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/User.java
new file mode 100644
index 00000000000..98196393ef1
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/User.java
@@ -0,0 +1,186 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+
+public class User   {
+  
+  @SerializedName("id")
+  private Long id = null;
+  
+  @SerializedName("username")
+  private String username = null;
+  
+  @SerializedName("firstName")
+  private String firstName = null;
+  
+  @SerializedName("lastName")
+  private String lastName = null;
+  
+  @SerializedName("email")
+  private String email = null;
+  
+  @SerializedName("password")
+  private String password = null;
+  
+  @SerializedName("phone")
+  private String phone = null;
+  
+  @SerializedName("userStatus")
+  private Integer userStatus = null;
+  
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getUsername() {
+    return username;
+  }
+  public void setUsername(String username) {
+    this.username = username;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getFirstName() {
+    return firstName;
+  }
+  public void setFirstName(String firstName) {
+    this.firstName = firstName;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getLastName() {
+    return lastName;
+  }
+  public void setLastName(String lastName) {
+    this.lastName = lastName;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getEmail() {
+    return email;
+  }
+  public void setEmail(String email) {
+    this.email = email;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getPassword() {
+    return password;
+  }
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getPhone() {
+    return phone;
+  }
+  public void setPhone(String phone) {
+    this.phone = phone;
+  }
+
+  
+  /**
+   * User Status
+   **/
+  @ApiModelProperty(value = "User Status")
+  public Integer getUserStatus() {
+    return userStatus;
+  }
+  public void setUserStatus(Integer userStatus) {
+    this.userStatus = userStatus;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    User user = (User) o;
+    return Objects.equals(id, user.id) &&
+        Objects.equals(username, user.username) &&
+        Objects.equals(firstName, user.firstName) &&
+        Objects.equals(lastName, user.lastName) &&
+        Objects.equals(email, user.email) &&
+        Objects.equals(password, user.password) &&
+        Objects.equals(phone, user.phone) &&
+        Objects.equals(userStatus, user.userStatus);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class User {\n");
+    
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    username: ").append(toIndentedString(username)).append("\n");
+    sb.append("    firstName: ").append(toIndentedString(firstName)).append("\n");
+    sb.append("    lastName: ").append(toIndentedString(lastName)).append("\n");
+    sb.append("    email: ").append(toIndentedString(email)).append("\n");
+    sb.append("    password: ").append(toIndentedString(password)).append("\n");
+    sb.append("    phone: ").append(toIndentedString(phone)).append("\n");
+    sb.append("    userStatus: ").append(toIndentedString(userStatus)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/petstore/test/PetApiTest.java
new file mode 100644
index 00000000000..a433321a0f9
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/petstore/test/PetApiTest.java
@@ -0,0 +1,254 @@
+package io.swagger.petstore.test;
+
+import io.swagger.client.ApiClient;
+import io.swagger.client.api.*;
+import io.swagger.client.model.*;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.*;
+
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+
+import static org.junit.Assert.*;
+
+public class PetApiTest {
+    PetApi api = null;
+
+    @Before
+    public void setup() {
+        api = new ApiClient().createService(PetApi.class);
+    }
+
+    @Test
+    public void testCreateAndGetPet() throws Exception {
+        final Pet pet = createRandomPet();
+        api.addPet(pet).subscribe(new SkeletonSubscriber<Void>() {
+            @Override
+            public void onCompleted() {
+                api.getPetById(pet.getId()).subscribe(new SkeletonSubscriber<Pet>() {
+                    @Override
+                    public void onNext(Pet fetched) {
+                        assertNotNull(fetched);
+                        assertEquals(pet.getId(), fetched.getId());
+                        assertNotNull(fetched.getCategory());
+                        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
+                    }
+                });
+
+            }
+        });
+
+    }
+
+    @Test
+    public void testUpdatePet() throws Exception {
+        final Pet pet = createRandomPet();
+        pet.setName("programmer");
+
+        api.updatePet(pet).subscribe(new SkeletonSubscriber<Void>() {
+            @Override
+            public void onCompleted() {
+                api.getPetById(pet.getId()).subscribe(new SkeletonSubscriber<Pet>() {
+                    @Override
+                    public void onNext(Pet fetched) {
+                        assertNotNull(fetched);
+                        assertEquals(pet.getId(), fetched.getId());
+                        assertNotNull(fetched.getCategory());
+                        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
+                    }
+                });
+
+            }
+        });
+
+    }
+
+    @Test
+    public void testFindPetsByStatus() throws Exception {
+        final Pet pet = createRandomPet();
+        pet.setName("programmer");
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
+
+        api.updatePet(pet).subscribe(new SkeletonSubscriber<Void>() {
+            @Override
+            public void onCompleted() {
+                api.findPetsByStatus(Arrays.asList(new String[]{"available"})).subscribe(new SkeletonSubscriber<List<Pet>>() {
+                    @Override
+                    public void onNext(List<Pet> pets) {
+                        assertNotNull(pets);
+
+                        boolean found = false;
+                        for (Pet fetched : pets) {
+                            if (fetched.getId().equals(pet.getId())) {
+                                found = true;
+                                break;
+                            }
+                        }
+
+                        assertTrue(found);
+                    }
+                });
+
+            }
+        });
+
+    }
+
+    @Test
+    public void testFindPetsByTags() throws Exception {
+        final Pet pet = createRandomPet();
+        pet.setName("monster");
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
+
+        List<Tag> tags = new ArrayList<Tag>();
+        Tag tag1 = new Tag();
+        tag1.setName("friendly");
+        tags.add(tag1);
+        pet.setTags(tags);
+
+        api.updatePet(pet).subscribe(new SkeletonSubscriber<Void>() {
+            @Override
+            public void onCompleted() {
+                api.findPetsByTags(Arrays.asList(new String[]{"friendly"})).subscribe(new SkeletonSubscriber<List<Pet>>() {
+                    @Override
+                    public void onNext(List<Pet> pets) {
+                        assertNotNull(pets);
+
+                        boolean found = false;
+                        for (Pet fetched : pets) {
+                            if (fetched.getId().equals(pet.getId())) {
+                                found = true;
+                                break;
+                            }
+                        }
+                        assertTrue(found);
+                    }
+                });
+
+            }
+        });
+
+    }
+
+    @Test
+    public void testUpdatePetWithForm() throws Exception {
+        final Pet pet = createRandomPet();
+        pet.setName("frank");
+        api.addPet(pet).subscribe(SkeletonSubscriber.failTestOnError());
+        api.getPetById(pet.getId()).subscribe(new SkeletonSubscriber<Pet>() {
+            @Override
+            public void onNext(final Pet fetched) {
+                api.updatePetWithForm(String.valueOf(fetched.getId()), "furt", null)
+                        .subscribe(new SkeletonSubscriber<Void>() {
+                            @Override
+                            public void onCompleted() {
+                                api.getPetById(fetched.getId()).subscribe(new SkeletonSubscriber<Pet>() {
+                                    @Override
+                                    public void onNext(Pet updated) {
+                                        assertEquals(updated.getName(), "furt");
+                                    }
+                                });
+
+                            }
+                        });
+            }
+        });
+
+
+    }
+
+    @Test
+    public void testDeletePet() throws Exception {
+        Pet pet = createRandomPet();
+        api.addPet(pet).subscribe(SkeletonSubscriber.failTestOnError());
+
+        api.getPetById(pet.getId()).subscribe(new SkeletonSubscriber<Pet>() {
+            @Override
+            public void onNext(Pet fetched) {
+
+                api.deletePet(fetched.getId(), null).subscribe(SkeletonSubscriber.failTestOnError());
+                api.getPetById(fetched.getId()).subscribe(new SkeletonSubscriber<Pet>() {
+                    @Override
+                    public void onNext(Pet deletedPet) {
+                        fail("Should not have found deleted pet.");
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        // expected, because the pet has been deleted.
+                    }
+                });
+            }
+        });
+    }
+
+    @Test
+    public void testUploadFile() throws Exception {
+        File file = File.createTempFile("test", "hello.txt");
+        BufferedWriter writer = new BufferedWriter(new FileWriter(file));
+
+        writer.write("Hello world!");
+        writer.close();
+
+        Pet pet = createRandomPet();
+        api.addPet(pet).subscribe(SkeletonSubscriber.failTestOnError());
+
+        RequestBody body = RequestBody.create(MediaType.parse("text/plain"), file);
+        api.uploadFile(pet.getId(), "a test file", body).subscribe(new SkeletonSubscriber<Void>() {
+            @Override
+            public void onError(Throwable e) {
+                // this also yields a 400 for other tests, so I guess it's okay...
+            }
+        });
+    }
+
+    @Test
+    public void testEqualsAndHashCode() {
+        Pet pet1 = new Pet();
+        Pet pet2 = new Pet();
+        assertTrue(pet1.equals(pet2));
+        assertTrue(pet2.equals(pet1));
+        assertTrue(pet1.hashCode() == pet2.hashCode());
+        assertTrue(pet1.equals(pet1));
+        assertTrue(pet1.hashCode() == pet1.hashCode());
+
+        pet2.setName("really-happy");
+        pet2.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
+        assertFalse(pet1.equals(pet2));
+        assertFalse(pet2.equals(pet1));
+        assertFalse(pet1.hashCode() == (pet2.hashCode()));
+        assertTrue(pet2.equals(pet2));
+        assertTrue(pet2.hashCode() == pet2.hashCode());
+
+        pet1.setName("really-happy");
+        pet1.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
+        assertTrue(pet1.equals(pet2));
+        assertTrue(pet2.equals(pet1));
+        assertTrue(pet1.hashCode() == pet2.hashCode());
+        assertTrue(pet1.equals(pet1));
+        assertTrue(pet1.hashCode() == pet1.hashCode());
+    }
+
+    private Pet createRandomPet() {
+        Pet pet = new Pet();
+        pet.setId(System.currentTimeMillis());
+        pet.setName("gorilla");
+
+        Category category = new Category();
+        category.setName("really-happy");
+
+        pet.setCategory(category);
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
+        List<String> photos = Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"});
+        pet.setPhotoUrls(photos);
+
+        return pet;
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/petstore/test/SkeletonSubscriber.java b/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/petstore/test/SkeletonSubscriber.java
new file mode 100644
index 00000000000..5d34a1e5d5d
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/petstore/test/SkeletonSubscriber.java
@@ -0,0 +1,30 @@
+package io.swagger.petstore.test;
+
+import junit.framework.TestFailure;
+import rx.Subscriber;
+
+/**
+ * Skeleton subscriber for tests that will fail when onError() is called unexpectedly.
+ */
+public abstract class SkeletonSubscriber<T> extends Subscriber<T> {
+
+    public static <T> SkeletonSubscriber<T> failTestOnError() {
+        return new SkeletonSubscriber<T>() {
+        };
+    }
+
+    @Override
+    public void onCompleted() {
+        // space for rent
+    }
+
+    @Override
+    public void onNext(T t) {
+        // space for rent
+    }
+
+    @Override
+    public void onError(Throwable e) {
+        throw new RuntimeException("Subscriber onError() called with unhandled exception!", e);
+    }
+}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/petstore/test/StoreApiTest.java
new file mode 100644
index 00000000000..39785f755ca
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/petstore/test/StoreApiTest.java
@@ -0,0 +1,96 @@
+package io.swagger.petstore.test;
+
+import io.swagger.client.ApiClient;
+import io.swagger.client.api.*;
+import io.swagger.client.model.*;
+
+import java.lang.reflect.Field;
+import java.util.Map;
+
+import org.junit.*;
+
+import retrofit2.Response;
+
+import static org.junit.Assert.*;
+
+public class StoreApiTest {
+    StoreApi api = null;
+
+    @Before
+    public void setup() {
+        api = new ApiClient().createService(StoreApi.class);
+    }
+
+    @Test
+    public void testGetInventory() throws Exception {
+        api.getInventory().subscribe(new SkeletonSubscriber<Map<String, Integer>>() {
+            @Override
+            public void onNext(Map<String, Integer> inventory) {
+                assertTrue(inventory.keySet().size() > 0);
+            }
+        });
+
+    }
+
+    @Test
+    public void testPlaceOrder() throws Exception {
+        final Order order = createOrder();
+        api.placeOrder(order).subscribe(SkeletonSubscriber.failTestOnError());
+        api.getOrderById(String.valueOf(order.getId())).subscribe(new SkeletonSubscriber<Order>() {
+            @Override
+            public void onNext(Order fetched) {
+                assertEquals(order.getId(), fetched.getId());
+                assertEquals(order.getPetId(), fetched.getPetId());
+                assertEquals(order.getQuantity(), fetched.getQuantity());
+            }
+        });
+    }
+
+    @Test
+    public void testDeleteOrder() throws Exception {
+        final Order order = createOrder();
+        api.placeOrder(order).subscribe(SkeletonSubscriber.failTestOnError());
+
+        api.getOrderById(String.valueOf(order.getId())).subscribe(new SkeletonSubscriber<Order>() {
+            @Override
+            public void onNext(Order fetched) {
+                assertEquals(fetched.getId(), order.getId());
+            }
+        });
+
+
+        api.deleteOrder(String.valueOf(order.getId())).subscribe(SkeletonSubscriber.failTestOnError());
+        api.getOrderById(String.valueOf(order.getId()))
+                .subscribe(new SkeletonSubscriber<Order>() {
+                               @Override
+                               public void onNext(Order order) {
+                                   throw new RuntimeException("Should not have found deleted order.");
+                               }
+
+                               @Override
+                               public void onError(Throwable e) {
+                                   // should not find deleted order.
+                               }
+                           }
+                );
+    }
+
+    private Order createOrder() {
+        Order order = new Order();
+        order.setPetId(new Long(200));
+        order.setQuantity(new Integer(13));
+        order.setShipDate(new java.util.Date());
+        order.setStatus(Order.StatusEnum.PLACED);
+        order.setComplete(true);
+
+        try {
+          Field idField = Order.class.getDeclaredField("id");
+          idField.setAccessible(true);
+          idField.set(order, System.currentTimeMillis());
+        } catch (Exception e) {
+          throw new RuntimeException(e);
+        }
+
+        return order;
+    }
+}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/petstore/test/UserApiTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/petstore/test/UserApiTest.java
new file mode 100644
index 00000000000..59e238b457b
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/petstore/test/UserApiTest.java
@@ -0,0 +1,108 @@
+package io.swagger.petstore.test;
+
+import io.swagger.client.ApiClient;
+import io.swagger.client.api.*;
+import io.swagger.client.model.*;
+
+
+import java.util.Arrays;
+
+import org.junit.*;
+
+import static org.junit.Assert.*;
+
+/**
+ * NOTE: This serves as a sample and test case for the generator, which is why this is java-7 code.
+ * Much looks much nicer with no anonymous classes.
+ */
+public class UserApiTest {
+    UserApi api = null;
+
+    @Before
+    public void setup() {
+        api = new ApiClient().createService(UserApi.class);
+    }
+
+    @Test
+    public void testCreateUser() throws Exception {
+        final User user = createUser();
+
+        api.createUser(user).subscribe(new SkeletonSubscriber<Void>() {
+            @Override
+            public void onCompleted() {
+                api.getUserByName(user.getUsername()).subscribe(new SkeletonSubscriber<User>() {
+                    @Override
+                    public void onNext(User fetched) {
+                        assertEquals(user.getId(), fetched.getId());
+                    }
+                });
+            }
+        });
+    }
+
+    @Test
+    public void testCreateUsersWithArray() throws Exception {
+        final User user1 = createUser();
+        user1.setUsername("abc123");
+        User user2 = createUser();
+        user2.setUsername("123abc");
+
+        api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2})).subscribe(SkeletonSubscriber.failTestOnError());
+
+        api.getUserByName(user1.getUsername()).subscribe(new SkeletonSubscriber<User>() {
+            @Override
+            public void onNext(User fetched) {
+                assertEquals(user1.getId(), fetched.getId());
+            }
+        });
+    }
+
+    @Test
+    public void testCreateUsersWithList() throws Exception {
+        final User user1 = createUser();
+        user1.setUsername("abc123");
+        User user2 = createUser();
+        user2.setUsername("123abc");
+
+        api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2})).subscribe(SkeletonSubscriber.failTestOnError());
+
+        api.getUserByName(user1.getUsername()).subscribe(new SkeletonSubscriber<User>() {
+            @Override
+            public void onNext(User fetched) {
+                assertEquals(user1.getId(), fetched.getId());
+            }
+        });
+    }
+
+    @Test
+    public void testLoginUser() throws Exception {
+        User user = createUser();
+        api.createUser(user);
+
+        api.loginUser(user.getUsername(), user.getPassword()).subscribe(new SkeletonSubscriber<String>() {
+            @Override
+            public void onNext(String token) {
+                assertTrue(token.startsWith("logged in user session:"));
+            }
+        });
+    }
+
+    @Test
+    public void logoutUser() throws Exception {
+        api.logoutUser();
+    }
+
+    private User createUser() {
+        User user = new User();
+        user.setId(System.currentTimeMillis());
+        user.setUsername("fred");
+        user.setFirstName("Fred");
+        user.setLastName("Meyer");
+        user.setEmail("fred@fredmeyer.com");
+        user.setPassword("xxXXxx");
+        user.setPhone("408-867-5309");
+        user.setUserStatus(123);
+
+        return user;
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/javascript-closure-angular/.gitignore b/samples/client/petstore/javascript-closure-angular/.gitignore
new file mode 100644
index 00000000000..ea9d108fa3e
--- /dev/null
+++ b/samples/client/petstore/javascript-closure-angular/.gitignore
@@ -0,0 +1,2 @@
+*.compiled.js
+node_modules
diff --git a/samples/client/petstore/javascript-closure-angular/API/Client/Category.js b/samples/client/petstore/javascript-closure-angular/API/Client/Category.js
new file mode 100644
index 00000000000..fe9d23c34ff
--- /dev/null
+++ b/samples/client/petstore/javascript-closure-angular/API/Client/Category.js
@@ -0,0 +1,19 @@
+goog.provide('API.Client.Category');
+
+/**
+ * @record
+ */
+API.Client.Category = function() {}
+
+/**
+ * @type {!number}
+ * @export
+ */
+API.Client.Category.prototype.id;
+
+/**
+ * @type {!string}
+ * @export
+ */
+API.Client.Category.prototype.name;
+
diff --git a/samples/client/petstore/javascript-closure-angular/API/Client/Order.js b/samples/client/petstore/javascript-closure-angular/API/Client/Order.js
new file mode 100644
index 00000000000..c4ec23a066a
--- /dev/null
+++ b/samples/client/petstore/javascript-closure-angular/API/Client/Order.js
@@ -0,0 +1,50 @@
+goog.provide('API.Client.Order');
+
+/**
+ * @record
+ */
+API.Client.Order = function() {}
+
+/**
+ * @type {!number}
+ * @export
+ */
+API.Client.Order.prototype.id;
+
+/**
+ * @type {!number}
+ * @export
+ */
+API.Client.Order.prototype.petId;
+
+/**
+ * @type {!number}
+ * @export
+ */
+API.Client.Order.prototype.quantity;
+
+/**
+ * @type {!Date}
+ * @export
+ */
+API.Client.Order.prototype.shipDate;
+
+/**
+ * Order Status
+ * @type {!string}
+ * @export
+ */
+API.Client.Order.prototype.status;
+
+/**
+ * @type {!boolean}
+ * @export
+ */
+API.Client.Order.prototype.complete;
+
+/** @enum {string} */
+API.Client.Order.StatusEnum = { 
+  placed: 'placed',
+  approved: 'approved',
+  delivered: 'delivered',
+}
diff --git a/samples/client/petstore/javascript-closure-angular/API/Client/Pet.js b/samples/client/petstore/javascript-closure-angular/API/Client/Pet.js
new file mode 100644
index 00000000000..2c734557b64
--- /dev/null
+++ b/samples/client/petstore/javascript-closure-angular/API/Client/Pet.js
@@ -0,0 +1,50 @@
+goog.provide('API.Client.Pet');
+
+/**
+ * @record
+ */
+API.Client.Pet = function() {}
+
+/**
+ * @type {!number}
+ * @export
+ */
+API.Client.Pet.prototype.id;
+
+/**
+ * @type {!API.Client.Category}
+ * @export
+ */
+API.Client.Pet.prototype.category;
+
+/**
+ * @type {!string}
+ * @export
+ */
+API.Client.Pet.prototype.name;
+
+/**
+ * @type {!Array<!string>}
+ * @export
+ */
+API.Client.Pet.prototype.photoUrls;
+
+/**
+ * @type {!Array<!API.Client.Tag>}
+ * @export
+ */
+API.Client.Pet.prototype.tags;
+
+/**
+ * pet status in the store
+ * @type {!string}
+ * @export
+ */
+API.Client.Pet.prototype.status;
+
+/** @enum {string} */
+API.Client.Pet.StatusEnum = { 
+  available: 'available',
+  pending: 'pending',
+  sold: 'sold',
+}
diff --git a/samples/client/petstore/javascript-closure-angular/API/Client/PetApi.js b/samples/client/petstore/javascript-closure-angular/API/Client/PetApi.js
new file mode 100644
index 00000000000..e39dcfc7e24
--- /dev/null
+++ b/samples/client/petstore/javascript-closure-angular/API/Client/PetApi.js
@@ -0,0 +1,448 @@
+/**
+ * @fileoverview AUTOMATICALLY GENERATED service for API.Client.PetApi.
+ * Do not edit this file by hand or your changes will be lost next time it is
+ * generated.
+ *
+ * This is a sample server Petstore server.  You can find out more about Swagger at &lt;a href=\&quot;http://swagger.io\&quot;&gt;http://swagger.io&lt;/a&gt; or on irc.freenode.net, #swagger.  For this sample, you can use the api key \&quot;special-key\&quot; to test the authorization filters
+ * Version: 1.0.0
+ * Generated at: 2016-02-02T00:45:38.616-07:00
+ * Generated by: class io.swagger.codegen.languages.JavascriptClosureAngularClientCodegen
+ */
+/**
+ * @license Apache 2.0
+ * http://www.apache.org/licenses/LICENSE-2.0.html
+ */
+
+goog.provide('API.Client.PetApi');
+
+goog.require('API.Client.Pet');
+
+/**
+ * @constructor
+ * @param {!angular.$http} $http
+ * @param {!Object} $httpParamSerializer
+ * @param {!angular.$injector} $injector
+ * @struct
+ */
+API.Client.PetApi = function($http, $httpParamSerializer, $injector) {
+  /** @private {!string} */
+  this.basePath_ = $injector.has('PetApiBasePath') ?
+                   /** @type {!string} */ ($injector.get('PetApiBasePath')) :
+                   'http://petstore.swagger.io/v2';
+
+  /** @private {!Object<string, string>} */
+  this.defaultHeaders_ = $injector.has('PetApiDefaultHeaders') ?
+                   /** @type {!Object<string, string>} */ (
+                       $injector.get('PetApiDefaultHeaders')) :
+                   {};
+
+  /** @private {!angular.$http} */
+  this.http_ = $http;
+
+  /** @private {!Object} */
+  this.httpParamSerializer_ = $injector.get('$httpParamSerializer');
+}
+API.Client.PetApi.$inject = ['$http', '$httpParamSerializer', '$injector'];
+
+/**
+ * Update an existing pet
+ * 
+ * @param {!Pet=} opt_body Pet object that needs to be added to the store
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise}
+ */
+API.Client.PetApi.prototype.updatePet = function(opt_body, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/pet';
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'PUT',
+    url: path,
+    json: true,
+    data: opt_body,
+    
+    
+    params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Add a new pet to the store
+ * 
+ * @param {!Pet=} opt_body Pet object that needs to be added to the store
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise}
+ */
+API.Client.PetApi.prototype.addPet = function(opt_body, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/pet';
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'POST',
+    url: path,
+    json: true,
+    data: opt_body,
+    
+    
+    params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Finds Pets by status
+ * Multiple status values can be provided with comma seperated strings
+ * @param {!Array<!string>=} opt_status Status values that need to be considered for filter
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise<!Array<!API.Client.Pet>>}
+ */
+API.Client.PetApi.prototype.findPetsByStatus = function(opt_status, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/pet/findByStatus';
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  if (opt_status !== undefined) {
+    queryParameters['status'] = opt_status;
+  }
+
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'GET',
+    url: path,
+    json: true,
+    
+    
+    params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Finds Pets by tags
+ * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+ * @param {!Array<!string>=} opt_tags Tags to filter by
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise<!Array<!API.Client.Pet>>}
+ */
+API.Client.PetApi.prototype.findPetsByTags = function(opt_tags, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/pet/findByTags';
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  if (opt_tags !== undefined) {
+    queryParameters['tags'] = opt_tags;
+  }
+
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'GET',
+    url: path,
+    json: true,
+    
+    
+    params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Find pet by ID
+ * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+ * @param {!number} petId ID of pet that needs to be fetched
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise<!API.Client.Pet>}
+ */
+API.Client.PetApi.prototype.getPetById = function(petId, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/pet/{petId}'
+      .replace('{' + 'petId' + '}', String(petId));
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  // verify required parameter 'petId' is set
+  if (!petId) {
+    throw new Error('Missing required parameter petId when calling getPetById');
+  }
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'GET',
+    url: path,
+    json: true,
+    
+    
+    params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Updates a pet in the store with form data
+ * 
+ * @param {!string} petId ID of pet that needs to be updated
+ * @param {!string=} opt_name Updated name of the pet
+ * @param {!string=} opt_status Updated status of the pet
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise}
+ */
+API.Client.PetApi.prototype.updatePetWithForm = function(petId, opt_name, opt_status, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/pet/{petId}'
+      .replace('{' + 'petId' + '}', String(petId));
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  /** @type {!Object} */
+  var formParams = {};
+
+  // verify required parameter 'petId' is set
+  if (!petId) {
+    throw new Error('Missing required parameter petId when calling updatePetWithForm');
+  }
+  headerParams['Content-Type'] = 'application/x-www-form-urlencoded';
+
+  formParams['name'] = opt_name;
+
+  formParams['status'] = opt_status;
+
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'POST',
+    url: path,
+    json: false,
+    
+    data: this.httpParamSerializer_(formParams),
+    
+    params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Deletes a pet
+ * 
+ * @param {!number} petId Pet id to delete
+ * @param {!string=} opt_apiKey 
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise}
+ */
+API.Client.PetApi.prototype.deletePet = function(petId, opt_apiKey, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/pet/{petId}'
+      .replace('{' + 'petId' + '}', String(petId));
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  // verify required parameter 'petId' is set
+  if (!petId) {
+    throw new Error('Missing required parameter petId when calling deletePet');
+  }
+  headerParams['api_key'] = opt_apiKey;
+
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'DELETE',
+    url: path,
+    json: true,
+    
+    
+    params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * uploads an image
+ * 
+ * @param {!number} petId ID of pet to update
+ * @param {!string=} opt_additionalMetadata Additional data to pass to server
+ * @param {!Object=} opt_file file to upload
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise}
+ */
+API.Client.PetApi.prototype.uploadFile = function(petId, opt_additionalMetadata, opt_file, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/pet/{petId}/uploadImage'
+      .replace('{' + 'petId' + '}', String(petId));
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  /** @type {!Object} */
+  var formParams = {};
+
+  // verify required parameter 'petId' is set
+  if (!petId) {
+    throw new Error('Missing required parameter petId when calling uploadFile');
+  }
+  headerParams['Content-Type'] = 'application/x-www-form-urlencoded';
+
+  formParams['additionalMetadata'] = opt_additionalMetadata;
+
+  formParams['file'] = opt_file;
+
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'POST',
+    url: path,
+    json: false,
+    
+    data: this.httpParamSerializer_(formParams),
+    
+    params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+ * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+ * @param {!number} petId ID of pet that needs to be fetched
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise<!string>}
+ */
+API.Client.PetApi.prototype.getPetByIdWithByteArray = function(petId, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/pet/{petId}?testing_byte_array=true'
+      .replace('{' + 'petId' + '}', String(petId));
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  // verify required parameter 'petId' is set
+  if (!petId) {
+    throw new Error('Missing required parameter petId when calling getPetByIdWithByteArray');
+  }
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'GET',
+    url: path,
+    json: true,
+    
+    
+    params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Fake endpoint to test byte array in body parameter for adding a new pet to the store
+ * 
+ * @param {!string=} opt_body Pet object in the form of byte array
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise}
+ */
+API.Client.PetApi.prototype.addPetUsingByteArray = function(opt_body, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/pet?testing_byte_array=true';
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'POST',
+    url: path,
+    json: true,
+    data: opt_body,
+    
+    
+    params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
diff --git a/samples/client/petstore/javascript-closure-angular/API/Client/StoreApi.js b/samples/client/petstore/javascript-closure-angular/API/Client/StoreApi.js
new file mode 100644
index 00000000000..f312b7b20ce
--- /dev/null
+++ b/samples/client/petstore/javascript-closure-angular/API/Client/StoreApi.js
@@ -0,0 +1,191 @@
+/**
+ * @fileoverview AUTOMATICALLY GENERATED service for API.Client.StoreApi.
+ * Do not edit this file by hand or your changes will be lost next time it is
+ * generated.
+ *
+ * This is a sample server Petstore server.  You can find out more about Swagger at &lt;a href=\&quot;http://swagger.io\&quot;&gt;http://swagger.io&lt;/a&gt; or on irc.freenode.net, #swagger.  For this sample, you can use the api key \&quot;special-key\&quot; to test the authorization filters
+ * Version: 1.0.0
+ * Generated at: 2016-02-02T00:45:38.616-07:00
+ * Generated by: class io.swagger.codegen.languages.JavascriptClosureAngularClientCodegen
+ */
+/**
+ * @license Apache 2.0
+ * http://www.apache.org/licenses/LICENSE-2.0.html
+ */
+
+goog.provide('API.Client.StoreApi');
+
+goog.require('API.Client.Order');
+
+/**
+ * @constructor
+ * @param {!angular.$http} $http
+ * @param {!Object} $httpParamSerializer
+ * @param {!angular.$injector} $injector
+ * @struct
+ */
+API.Client.StoreApi = function($http, $httpParamSerializer, $injector) {
+  /** @private {!string} */
+  this.basePath_ = $injector.has('StoreApiBasePath') ?
+                   /** @type {!string} */ ($injector.get('StoreApiBasePath')) :
+                   'http://petstore.swagger.io/v2';
+
+  /** @private {!Object<string, string>} */
+  this.defaultHeaders_ = $injector.has('StoreApiDefaultHeaders') ?
+                   /** @type {!Object<string, string>} */ (
+                       $injector.get('StoreApiDefaultHeaders')) :
+                   {};
+
+  /** @private {!angular.$http} */
+  this.http_ = $http;
+
+  /** @private {!Object} */
+  this.httpParamSerializer_ = $injector.get('$httpParamSerializer');
+}
+API.Client.StoreApi.$inject = ['$http', '$httpParamSerializer', '$injector'];
+
+/**
+ * Returns pet inventories by status
+ * Returns a map of status codes to quantities
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise<!Object<!string, number>>}
+ */
+API.Client.StoreApi.prototype.getInventory = function(opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/store/inventory';
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'GET',
+    url: path,
+    json: true,
+    
+    
+    params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Place an order for a pet
+ * 
+ * @param {!Order=} opt_body order placed for purchasing the pet
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise<!API.Client.Order>}
+ */
+API.Client.StoreApi.prototype.placeOrder = function(opt_body, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/store/order';
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'POST',
+    url: path,
+    json: true,
+    data: opt_body,
+    
+    
+    params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Find purchase order by ID
+ * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+ * @param {!string} orderId ID of pet that needs to be fetched
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise<!API.Client.Order>}
+ */
+API.Client.StoreApi.prototype.getOrderById = function(orderId, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/store/order/{orderId}'
+      .replace('{' + 'orderId' + '}', String(orderId));
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  // verify required parameter 'orderId' is set
+  if (!orderId) {
+    throw new Error('Missing required parameter orderId when calling getOrderById');
+  }
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'GET',
+    url: path,
+    json: true,
+    
+    
+    params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Delete purchase order by ID
+ * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+ * @param {!string} orderId ID of the order that needs to be deleted
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise}
+ */
+API.Client.StoreApi.prototype.deleteOrder = function(orderId, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/store/order/{orderId}'
+      .replace('{' + 'orderId' + '}', String(orderId));
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  // verify required parameter 'orderId' is set
+  if (!orderId) {
+    throw new Error('Missing required parameter orderId when calling deleteOrder');
+  }
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'DELETE',
+    url: path,
+    json: true,
+    
+    
+    params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
diff --git a/samples/client/petstore/javascript-closure-angular/API/Client/Tag.js b/samples/client/petstore/javascript-closure-angular/API/Client/Tag.js
new file mode 100644
index 00000000000..a65ee4658c8
--- /dev/null
+++ b/samples/client/petstore/javascript-closure-angular/API/Client/Tag.js
@@ -0,0 +1,19 @@
+goog.provide('API.Client.Tag');
+
+/**
+ * @record
+ */
+API.Client.Tag = function() {}
+
+/**
+ * @type {!number}
+ * @export
+ */
+API.Client.Tag.prototype.id;
+
+/**
+ * @type {!string}
+ * @export
+ */
+API.Client.Tag.prototype.name;
+
diff --git a/samples/client/petstore/javascript-closure-angular/API/Client/User.js b/samples/client/petstore/javascript-closure-angular/API/Client/User.js
new file mode 100644
index 00000000000..332c98a8028
--- /dev/null
+++ b/samples/client/petstore/javascript-closure-angular/API/Client/User.js
@@ -0,0 +1,56 @@
+goog.provide('API.Client.User');
+
+/**
+ * @record
+ */
+API.Client.User = function() {}
+
+/**
+ * @type {!number}
+ * @export
+ */
+API.Client.User.prototype.id;
+
+/**
+ * @type {!string}
+ * @export
+ */
+API.Client.User.prototype.username;
+
+/**
+ * @type {!string}
+ * @export
+ */
+API.Client.User.prototype.firstName;
+
+/**
+ * @type {!string}
+ * @export
+ */
+API.Client.User.prototype.lastName;
+
+/**
+ * @type {!string}
+ * @export
+ */
+API.Client.User.prototype.email;
+
+/**
+ * @type {!string}
+ * @export
+ */
+API.Client.User.prototype.password;
+
+/**
+ * @type {!string}
+ * @export
+ */
+API.Client.User.prototype.phone;
+
+/**
+ * User Status
+ * @type {!number}
+ * @export
+ */
+API.Client.User.prototype.userStatus;
+
diff --git a/samples/client/petstore/javascript-closure-angular/API/Client/UserApi.js b/samples/client/petstore/javascript-closure-angular/API/Client/UserApi.js
new file mode 100644
index 00000000000..4c97786fa9f
--- /dev/null
+++ b/samples/client/petstore/javascript-closure-angular/API/Client/UserApi.js
@@ -0,0 +1,345 @@
+/**
+ * @fileoverview AUTOMATICALLY GENERATED service for API.Client.UserApi.
+ * Do not edit this file by hand or your changes will be lost next time it is
+ * generated.
+ *
+ * This is a sample server Petstore server.  You can find out more about Swagger at &lt;a href=\&quot;http://swagger.io\&quot;&gt;http://swagger.io&lt;/a&gt; or on irc.freenode.net, #swagger.  For this sample, you can use the api key \&quot;special-key\&quot; to test the authorization filters
+ * Version: 1.0.0
+ * Generated at: 2016-02-02T00:45:38.616-07:00
+ * Generated by: class io.swagger.codegen.languages.JavascriptClosureAngularClientCodegen
+ */
+/**
+ * @license Apache 2.0
+ * http://www.apache.org/licenses/LICENSE-2.0.html
+ */
+
+goog.provide('API.Client.UserApi');
+
+goog.require('API.Client.User');
+
+/**
+ * @constructor
+ * @param {!angular.$http} $http
+ * @param {!Object} $httpParamSerializer
+ * @param {!angular.$injector} $injector
+ * @struct
+ */
+API.Client.UserApi = function($http, $httpParamSerializer, $injector) {
+  /** @private {!string} */
+  this.basePath_ = $injector.has('UserApiBasePath') ?
+                   /** @type {!string} */ ($injector.get('UserApiBasePath')) :
+                   'http://petstore.swagger.io/v2';
+
+  /** @private {!Object<string, string>} */
+  this.defaultHeaders_ = $injector.has('UserApiDefaultHeaders') ?
+                   /** @type {!Object<string, string>} */ (
+                       $injector.get('UserApiDefaultHeaders')) :
+                   {};
+
+  /** @private {!angular.$http} */
+  this.http_ = $http;
+
+  /** @private {!Object} */
+  this.httpParamSerializer_ = $injector.get('$httpParamSerializer');
+}
+API.Client.UserApi.$inject = ['$http', '$httpParamSerializer', '$injector'];
+
+/**
+ * Create user
+ * This can only be done by the logged in user.
+ * @param {!User=} opt_body Created user object
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise}
+ */
+API.Client.UserApi.prototype.createUser = function(opt_body, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/user';
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'POST',
+    url: path,
+    json: true,
+    data: opt_body,
+    
+    
+    params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Creates list of users with given input array
+ * 
+ * @param {!Array<!API.Client.User>=} opt_body List of user object
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise}
+ */
+API.Client.UserApi.prototype.createUsersWithArrayInput = function(opt_body, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/user/createWithArray';
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'POST',
+    url: path,
+    json: true,
+    data: opt_body,
+    
+    
+    params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Creates list of users with given input array
+ * 
+ * @param {!Array<!API.Client.User>=} opt_body List of user object
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise}
+ */
+API.Client.UserApi.prototype.createUsersWithListInput = function(opt_body, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/user/createWithList';
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'POST',
+    url: path,
+    json: true,
+    data: opt_body,
+    
+    
+    params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Logs user into the system
+ * 
+ * @param {!string=} opt_username The user name for login
+ * @param {!string=} opt_password The password for login in clear text
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise<!string>}
+ */
+API.Client.UserApi.prototype.loginUser = function(opt_username, opt_password, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/user/login';
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  if (opt_username !== undefined) {
+    queryParameters['username'] = opt_username;
+  }
+
+  if (opt_password !== undefined) {
+    queryParameters['password'] = opt_password;
+  }
+
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'GET',
+    url: path,
+    json: true,
+    
+    
+    params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Logs out current logged in user session
+ * 
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise}
+ */
+API.Client.UserApi.prototype.logoutUser = function(opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/user/logout';
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'GET',
+    url: path,
+    json: true,
+    
+    
+    params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Get user by user name
+ * 
+ * @param {!string} username The name that needs to be fetched. Use user1 for testing.
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise<!API.Client.User>}
+ */
+API.Client.UserApi.prototype.getUserByName = function(username, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/user/{username}'
+      .replace('{' + 'username' + '}', String(username));
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  // verify required parameter 'username' is set
+  if (!username) {
+    throw new Error('Missing required parameter username when calling getUserByName');
+  }
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'GET',
+    url: path,
+    json: true,
+    
+    
+    params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Updated user
+ * This can only be done by the logged in user.
+ * @param {!string} username name that need to be deleted
+ * @param {!User=} opt_body Updated user object
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise}
+ */
+API.Client.UserApi.prototype.updateUser = function(username, opt_body, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/user/{username}'
+      .replace('{' + 'username' + '}', String(username));
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  // verify required parameter 'username' is set
+  if (!username) {
+    throw new Error('Missing required parameter username when calling updateUser');
+  }
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'PUT',
+    url: path,
+    json: true,
+    data: opt_body,
+    
+    
+    params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Delete user
+ * This can only be done by the logged in user.
+ * @param {!string} username The name that needs to be deleted
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise}
+ */
+API.Client.UserApi.prototype.deleteUser = function(username, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/user/{username}'
+      .replace('{' + 'username' + '}', String(username));
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  // verify required parameter 'username' is set
+  if (!username) {
+    throw new Error('Missing required parameter username when calling deleteUser');
+  }
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'DELETE',
+    url: path,
+    json: true,
+    
+    
+    params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
diff --git a/samples/client/petstore/javascript-closure-angular/compile.py b/samples/client/petstore/javascript-closure-angular/compile.py
new file mode 100755
index 00000000000..2797a6f3456
--- /dev/null
+++ b/samples/client/petstore/javascript-closure-angular/compile.py
@@ -0,0 +1,63 @@
+#!/usr/bin/python
+
+import httplib, urllib, sys
+
+# Collect all the files in an order that will work. That is Models first then APIs
+def concatFiles(files):
+    code = ""
+    for file in files:
+        code += open(file).read()
+    return code
+
+def makeRequest(params):
+    # Always use the following value for the Content-type header.
+    headers = { "Content-type": "application/x-www-form-urlencoded" }
+    conn = httplib.HTTPConnection('closure-compiler.appspot.com')
+    conn.request('POST', '/compile', params, headers)
+    response = conn.getresponse()
+    data = response.read()
+    conn.close()
+    return data
+
+def checkForCompilerErrors(files):
+    params = urllib.urlencode([
+        ('js_code', concatFiles(files)),
+        ('compilation_level', 'SIMPLE_OPTIMIZATIONS'),
+        ('language', 'ECMASCRIPT5_STRICT'),
+        ('output_format', 'text'),
+        ('output_info', 'errors'),
+      ])
+
+    return makeRequest(params)
+
+def compile(output, files):
+    params = urllib.urlencode([
+        ('js_code', concatFiles(files)),
+        ('compilation_level', 'SIMPLE_OPTIMIZATIONS'),
+        ('language', 'ECMASCRIPT5_STRICT'),
+        ('output_format', 'text'),
+        ('output_info', 'compiled_code'),
+      ])
+
+    f = open(output, 'w')
+    f.write(makeRequest(params))
+    f.close()
+
+targets = {
+    "PetAPI": ["API/Client/Tag.js", "API/Client/Category.js", "API/Client/Pet.js", "API/Client/PetApi.js"],
+    "StoreAPI": ["API/Client/Order.js", "API/Client/StoreApi.js"],
+    "UserAPI": ["API/Client/User.js", "API/Client/UserApi.js"],
+}
+
+def main():
+    for name, targetFiles in targets.iteritems():
+        errors = checkForCompilerErrors(targetFiles)
+        if errors:
+            print "Compiler errors when building %s" % name
+            print errors
+
+    for name, targetFiles in targets.iteritems():
+        compile("%s.compiled.js" % name, targets[name])
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/samples/client/petstore/javascript-closure-angular/karma.conf.js b/samples/client/petstore/javascript-closure-angular/karma.conf.js
new file mode 100644
index 00000000000..b3994e2a309
--- /dev/null
+++ b/samples/client/petstore/javascript-closure-angular/karma.conf.js
@@ -0,0 +1,78 @@
+// Karma configuration
+// Generated on Tue Feb 02 2016 00:09:34 GMT-0700 (MST)
+
+module.exports = function(config) {
+  config.set({
+
+    // base path, that will be used to resolve files and exclude
+    basePath: '',
+
+
+    // frameworks to use
+    frameworks: ['jasmine', 'closure'],
+
+
+    // list of files / patterns to load in the browser
+    files: [
+      'node_modules/angular/angular.js',
+      'node_modules/angular-mocks/angular-mocks.js',
+      {pattern: 'lib/**/*.js', included: true},
+      {pattern: 'API/**/*.js', included: false},
+      {pattern: 'test/**/*.js'},
+    ],
+
+    preprocessors: {
+      // tests are preprocessed for dependencies (closure)
+      'test/**/*.js': ['closure', 'closure-iit'],
+      // source files are preprocessed for dependencies
+      'API/**/*.js': ['closure'],
+      // external deps
+      'lib/goog/deps.js': ['closure-deps']
+    },
+
+    // list of files to exclude
+    exclude: [],
+
+
+    // test results reporter to use
+    // possible values: 'dots', 'progress', 'junit', 'growl', 'coverage'
+    reporters: ['dots'],
+
+
+    // web server port
+    port: 9876,
+
+
+    // enable / disable colors in the output (reporters and logs)
+    colors: true,
+
+
+    // level of logging
+    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+    logLevel: config.LOG_INFO,
+
+
+    // enable / disable watching file and executing tests whenever any file changes
+    autoWatch: true,
+
+
+    // Start these browsers, currently available:
+    // - Chrome
+    // - ChromeCanary
+    // - Firefox
+    // - Opera (has to be installed with `npm install karma-opera-launcher`)
+    // - Safari (only Mac; has to be installed with `npm install karma-safari-launcher`)
+    // - PhantomJS
+    // - IE (only Windows; has to be installed with `npm install karma-ie-launcher`)
+    browsers: ['PhantomJS'],
+
+
+    // If browser does not capture in given timeout [ms], kill it
+    captureTimeout: 60000,
+
+
+    // Continuous Integration mode
+    // if true, it capture browsers, run tests and exit
+    singleRun: false
+  });
+};
diff --git a/samples/client/petstore/javascript-closure-angular/lib/goog/base.js b/samples/client/petstore/javascript-closure-angular/lib/goog/base.js
new file mode 100644
index 00000000000..58674377024
--- /dev/null
+++ b/samples/client/petstore/javascript-closure-angular/lib/goog/base.js
@@ -0,0 +1,1548 @@
+// Copyright 2006 The Closure Library Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS-IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/**
+ * @fileoverview Bootstrap for the Google JS Library (Closure).
+ *
+ * In uncompiled mode base.js will write out Closure's deps file, unless the
+ * global <code>CLOSURE_NO_DEPS</code> is set to true.  This allows projects to
+ * include their own deps file(s) from different locations.
+ *
+ *
+ * @provideGoog
+ */
+
+
+/**
+ * @define {boolean} Overridden to true by the compiler when --closure_pass
+ *     or --mark_as_compiled is specified.
+ */
+var COMPILED = false;
+
+
+/**
+ * Base namespace for the Closure library.  Checks to see goog is
+ * already defined in the current scope before assigning to prevent
+ * clobbering if base.js is loaded more than once.
+ *
+ * @const
+ */
+var goog = goog || {}; // Identifies this file as the Closure base.
+
+
+/**
+ * Reference to the global context.  In most cases this will be 'window'.
+ */
+goog.global = this;
+
+
+/**
+ * @define {boolean} DEBUG is provided as a convenience so that debugging code
+ * that should not be included in a production js_binary can be easily stripped
+ * by specifying --define goog.DEBUG=false to the JSCompiler. For example, most
+ * toString() methods should be declared inside an "if (goog.DEBUG)" conditional
+ * because they are generally used for debugging purposes and it is difficult
+ * for the JSCompiler to statically determine whether they are used.
+ */
+goog.DEBUG = true;
+
+
+/**
+ * @define {string} LOCALE defines the locale being used for compilation. It is
+ * used to select locale specific data to be compiled in js binary. BUILD rule
+ * can specify this value by "--define goog.LOCALE=<locale_name>" as JSCompiler
+ * option.
+ *
+ * Take into account that the locale code format is important. You should use
+ * the canonical Unicode format with hyphen as a delimiter. Language must be
+ * lowercase, Language Script - Capitalized, Region - UPPERCASE.
+ * There are few examples: pt-BR, en, en-US, sr-Latin-BO, zh-Hans-CN.
+ *
+ * See more info about locale codes here:
+ * http://www.unicode.org/reports/tr35/#Unicode_Language_and_Locale_Identifiers
+ *
+ * For language codes you should use values defined by ISO 693-1. See it here
+ * http://www.w3.org/WAI/ER/IG/ert/iso639.htm. There is only one exception from
+ * this rule: the Hebrew language. For legacy reasons the old code (iw) should
+ * be used instead of the new code (he), see http://wiki/Main/IIISynonyms.
+ */
+goog.LOCALE = 'en';  // default to en
+
+
+/**
+ * @define {boolean} Whether this code is running on trusted sites.
+ *
+ * On untrusted sites, several native functions can be defined or overridden by
+ * external libraries like Prototype, Datejs, and JQuery and setting this flag
+ * to false forces closure to use its own implementations when possible.
+ *
+ * If your javascript can be loaded by a third party site and you are wary about
+ * relying on non-standard implementations, specify
+ * "--define goog.TRUSTED_SITE=false" to the JSCompiler.
+ */
+goog.TRUSTED_SITE = true;
+
+
+/**
+ * Creates object stubs for a namespace.  The presence of one or more
+ * goog.provide() calls indicate that the file defines the given
+ * objects/namespaces.  Build tools also scan for provide/require statements
+ * to discern dependencies, build dependency files (see deps.js), etc.
+ * @see goog.require
+ * @param {string} name Namespace provided by this file in the form
+ *     "goog.package.part".
+ */
+goog.provide = function(name) {
+  if (!COMPILED) {
+    // Ensure that the same namespace isn't provided twice. This is intended
+    // to teach new developers that 'goog.provide' is effectively a variable
+    // declaration. And when JSCompiler transforms goog.provide into a real
+    // variable declaration, the compiled JS should work the same as the raw
+    // JS--even when the raw JS uses goog.provide incorrectly.
+    if (goog.isProvided_(name)) {
+      throw Error('Namespace "' + name + '" already declared.');
+    }
+    delete goog.implicitNamespaces_[name];
+
+    var namespace = name;
+    while ((namespace = namespace.substring(0, namespace.lastIndexOf('.')))) {
+      if (goog.getObjectByName(namespace)) {
+        break;
+      }
+      goog.implicitNamespaces_[namespace] = true;
+    }
+  }
+
+  goog.exportPath_(name);
+};
+
+
+/**
+ * Marks that the current file should only be used for testing, and never for
+ * live code in production.
+ * @param {string=} opt_message Optional message to add to the error that's
+ *     raised when used in production code.
+ */
+goog.setTestOnly = function(opt_message) {
+  if (COMPILED && !goog.DEBUG) {
+    opt_message = opt_message || '';
+    throw Error('Importing test-only code into non-debug environment' +
+                opt_message ? ': ' + opt_message : '.');
+  }
+};
+
+
+if (!COMPILED) {
+
+  /**
+   * Check if the given name has been goog.provided. This will return false for
+   * names that are available only as implicit namespaces.
+   * @param {string} name name of the object to look for.
+   * @return {boolean} Whether the name has been provided.
+   * @private
+   */
+  goog.isProvided_ = function(name) {
+    return !goog.implicitNamespaces_[name] && !!goog.getObjectByName(name);
+  };
+
+  /**
+   * Namespaces implicitly defined by goog.provide. For example,
+   * goog.provide('goog.events.Event') implicitly declares
+   * that 'goog' and 'goog.events' must be namespaces.
+   *
+   * @type {Object}
+   * @private
+   */
+  goog.implicitNamespaces_ = {};
+}
+
+
+/**
+ * Builds an object structure for the provided namespace path,
+ * ensuring that names that already exist are not overwritten. For
+ * example:
+ * "a.b.c" -> a = {};a.b={};a.b.c={};
+ * Used by goog.provide and goog.exportSymbol.
+ * @param {string} name name of the object that this file defines.
+ * @param {*=} opt_object the object to expose at the end of the path.
+ * @param {Object=} opt_objectToExportTo The object to add the path to; default
+ *     is |goog.global|.
+ * @private
+ */
+goog.exportPath_ = function(name, opt_object, opt_objectToExportTo) {
+  var parts = name.split('.');
+  var cur = opt_objectToExportTo || goog.global;
+
+  // Internet Explorer exhibits strange behavior when throwing errors from
+  // methods externed in this manner.  See the testExportSymbolExceptions in
+  // base_test.html for an example.
+  if (!(parts[0] in cur) && cur.execScript) {
+    cur.execScript('var ' + parts[0]);
+  }
+
+  // Certain browsers cannot parse code in the form for((a in b); c;);
+  // This pattern is produced by the JSCompiler when it collapses the
+  // statement above into the conditional loop below. To prevent this from
+  // happening, use a for-loop and reserve the init logic as below.
+
+  // Parentheses added to eliminate strict JS warning in Firefox.
+  for (var part; parts.length && (part = parts.shift());) {
+    if (!parts.length && goog.isDef(opt_object)) {
+      // last part and we have an object; use it
+      cur[part] = opt_object;
+    } else if (cur[part]) {
+      cur = cur[part];
+    } else {
+      cur = cur[part] = {};
+    }
+  }
+};
+
+
+/**
+ * Returns an object based on its fully qualified external name.  If you are
+ * using a compilation pass that renames property names beware that using this
+ * function will not find renamed properties.
+ *
+ * @param {string} name The fully qualified name.
+ * @param {Object=} opt_obj The object within which to look; default is
+ *     |goog.global|.
+ * @return {?} The value (object or primitive) or, if not found, null.
+ */
+goog.getObjectByName = function(name, opt_obj) {
+  var parts = name.split('.');
+  var cur = opt_obj || goog.global;
+  for (var part; part = parts.shift(); ) {
+    if (goog.isDefAndNotNull(cur[part])) {
+      cur = cur[part];
+    } else {
+      return null;
+    }
+  }
+  return cur;
+};
+
+
+/**
+ * Globalizes a whole namespace, such as goog or goog.lang.
+ *
+ * @param {Object} obj The namespace to globalize.
+ * @param {Object=} opt_global The object to add the properties to.
+ * @deprecated Properties may be explicitly exported to the global scope, but
+ *     this should no longer be done in bulk.
+ */
+goog.globalize = function(obj, opt_global) {
+  var global = opt_global || goog.global;
+  for (var x in obj) {
+    global[x] = obj[x];
+  }
+};
+
+
+/**
+ * Adds a dependency from a file to the files it requires.
+ * @param {string} relPath The path to the js file.
+ * @param {Array} provides An array of strings with the names of the objects
+ *                         this file provides.
+ * @param {Array} requires An array of strings with the names of the objects
+ *                         this file requires.
+ */
+goog.addDependency = function(relPath, provides, requires) {
+  if (!COMPILED) {
+    var provide, require;
+    var path = relPath.replace(/\\/g, '/');
+    var deps = goog.dependencies_;
+    for (var i = 0; provide = provides[i]; i++) {
+      deps.nameToPath[provide] = path;
+      if (!(path in deps.pathToNames)) {
+        deps.pathToNames[path] = {};
+      }
+      deps.pathToNames[path][provide] = true;
+    }
+    for (var j = 0; require = requires[j]; j++) {
+      if (!(path in deps.requires)) {
+        deps.requires[path] = {};
+      }
+      deps.requires[path][require] = true;
+    }
+  }
+};
+
+
+
+
+// NOTE(nnaze): The debug DOM loader was included in base.js as an orignal
+// way to do "debug-mode" development.  The dependency system can sometimes
+// be confusing, as can the debug DOM loader's asyncronous nature.
+//
+// With the DOM loader, a call to goog.require() is not blocking -- the
+// script will not load until some point after the current script.  If a
+// namespace is needed at runtime, it needs to be defined in a previous
+// script, or loaded via require() with its registered dependencies.
+// User-defined namespaces may need their own deps file.  See http://go/js_deps,
+// http://go/genjsdeps, or, externally, DepsWriter.
+// http://code.google.com/closure/library/docs/depswriter.html
+//
+// Because of legacy clients, the DOM loader can't be easily removed from
+// base.js.  Work is being done to make it disableable or replaceable for
+// different environments (DOM-less JavaScript interpreters like Rhino or V8,
+// for example). See bootstrap/ for more information.
+
+
+/**
+ * @define {boolean} Whether to enable the debug loader.
+ *
+ * If enabled, a call to goog.require() will attempt to load the namespace by
+ * appending a script tag to the DOM (if the namespace has been registered).
+ *
+ * If disabled, goog.require() will simply assert that the namespace has been
+ * provided (and depend on the fact that some outside tool correctly ordered
+ * the script).
+ */
+goog.ENABLE_DEBUG_LOADER = true;
+
+
+/**
+ * Implements a system for the dynamic resolution of dependencies
+ * that works in parallel with the BUILD system. Note that all calls
+ * to goog.require will be stripped by the JSCompiler when the
+ * --closure_pass option is used.
+ * @see goog.provide
+ * @param {string} name Namespace to include (as was given in goog.provide())
+ *     in the form "goog.package.part".
+ */
+goog.require = function(name) {
+
+  // if the object already exists we do not need do do anything
+  // TODO(arv): If we start to support require based on file name this has
+  //            to change
+  // TODO(arv): If we allow goog.foo.* this has to change
+  // TODO(arv): If we implement dynamic load after page load we should probably
+  //            not remove this code for the compiled output
+  if (!COMPILED) {
+    if (goog.isProvided_(name)) {
+      return;
+    }
+
+    if (goog.ENABLE_DEBUG_LOADER) {
+      var path = goog.getPathFromDeps_(name);
+      if (path) {
+        goog.included_[path] = true;
+        goog.writeScripts_();
+        return;
+      }
+    }
+
+    var errorMessage = 'goog.require could not find: ' + name;
+    if (goog.global.console) {
+      goog.global.console['error'](errorMessage);
+    }
+
+
+      throw Error(errorMessage);
+
+  }
+};
+
+
+/**
+ * Path for included scripts
+ * @type {string}
+ */
+goog.basePath = '';
+
+
+/**
+ * A hook for overriding the base path.
+ * @type {string|undefined}
+ */
+goog.global.CLOSURE_BASE_PATH;
+
+
+/**
+ * Whether to write out Closure's deps file. By default,
+ * the deps are written.
+ * @type {boolean|undefined}
+ */
+goog.global.CLOSURE_NO_DEPS;
+
+
+/**
+ * A function to import a single script. This is meant to be overridden when
+ * Closure is being run in non-HTML contexts, such as web workers. It's defined
+ * in the global scope so that it can be set before base.js is loaded, which
+ * allows deps.js to be imported properly.
+ *
+ * The function is passed the script source, which is a relative URI. It should
+ * return true if the script was imported, false otherwise.
+ */
+goog.global.CLOSURE_IMPORT_SCRIPT;
+
+
+/**
+ * Null function used for default values of callbacks, etc.
+ * @return {void} Nothing.
+ */
+goog.nullFunction = function() {};
+
+
+/**
+ * The identity function. Returns its first argument.
+ *
+ * @param {*=} opt_returnValue The single value that will be returned.
+ * @param {...*} var_args Optional trailing arguments. These are ignored.
+ * @return {?} The first argument. We can't know the type -- just pass it along
+ *      without type.
+ * @deprecated Use goog.functions.identity instead.
+ */
+goog.identityFunction = function(opt_returnValue, var_args) {
+  return opt_returnValue;
+};
+
+
+/**
+ * When defining a class Foo with an abstract method bar(), you can do:
+ *
+ * Foo.prototype.bar = goog.abstractMethod
+ *
+ * Now if a subclass of Foo fails to override bar(), an error
+ * will be thrown when bar() is invoked.
+ *
+ * Note: This does not take the name of the function to override as
+ * an argument because that would make it more difficult to obfuscate
+ * our JavaScript code.
+ *
+ * @type {!Function}
+ * @throws {Error} when invoked to indicate the method should be
+ *   overridden.
+ */
+goog.abstractMethod = function() {
+  throw Error('unimplemented abstract method');
+};
+
+
+/**
+ * Adds a {@code getInstance} static method that always return the same instance
+ * object.
+ * @param {!Function} ctor The constructor for the class to add the static
+ *     method to.
+ */
+goog.addSingletonGetter = function(ctor) {
+  ctor.getInstance = function() {
+    if (ctor.instance_) {
+      return ctor.instance_;
+    }
+    if (goog.DEBUG) {
+      // NOTE: JSCompiler can't optimize away Array#push.
+      goog.instantiatedSingletons_[goog.instantiatedSingletons_.length] = ctor;
+    }
+    return ctor.instance_ = new ctor;
+  };
+};
+
+
+/**
+ * All singleton classes that have been instantiated, for testing. Don't read
+ * it directly, use the {@code goog.testing.singleton} module. The compiler
+ * removes this variable if unused.
+ * @type {!Array.<!Function>}
+ * @private
+ */
+goog.instantiatedSingletons_ = [];
+
+
+if (!COMPILED && goog.ENABLE_DEBUG_LOADER) {
+  /**
+   * Object used to keep track of urls that have already been added. This
+   * record allows the prevention of circular dependencies.
+   * @type {Object}
+   * @private
+   */
+  goog.included_ = {};
+
+
+  /**
+   * This object is used to keep track of dependencies and other data that is
+   * used for loading scripts
+   * @private
+   * @type {Object}
+   */
+  goog.dependencies_ = {
+    pathToNames: {}, // 1 to many
+    nameToPath: {}, // 1 to 1
+    requires: {}, // 1 to many
+    // used when resolving dependencies to prevent us from
+    // visiting the file twice
+    visited: {},
+    written: {} // used to keep track of script files we have written
+  };
+
+
+  /**
+   * Tries to detect whether is in the context of an HTML document.
+   * @return {boolean} True if it looks like HTML document.
+   * @private
+   */
+  goog.inHtmlDocument_ = function() {
+    var doc = goog.global.document;
+    return typeof doc != 'undefined' &&
+           'write' in doc;  // XULDocument misses write.
+  };
+
+
+  /**
+   * Tries to detect the base path of the base.js script that bootstraps Closure
+   * @private
+   */
+  goog.findBasePath_ = function() {
+    if (goog.global.CLOSURE_BASE_PATH) {
+      goog.basePath = goog.global.CLOSURE_BASE_PATH;
+      return;
+    } else if (!goog.inHtmlDocument_()) {
+      return;
+    }
+    var doc = goog.global.document;
+    var scripts = doc.getElementsByTagName('script');
+    // Search backwards since the current script is in almost all cases the one
+    // that has base.js.
+    for (var i = scripts.length - 1; i >= 0; --i) {
+      var src = scripts[i].src;
+      var qmark = src.lastIndexOf('?');
+      var l = qmark == -1 ? src.length : qmark;
+      if (src.substr(l - 7, 7) == 'base.js') {
+        goog.basePath = src.substr(0, l - 7);
+        return;
+      }
+    }
+  };
+
+
+  /**
+   * Imports a script if, and only if, that script hasn't already been imported.
+   * (Must be called at execution time)
+   * @param {string} src Script source.
+   * @private
+   */
+  goog.importScript_ = function(src) {
+    var importScript = goog.global.CLOSURE_IMPORT_SCRIPT ||
+        goog.writeScriptTag_;
+    if (!goog.dependencies_.written[src] && importScript(src)) {
+      goog.dependencies_.written[src] = true;
+    }
+  };
+
+
+  /**
+   * The default implementation of the import function. Writes a script tag to
+   * import the script.
+   *
+   * @param {string} src The script source.
+   * @return {boolean} True if the script was imported, false otherwise.
+   * @private
+   */
+  goog.writeScriptTag_ = function(src) {
+    if (goog.inHtmlDocument_()) {
+      var doc = goog.global.document;
+
+      // If the user tries to require a new symbol after document load,
+      // something has gone terribly wrong. Doing a document.write would
+      // wipe out the page.
+      if (doc.readyState == 'complete') {
+        // Certain test frameworks load base.js multiple times, which tries
+        // to write deps.js each time. If that happens, just fail silently.
+        // These frameworks wipe the page between each load of base.js, so this
+        // is OK.
+        var isDeps = /\bdeps.js$/.test(src);
+        if (isDeps) {
+          return false;
+        } else {
+          throw Error('Cannot write "' + src + '" after document load');
+        }
+      }
+
+      doc.write(
+          '<script type="text/javascript" src="' + src + '"></' + 'script>');
+      return true;
+    } else {
+      return false;
+    }
+  };
+
+
+  /**
+   * Resolves dependencies based on the dependencies added using addDependency
+   * and calls importScript_ in the correct order.
+   * @private
+   */
+  goog.writeScripts_ = function() {
+    // the scripts we need to write this time
+    var scripts = [];
+    var seenScript = {};
+    var deps = goog.dependencies_;
+
+    function visitNode(path) {
+      if (path in deps.written) {
+        return;
+      }
+
+      // we have already visited this one. We can get here if we have cyclic
+      // dependencies
+      if (path in deps.visited) {
+        if (!(path in seenScript)) {
+          seenScript[path] = true;
+          scripts.push(path);
+        }
+        return;
+      }
+
+      deps.visited[path] = true;
+
+      if (path in deps.requires) {
+        for (var requireName in deps.requires[path]) {
+          // If the required name is defined, we assume that it was already
+          // bootstrapped by other means.
+          if (!goog.isProvided_(requireName)) {
+            if (requireName in deps.nameToPath) {
+              visitNode(deps.nameToPath[requireName]);
+            } else {
+              throw Error('Undefined nameToPath for ' + requireName);
+            }
+          }
+        }
+      }
+
+      if (!(path in seenScript)) {
+        seenScript[path] = true;
+        scripts.push(path);
+      }
+    }
+
+    for (var path in goog.included_) {
+      if (!deps.written[path]) {
+        visitNode(path);
+      }
+    }
+
+    for (var i = 0; i < scripts.length; i++) {
+      if (scripts[i]) {
+        goog.importScript_(goog.basePath + scripts[i]);
+      } else {
+        throw Error('Undefined script input');
+      }
+    }
+  };
+
+
+  /**
+   * Looks at the dependency rules and tries to determine the script file that
+   * fulfills a particular rule.
+   * @param {string} rule In the form goog.namespace.Class or project.script.
+   * @return {?string} Url corresponding to the rule, or null.
+   * @private
+   */
+  goog.getPathFromDeps_ = function(rule) {
+    if (rule in goog.dependencies_.nameToPath) {
+      return goog.dependencies_.nameToPath[rule];
+    } else {
+      return null;
+    }
+  };
+
+  goog.findBasePath_();
+
+  // Allow projects to manage the deps files themselves.
+  if (!goog.global.CLOSURE_NO_DEPS) {
+    goog.importScript_(goog.basePath + 'deps.js');
+  }
+}
+
+
+
+//==============================================================================
+// Language Enhancements
+//==============================================================================
+
+
+/**
+ * This is a "fixed" version of the typeof operator.  It differs from the typeof
+ * operator in such a way that null returns 'null' and arrays return 'array'.
+ * @param {*} value The value to get the type of.
+ * @return {string} The name of the type.
+ */
+goog.typeOf = function(value) {
+  var s = typeof value;
+  if (s == 'object') {
+    if (value) {
+      // Check these first, so we can avoid calling Object.prototype.toString if
+      // possible.
+      //
+      // IE improperly marshals tyepof across execution contexts, but a
+      // cross-context object will still return false for "instanceof Object".
+      if (value instanceof Array) {
+        return 'array';
+      } else if (value instanceof Object) {
+        return s;
+      }
+
+      // HACK: In order to use an Object prototype method on the arbitrary
+      //   value, the compiler requires the value be cast to type Object,
+      //   even though the ECMA spec explicitly allows it.
+      var className = Object.prototype.toString.call(
+          /** @type {Object} */ (value));
+      // In Firefox 3.6, attempting to access iframe window objects' length
+      // property throws an NS_ERROR_FAILURE, so we need to special-case it
+      // here.
+      if (className == '[object Window]') {
+        return 'object';
+      }
+
+      // We cannot always use constructor == Array or instanceof Array because
+      // different frames have different Array objects. In IE6, if the iframe
+      // where the array was created is destroyed, the array loses its
+      // prototype. Then dereferencing val.splice here throws an exception, so
+      // we can't use goog.isFunction. Calling typeof directly returns 'unknown'
+      // so that will work. In this case, this function will return false and
+      // most array functions will still work because the array is still
+      // array-like (supports length and []) even though it has lost its
+      // prototype.
+      // Mark Miller noticed that Object.prototype.toString
+      // allows access to the unforgeable [[Class]] property.
+      //  15.2.4.2 Object.prototype.toString ( )
+      //  When the toString method is called, the following steps are taken:
+      //      1. Get the [[Class]] property of this object.
+      //      2. Compute a string value by concatenating the three strings
+      //         "[object ", Result(1), and "]".
+      //      3. Return Result(2).
+      // and this behavior survives the destruction of the execution context.
+      if ((className == '[object Array]' ||
+           // In IE all non value types are wrapped as objects across window
+           // boundaries (not iframe though) so we have to do object detection
+           // for this edge case
+           typeof value.length == 'number' &&
+           typeof value.splice != 'undefined' &&
+           typeof value.propertyIsEnumerable != 'undefined' &&
+           !value.propertyIsEnumerable('splice')
+
+          )) {
+        return 'array';
+      }
+      // HACK: There is still an array case that fails.
+      //     function ArrayImpostor() {}
+      //     ArrayImpostor.prototype = [];
+      //     var impostor = new ArrayImpostor;
+      // this can be fixed by getting rid of the fast path
+      // (value instanceof Array) and solely relying on
+      // (value && Object.prototype.toString.vall(value) === '[object Array]')
+      // but that would require many more function calls and is not warranted
+      // unless closure code is receiving objects from untrusted sources.
+
+      // IE in cross-window calls does not correctly marshal the function type
+      // (it appears just as an object) so we cannot use just typeof val ==
+      // 'function'. However, if the object has a call property, it is a
+      // function.
+      if ((className == '[object Function]' ||
+          typeof value.call != 'undefined' &&
+          typeof value.propertyIsEnumerable != 'undefined' &&
+          !value.propertyIsEnumerable('call'))) {
+        return 'function';
+      }
+
+
+    } else {
+      return 'null';
+    }
+
+  } else if (s == 'function' && typeof value.call == 'undefined') {
+    // In Safari typeof nodeList returns 'function', and on Firefox
+    // typeof behaves similarly for HTML{Applet,Embed,Object}Elements
+    // and RegExps.  We would like to return object for those and we can
+    // detect an invalid function by making sure that the function
+    // object has a call method.
+    return 'object';
+  }
+  return s;
+};
+
+
+/**
+ * Returns true if the specified value is not |undefined|.
+ * WARNING: Do not use this to test if an object has a property. Use the in
+ * operator instead.  Additionally, this function assumes that the global
+ * undefined variable has not been redefined.
+ * @param {*} val Variable to test.
+ * @return {boolean} Whether variable is defined.
+ */
+goog.isDef = function(val) {
+  return val !== undefined;
+};
+
+
+/**
+ * Returns true if the specified value is |null|
+ * @param {*} val Variable to test.
+ * @return {boolean} Whether variable is null.
+ */
+goog.isNull = function(val) {
+  return val === null;
+};
+
+
+/**
+ * Returns true if the specified value is defined and not null
+ * @param {*} val Variable to test.
+ * @return {boolean} Whether variable is defined and not null.
+ */
+goog.isDefAndNotNull = function(val) {
+  // Note that undefined == null.
+  return val != null;
+};
+
+
+/**
+ * Returns true if the specified value is an array
+ * @param {*} val Variable to test.
+ * @return {boolean} Whether variable is an array.
+ */
+goog.isArray = function(val) {
+  return goog.typeOf(val) == 'array';
+};
+
+
+/**
+ * Returns true if the object looks like an array. To qualify as array like
+ * the value needs to be either a NodeList or an object with a Number length
+ * property.
+ * @param {*} val Variable to test.
+ * @return {boolean} Whether variable is an array.
+ */
+goog.isArrayLike = function(val) {
+  var type = goog.typeOf(val);
+  return type == 'array' || type == 'object' && typeof val.length == 'number';
+};
+
+
+/**
+ * Returns true if the object looks like a Date. To qualify as Date-like
+ * the value needs to be an object and have a getFullYear() function.
+ * @param {*} val Variable to test.
+ * @return {boolean} Whether variable is a like a Date.
+ */
+goog.isDateLike = function(val) {
+  return goog.isObject(val) && typeof val.getFullYear == 'function';
+};
+
+
+/**
+ * Returns true if the specified value is a string
+ * @param {*} val Variable to test.
+ * @return {boolean} Whether variable is a string.
+ */
+goog.isString = function(val) {
+  return typeof val == 'string';
+};
+
+
+/**
+ * Returns true if the specified value is a boolean
+ * @param {*} val Variable to test.
+ * @return {boolean} Whether variable is boolean.
+ */
+goog.isBoolean = function(val) {
+  return typeof val == 'boolean';
+};
+
+
+/**
+ * Returns true if the specified value is a number
+ * @param {*} val Variable to test.
+ * @return {boolean} Whether variable is a number.
+ */
+goog.isNumber = function(val) {
+  return typeof val == 'number';
+};
+
+
+/**
+ * Returns true if the specified value is a function
+ * @param {*} val Variable to test.
+ * @return {boolean} Whether variable is a function.
+ */
+goog.isFunction = function(val) {
+  return goog.typeOf(val) == 'function';
+};
+
+
+/**
+ * Returns true if the specified value is an object.  This includes arrays
+ * and functions.
+ * @param {*} val Variable to test.
+ * @return {boolean} Whether variable is an object.
+ */
+goog.isObject = function(val) {
+  var type = typeof val;
+  return type == 'object' && val != null || type == 'function';
+  // return Object(val) === val also works, but is slower, especially if val is
+  // not an object.
+};
+
+
+/**
+ * Gets a unique ID for an object. This mutates the object so that further
+ * calls with the same object as a parameter returns the same value. The unique
+ * ID is guaranteed to be unique across the current session amongst objects that
+ * are passed into {@code getUid}. There is no guarantee that the ID is unique
+ * or consistent across sessions. It is unsafe to generate unique ID for
+ * function prototypes.
+ *
+ * @param {Object} obj The object to get the unique ID for.
+ * @return {number} The unique ID for the object.
+ */
+goog.getUid = function(obj) {
+  // TODO(arv): Make the type stricter, do not accept null.
+
+  // In Opera window.hasOwnProperty exists but always returns false so we avoid
+  // using it. As a consequence the unique ID generated for BaseClass.prototype
+  // and SubClass.prototype will be the same.
+  return obj[goog.UID_PROPERTY_] ||
+      (obj[goog.UID_PROPERTY_] = ++goog.uidCounter_);
+};
+
+
+/**
+ * Removes the unique ID from an object. This is useful if the object was
+ * previously mutated using {@code goog.getUid} in which case the mutation is
+ * undone.
+ * @param {Object} obj The object to remove the unique ID field from.
+ */
+goog.removeUid = function(obj) {
+  // TODO(arv): Make the type stricter, do not accept null.
+
+  // DOM nodes in IE are not instance of Object and throws exception
+  // for delete. Instead we try to use removeAttribute
+  if ('removeAttribute' in obj) {
+    obj.removeAttribute(goog.UID_PROPERTY_);
+  }
+  /** @preserveTry */
+  try {
+    delete obj[goog.UID_PROPERTY_];
+  } catch (ex) {
+  }
+};
+
+
+/**
+ * Name for unique ID property. Initialized in a way to help avoid collisions
+ * with other closure javascript on the same page.
+ * @type {string}
+ * @private
+ */
+goog.UID_PROPERTY_ = 'closure_uid_' + ((Math.random() * 1e9) >>> 0);
+
+
+/**
+ * Counter for UID.
+ * @type {number}
+ * @private
+ */
+goog.uidCounter_ = 0;
+
+
+/**
+ * Adds a hash code field to an object. The hash code is unique for the
+ * given object.
+ * @param {Object} obj The object to get the hash code for.
+ * @return {number} The hash code for the object.
+ * @deprecated Use goog.getUid instead.
+ */
+goog.getHashCode = goog.getUid;
+
+
+/**
+ * Removes the hash code field from an object.
+ * @param {Object} obj The object to remove the field from.
+ * @deprecated Use goog.removeUid instead.
+ */
+goog.removeHashCode = goog.removeUid;
+
+
+/**
+ * Clones a value. The input may be an Object, Array, or basic type. Objects and
+ * arrays will be cloned recursively.
+ *
+ * WARNINGS:
+ * <code>goog.cloneObject</code> does not detect reference loops. Objects that
+ * refer to themselves will cause infinite recursion.
+ *
+ * <code>goog.cloneObject</code> is unaware of unique identifiers, and copies
+ * UIDs created by <code>getUid</code> into cloned results.
+ *
+ * @param {*} obj The value to clone.
+ * @return {*} A clone of the input value.
+ * @deprecated goog.cloneObject is unsafe. Prefer the goog.object methods.
+ */
+goog.cloneObject = function(obj) {
+  var type = goog.typeOf(obj);
+  if (type == 'object' || type == 'array') {
+    if (obj.clone) {
+      return obj.clone();
+    }
+    var clone = type == 'array' ? [] : {};
+    for (var key in obj) {
+      clone[key] = goog.cloneObject(obj[key]);
+    }
+    return clone;
+  }
+
+  return obj;
+};
+
+
+/**
+ * A native implementation of goog.bind.
+ * @param {Function} fn A function to partially apply.
+ * @param {Object|undefined} selfObj Specifies the object which |this| should
+ *     point to when the function is run.
+ * @param {...*} var_args Additional arguments that are partially
+ *     applied to the function.
+ * @return {!Function} A partially-applied form of the function bind() was
+ *     invoked as a method of.
+ * @private
+ * @suppress {deprecated} The compiler thinks that Function.prototype.bind
+ *     is deprecated because some people have declared a pure-JS version.
+ *     Only the pure-JS version is truly deprecated.
+ */
+goog.bindNative_ = function(fn, selfObj, var_args) {
+  return /** @type {!Function} */ (fn.call.apply(fn.bind, arguments));
+};
+
+
+/**
+ * A pure-JS implementation of goog.bind.
+ * @param {Function} fn A function to partially apply.
+ * @param {Object|undefined} selfObj Specifies the object which |this| should
+ *     point to when the function is run.
+ * @param {...*} var_args Additional arguments that are partially
+ *     applied to the function.
+ * @return {!Function} A partially-applied form of the function bind() was
+ *     invoked as a method of.
+ * @private
+ */
+goog.bindJs_ = function(fn, selfObj, var_args) {
+  if (!fn) {
+    throw new Error();
+  }
+
+  if (arguments.length > 2) {
+    var boundArgs = Array.prototype.slice.call(arguments, 2);
+    return function() {
+      // Prepend the bound arguments to the current arguments.
+      var newArgs = Array.prototype.slice.call(arguments);
+      Array.prototype.unshift.apply(newArgs, boundArgs);
+      return fn.apply(selfObj, newArgs);
+    };
+
+  } else {
+    return function() {
+      return fn.apply(selfObj, arguments);
+    };
+  }
+};
+
+
+/**
+ * Partially applies this function to a particular 'this object' and zero or
+ * more arguments. The result is a new function with some arguments of the first
+ * function pre-filled and the value of |this| 'pre-specified'.<br><br>
+ *
+ * Remaining arguments specified at call-time are appended to the pre-
+ * specified ones.<br><br>
+ *
+ * Also see: {@link #partial}.<br><br>
+ *
+ * Usage:
+ * <pre>var barMethBound = bind(myFunction, myObj, 'arg1', 'arg2');
+ * barMethBound('arg3', 'arg4');</pre>
+ *
+ * @param {Function} fn A function to partially apply.
+ * @param {Object|undefined} selfObj Specifies the object which |this| should
+ *     point to when the function is run.
+ * @param {...*} var_args Additional arguments that are partially
+ *     applied to the function.
+ * @return {!Function} A partially-applied form of the function bind() was
+ *     invoked as a method of.
+ * @suppress {deprecated} See above.
+ */
+goog.bind = function(fn, selfObj, var_args) {
+  // TODO(nicksantos): narrow the type signature.
+  if (Function.prototype.bind &&
+      // NOTE(nicksantos): Somebody pulled base.js into the default
+      // Chrome extension environment. This means that for Chrome extensions,
+      // they get the implementation of Function.prototype.bind that
+      // calls goog.bind instead of the native one. Even worse, we don't want
+      // to introduce a circular dependency between goog.bind and
+      // Function.prototype.bind, so we have to hack this to make sure it
+      // works correctly.
+      Function.prototype.bind.toString().indexOf('native code') != -1) {
+    goog.bind = goog.bindNative_;
+  } else {
+    goog.bind = goog.bindJs_;
+  }
+  return goog.bind.apply(null, arguments);
+};
+
+
+/**
+ * Like bind(), except that a 'this object' is not required. Useful when the
+ * target function is already bound.
+ *
+ * Usage:
+ * var g = partial(f, arg1, arg2);
+ * g(arg3, arg4);
+ *
+ * @param {Function} fn A function to partially apply.
+ * @param {...*} var_args Additional arguments that are partially
+ *     applied to fn.
+ * @return {!Function} A partially-applied form of the function bind() was
+ *     invoked as a method of.
+ */
+goog.partial = function(fn, var_args) {
+  var args = Array.prototype.slice.call(arguments, 1);
+  return function() {
+    // Prepend the bound arguments to the current arguments.
+    var newArgs = Array.prototype.slice.call(arguments);
+    newArgs.unshift.apply(newArgs, args);
+    return fn.apply(this, newArgs);
+  };
+};
+
+
+/**
+ * Copies all the members of a source object to a target object. This method
+ * does not work on all browsers for all objects that contain keys such as
+ * toString or hasOwnProperty. Use goog.object.extend for this purpose.
+ * @param {Object} target Target.
+ * @param {Object} source Source.
+ */
+goog.mixin = function(target, source) {
+  for (var x in source) {
+    target[x] = source[x];
+  }
+
+  // For IE7 or lower, the for-in-loop does not contain any properties that are
+  // not enumerable on the prototype object (for example, isPrototypeOf from
+  // Object.prototype) but also it will not include 'replace' on objects that
+  // extend String and change 'replace' (not that it is common for anyone to
+  // extend anything except Object).
+};
+
+
+/**
+ * @return {number} An integer value representing the number of milliseconds
+ *     between midnight, January 1, 1970 and the current time.
+ */
+goog.now = (goog.TRUSTED_SITE && Date.now) || (function() {
+  // Unary plus operator converts its operand to a number which in the case of
+  // a date is done by calling getTime().
+  return +new Date();
+});
+
+
+/**
+ * Evals javascript in the global scope.  In IE this uses execScript, other
+ * browsers use goog.global.eval. If goog.global.eval does not evaluate in the
+ * global scope (for example, in Safari), appends a script tag instead.
+ * Throws an exception if neither execScript or eval is defined.
+ * @param {string} script JavaScript string.
+ */
+goog.globalEval = function(script) {
+  if (goog.global.execScript) {
+    goog.global.execScript(script, 'JavaScript');
+  } else if (goog.global.eval) {
+    // Test to see if eval works
+    if (goog.evalWorksForGlobals_ == null) {
+      goog.global.eval('var _et_ = 1;');
+      if (typeof goog.global['_et_'] != 'undefined') {
+        delete goog.global['_et_'];
+        goog.evalWorksForGlobals_ = true;
+      } else {
+        goog.evalWorksForGlobals_ = false;
+      }
+    }
+
+    if (goog.evalWorksForGlobals_) {
+      goog.global.eval(script);
+    } else {
+      var doc = goog.global.document;
+      var scriptElt = doc.createElement('script');
+      scriptElt.type = 'text/javascript';
+      scriptElt.defer = false;
+      // Note(user): can't use .innerHTML since "t('<test>')" will fail and
+      // .text doesn't work in Safari 2.  Therefore we append a text node.
+      scriptElt.appendChild(doc.createTextNode(script));
+      doc.body.appendChild(scriptElt);
+      doc.body.removeChild(scriptElt);
+    }
+  } else {
+    throw Error('goog.globalEval not available');
+  }
+};
+
+
+/**
+ * Indicates whether or not we can call 'eval' directly to eval code in the
+ * global scope. Set to a Boolean by the first call to goog.globalEval (which
+ * empirically tests whether eval works for globals). @see goog.globalEval
+ * @type {?boolean}
+ * @private
+ */
+goog.evalWorksForGlobals_ = null;
+
+
+/**
+ * Optional map of CSS class names to obfuscated names used with
+ * goog.getCssName().
+ * @type {Object|undefined}
+ * @private
+ * @see goog.setCssNameMapping
+ */
+goog.cssNameMapping_;
+
+
+/**
+ * Optional obfuscation style for CSS class names. Should be set to either
+ * 'BY_WHOLE' or 'BY_PART' if defined.
+ * @type {string|undefined}
+ * @private
+ * @see goog.setCssNameMapping
+ */
+goog.cssNameMappingStyle_;
+
+
+/**
+ * Handles strings that are intended to be used as CSS class names.
+ *
+ * This function works in tandem with @see goog.setCssNameMapping.
+ *
+ * Without any mapping set, the arguments are simple joined with a
+ * hyphen and passed through unaltered.
+ *
+ * When there is a mapping, there are two possible styles in which
+ * these mappings are used. In the BY_PART style, each part (i.e. in
+ * between hyphens) of the passed in css name is rewritten according
+ * to the map. In the BY_WHOLE style, the full css name is looked up in
+ * the map directly. If a rewrite is not specified by the map, the
+ * compiler will output a warning.
+ *
+ * When the mapping is passed to the compiler, it will replace calls
+ * to goog.getCssName with the strings from the mapping, e.g.
+ *     var x = goog.getCssName('foo');
+ *     var y = goog.getCssName(this.baseClass, 'active');
+ *  becomes:
+ *     var x= 'foo';
+ *     var y = this.baseClass + '-active';
+ *
+ * If one argument is passed it will be processed, if two are passed
+ * only the modifier will be processed, as it is assumed the first
+ * argument was generated as a result of calling goog.getCssName.
+ *
+ * @param {string} className The class name.
+ * @param {string=} opt_modifier A modifier to be appended to the class name.
+ * @return {string} The class name or the concatenation of the class name and
+ *     the modifier.
+ */
+goog.getCssName = function(className, opt_modifier) {
+  var getMapping = function(cssName) {
+    return goog.cssNameMapping_[cssName] || cssName;
+  };
+
+  var renameByParts = function(cssName) {
+    // Remap all the parts individually.
+    var parts = cssName.split('-');
+    var mapped = [];
+    for (var i = 0; i < parts.length; i++) {
+      mapped.push(getMapping(parts[i]));
+    }
+    return mapped.join('-');
+  };
+
+  var rename;
+  if (goog.cssNameMapping_) {
+    rename = goog.cssNameMappingStyle_ == 'BY_WHOLE' ?
+        getMapping : renameByParts;
+  } else {
+    rename = function(a) {
+      return a;
+    };
+  }
+
+  if (opt_modifier) {
+    return className + '-' + rename(opt_modifier);
+  } else {
+    return rename(className);
+  }
+};
+
+
+/**
+ * Sets the map to check when returning a value from goog.getCssName(). Example:
+ * <pre>
+ * goog.setCssNameMapping({
+ *   "goog": "a",
+ *   "disabled": "b",
+ * });
+ *
+ * var x = goog.getCssName('goog');
+ * // The following evaluates to: "a a-b".
+ * goog.getCssName('goog') + ' ' + goog.getCssName(x, 'disabled')
+ * </pre>
+ * When declared as a map of string literals to string literals, the JSCompiler
+ * will replace all calls to goog.getCssName() using the supplied map if the
+ * --closure_pass flag is set.
+ *
+ * @param {!Object} mapping A map of strings to strings where keys are possible
+ *     arguments to goog.getCssName() and values are the corresponding values
+ *     that should be returned.
+ * @param {string=} opt_style The style of css name mapping. There are two valid
+ *     options: 'BY_PART', and 'BY_WHOLE'.
+ * @see goog.getCssName for a description.
+ */
+goog.setCssNameMapping = function(mapping, opt_style) {
+  goog.cssNameMapping_ = mapping;
+  goog.cssNameMappingStyle_ = opt_style;
+};
+
+
+/**
+ * To use CSS renaming in compiled mode, one of the input files should have a
+ * call to goog.setCssNameMapping() with an object literal that the JSCompiler
+ * can extract and use to replace all calls to goog.getCssName(). In uncompiled
+ * mode, JavaScript code should be loaded before this base.js file that declares
+ * a global variable, CLOSURE_CSS_NAME_MAPPING, which is used below. This is
+ * to ensure that the mapping is loaded before any calls to goog.getCssName()
+ * are made in uncompiled mode.
+ *
+ * A hook for overriding the CSS name mapping.
+ * @type {Object|undefined}
+ */
+goog.global.CLOSURE_CSS_NAME_MAPPING;
+
+
+if (!COMPILED && goog.global.CLOSURE_CSS_NAME_MAPPING) {
+  // This does not call goog.setCssNameMapping() because the JSCompiler
+  // requires that goog.setCssNameMapping() be called with an object literal.
+  goog.cssNameMapping_ = goog.global.CLOSURE_CSS_NAME_MAPPING;
+}
+
+
+/**
+ * Gets a localized message.
+ *
+ * This function is a compiler primitive. If you give the compiler a localized
+ * message bundle, it will replace the string at compile-time with a localized
+ * version, and expand goog.getMsg call to a concatenated string.
+ *
+ * Messages must be initialized in the form:
+ * <code>
+ * var MSG_NAME = goog.getMsg('Hello {$placeholder}', {'placeholder': 'world'});
+ * </code>
+ *
+ * @param {string} str Translatable string, places holders in the form {$foo}.
+ * @param {Object=} opt_values Map of place holder name to value.
+ * @return {string} message with placeholders filled.
+ */
+goog.getMsg = function(str, opt_values) {
+  var values = opt_values || {};
+  for (var key in values) {
+    var value = ('' + values[key]).replace(/\$/g, '$$$$');
+    str = str.replace(new RegExp('\\{\\$' + key + '\\}', 'gi'), value);
+  }
+  return str;
+};
+
+
+/**
+ * Gets a localized message. If the message does not have a translation, gives a
+ * fallback message.
+ *
+ * This is useful when introducing a new message that has not yet been
+ * translated into all languages.
+ *
+ * This function is a compiler primtive. Must be used in the form:
+ * <code>var x = goog.getMsgWithFallback(MSG_A, MSG_B);</code>
+ * where MSG_A and MSG_B were initialized with goog.getMsg.
+ *
+ * @param {string} a The preferred message.
+ * @param {string} b The fallback message.
+ * @return {string} The best translated message.
+ */
+goog.getMsgWithFallback = function(a, b) {
+  return a;
+};
+
+
+/**
+ * Exposes an unobfuscated global namespace path for the given object.
+ * Note that fields of the exported object *will* be obfuscated,
+ * unless they are exported in turn via this function or
+ * goog.exportProperty
+ *
+ * <p>Also handy for making public items that are defined in anonymous
+ * closures.
+ *
+ * ex. goog.exportSymbol('public.path.Foo', Foo);
+ *
+ * ex. goog.exportSymbol('public.path.Foo.staticFunction',
+ *                       Foo.staticFunction);
+ *     public.path.Foo.staticFunction();
+ *
+ * ex. goog.exportSymbol('public.path.Foo.prototype.myMethod',
+ *                       Foo.prototype.myMethod);
+ *     new public.path.Foo().myMethod();
+ *
+ * @param {string} publicPath Unobfuscated name to export.
+ * @param {*} object Object the name should point to.
+ * @param {Object=} opt_objectToExportTo The object to add the path to; default
+ *     is |goog.global|.
+ */
+goog.exportSymbol = function(publicPath, object, opt_objectToExportTo) {
+  goog.exportPath_(publicPath, object, opt_objectToExportTo);
+};
+
+
+/**
+ * Exports a property unobfuscated into the object's namespace.
+ * ex. goog.exportProperty(Foo, 'staticFunction', Foo.staticFunction);
+ * ex. goog.exportProperty(Foo.prototype, 'myMethod', Foo.prototype.myMethod);
+ * @param {Object} object Object whose static property is being exported.
+ * @param {string} publicName Unobfuscated name to export.
+ * @param {*} symbol Object the name should point to.
+ */
+goog.exportProperty = function(object, publicName, symbol) {
+  object[publicName] = symbol;
+};
+
+
+/**
+ * Inherit the prototype methods from one constructor into another.
+ *
+ * Usage:
+ * <pre>
+ * function ParentClass(a, b) { }
+ * ParentClass.prototype.foo = function(a) { }
+ *
+ * function ChildClass(a, b, c) {
+ *   goog.base(this, a, b);
+ * }
+ * goog.inherits(ChildClass, ParentClass);
+ *
+ * var child = new ChildClass('a', 'b', 'see');
+ * child.foo(); // works
+ * </pre>
+ *
+ * In addition, a superclass' implementation of a method can be invoked
+ * as follows:
+ *
+ * <pre>
+ * ChildClass.prototype.foo = function(a) {
+ *   ChildClass.superClass_.foo.call(this, a);
+ *   // other code
+ * };
+ * </pre>
+ *
+ * @param {Function} childCtor Child class.
+ * @param {Function} parentCtor Parent class.
+ */
+goog.inherits = function(childCtor, parentCtor) {
+  /** @constructor */
+  function tempCtor() {};
+  tempCtor.prototype = parentCtor.prototype;
+  childCtor.superClass_ = parentCtor.prototype;
+  childCtor.prototype = new tempCtor();
+  /** @override */
+  childCtor.prototype.constructor = childCtor;
+};
+
+
+/**
+ * Call up to the superclass.
+ *
+ * If this is called from a constructor, then this calls the superclass
+ * contructor with arguments 1-N.
+ *
+ * If this is called from a prototype method, then you must pass
+ * the name of the method as the second argument to this function. If
+ * you do not, you will get a runtime error. This calls the superclass'
+ * method with arguments 2-N.
+ *
+ * This function only works if you use goog.inherits to express
+ * inheritance relationships between your classes.
+ *
+ * This function is a compiler primitive. At compile-time, the
+ * compiler will do macro expansion to remove a lot of
+ * the extra overhead that this function introduces. The compiler
+ * will also enforce a lot of the assumptions that this function
+ * makes, and treat it as a compiler error if you break them.
+ *
+ * @param {!Object} me Should always be "this".
+ * @param {*=} opt_methodName The method name if calling a super method.
+ * @param {...*} var_args The rest of the arguments.
+ * @return {*} The return value of the superclass method.
+ */
+goog.base = function(me, opt_methodName, var_args) {
+  var caller = arguments.callee.caller;
+  if (caller.superClass_) {
+    // This is a constructor. Call the superclass constructor.
+    return caller.superClass_.constructor.apply(
+        me, Array.prototype.slice.call(arguments, 1));
+  }
+
+  var args = Array.prototype.slice.call(arguments, 2);
+  var foundCaller = false;
+  for (var ctor = me.constructor;
+       ctor; ctor = ctor.superClass_ && ctor.superClass_.constructor) {
+    if (ctor.prototype[opt_methodName] === caller) {
+      foundCaller = true;
+    } else if (foundCaller) {
+      return ctor.prototype[opt_methodName].apply(me, args);
+    }
+  }
+
+  // If we did not find the caller in the prototype chain,
+  // then one of two things happened:
+  // 1) The caller is an instance method.
+  // 2) This method was not called by the right caller.
+  if (me[opt_methodName] === caller) {
+    return me.constructor.prototype[opt_methodName].apply(me, args);
+  } else {
+    throw Error(
+        'goog.base called from a method of one name ' +
+        'to a method of a different name');
+  }
+};
+
+
+/**
+ * Allow for aliasing within scope functions.  This function exists for
+ * uncompiled code - in compiled code the calls will be inlined and the
+ * aliases applied.  In uncompiled code the function is simply run since the
+ * aliases as written are valid JavaScript.
+ * @param {function()} fn Function to call.  This function can contain aliases
+ *     to namespaces (e.g. "var dom = goog.dom") or classes
+ *    (e.g. "var Timer = goog.Timer").
+ */
+goog.scope = function(fn) {
+  fn.call(goog.global);
+};
+
+
diff --git a/samples/client/petstore/javascript-closure-angular/package.json b/samples/client/petstore/javascript-closure-angular/package.json
new file mode 100644
index 00000000000..de241f2180d
--- /dev/null
+++ b/samples/client/petstore/javascript-closure-angular/package.json
@@ -0,0 +1,8 @@
+{
+  "devDependencies": {
+    "angular": "^1.4.9",
+    "angular-mocks": "^1.4.9",
+    "karma": "~0.13",
+    "karma-closure": "~0.1.1"
+  }
+}
diff --git a/samples/client/petstore/javascript-closure-angular/test/petapi.spec.js b/samples/client/petstore/javascript-closure-angular/test/petapi.spec.js
new file mode 100644
index 00000000000..2401c4010fb
--- /dev/null
+++ b/samples/client/petstore/javascript-closure-angular/test/petapi.spec.js
@@ -0,0 +1,98 @@
+goog.require('API.Client.PetApi');
+
+angular.module('PetApi', [])
+    .service('petApi', API.Client.PetApi)
+    .value('PetApiBasePath', 'https://example.com');
+
+describe('API.Client.PetAPI', function() {
+  beforeEach(module('ng', 'ngMock', 'PetApi'));
+
+  /** @type {!Object} */
+  var $httpBackend;
+
+  /** @type {!API.Client.PetAPI} */
+  var api;
+
+  /** @type {!API.Client.Category} */
+  var sampleCategory = {
+    id: 345,
+    name: 'categoryname',
+  };
+
+  /** @type {!API.Client.Pet} */
+  var samplePet = {
+    id: 123,
+    category: sampleCategory,
+    name: 'petname',
+    photoUrls: [],
+    tags: [sampleTag],
+    status: API.Client.Pet.StatusEnum.available,
+  };
+
+  /** @type {!API.Client.Tag} */
+  var sampleTag = {
+    id: 345,
+    name: 'categoryname',
+  };
+
+  beforeEach(function() {
+    inject(function($injector) {
+      $httpBackend = $injector.get('$httpBackend');
+      api = $injector.get('petApi');
+    })
+  });
+
+  it('should update pets', function() {
+    $httpBackend.expectPUT('https://example.com/pet', samplePet)
+        .respond(200, '');
+    api.updatePet(samplePet);
+    $httpBackend.flush();
+  });
+
+  it('should add a pet', function() {
+    $httpBackend.expectPOST('https://example.com/pet', samplePet)
+        .respond(200, '');
+    api.addPet(samplePet);
+    $httpBackend.flush();
+  });
+
+  it('should find pets by status', function() {
+    $httpBackend.expectGET('https://example.com/pet/findByStatus?status=sold')
+        .respond(200, '');
+    api.findPetsByStatus(API.Client.Pet.StatusEnum.sold);
+    $httpBackend.flush();
+  });
+
+  it('should find a pet by tag', function() {
+    $httpBackend.expectGET('https://example.com/pet/findByTags?tags=%7B%22id%22:345,%22name%22:%22categoryname%22%7D')
+        .respond(200, '');
+    api.findPetsByTags(sampleTag);
+    $httpBackend.flush();
+  });
+
+  it('should get pet by id', function() {
+    $httpBackend.expectGET('https://example.com/pet/789')
+        .respond(200, '');
+    api.getPetById(789);
+    $httpBackend.flush();
+  });
+
+  it('should update pet with form', function() {
+    $httpBackend.expectPOST('https://example.com/pet/890', "name=newname&status=pending")
+        .respond(200, '');
+    api.updatePetWithForm(890, 'newname', API.Client.Pet.StatusEnum.pending);
+    $httpBackend.flush();
+  });
+
+  it('should delete a pet', function() {
+    $httpBackend.expectDELETE('https://example.com/pet/234')
+        .respond(200, '');
+    api.deletePet(234);
+    $httpBackend.flush();
+  });
+
+  afterEach(function() {
+    $httpBackend.verifyNoOutstandingExpectation();
+    $httpBackend.verifyNoOutstandingRequest();
+  });
+});
diff --git a/samples/client/petstore/javascript-closure-angular/test/storeapi.spec.js b/samples/client/petstore/javascript-closure-angular/test/storeapi.spec.js
new file mode 100644
index 00000000000..490a7b32c97
--- /dev/null
+++ b/samples/client/petstore/javascript-closure-angular/test/storeapi.spec.js
@@ -0,0 +1,68 @@
+goog.require('API.Client.StoreApi');
+
+angular.module('StoreApi', [])
+    .service('storeApi', API.Client.StoreApi)
+    .value('StoreApiBasePath', 'https://example.com');
+
+describe('API.Client.StoreApi', function() {
+  beforeEach(module('ng', 'ngMock', 'StoreApi'));
+
+  /** @type {!Object} */
+  var $httpBackend;
+
+  /** @type {!API.Client.PetAPI} */
+  var api;
+
+  /** @type {!Date} */
+  fixedDate = new Date();
+
+  /** @type {!API.Client.Order} */
+  var sampleOrder = {
+    id: 123,
+    petId: 234,
+    quantity: 1,
+    shipDate: fixedDate,
+    status: API.Client.Order.StatusEnum.placed,
+    complete: false,
+  };
+
+  beforeEach(function() {
+    inject(function($injector) {
+      $httpBackend = $injector.get('$httpBackend');
+      api = $injector.get('storeApi');
+    })
+  });
+
+  it('should get the inventory', function() {
+    $httpBackend.expectGET('https://example.com/store/inventory')
+        .respond(200, 'ok');
+    api.getInventory();
+    $httpBackend.flush();
+  });
+
+  it('should place an order', function() {
+    $httpBackend.expectPOST('https://example.com/store/order', sampleOrder)
+        .respond(200, 'ok');
+    api.placeOrder(sampleOrder);
+    $httpBackend.flush();
+  });
+
+  it('should get an order by id', function() {
+    $httpBackend.expectGET('https://example.com/store/order/345')
+        .respond(200, 'ok');
+    api.getOrderById(345);
+    $httpBackend.flush();
+  });
+
+  it('should delete an order', function() {
+    $httpBackend.expectDELETE('https://example.com/store/order/456')
+        .respond(200, 'ok');
+    api.deleteOrder(456);
+    $httpBackend.flush();
+  });
+
+  afterEach(function() {
+    $httpBackend.verifyNoOutstandingExpectation();
+    $httpBackend.verifyNoOutstandingRequest();
+  });
+});
diff --git a/samples/client/petstore/javascript-closure-angular/test/userapi.spec.js b/samples/client/petstore/javascript-closure-angular/test/userapi.spec.js
new file mode 100644
index 00000000000..8397ea23947
--- /dev/null
+++ b/samples/client/petstore/javascript-closure-angular/test/userapi.spec.js
@@ -0,0 +1,81 @@
+goog.require('API.Client.UserApi');
+
+angular.module('UserApi', [])
+    .service('UserApi', API.Client.UserApi)
+    .value('UserApiBasePath', 'https://example.com');
+
+describe('API.Client.PetAPI', function() {
+  beforeEach(module('ng', 'ngMock', 'UserApi'));
+
+  /** @type {!Object} */
+  var $httpBackend;
+
+  /** @type {!API.Client.UserApi} */
+  var api;
+
+  /** @type {!API.Client.User} */
+  var sampleUser = {
+    id: 123,
+    username: 'username',
+    firstName: 'first',
+    lastName: 'last',
+    email: 'email@example.com',
+    password: 'password',
+    userStatus: 0,
+  };
+
+  beforeEach(function() {
+    inject(function($injector) {
+      $httpBackend = $injector.get('$httpBackend');
+      api = $injector.get('UserApi');
+    })
+  });
+
+  it('should create a user', function() {
+    $httpBackend.expectPOST('https://example.com/user', sampleUser)
+        .respond(200, '');
+    api.createUser(sampleUser);
+    $httpBackend.flush();
+  });
+
+  it('should create an array of users', function() {
+    $httpBackend.expectPOST('https://example.com/user/createWithArray', [sampleUser])
+        .respond(200, '');
+    api.createUsersWithArrayInput([sampleUser]);
+    $httpBackend.flush();
+  });
+
+  it('should create a list of users', function() {
+    $httpBackend.expectPOST('https://example.com/user/createWithList', [sampleUser])
+        .respond(200, '');
+    api.createUsersWithListInput([sampleUser]);
+    $httpBackend.flush();
+  });
+
+  it('should login a user', function() {
+    $httpBackend.expectGET('https://example.com/user/login?password=password&username=username')
+        .respond(200, '');
+    api.loginUser('username', 'password');
+    $httpBackend.flush();
+  });
+
+  it('should logout a user', function() {
+    $httpBackend.expectGET('https://example.com/user/logout')
+        .respond(200, '');
+    api.logoutUser();
+    $httpBackend.flush();
+  });
+
+  it('should get a user by username', function() {
+    $httpBackend.expectGET('https://example.com/user/username')
+        .respond(200, '');
+    api.getUserByName('username');
+    $httpBackend.flush();
+  });
+
+  afterEach(function() {
+    $httpBackend.verifyNoOutstandingExpectation();
+    $httpBackend.verifyNoOutstandingRequest();
+  });
+});
+
diff --git a/samples/client/petstore/javascript-promise/.gitignore b/samples/client/petstore/javascript-promise/.gitignore
new file mode 100644
index 00000000000..2ccbe4656c6
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/.gitignore
@@ -0,0 +1 @@
+/node_modules/
diff --git a/samples/client/petstore/javascript-promise/README.md b/samples/client/petstore/javascript-promise/README.md
new file mode 100644
index 00000000000..3fc0c158a2a
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/README.md
@@ -0,0 +1,171 @@
+# swagger-petstore
+
+SwaggerPetstore - JavaScript client for swagger-petstore
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This SDK is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
+
+- API version: 1.0.0
+- Package version: 1.0.0
+- Build date: 2016-03-30T20:58:13.565+08:00
+- Build package: class io.swagger.codegen.languages.JavascriptClientCodegen
+
+## Installation
+
+### For [Node.js](https://nodejs.org/)
+
+#### npm
+
+To publish the library as a [npm](https://www.npmjs.com/),
+please follow the procedure in ["Publishing npm packages"](https://docs.npmjs.com/getting-started/publishing-npm-packages).
+
+Then install it via:
+
+```shell
+npm install swagger-petstore --save
+```
+
+#### git
+#
+If the library is hosted at a git repository, e.g.
+https://github.com/YOUR_USERNAME/YOUR_GIT_REPO_ID
+then install it via:
+
+```shell
+npm install YOUR_USERNAME/YOUR_GIT_REPO_ID --save
+```
+
+### For browser
+
+The library also works in the browser environment via npm and [browserify](http://browserify.org/). After following
+the above steps with Node.js and installing browserify with `npm install -g browserify`,
+perform the following (assuming *main.js* is your entry file):
+
+```shell
+browserify main.js > bundle.js
+```
+
+Then include *bundle.js* in the HTML pages.
+
+## Getting Started
+
+Please follow the [installation](#installation) instruction and execute the following JS code:
+
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure OAuth2 access token for authorization: petstore_auth
+var petstore_auth = defaultClient.authentications['petstore_auth'];
+petstore_auth.accessToken = "YOUR ACCESS TOKEN"
+
+var api = new SwaggerPetstore.PetApi()
+
+var opts = { 
+  'body': new SwaggerPetstore.Pet() // {Pet} Pet object that needs to be added to the store
+};
+api.addPet(opts).then(function() {
+  console.log('API called successfully.');
+}, function(error) {
+  console.error(error);
+});
+
+
+```
+
+## Documentation for API Endpoints
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*SwaggerPetstore.PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
+*SwaggerPetstore.PetApi* | [**addPetUsingByteArray**](docs/PetApi.md#addPetUsingByteArray) | **POST** /pet?testing_byte_array=true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
+*SwaggerPetstore.PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
+*SwaggerPetstore.PetApi* | [**findPetsByStatus**](docs/PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
+*SwaggerPetstore.PetApi* | [**findPetsByTags**](docs/PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags
+*SwaggerPetstore.PetApi* | [**getPetById**](docs/PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID
+*SwaggerPetstore.PetApi* | [**getPetByIdInObject**](docs/PetApi.md#getPetByIdInObject) | **GET** /pet/{petId}?response=inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+*SwaggerPetstore.PetApi* | [**petPetIdtestingByteArraytrueGet**](docs/PetApi.md#petPetIdtestingByteArraytrueGet) | **GET** /pet/{petId}?testing_byte_array=true | Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+*SwaggerPetstore.PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
+*SwaggerPetstore.PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
+*SwaggerPetstore.PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*SwaggerPetstore.StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
+*SwaggerPetstore.StoreApi* | [**findOrdersByStatus**](docs/StoreApi.md#findOrdersByStatus) | **GET** /store/findByStatus | Finds orders by status
+*SwaggerPetstore.StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
+*SwaggerPetstore.StoreApi* | [**getInventoryInObject**](docs/StoreApi.md#getInventoryInObject) | **GET** /store/inventory?response=arbitrary_object | Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+*SwaggerPetstore.StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{orderId} | Find purchase order by ID
+*SwaggerPetstore.StoreApi* | [**placeOrder**](docs/StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet
+*SwaggerPetstore.UserApi* | [**createUser**](docs/UserApi.md#createUser) | **POST** /user | Create user
+*SwaggerPetstore.UserApi* | [**createUsersWithArrayInput**](docs/UserApi.md#createUsersWithArrayInput) | **POST** /user/createWithArray | Creates list of users with given input array
+*SwaggerPetstore.UserApi* | [**createUsersWithListInput**](docs/UserApi.md#createUsersWithListInput) | **POST** /user/createWithList | Creates list of users with given input array
+*SwaggerPetstore.UserApi* | [**deleteUser**](docs/UserApi.md#deleteUser) | **DELETE** /user/{username} | Delete user
+*SwaggerPetstore.UserApi* | [**getUserByName**](docs/UserApi.md#getUserByName) | **GET** /user/{username} | Get user by user name
+*SwaggerPetstore.UserApi* | [**loginUser**](docs/UserApi.md#loginUser) | **GET** /user/login | Logs user into the system
+*SwaggerPetstore.UserApi* | [**logoutUser**](docs/UserApi.md#logoutUser) | **GET** /user/logout | Logs out current logged in user session
+*SwaggerPetstore.UserApi* | [**updateUser**](docs/UserApi.md#updateUser) | **PUT** /user/{username} | Updated user
+
+
+## Documentation for Models
+
+ - [SwaggerPetstore.Animal](docs/Animal.md)
+ - [SwaggerPetstore.Cat](docs/Cat.md)
+ - [SwaggerPetstore.Category](docs/Category.md)
+ - [SwaggerPetstore.Dog](docs/Dog.md)
+ - [SwaggerPetstore.InlineResponse200](docs/InlineResponse200.md)
+ - [SwaggerPetstore.Model200Response](docs/Model200Response.md)
+ - [SwaggerPetstore.ModelReturn](docs/ModelReturn.md)
+ - [SwaggerPetstore.Name](docs/Name.md)
+ - [SwaggerPetstore.Order](docs/Order.md)
+ - [SwaggerPetstore.Pet](docs/Pet.md)
+ - [SwaggerPetstore.SpecialModelName](docs/SpecialModelName.md)
+ - [SwaggerPetstore.Tag](docs/Tag.md)
+ - [SwaggerPetstore.User](docs/User.md)
+
+
+## Documentation for Authorization
+
+
+### test_api_key_header
+
+- **Type**: API key
+- **API key parameter name**: test_api_key_header
+- **Location**: HTTP header
+
+### api_key
+
+- **Type**: API key
+- **API key parameter name**: api_key
+- **Location**: HTTP header
+
+### test_http_basic
+
+- **Type**: HTTP basic authentication
+
+### test_api_client_secret
+
+- **Type**: API key
+- **API key parameter name**: x-test_api_client_secret
+- **Location**: HTTP header
+
+### test_api_client_id
+
+- **Type**: API key
+- **API key parameter name**: x-test_api_client_id
+- **Location**: HTTP header
+
+### test_api_key_query
+
+- **Type**: API key
+- **API key parameter name**: test_api_key_query
+- **Location**: URL query string
+
+### petstore_auth
+
+- **Type**: OAuth
+- **Flow**: implicit
+- **Authorizatoin URL**: http://petstore.swagger.io/api/oauth/dialog
+- **Scopes**: 
+  - write:pets: modify pets in your account
+  - read:pets: read your pets
+
diff --git a/samples/client/petstore/javascript-promise/docs/Animal.md b/samples/client/petstore/javascript-promise/docs/Animal.md
new file mode 100644
index 00000000000..c37d95695a0
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/docs/Animal.md
@@ -0,0 +1,8 @@
+# SwaggerPetstore.Animal
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**className** | **String** |  | 
+
+
diff --git a/samples/client/petstore/javascript-promise/docs/Cat.md b/samples/client/petstore/javascript-promise/docs/Cat.md
new file mode 100644
index 00000000000..8cd391bc911
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/docs/Cat.md
@@ -0,0 +1,8 @@
+# SwaggerPetstore.Cat
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**declawed** | **Boolean** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript-promise/docs/Category.md b/samples/client/petstore/javascript-promise/docs/Category.md
new file mode 100644
index 00000000000..47930eb882c
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/docs/Category.md
@@ -0,0 +1,9 @@
+# SwaggerPetstore.Category
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **Integer** |  | [optional] 
+**name** | **String** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript-promise/docs/Dog.md b/samples/client/petstore/javascript-promise/docs/Dog.md
new file mode 100644
index 00000000000..9253eace011
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/docs/Dog.md
@@ -0,0 +1,8 @@
+# SwaggerPetstore.Dog
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**breed** | **String** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript-promise/docs/InlineResponse200.md b/samples/client/petstore/javascript-promise/docs/InlineResponse200.md
new file mode 100644
index 00000000000..bbb11067e9a
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/docs/InlineResponse200.md
@@ -0,0 +1,13 @@
+# SwaggerPetstore.InlineResponse200
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**tags** | [**[Tag]**](Tag.md) |  | [optional] 
+**id** | **Integer** |  | 
+**category** | **Object** |  | [optional] 
+**status** | **String** | pet status in the store | [optional] 
+**name** | **String** |  | [optional] 
+**photoUrls** | **[String]** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript-promise/docs/Model200Response.md b/samples/client/petstore/javascript-promise/docs/Model200Response.md
new file mode 100644
index 00000000000..cc06fcd2d18
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/docs/Model200Response.md
@@ -0,0 +1,8 @@
+# SwaggerPetstore.Model200Response
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **Integer** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript-promise/docs/ModelReturn.md b/samples/client/petstore/javascript-promise/docs/ModelReturn.md
new file mode 100644
index 00000000000..88412c87197
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/docs/ModelReturn.md
@@ -0,0 +1,8 @@
+# SwaggerPetstore.ModelReturn
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**_return** | **Integer** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript-promise/docs/Name.md b/samples/client/petstore/javascript-promise/docs/Name.md
new file mode 100644
index 00000000000..5086f6c5a3e
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/docs/Name.md
@@ -0,0 +1,9 @@
+# SwaggerPetstore.Name
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **Integer** |  | [optional] 
+**snakeCase** | **Integer** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript-promise/docs/Order.md b/samples/client/petstore/javascript-promise/docs/Order.md
new file mode 100644
index 00000000000..b34b67d3a56
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/docs/Order.md
@@ -0,0 +1,13 @@
+# SwaggerPetstore.Order
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **Integer** |  | [optional] 
+**petId** | **Integer** |  | [optional] 
+**quantity** | **Integer** |  | [optional] 
+**shipDate** | **Date** |  | [optional] 
+**status** | **String** | Order Status | [optional] 
+**complete** | **Boolean** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript-promise/docs/Pet.md b/samples/client/petstore/javascript-promise/docs/Pet.md
new file mode 100644
index 00000000000..f1b049dcadd
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/docs/Pet.md
@@ -0,0 +1,13 @@
+# SwaggerPetstore.Pet
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **Integer** |  | [optional] 
+**category** | [**Category**](Category.md) |  | [optional] 
+**name** | **String** |  | 
+**photoUrls** | **[String]** |  | 
+**tags** | [**[Tag]**](Tag.md) |  | [optional] 
+**status** | **String** | pet status in the store | [optional] 
+
+
diff --git a/samples/client/petstore/javascript-promise/docs/PetApi.md b/samples/client/petstore/javascript-promise/docs/PetApi.md
new file mode 100644
index 00000000000..77d9630f888
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/docs/PetApi.md
@@ -0,0 +1,586 @@
+# SwaggerPetstore.PetApi
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**addPet**](PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
+[**addPetUsingByteArray**](PetApi.md#addPetUsingByteArray) | **POST** /pet?testing_byte_array=true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
+[**deletePet**](PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
+[**findPetsByStatus**](PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
+[**findPetsByTags**](PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags
+[**getPetById**](PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID
+[**getPetByIdInObject**](PetApi.md#getPetByIdInObject) | **GET** /pet/{petId}?response=inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+[**petPetIdtestingByteArraytrueGet**](PetApi.md#petPetIdtestingByteArraytrueGet) | **GET** /pet/{petId}?testing_byte_array=true | Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+[**updatePet**](PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
+[**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
+[**uploadFile**](PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+
+
+<a name="addPet"></a>
+# **addPet**
+> addPet(opts)
+
+Add a new pet to the store
+
+
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure OAuth2 access token for authorization: petstore_auth
+var petstore_auth = defaultClient.authentications['petstore_auth'];
+petstore_auth.accessToken = "YOUR ACCESS TOKEN"
+
+var apiInstance = new SwaggerPetstore.PetApi()
+
+var opts = { 
+  'body': new SwaggerPetstore.Pet() // {Pet} Pet object that needs to be added to the store
+};
+apiInstance.addPet(opts).then(function() {
+  console.log('API called successfully.');
+}, function(error) {
+  console.error(error);
+});
+
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | [optional] 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: application/json, application/xml
+
+<a name="addPetUsingByteArray"></a>
+# **addPetUsingByteArray**
+> addPetUsingByteArray(opts)
+
+Fake endpoint to test byte array in body parameter for adding a new pet to the store
+
+
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure OAuth2 access token for authorization: petstore_auth
+var petstore_auth = defaultClient.authentications['petstore_auth'];
+petstore_auth.accessToken = "YOUR ACCESS TOKEN"
+
+var apiInstance = new SwaggerPetstore.PetApi()
+
+var opts = { 
+  'body': "B" // {String} Pet object in the form of byte array
+};
+apiInstance.addPetUsingByteArray(opts).then(function() {
+  console.log('API called successfully.');
+}, function(error) {
+  console.error(error);
+});
+
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | **String**| Pet object in the form of byte array | [optional] 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: application/json, application/xml
+
+<a name="deletePet"></a>
+# **deletePet**
+> deletePet(petId, opts)
+
+Deletes a pet
+
+
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure OAuth2 access token for authorization: petstore_auth
+var petstore_auth = defaultClient.authentications['petstore_auth'];
+petstore_auth.accessToken = "YOUR ACCESS TOKEN"
+
+var apiInstance = new SwaggerPetstore.PetApi()
+
+var petId = 789; // {Integer} Pet id to delete
+
+var opts = { 
+  'apiKey': "apiKey_example" // {String} 
+};
+apiInstance.deletePet(petId, opts).then(function() {
+  console.log('API called successfully.');
+}, function(error) {
+  console.error(error);
+});
+
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Integer**| Pet id to delete | 
+ **apiKey** | **String**|  | [optional] 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="findPetsByStatus"></a>
+# **findPetsByStatus**
+> [Pet] findPetsByStatus(opts)
+
+Finds Pets by status
+
+Multiple status values can be provided with comma separated strings
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure OAuth2 access token for authorization: petstore_auth
+var petstore_auth = defaultClient.authentications['petstore_auth'];
+petstore_auth.accessToken = "YOUR ACCESS TOKEN"
+
+var apiInstance = new SwaggerPetstore.PetApi()
+
+var opts = { 
+  'status': ["available"] // {[String]} Status values that need to be considered for query
+};
+apiInstance.findPetsByStatus(opts).then(function(data) {
+  console.log('API called successfully. Returned data: ' + data);
+}, function(error) {
+  console.error(error);
+});
+
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **status** | [**[String]**](String.md)| Status values that need to be considered for query | [optional] [default to available]
+
+### Return type
+
+[**[Pet]**](Pet.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="findPetsByTags"></a>
+# **findPetsByTags**
+> [Pet] findPetsByTags(opts)
+
+Finds Pets by tags
+
+Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure OAuth2 access token for authorization: petstore_auth
+var petstore_auth = defaultClient.authentications['petstore_auth'];
+petstore_auth.accessToken = "YOUR ACCESS TOKEN"
+
+var apiInstance = new SwaggerPetstore.PetApi()
+
+var opts = { 
+  'tags': ["tags_example"] // {[String]} Tags to filter by
+};
+apiInstance.findPetsByTags(opts).then(function(data) {
+  console.log('API called successfully. Returned data: ' + data);
+}, function(error) {
+  console.error(error);
+});
+
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **tags** | [**[String]**](String.md)| Tags to filter by | [optional] 
+
+### Return type
+
+[**[Pet]**](Pet.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="getPetById"></a>
+# **getPetById**
+> Pet getPetById(petId)
+
+Find pet by ID
+
+Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure API key authorization: api_key
+var api_key = defaultClient.authentications['api_key'];
+api_key.apiKey = "YOUR API KEY"
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//api_key.apiKeyPrefix['api_key'] = "Token"
+
+// Configure OAuth2 access token for authorization: petstore_auth
+var petstore_auth = defaultClient.authentications['petstore_auth'];
+petstore_auth.accessToken = "YOUR ACCESS TOKEN"
+
+var apiInstance = new SwaggerPetstore.PetApi()
+
+var petId = 789; // {Integer} ID of pet that needs to be fetched
+
+apiInstance.getPetById(petId).then(function(data) {
+  console.log('API called successfully. Returned data: ' + data);
+}, function(error) {
+  console.error(error);
+});
+
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Integer**| ID of pet that needs to be fetched | 
+
+### Return type
+
+[**Pet**](Pet.md)
+
+### Authorization
+
+[api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="getPetByIdInObject"></a>
+# **getPetByIdInObject**
+> InlineResponse200 getPetByIdInObject(petId)
+
+Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+
+Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure API key authorization: api_key
+var api_key = defaultClient.authentications['api_key'];
+api_key.apiKey = "YOUR API KEY"
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//api_key.apiKeyPrefix['api_key'] = "Token"
+
+// Configure OAuth2 access token for authorization: petstore_auth
+var petstore_auth = defaultClient.authentications['petstore_auth'];
+petstore_auth.accessToken = "YOUR ACCESS TOKEN"
+
+var apiInstance = new SwaggerPetstore.PetApi()
+
+var petId = 789; // {Integer} ID of pet that needs to be fetched
+
+apiInstance.getPetByIdInObject(petId).then(function(data) {
+  console.log('API called successfully. Returned data: ' + data);
+}, function(error) {
+  console.error(error);
+});
+
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Integer**| ID of pet that needs to be fetched | 
+
+### Return type
+
+[**InlineResponse200**](InlineResponse200.md)
+
+### Authorization
+
+[api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="petPetIdtestingByteArraytrueGet"></a>
+# **petPetIdtestingByteArraytrueGet**
+> &#39;String&#39; petPetIdtestingByteArraytrueGet(petId)
+
+Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+
+Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure API key authorization: api_key
+var api_key = defaultClient.authentications['api_key'];
+api_key.apiKey = "YOUR API KEY"
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//api_key.apiKeyPrefix['api_key'] = "Token"
+
+// Configure OAuth2 access token for authorization: petstore_auth
+var petstore_auth = defaultClient.authentications['petstore_auth'];
+petstore_auth.accessToken = "YOUR ACCESS TOKEN"
+
+var apiInstance = new SwaggerPetstore.PetApi()
+
+var petId = 789; // {Integer} ID of pet that needs to be fetched
+
+apiInstance.petPetIdtestingByteArraytrueGet(petId).then(function(data) {
+  console.log('API called successfully. Returned data: ' + data);
+}, function(error) {
+  console.error(error);
+});
+
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Integer**| ID of pet that needs to be fetched | 
+
+### Return type
+
+**&#39;String&#39;**
+
+### Authorization
+
+[api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="updatePet"></a>
+# **updatePet**
+> updatePet(opts)
+
+Update an existing pet
+
+
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure OAuth2 access token for authorization: petstore_auth
+var petstore_auth = defaultClient.authentications['petstore_auth'];
+petstore_auth.accessToken = "YOUR ACCESS TOKEN"
+
+var apiInstance = new SwaggerPetstore.PetApi()
+
+var opts = { 
+  'body': new SwaggerPetstore.Pet() // {Pet} Pet object that needs to be added to the store
+};
+apiInstance.updatePet(opts).then(function() {
+  console.log('API called successfully.');
+}, function(error) {
+  console.error(error);
+});
+
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | [optional] 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: application/json, application/xml
+
+<a name="updatePetWithForm"></a>
+# **updatePetWithForm**
+> updatePetWithForm(petId, opts)
+
+Updates a pet in the store with form data
+
+
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure OAuth2 access token for authorization: petstore_auth
+var petstore_auth = defaultClient.authentications['petstore_auth'];
+petstore_auth.accessToken = "YOUR ACCESS TOKEN"
+
+var apiInstance = new SwaggerPetstore.PetApi()
+
+var petId = "petId_example"; // {String} ID of pet that needs to be updated
+
+var opts = { 
+  'name': "name_example", // {String} Updated name of the pet
+  'status': "status_example" // {String} Updated status of the pet
+};
+apiInstance.updatePetWithForm(petId, opts).then(function() {
+  console.log('API called successfully.');
+}, function(error) {
+  console.error(error);
+});
+
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **String**| ID of pet that needs to be updated | 
+ **name** | **String**| Updated name of the pet | [optional] 
+ **status** | **String**| Updated status of the pet | [optional] 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: application/x-www-form-urlencoded
+ - **Accept**: application/json, application/xml
+
+<a name="uploadFile"></a>
+# **uploadFile**
+> uploadFile(petId, opts)
+
+uploads an image
+
+
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure OAuth2 access token for authorization: petstore_auth
+var petstore_auth = defaultClient.authentications['petstore_auth'];
+petstore_auth.accessToken = "YOUR ACCESS TOKEN"
+
+var apiInstance = new SwaggerPetstore.PetApi()
+
+var petId = 789; // {Integer} ID of pet to update
+
+var opts = { 
+  'additionalMetadata': "additionalMetadata_example", // {String} Additional data to pass to server
+  'file': "/path/to/file.txt" // {File} file to upload
+};
+apiInstance.uploadFile(petId, opts).then(function() {
+  console.log('API called successfully.');
+}, function(error) {
+  console.error(error);
+});
+
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Integer**| ID of pet to update | 
+ **additionalMetadata** | **String**| Additional data to pass to server | [optional] 
+ **file** | **File**| file to upload | [optional] 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: multipart/form-data
+ - **Accept**: application/json, application/xml
+
diff --git a/samples/client/petstore/javascript-promise/docs/SpecialModelName.md b/samples/client/petstore/javascript-promise/docs/SpecialModelName.md
new file mode 100644
index 00000000000..03dffa54c3f
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/docs/SpecialModelName.md
@@ -0,0 +1,8 @@
+# SwaggerPetstore.SpecialModelName
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**specialPropertyName** | **Integer** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript-promise/docs/StoreApi.md b/samples/client/petstore/javascript-promise/docs/StoreApi.md
new file mode 100644
index 00000000000..930586a96f5
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/docs/StoreApi.md
@@ -0,0 +1,315 @@
+# SwaggerPetstore.StoreApi
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**deleteOrder**](StoreApi.md#deleteOrder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
+[**findOrdersByStatus**](StoreApi.md#findOrdersByStatus) | **GET** /store/findByStatus | Finds orders by status
+[**getInventory**](StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
+[**getInventoryInObject**](StoreApi.md#getInventoryInObject) | **GET** /store/inventory?response=arbitrary_object | Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+[**getOrderById**](StoreApi.md#getOrderById) | **GET** /store/order/{orderId} | Find purchase order by ID
+[**placeOrder**](StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet
+
+
+<a name="deleteOrder"></a>
+# **deleteOrder**
+> deleteOrder(orderId)
+
+Delete purchase order by ID
+
+For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+
+var apiInstance = new SwaggerPetstore.StoreApi()
+
+var orderId = "orderId_example"; // {String} ID of the order that needs to be deleted
+
+apiInstance.deleteOrder(orderId).then(function() {
+  console.log('API called successfully.');
+}, function(error) {
+  console.error(error);
+});
+
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **orderId** | **String**| ID of the order that needs to be deleted | 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="findOrdersByStatus"></a>
+# **findOrdersByStatus**
+> [Order] findOrdersByStatus(opts)
+
+Finds orders by status
+
+A single status value can be provided as a string
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure API key authorization: test_api_client_id
+var test_api_client_id = defaultClient.authentications['test_api_client_id'];
+test_api_client_id.apiKey = "YOUR API KEY"
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//test_api_client_id.apiKeyPrefix['x-test_api_client_id'] = "Token"
+
+// Configure API key authorization: test_api_client_secret
+var test_api_client_secret = defaultClient.authentications['test_api_client_secret'];
+test_api_client_secret.apiKey = "YOUR API KEY"
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//test_api_client_secret.apiKeyPrefix['x-test_api_client_secret'] = "Token"
+
+var apiInstance = new SwaggerPetstore.StoreApi()
+
+var opts = { 
+  'status': "placed" // {String} Status value that needs to be considered for query
+};
+apiInstance.findOrdersByStatus(opts).then(function(data) {
+  console.log('API called successfully. Returned data: ' + data);
+}, function(error) {
+  console.error(error);
+});
+
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **status** | **String**| Status value that needs to be considered for query | [optional] [default to placed]
+
+### Return type
+
+[**[Order]**](Order.md)
+
+### Authorization
+
+[test_api_client_id](../README.md#test_api_client_id), [test_api_client_secret](../README.md#test_api_client_secret)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="getInventory"></a>
+# **getInventory**
+> {&#39;String&#39;: &#39;Integer&#39;} getInventory
+
+Returns pet inventories by status
+
+Returns a map of status codes to quantities
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure API key authorization: api_key
+var api_key = defaultClient.authentications['api_key'];
+api_key.apiKey = "YOUR API KEY"
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//api_key.apiKeyPrefix['api_key'] = "Token"
+
+var apiInstance = new SwaggerPetstore.StoreApi()
+apiInstance.getInventory().then(function(data) {
+  console.log('API called successfully. Returned data: ' + data);
+}, function(error) {
+  console.error(error);
+});
+
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+**{&#39;String&#39;: &#39;Integer&#39;}**
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="getInventoryInObject"></a>
+# **getInventoryInObject**
+> Object getInventoryInObject
+
+Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+
+Returns an arbitrary object which is actually a map of status codes to quantities
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure API key authorization: api_key
+var api_key = defaultClient.authentications['api_key'];
+api_key.apiKey = "YOUR API KEY"
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//api_key.apiKeyPrefix['api_key'] = "Token"
+
+var apiInstance = new SwaggerPetstore.StoreApi()
+apiInstance.getInventoryInObject().then(function(data) {
+  console.log('API called successfully. Returned data: ' + data);
+}, function(error) {
+  console.error(error);
+});
+
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+**Object**
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="getOrderById"></a>
+# **getOrderById**
+> Order getOrderById(orderId)
+
+Find purchase order by ID
+
+For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure API key authorization: test_api_key_header
+var test_api_key_header = defaultClient.authentications['test_api_key_header'];
+test_api_key_header.apiKey = "YOUR API KEY"
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//test_api_key_header.apiKeyPrefix['test_api_key_header'] = "Token"
+
+// Configure API key authorization: test_api_key_query
+var test_api_key_query = defaultClient.authentications['test_api_key_query'];
+test_api_key_query.apiKey = "YOUR API KEY"
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//test_api_key_query.apiKeyPrefix['test_api_key_query'] = "Token"
+
+var apiInstance = new SwaggerPetstore.StoreApi()
+
+var orderId = "orderId_example"; // {String} ID of pet that needs to be fetched
+
+apiInstance.getOrderById(orderId).then(function(data) {
+  console.log('API called successfully. Returned data: ' + data);
+}, function(error) {
+  console.error(error);
+});
+
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **orderId** | **String**| ID of pet that needs to be fetched | 
+
+### Return type
+
+[**Order**](Order.md)
+
+### Authorization
+
+[test_api_key_header](../README.md#test_api_key_header), [test_api_key_query](../README.md#test_api_key_query)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="placeOrder"></a>
+# **placeOrder**
+> Order placeOrder(opts)
+
+Place an order for a pet
+
+
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure API key authorization: test_api_client_id
+var test_api_client_id = defaultClient.authentications['test_api_client_id'];
+test_api_client_id.apiKey = "YOUR API KEY"
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//test_api_client_id.apiKeyPrefix['x-test_api_client_id'] = "Token"
+
+// Configure API key authorization: test_api_client_secret
+var test_api_client_secret = defaultClient.authentications['test_api_client_secret'];
+test_api_client_secret.apiKey = "YOUR API KEY"
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//test_api_client_secret.apiKeyPrefix['x-test_api_client_secret'] = "Token"
+
+var apiInstance = new SwaggerPetstore.StoreApi()
+
+var opts = { 
+  'body': new SwaggerPetstore.Order() // {Order} order placed for purchasing the pet
+};
+apiInstance.placeOrder(opts).then(function(data) {
+  console.log('API called successfully. Returned data: ' + data);
+}, function(error) {
+  console.error(error);
+});
+
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Order**](Order.md)| order placed for purchasing the pet | [optional] 
+
+### Return type
+
+[**Order**](Order.md)
+
+### Authorization
+
+[test_api_client_id](../README.md#test_api_client_id), [test_api_client_secret](../README.md#test_api_client_secret)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
diff --git a/samples/client/petstore/javascript-promise/docs/Tag.md b/samples/client/petstore/javascript-promise/docs/Tag.md
new file mode 100644
index 00000000000..6c109046fb3
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/docs/Tag.md
@@ -0,0 +1,9 @@
+# SwaggerPetstore.Tag
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **Integer** |  | [optional] 
+**name** | **String** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript-promise/docs/User.md b/samples/client/petstore/javascript-promise/docs/User.md
new file mode 100644
index 00000000000..071fbb46e47
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/docs/User.md
@@ -0,0 +1,15 @@
+# SwaggerPetstore.User
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **Integer** |  | [optional] 
+**username** | **String** |  | [optional] 
+**firstName** | **String** |  | [optional] 
+**lastName** | **String** |  | [optional] 
+**email** | **String** |  | [optional] 
+**password** | **String** |  | [optional] 
+**phone** | **String** |  | [optional] 
+**userStatus** | **Integer** | User Status | [optional] 
+
+
diff --git a/samples/client/petstore/javascript-promise/docs/UserApi.md b/samples/client/petstore/javascript-promise/docs/UserApi.md
new file mode 100644
index 00000000000..1c14b708231
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/docs/UserApi.md
@@ -0,0 +1,370 @@
+# SwaggerPetstore.UserApi
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**createUser**](UserApi.md#createUser) | **POST** /user | Create user
+[**createUsersWithArrayInput**](UserApi.md#createUsersWithArrayInput) | **POST** /user/createWithArray | Creates list of users with given input array
+[**createUsersWithListInput**](UserApi.md#createUsersWithListInput) | **POST** /user/createWithList | Creates list of users with given input array
+[**deleteUser**](UserApi.md#deleteUser) | **DELETE** /user/{username} | Delete user
+[**getUserByName**](UserApi.md#getUserByName) | **GET** /user/{username} | Get user by user name
+[**loginUser**](UserApi.md#loginUser) | **GET** /user/login | Logs user into the system
+[**logoutUser**](UserApi.md#logoutUser) | **GET** /user/logout | Logs out current logged in user session
+[**updateUser**](UserApi.md#updateUser) | **PUT** /user/{username} | Updated user
+
+
+<a name="createUser"></a>
+# **createUser**
+> createUser(opts)
+
+Create user
+
+This can only be done by the logged in user.
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+
+var apiInstance = new SwaggerPetstore.UserApi()
+
+var opts = { 
+  'body': new SwaggerPetstore.User() // {User} Created user object
+};
+apiInstance.createUser(opts).then(function() {
+  console.log('API called successfully.');
+}, function(error) {
+  console.error(error);
+});
+
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**User**](User.md)| Created user object | [optional] 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="createUsersWithArrayInput"></a>
+# **createUsersWithArrayInput**
+> createUsersWithArrayInput(opts)
+
+Creates list of users with given input array
+
+
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+
+var apiInstance = new SwaggerPetstore.UserApi()
+
+var opts = { 
+  'body': [new SwaggerPetstore.User()] // {[User]} List of user object
+};
+apiInstance.createUsersWithArrayInput(opts).then(function() {
+  console.log('API called successfully.');
+}, function(error) {
+  console.error(error);
+});
+
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**[User]**](User.md)| List of user object | [optional] 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="createUsersWithListInput"></a>
+# **createUsersWithListInput**
+> createUsersWithListInput(opts)
+
+Creates list of users with given input array
+
+
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+
+var apiInstance = new SwaggerPetstore.UserApi()
+
+var opts = { 
+  'body': [new SwaggerPetstore.User()] // {[User]} List of user object
+};
+apiInstance.createUsersWithListInput(opts).then(function() {
+  console.log('API called successfully.');
+}, function(error) {
+  console.error(error);
+});
+
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**[User]**](User.md)| List of user object | [optional] 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="deleteUser"></a>
+# **deleteUser**
+> deleteUser(username)
+
+Delete user
+
+This can only be done by the logged in user.
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure HTTP basic authorization: test_http_basic
+var test_http_basic = defaultClient.authentications['test_http_basic'];
+test_http_basic.username = 'YOUR USERNAME'
+test_http_basic.password = 'YOUR PASSWORD'
+
+var apiInstance = new SwaggerPetstore.UserApi()
+
+var username = "username_example"; // {String} The name that needs to be deleted
+
+apiInstance.deleteUser(username).then(function() {
+  console.log('API called successfully.');
+}, function(error) {
+  console.error(error);
+});
+
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **String**| The name that needs to be deleted | 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+[test_http_basic](../README.md#test_http_basic)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="getUserByName"></a>
+# **getUserByName**
+> User getUserByName(username)
+
+Get user by user name
+
+
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+
+var apiInstance = new SwaggerPetstore.UserApi()
+
+var username = "username_example"; // {String} The name that needs to be fetched. Use user1 for testing.
+
+apiInstance.getUserByName(username).then(function(data) {
+  console.log('API called successfully. Returned data: ' + data);
+}, function(error) {
+  console.error(error);
+});
+
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **String**| The name that needs to be fetched. Use user1 for testing. | 
+
+### Return type
+
+[**User**](User.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="loginUser"></a>
+# **loginUser**
+> &#39;String&#39; loginUser(opts)
+
+Logs user into the system
+
+
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+
+var apiInstance = new SwaggerPetstore.UserApi()
+
+var opts = { 
+  'username': "username_example", // {String} The user name for login
+  'password': "password_example" // {String} The password for login in clear text
+};
+apiInstance.loginUser(opts).then(function(data) {
+  console.log('API called successfully. Returned data: ' + data);
+}, function(error) {
+  console.error(error);
+});
+
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **String**| The user name for login | [optional] 
+ **password** | **String**| The password for login in clear text | [optional] 
+
+### Return type
+
+**&#39;String&#39;**
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="logoutUser"></a>
+# **logoutUser**
+> logoutUser
+
+Logs out current logged in user session
+
+
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+
+var apiInstance = new SwaggerPetstore.UserApi()
+apiInstance.logoutUser().then(function() {
+  console.log('API called successfully.');
+}, function(error) {
+  console.error(error);
+});
+
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="updateUser"></a>
+# **updateUser**
+> updateUser(username, opts)
+
+Updated user
+
+This can only be done by the logged in user.
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+
+var apiInstance = new SwaggerPetstore.UserApi()
+
+var username = "username_example"; // {String} name that need to be deleted
+
+var opts = { 
+  'body': new SwaggerPetstore.User() // {User} Updated user object
+};
+apiInstance.updateUser(username, opts).then(function() {
+  console.log('API called successfully.');
+}, function(error) {
+  console.error(error);
+});
+
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **String**| name that need to be deleted | 
+ **body** | [**User**](User.md)| Updated user object | [optional] 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
diff --git a/samples/client/petstore/javascript-promise/git_push.sh b/samples/client/petstore/javascript-promise/git_push.sh
new file mode 100644
index 00000000000..1a36388db02
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="YOUR_GIT_USR_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="YOUR_GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/client/petstore/javascript-promise/package.json b/samples/client/petstore/javascript-promise/package.json
new file mode 100644
index 00000000000..72a48ac71de
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "swagger-petstore",
+  "version": "1.0.0",
+  "description": "This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters",
+  "license": "Apache 2.0",
+  "main": "src/index.js",
+  "scripts": {
+    "test": "./node_modules/mocha/bin/mocha --recursive"
+  },
+  "dependencies": {
+    "superagent": "1.7.1"
+  },
+  "devDependencies": {
+    "mocha": "~2.3.4",
+    "sinon": "1.17.3",
+    "expect.js": "~0.3.1"
+  }
+}
diff --git a/samples/client/petstore/javascript-promise/pom.xml b/samples/client/petstore/javascript-promise/pom.xml
new file mode 100644
index 00000000000..d77a24fcd75
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/pom.xml
@@ -0,0 +1,45 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>io.swagger</groupId>
+    <artifactId>swagger-petstore-javascript-promise</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>Swagger Petstore - Javascript Client (Promise version)</name>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>npm-install</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>install</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>mocha</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>test</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/samples/client/petstore/javascript-promise/src/ApiClient.js b/samples/client/petstore/javascript-promise/src/ApiClient.js
new file mode 100644
index 00000000000..8943bd4792b
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/src/ApiClient.js
@@ -0,0 +1,467 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['superagent'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('superagent'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.ApiClient = factory(root.superagent);
+  }
+}(this, function(superagent) {
+  'use strict';
+
+  /**
+   * @module ApiClient
+   * @version 1.0.0
+   */
+
+  /**
+   * Manages low level client-server communications, parameter marshalling, etc. There should not be any need for an
+   * application to use this class directly - the *Api and model classes provide the public API for the service. The
+   * contents of this file should be regarded as internal but are documented for completeness.
+   * @alias module:ApiClient
+   * @class
+   */
+  var exports = function() {
+    /**
+     * The base URL against which to resolve every API call's (relative) path.
+     * @type {String}
+     * @default http://petstore.swagger.io/v2
+     */
+    this.basePath = 'http://petstore.swagger.io/v2'.replace(/\/+$/, '');
+
+    /**
+     * The authentication methods to be included for all API calls.
+     * @type {Array.<String>}
+     */
+    this.authentications = {
+      'test_api_key_header': {type: 'apiKey', 'in': 'header', name: 'test_api_key_header'},
+      'api_key': {type: 'apiKey', 'in': 'header', name: 'api_key'},
+      'test_http_basic': {type: 'basic'},
+      'test_api_client_secret': {type: 'apiKey', 'in': 'header', name: 'x-test_api_client_secret'},
+      'test_api_client_id': {type: 'apiKey', 'in': 'header', name: 'x-test_api_client_id'},
+      'test_api_key_query': {type: 'apiKey', 'in': 'query', name: 'test_api_key_query'},
+      'petstore_auth': {type: 'oauth2'}
+    };
+
+    /**
+     * The default HTTP headers to be included for all API calls.
+     * @type {Array.<String>}
+     * @default {}
+     */
+    this.defaultHeaders = {};
+
+    /**
+     * The default HTTP timeout for all API calls.
+     * @type {Number}
+     * @default 60000
+     */
+    this.timeout = 60000;
+  };
+
+  /**
+   * Returns a string representation for an actual parameter.
+   * @param param The actual parameter.
+   * @returns {String} The string representation of <code>param</code>.
+   */
+  exports.prototype.paramToString = function(param) {
+    if (param == undefined || param == null) {
+      return '';
+    }
+    if (param instanceof Date) {
+      return param.toJSON();
+    }
+    return param.toString();
+  };
+
+  /**
+   * Builds full URL by appending the given path to the base URL and replacing path parameter place-holders with parameter values.
+   * NOTE: query parameters are not handled here.
+   * @param {String} path The path to append to the base URL.
+   * @param {Object} pathParams The parameter values to append.
+   * @returns {String} The encoded path with parameter values substituted.
+   */
+  exports.prototype.buildUrl = function(path, pathParams) {
+    if (!path.match(/^\//)) {
+      path = '/' + path;
+    }
+    var url = this.basePath + path;
+    var _this = this;
+    url = url.replace(/\{([\w-]+)\}/g, function(fullMatch, key) {
+      var value;
+      if (pathParams.hasOwnProperty(key)) {
+        value = _this.paramToString(pathParams[key]);
+      } else {
+        value = fullMatch;
+      }
+      return encodeURIComponent(value);
+    });
+    return url;
+  };
+
+  /**
+   * Checks whether the given content type represents JSON.<br>
+   * JSON content type examples:<br>
+   * <ul>
+   * <li>application/json</li>
+   * <li>application/json; charset=UTF8</li>
+   * <li>APPLICATION/JSON</li>
+   * </ul>
+   * @param {String} contentType The MIME content type to check.
+   * @returns {Boolean} <code>true</code> if <code>contentType</code> represents JSON, otherwise <code>false</code>.
+   */
+  exports.prototype.isJsonMime = function(contentType) {
+    return Boolean(contentType != null && contentType.match(/^application\/json(;.*)?$/i));
+  };
+
+  /**
+   * Chooses a content type from the given array, with JSON preferred; i.e. return JSON if included, otherwise return the first.
+   * @param {Array.<String>} contentTypes
+   * @returns {String} The chosen content type, preferring JSON.
+   */
+  exports.prototype.jsonPreferredMime = function(contentTypes) {
+    for (var i = 0; i < contentTypes.length; i++) {
+      if (this.isJsonMime(contentTypes[i])) {
+        return contentTypes[i];
+      }
+    }
+    return contentTypes[0];
+  };
+
+  /**
+   * Checks whether the given parameter value represents file-like content.
+   * @param param The parameter to check.
+   * @returns {Boolean} <code>true</code> if <code>param</code> represents a file. 
+   */
+  exports.prototype.isFileParam = function(param) {
+    // fs.ReadStream in Node.js (but not in runtime like browserify)
+    if (typeof window === 'undefined' &&
+        typeof require === 'function' &&
+        require('fs') &&
+        param instanceof require('fs').ReadStream) {
+      return true;
+    }
+    // Buffer in Node.js
+    if (typeof Buffer === 'function' && param instanceof Buffer) {
+      return true;
+    }
+    // Blob in browser
+    if (typeof Blob === 'function' && param instanceof Blob) {
+      return true;
+    }
+    // File in browser (it seems File object is also instance of Blob, but keep this for safe)
+    if (typeof File === 'function' && param instanceof File) {
+      return true;
+    }
+    return false;
+  };
+
+  /**
+   * Normalizes parameter values:
+   * <ul>
+   * <li>remove nils</li>
+   * <li>keep files and arrays</li>
+   * <li>format to string with `paramToString` for other cases</li>
+   * </ul>
+   * @param {Object.<String, Object>} params The parameters as object properties.
+   * @returns {Object.<String, Object>} normalized parameters.
+   */
+  exports.prototype.normalizeParams = function(params) {
+    var newParams = {};
+    for (var key in params) {
+      if (params.hasOwnProperty(key) && params[key] != undefined && params[key] != null) {
+        var value = params[key];
+        if (this.isFileParam(value) || Array.isArray(value)) {
+          newParams[key] = value;
+        } else {
+          newParams[key] = this.paramToString(value);
+        }
+      }
+    }
+    return newParams;
+  };
+
+  /**
+   * Enumeration of collection format separator strategies.
+   * @enum {String} 
+   * @readonly
+   */
+  exports.CollectionFormatEnum = {
+    /**
+     * Comma-separated values. Value: <code>csv</code>
+     * @const
+     */
+    CSV: ',',
+    /**
+     * Space-separated values. Value: <code>ssv</code>
+     * @const
+     */
+    SSV: ' ',
+    /**
+     * Tab-separated values. Value: <code>tsv</code>
+     * @const
+     */
+    TSV: '\t',
+    /**
+     * Pipe(|)-separated values. Value: <code>pipes</code>
+     * @const
+     */
+    PIPES: '|',
+    /**
+     * Native array. Value: <code>multi</code>
+     * @const
+     */
+    MULTI: 'multi'
+  };
+
+  /**
+   * Builds a string representation of an array-type actual parameter, according to the given collection format.
+   * @param {Array} param An array parameter.
+   * @param {module:ApiClient.CollectionFormatEnum} collectionFormat The array element separator strategy.
+   * @returns {String|Array} A string representation of the supplied collection, using the specified delimiter. Returns
+   * <code>param</code> as is if <code>collectionFormat</code> is <code>multi</code>.
+   */
+  exports.prototype.buildCollectionParam = function buildCollectionParam(param, collectionFormat) {
+    if (param == null) {
+      return null;
+    }
+    switch (collectionFormat) {
+      case 'csv':
+        return param.map(this.paramToString).join(',');
+      case 'ssv':
+        return param.map(this.paramToString).join(' ');
+      case 'tsv':
+        return param.map(this.paramToString).join('\t');
+      case 'pipes':
+        return param.map(this.paramToString).join('|');
+      case 'multi':
+        // return the array directly as SuperAgent will handle it as expected
+        return param.map(this.paramToString);
+      default:
+        throw new Error('Unknown collection format: ' + collectionFormat);
+    }
+  };
+
+  /**
+   * Applies authentication headers to the request.
+   * @param {Object} request The request object created by a <code>superagent()</code> call.
+   * @param {Array.<String>} authNames An array of authentication method names.
+   */
+  exports.prototype.applyAuthToRequest = function(request, authNames) {
+    var _this = this;
+    authNames.forEach(function(authName) {
+      var auth = _this.authentications[authName];
+      switch (auth.type) {
+        case 'basic':
+          if (auth.username || auth.password) {
+            request.auth(auth.username || '', auth.password || '');
+          }
+          break;
+        case 'apiKey':
+          if (auth.apiKey) {
+            var data = {};
+            if (auth.apiKeyPrefix) {
+              data[auth.name] = auth.apiKeyPrefix + ' ' + auth.apiKey;
+            } else {
+              data[auth.name] = auth.apiKey;
+            }
+            if (auth['in'] === 'header') {
+              request.set(data);
+            } else {
+              request.query(data);
+            }
+          }
+          break;
+        case 'oauth2':
+          if (auth.accessToken) {
+            request.set({'Authorization': 'Bearer ' + auth.accessToken});
+          }
+          break;
+        default:
+          throw new Error('Unknown authentication type: ' + auth.type);
+      }
+    });
+  };
+
+  /**
+   * Deserializes an HTTP response body into a value of the specified type.
+   * @param {Object} response A SuperAgent response object.
+   * @param {(String|Array.<String>|Object.<String, Object>|Function)} returnType The type to return. Pass a string for simple types
+   * or the constructor function for a complex type. Pass an array containing the type name to return an array of that type. To
+   * return an object, pass an object with one property whose name is the key type and whose value is the corresponding value type:
+   * all properties on <code>data<code> will be converted to this type.
+   * @returns A value of the specified type.
+   */
+  exports.prototype.deserialize = function deserialize(response, returnType) {
+    if (response == null || returnType == null) {
+      return null;
+    }
+    // Rely on SuperAgent for parsing response body.
+    // See http://visionmedia.github.io/superagent/#parsing-response-bodies
+    var data = response.body;
+    if (data == null) {
+      // SuperAgent does not always produce a body; use the unparsed response as a fallback
+      data = response.text;
+    }
+    return exports.convertToType(data, returnType);
+  };
+
+  /**
+   * Invokes the REST service using the supplied settings and parameters.
+   * @param {String} path The base URL to invoke.
+   * @param {String} httpMethod The HTTP method to use.
+   * @param {Object.<String, String>} pathParams A map of path parameters and their values.
+   * @param {Object.<String, Object>} queryParams A map of query parameters and their values.
+   * @param {Object.<String, Object>} headerParams A map of header parameters and their values.
+   * @param {Object.<String, Object>} formParams A map of form parameters and their values.
+   * @param {Object} bodyParam The value to pass as the request body.
+   * @param {Array.<String>} authNames An array of authentication type names.
+   * @param {Array.<String>} contentTypes An array of request MIME types.
+   * @param {Array.<String>} accepts An array of acceptable response MIME types.
+   * @param {(String|Array|ObjectFunction)} returnType The required type to return; can be a string for simple types or the
+   * constructor for a complex type.   * @returns {Promise} A Promise object.
+   */
+  exports.prototype.callApi = function callApi(path, httpMethod, pathParams,
+      queryParams, headerParams, formParams, bodyParam, authNames, contentTypes, accepts,
+      returnType) {
+
+    var _this = this;
+    var url = this.buildUrl(path, pathParams);
+    var request = superagent(httpMethod, url);
+
+    // apply authentications
+    this.applyAuthToRequest(request, authNames);
+
+    // set query parameters
+    request.query(this.normalizeParams(queryParams));
+
+    // set header parameters
+    request.set(this.defaultHeaders).set(this.normalizeParams(headerParams));
+
+    // set request timeout
+    request.timeout(this.timeout);
+
+    var contentType = this.jsonPreferredMime(contentTypes);
+    if (contentType) {
+      request.type(contentType);
+    } else if (!request.header['Content-Type']) {
+      request.type('application/json');
+    }
+
+    if (contentType === 'application/x-www-form-urlencoded') {
+      request.send(this.normalizeParams(formParams));
+    } else if (contentType == 'multipart/form-data') {
+      var _formParams = this.normalizeParams(formParams);
+      for (var key in _formParams) {
+        if (_formParams.hasOwnProperty(key)) {
+          if (this.isFileParam(_formParams[key])) {
+            // file field
+            request.attach(key, _formParams[key]);
+          } else {
+            request.field(key, _formParams[key]);
+          }
+        }
+      }
+    } else if (bodyParam) {
+      request.send(bodyParam);
+    }
+
+    var accept = this.jsonPreferredMime(accepts);
+    if (accept) {
+      request.accept(accept);
+    }
+
+    return new Promise(function(resolve, reject) {
+      request.end(function(error, response) {
+        if (error) {
+          reject(error);
+        } else {
+          var data = _this.deserialize(response, returnType);
+          resolve(data);
+        }
+      });
+    });
+  };
+
+  /**
+   * Parses an ISO-8601 string representation of a date value.
+   * @param {String} str The date value as a string.
+   * @returns {Date} The parsed date object.
+   */
+  exports.parseDate = function(str) {
+    return new Date(str.replace(/T/i, ' '));
+  };
+
+  /**
+   * Converts a value to the specified type.
+   * @param {(String|Object)} data The data to convert, as a string or object.
+   * @param {(String|Array.<String>|Object.<String, Object>|Function)} type The type to return. Pass a string for simple types
+   * or the constructor function for a complex type. Pass an array containing the type name to return an array of that type. To
+   * return an object, pass an object with one property whose name is the key type and whose value is the corresponding value type:
+   * all properties on <code>data<code> will be converted to this type.
+   * @returns An instance of the specified type.
+   */
+  exports.convertToType = function(data, type) {
+    switch (type) {
+      case 'Boolean':
+        return Boolean(data);
+      case 'Integer':
+        return parseInt(data, 10);
+      case 'Number':
+        return parseFloat(data);
+      case 'String':
+        return String(data);
+      case 'Date':
+        return this.parseDate(String(data));
+      default:
+        if (type === Object) {
+          // generic object, return directly
+          return data;
+        } else if (typeof type === 'function') {
+          // for model type like: User
+          return type.constructFromObject(data);
+        } else if (Array.isArray(type)) {
+          // for array type like: ['String']
+          var itemType = type[0];
+          return data.map(function(item) {
+            return exports.convertToType(item, itemType);
+          });
+        } else if (typeof type === 'object') {
+          // for plain object type like: {'String': 'Integer'}
+          var keyType, valueType;
+          for (var k in type) {
+            if (type.hasOwnProperty(k)) {
+              keyType = k;
+              valueType = type[k];
+              break;
+            }
+          }
+          var result = {};
+          for (var k in data) {
+            if (data.hasOwnProperty(k)) {
+              var key = exports.convertToType(k, keyType);
+              var value = exports.convertToType(data[k], valueType);
+              result[key] = value;
+            }
+          }
+          return result;
+        } else {
+          // for unknown type, return the data directly
+          return data;
+        }
+    }
+  };
+
+  /**
+   * The default API client implementation.
+   * @type {module:ApiClient}
+   */
+  exports.instance = new exports();
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript-promise/src/api/PetApi.js b/samples/client/petstore/javascript-promise/src/api/PetApi.js
new file mode 100644
index 00000000000..520791b3f0a
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/src/api/PetApi.js
@@ -0,0 +1,447 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient', '../model/Pet', '../model/InlineResponse200'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'), require('../model/Pet'), require('../model/InlineResponse200'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.PetApi = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Pet, root.SwaggerPetstore.InlineResponse200);
+  }
+}(this, function(ApiClient, Pet, InlineResponse200) {
+  'use strict';
+
+  /**
+   * Pet service.
+   * @module api/PetApi
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new PetApi. 
+   * @alias module:api/PetApi
+   * @class
+   * @param {module:ApiClient} apiClient Optional API client implementation to use, default to {@link module:ApiClient#instance}
+   * if unspecified.
+   */
+  var exports = function(apiClient) {
+    this.apiClient = apiClient || ApiClient.instance;
+
+
+
+    /**
+     * Add a new pet to the store
+     * 
+     * @param {Object} opts Optional parameters
+     * @param {module:model/Pet} opts.body Pet object that needs to be added to the store
+     */
+    this.addPet = function(opts) {
+      opts = opts || {};
+      var postBody = opts['body'];
+
+
+      var pathParams = {
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = ['petstore_auth'];
+      var contentTypes = ['application/json', 'application/xml'];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = null;
+
+      return this.apiClient.callApi(
+        '/pet', 'POST',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+
+
+    /**
+     * Fake endpoint to test byte array in body parameter for adding a new pet to the store
+     * 
+     * @param {Object} opts Optional parameters
+     * @param {String} opts.body Pet object in the form of byte array
+     */
+    this.addPetUsingByteArray = function(opts) {
+      opts = opts || {};
+      var postBody = opts['body'];
+
+
+      var pathParams = {
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = ['petstore_auth'];
+      var contentTypes = ['application/json', 'application/xml'];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = null;
+
+      return this.apiClient.callApi(
+        '/pet?testing_byte_array=true', 'POST',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+
+
+    /**
+     * Deletes a pet
+     * 
+     * @param {Integer} petId Pet id to delete
+     * @param {Object} opts Optional parameters
+     * @param {String} opts.apiKey 
+     */
+    this.deletePet = function(petId, opts) {
+      opts = opts || {};
+      var postBody = null;
+
+      // verify the required parameter 'petId' is set
+      if (petId == undefined || petId == null) {
+        throw "Missing the required parameter 'petId' when calling deletePet";
+      }
+
+
+      var pathParams = {
+        'petId': petId
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+        'api_key': opts['apiKey']
+      };
+      var formParams = {
+      };
+
+      var authNames = ['petstore_auth'];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = null;
+
+      return this.apiClient.callApi(
+        '/pet/{petId}', 'DELETE',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+
+
+    /**
+     * Finds Pets by status
+     * Multiple status values can be provided with comma separated strings
+     * @param {Object} opts Optional parameters
+     * @param {Array.<String>} opts.status Status values that need to be considered for query (default to available)
+     * data is of type: {Array.<module:model/Pet>}
+     */
+    this.findPetsByStatus = function(opts) {
+      opts = opts || {};
+      var postBody = null;
+
+
+      var pathParams = {
+      };
+      var queryParams = {
+        'status': this.apiClient.buildCollectionParam(opts['status'], 'multi')
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = ['petstore_auth'];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = [Pet];
+
+      return this.apiClient.callApi(
+        '/pet/findByStatus', 'GET',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+
+
+    /**
+     * Finds Pets by tags
+     * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+     * @param {Object} opts Optional parameters
+     * @param {Array.<String>} opts.tags Tags to filter by
+     * data is of type: {Array.<module:model/Pet>}
+     */
+    this.findPetsByTags = function(opts) {
+      opts = opts || {};
+      var postBody = null;
+
+
+      var pathParams = {
+      };
+      var queryParams = {
+        'tags': this.apiClient.buildCollectionParam(opts['tags'], 'multi')
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = ['petstore_auth'];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = [Pet];
+
+      return this.apiClient.callApi(
+        '/pet/findByTags', 'GET',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+
+
+    /**
+     * Find pet by ID
+     * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+     * @param {Integer} petId ID of pet that needs to be fetched
+     * data is of type: {module:model/Pet}
+     */
+    this.getPetById = function(petId) {
+      var postBody = null;
+
+      // verify the required parameter 'petId' is set
+      if (petId == undefined || petId == null) {
+        throw "Missing the required parameter 'petId' when calling getPetById";
+      }
+
+
+      var pathParams = {
+        'petId': petId
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = ['api_key', 'petstore_auth'];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = Pet;
+
+      return this.apiClient.callApi(
+        '/pet/{petId}', 'GET',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+
+
+    /**
+     * Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+     * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+     * @param {Integer} petId ID of pet that needs to be fetched
+     * data is of type: {module:model/InlineResponse200}
+     */
+    this.getPetByIdInObject = function(petId) {
+      var postBody = null;
+
+      // verify the required parameter 'petId' is set
+      if (petId == undefined || petId == null) {
+        throw "Missing the required parameter 'petId' when calling getPetByIdInObject";
+      }
+
+
+      var pathParams = {
+        'petId': petId
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = ['api_key', 'petstore_auth'];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = InlineResponse200;
+
+      return this.apiClient.callApi(
+        '/pet/{petId}?response=inline_arbitrary_object', 'GET',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+
+
+    /**
+     * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+     * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+     * @param {Integer} petId ID of pet that needs to be fetched
+     * data is of type: {'String'}
+     */
+    this.petPetIdtestingByteArraytrueGet = function(petId) {
+      var postBody = null;
+
+      // verify the required parameter 'petId' is set
+      if (petId == undefined || petId == null) {
+        throw "Missing the required parameter 'petId' when calling petPetIdtestingByteArraytrueGet";
+      }
+
+
+      var pathParams = {
+        'petId': petId
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = ['api_key', 'petstore_auth'];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = 'String';
+
+      return this.apiClient.callApi(
+        '/pet/{petId}?testing_byte_array=true', 'GET',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+
+
+    /**
+     * Update an existing pet
+     * 
+     * @param {Object} opts Optional parameters
+     * @param {module:model/Pet} opts.body Pet object that needs to be added to the store
+     */
+    this.updatePet = function(opts) {
+      opts = opts || {};
+      var postBody = opts['body'];
+
+
+      var pathParams = {
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = ['petstore_auth'];
+      var contentTypes = ['application/json', 'application/xml'];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = null;
+
+      return this.apiClient.callApi(
+        '/pet', 'PUT',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+
+
+    /**
+     * Updates a pet in the store with form data
+     * 
+     * @param {String} petId ID of pet that needs to be updated
+     * @param {Object} opts Optional parameters
+     * @param {String} opts.name Updated name of the pet
+     * @param {String} opts.status Updated status of the pet
+     */
+    this.updatePetWithForm = function(petId, opts) {
+      opts = opts || {};
+      var postBody = null;
+
+      // verify the required parameter 'petId' is set
+      if (petId == undefined || petId == null) {
+        throw "Missing the required parameter 'petId' when calling updatePetWithForm";
+      }
+
+
+      var pathParams = {
+        'petId': petId
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+        'name': opts['name'],
+        'status': opts['status']
+      };
+
+      var authNames = ['petstore_auth'];
+      var contentTypes = ['application/x-www-form-urlencoded'];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = null;
+
+      return this.apiClient.callApi(
+        '/pet/{petId}', 'POST',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+
+
+    /**
+     * uploads an image
+     * 
+     * @param {Integer} petId ID of pet to update
+     * @param {Object} opts Optional parameters
+     * @param {String} opts.additionalMetadata Additional data to pass to server
+     * @param {File} opts.file file to upload
+     */
+    this.uploadFile = function(petId, opts) {
+      opts = opts || {};
+      var postBody = null;
+
+      // verify the required parameter 'petId' is set
+      if (petId == undefined || petId == null) {
+        throw "Missing the required parameter 'petId' when calling uploadFile";
+      }
+
+
+      var pathParams = {
+        'petId': petId
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+        'additionalMetadata': opts['additionalMetadata'],
+        'file': opts['file']
+      };
+
+      var authNames = ['petstore_auth'];
+      var contentTypes = ['multipart/form-data'];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = null;
+
+      return this.apiClient.callApi(
+        '/pet/{petId}/uploadImage', 'POST',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+  };
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript-promise/src/api/StoreApi.js b/samples/client/petstore/javascript-promise/src/api/StoreApi.js
new file mode 100644
index 00000000000..32a6dce47e9
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/src/api/StoreApi.js
@@ -0,0 +1,243 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient', '../model/Order'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'), require('../model/Order'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.StoreApi = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Order);
+  }
+}(this, function(ApiClient, Order) {
+  'use strict';
+
+  /**
+   * Store service.
+   * @module api/StoreApi
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new StoreApi. 
+   * @alias module:api/StoreApi
+   * @class
+   * @param {module:ApiClient} apiClient Optional API client implementation to use, default to {@link module:ApiClient#instance}
+   * if unspecified.
+   */
+  var exports = function(apiClient) {
+    this.apiClient = apiClient || ApiClient.instance;
+
+
+
+    /**
+     * Delete purchase order by ID
+     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+     * @param {String} orderId ID of the order that needs to be deleted
+     */
+    this.deleteOrder = function(orderId) {
+      var postBody = null;
+
+      // verify the required parameter 'orderId' is set
+      if (orderId == undefined || orderId == null) {
+        throw "Missing the required parameter 'orderId' when calling deleteOrder";
+      }
+
+
+      var pathParams = {
+        'orderId': orderId
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = [];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = null;
+
+      return this.apiClient.callApi(
+        '/store/order/{orderId}', 'DELETE',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+
+
+    /**
+     * Finds orders by status
+     * A single status value can be provided as a string
+     * @param {Object} opts Optional parameters
+     * @param {module:model/String} opts.status Status value that needs to be considered for query (default to placed)
+     * data is of type: {Array.<module:model/Order>}
+     */
+    this.findOrdersByStatus = function(opts) {
+      opts = opts || {};
+      var postBody = null;
+
+
+      var pathParams = {
+      };
+      var queryParams = {
+        'status': opts['status']
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = ['test_api_client_id', 'test_api_client_secret'];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = [Order];
+
+      return this.apiClient.callApi(
+        '/store/findByStatus', 'GET',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+
+
+    /**
+     * Returns pet inventories by status
+     * Returns a map of status codes to quantities
+     * data is of type: {Object.<String, {'String': 'Integer'}>}
+     */
+    this.getInventory = function() {
+      var postBody = null;
+
+
+      var pathParams = {
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = ['api_key'];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = {'String': 'Integer'};
+
+      return this.apiClient.callApi(
+        '/store/inventory', 'GET',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+
+
+    /**
+     * Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+     * Returns an arbitrary object which is actually a map of status codes to quantities
+     * data is of type: {Object}
+     */
+    this.getInventoryInObject = function() {
+      var postBody = null;
+
+
+      var pathParams = {
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = ['api_key'];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = Object;
+
+      return this.apiClient.callApi(
+        '/store/inventory?response=arbitrary_object', 'GET',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+
+
+    /**
+     * Find purchase order by ID
+     * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+     * @param {String} orderId ID of pet that needs to be fetched
+     * data is of type: {module:model/Order}
+     */
+    this.getOrderById = function(orderId) {
+      var postBody = null;
+
+      // verify the required parameter 'orderId' is set
+      if (orderId == undefined || orderId == null) {
+        throw "Missing the required parameter 'orderId' when calling getOrderById";
+      }
+
+
+      var pathParams = {
+        'orderId': orderId
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = ['test_api_key_header', 'test_api_key_query'];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = Order;
+
+      return this.apiClient.callApi(
+        '/store/order/{orderId}', 'GET',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+
+
+    /**
+     * Place an order for a pet
+     * 
+     * @param {Object} opts Optional parameters
+     * @param {module:model/Order} opts.body order placed for purchasing the pet
+     * data is of type: {module:model/Order}
+     */
+    this.placeOrder = function(opts) {
+      opts = opts || {};
+      var postBody = opts['body'];
+
+
+      var pathParams = {
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = ['test_api_client_id', 'test_api_client_secret'];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = Order;
+
+      return this.apiClient.callApi(
+        '/store/order', 'POST',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+  };
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript-promise/src/api/UserApi.js b/samples/client/petstore/javascript-promise/src/api/UserApi.js
new file mode 100644
index 00000000000..8914d9c883d
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/src/api/UserApi.js
@@ -0,0 +1,318 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient', '../model/User'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'), require('../model/User'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.UserApi = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.User);
+  }
+}(this, function(ApiClient, User) {
+  'use strict';
+
+  /**
+   * User service.
+   * @module api/UserApi
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new UserApi. 
+   * @alias module:api/UserApi
+   * @class
+   * @param {module:ApiClient} apiClient Optional API client implementation to use, default to {@link module:ApiClient#instance}
+   * if unspecified.
+   */
+  var exports = function(apiClient) {
+    this.apiClient = apiClient || ApiClient.instance;
+
+
+
+    /**
+     * Create user
+     * This can only be done by the logged in user.
+     * @param {Object} opts Optional parameters
+     * @param {module:model/User} opts.body Created user object
+     */
+    this.createUser = function(opts) {
+      opts = opts || {};
+      var postBody = opts['body'];
+
+
+      var pathParams = {
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = [];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = null;
+
+      return this.apiClient.callApi(
+        '/user', 'POST',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+
+
+    /**
+     * Creates list of users with given input array
+     * 
+     * @param {Object} opts Optional parameters
+     * @param {Array.<module:model/User>} opts.body List of user object
+     */
+    this.createUsersWithArrayInput = function(opts) {
+      opts = opts || {};
+      var postBody = opts['body'];
+
+
+      var pathParams = {
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = [];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = null;
+
+      return this.apiClient.callApi(
+        '/user/createWithArray', 'POST',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+
+
+    /**
+     * Creates list of users with given input array
+     * 
+     * @param {Object} opts Optional parameters
+     * @param {Array.<module:model/User>} opts.body List of user object
+     */
+    this.createUsersWithListInput = function(opts) {
+      opts = opts || {};
+      var postBody = opts['body'];
+
+
+      var pathParams = {
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = [];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = null;
+
+      return this.apiClient.callApi(
+        '/user/createWithList', 'POST',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+
+
+    /**
+     * Delete user
+     * This can only be done by the logged in user.
+     * @param {String} username The name that needs to be deleted
+     */
+    this.deleteUser = function(username) {
+      var postBody = null;
+
+      // verify the required parameter 'username' is set
+      if (username == undefined || username == null) {
+        throw "Missing the required parameter 'username' when calling deleteUser";
+      }
+
+
+      var pathParams = {
+        'username': username
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = ['test_http_basic'];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = null;
+
+      return this.apiClient.callApi(
+        '/user/{username}', 'DELETE',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+
+
+    /**
+     * Get user by user name
+     * 
+     * @param {String} username The name that needs to be fetched. Use user1 for testing.
+     * data is of type: {module:model/User}
+     */
+    this.getUserByName = function(username) {
+      var postBody = null;
+
+      // verify the required parameter 'username' is set
+      if (username == undefined || username == null) {
+        throw "Missing the required parameter 'username' when calling getUserByName";
+      }
+
+
+      var pathParams = {
+        'username': username
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = [];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = User;
+
+      return this.apiClient.callApi(
+        '/user/{username}', 'GET',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+
+
+    /**
+     * Logs user into the system
+     * 
+     * @param {Object} opts Optional parameters
+     * @param {String} opts.username The user name for login
+     * @param {String} opts.password The password for login in clear text
+     * data is of type: {'String'}
+     */
+    this.loginUser = function(opts) {
+      opts = opts || {};
+      var postBody = null;
+
+
+      var pathParams = {
+      };
+      var queryParams = {
+        'username': opts['username'],
+        'password': opts['password']
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = [];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = 'String';
+
+      return this.apiClient.callApi(
+        '/user/login', 'GET',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+
+
+    /**
+     * Logs out current logged in user session
+     * 
+     */
+    this.logoutUser = function() {
+      var postBody = null;
+
+
+      var pathParams = {
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = [];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = null;
+
+      return this.apiClient.callApi(
+        '/user/logout', 'GET',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+
+
+    /**
+     * Updated user
+     * This can only be done by the logged in user.
+     * @param {String} username name that need to be deleted
+     * @param {Object} opts Optional parameters
+     * @param {module:model/User} opts.body Updated user object
+     */
+    this.updateUser = function(username, opts) {
+      opts = opts || {};
+      var postBody = opts['body'];
+
+      // verify the required parameter 'username' is set
+      if (username == undefined || username == null) {
+        throw "Missing the required parameter 'username' when calling updateUser";
+      }
+
+
+      var pathParams = {
+        'username': username
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = [];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = null;
+
+      return this.apiClient.callApi(
+        '/user/{username}', 'PUT',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType
+      );
+    }
+  };
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript-promise/src/index.js b/samples/client/petstore/javascript-promise/src/index.js
new file mode 100644
index 00000000000..da193f80e4d
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/src/index.js
@@ -0,0 +1,132 @@
+(function(factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['./ApiClient', './model/Animal', './model/Cat', './model/Category', './model/Dog', './model/InlineResponse200', './model/Model200Response', './model/ModelReturn', './model/Name', './model/Order', './model/Pet', './model/SpecialModelName', './model/Tag', './model/User', './api/PetApi', './api/StoreApi', './api/UserApi'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('./ApiClient'), require('./model/Animal'), require('./model/Cat'), require('./model/Category'), require('./model/Dog'), require('./model/InlineResponse200'), require('./model/Model200Response'), require('./model/ModelReturn'), require('./model/Name'), require('./model/Order'), require('./model/Pet'), require('./model/SpecialModelName'), require('./model/Tag'), require('./model/User'), require('./api/PetApi'), require('./api/StoreApi'), require('./api/UserApi'));
+  }
+}(function(ApiClient, Animal, Cat, Category, Dog, InlineResponse200, Model200Response, ModelReturn, Name, Order, Pet, SpecialModelName, Tag, User, PetApi, StoreApi, UserApi) {
+  'use strict';
+
+  /**
+   * This is a sample server Petstore server.  You can find out more about Swagger at &lt;a href=\&quot;http://swagger.io\&quot;&gt;http://swagger.io&lt;/a&gt; or on irc.freenode.net, #swagger.  For this sample, you can use the api key \&quot;special-key\&quot; to test the authorization filters.<br>
+   * The <code>index</code> module provides access to constructors for all the classes which comprise the public API.
+   * <p>
+   * An AMD (recommended!) or CommonJS application will generally do something equivalent to the following:
+   * <pre>
+   * var SwaggerPetstore = require('./index'); // See note below*.
+   * var xxxSvc = new SwaggerPetstore.XxxApi(); // Allocate the API class we're going to use.
+   * var yyyModel = new SwaggerPetstore.Yyy(); // Construct a model instance.
+   * yyyModel.someProperty = 'someValue';
+   * ...
+   * var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
+   * ...
+   * </pre>
+   * <em>*NOTE: For a top-level AMD script, use require(['./index'], function(){...}) and put the application logic within the
+   * callback function.</em>
+   * </p>
+   * <p>
+   * A non-AMD browser application (discouraged) might do something like this:
+   * <pre>
+   * var xxxSvc = new SwaggerPetstore.XxxApi(); // Allocate the API class we're going to use.
+   * var yyy = new SwaggerPetstore.Yyy(); // Construct a model instance.
+   * yyyModel.someProperty = 'someValue';
+   * ...
+   * var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
+   * ...
+   * </pre>
+   * </p>
+   * @module index
+   * @version 1.0.0
+   */
+  var exports = {
+    /**
+     * The ApiClient constructor.
+     * @property {module:ApiClient}
+     */
+    ApiClient: ApiClient,
+    /**
+     * The Animal model constructor.
+     * @property {module:model/Animal}
+     */
+    Animal: Animal,
+    /**
+     * The Cat model constructor.
+     * @property {module:model/Cat}
+     */
+    Cat: Cat,
+    /**
+     * The Category model constructor.
+     * @property {module:model/Category}
+     */
+    Category: Category,
+    /**
+     * The Dog model constructor.
+     * @property {module:model/Dog}
+     */
+    Dog: Dog,
+    /**
+     * The InlineResponse200 model constructor.
+     * @property {module:model/InlineResponse200}
+     */
+    InlineResponse200: InlineResponse200,
+    /**
+     * The Model200Response model constructor.
+     * @property {module:model/Model200Response}
+     */
+    Model200Response: Model200Response,
+    /**
+     * The ModelReturn model constructor.
+     * @property {module:model/ModelReturn}
+     */
+    ModelReturn: ModelReturn,
+    /**
+     * The Name model constructor.
+     * @property {module:model/Name}
+     */
+    Name: Name,
+    /**
+     * The Order model constructor.
+     * @property {module:model/Order}
+     */
+    Order: Order,
+    /**
+     * The Pet model constructor.
+     * @property {module:model/Pet}
+     */
+    Pet: Pet,
+    /**
+     * The SpecialModelName model constructor.
+     * @property {module:model/SpecialModelName}
+     */
+    SpecialModelName: SpecialModelName,
+    /**
+     * The Tag model constructor.
+     * @property {module:model/Tag}
+     */
+    Tag: Tag,
+    /**
+     * The User model constructor.
+     * @property {module:model/User}
+     */
+    User: User,
+    /**
+     * The PetApi service constructor.
+     * @property {module:api/PetApi}
+     */
+    PetApi: PetApi,
+    /**
+     * The StoreApi service constructor.
+     * @property {module:api/StoreApi}
+     */
+    StoreApi: StoreApi,
+    /**
+     * The UserApi service constructor.
+     * @property {module:api/UserApi}
+     */
+    UserApi: UserApi
+  };
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript-promise/src/model/Animal.js b/samples/client/petstore/javascript-promise/src/model/Animal.js
new file mode 100644
index 00000000000..674471a30ee
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/src/model/Animal.js
@@ -0,0 +1,63 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.Animal = factory(root.SwaggerPetstore.ApiClient);
+  }
+}(this, function(ApiClient) {
+  'use strict';
+
+  /**
+   * The Animal model module.
+   * @module model/Animal
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new <code>Animal</code>.
+   * @alias module:model/Animal
+   * @class
+   * @param className
+   */
+  var exports = function(className) {
+
+    this['className'] = className;
+  };
+
+  /**
+   * Constructs a <code>Animal</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/Animal} obj Optional instance to populate.
+   * @return {module:model/Animal} The populated <code>Animal</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) { 
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('className')) {
+        obj['className'] = ApiClient.convertToType(data['className'], 'String');
+      }
+    }
+    return obj;
+  }
+
+
+  /**
+   * @member {String} className
+   */
+  exports.prototype['className'] = undefined;
+
+
+
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript-promise/src/model/Cat.js b/samples/client/petstore/javascript-promise/src/model/Cat.js
new file mode 100644
index 00000000000..c878af6edec
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/src/model/Cat.js
@@ -0,0 +1,67 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient', './Animal'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'), require('./Animal'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.Cat = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Animal);
+  }
+}(this, function(ApiClient, Animal) {
+  'use strict';
+
+  /**
+   * The Cat model module.
+   * @module model/Cat
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new <code>Cat</code>.
+   * @alias module:model/Cat
+   * @class
+   * @extends module:model/Animal
+   * @param className
+   */
+  var exports = function(className) {
+    Animal.call(this, className);
+
+  };
+
+  /**
+   * Constructs a <code>Cat</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/Cat} obj Optional instance to populate.
+   * @return {module:model/Cat} The populated <code>Cat</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) { 
+      obj = obj || new exports();
+      Animal.constructFromObject(data, obj);
+      if (data.hasOwnProperty('declawed')) {
+        obj['declawed'] = ApiClient.convertToType(data['declawed'], 'Boolean');
+      }
+    }
+    return obj;
+  }
+
+  exports.prototype = Object.create(Animal.prototype);
+  exports.prototype.constructor = exports;
+
+
+  /**
+   * @member {Boolean} declawed
+   */
+  exports.prototype['declawed'] = undefined;
+
+
+
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript-promise/src/model/Category.js b/samples/client/petstore/javascript-promise/src/model/Category.js
new file mode 100644
index 00000000000..473f4b783d5
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/src/model/Category.js
@@ -0,0 +1,71 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.Category = factory(root.SwaggerPetstore.ApiClient);
+  }
+}(this, function(ApiClient) {
+  'use strict';
+
+  /**
+   * The Category model module.
+   * @module model/Category
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new <code>Category</code>.
+   * @alias module:model/Category
+   * @class
+   */
+  var exports = function() {
+
+
+
+  };
+
+  /**
+   * Constructs a <code>Category</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/Category} obj Optional instance to populate.
+   * @return {module:model/Category} The populated <code>Category</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) { 
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('id')) {
+        obj['id'] = ApiClient.convertToType(data['id'], 'Integer');
+      }
+      if (data.hasOwnProperty('name')) {
+        obj['name'] = ApiClient.convertToType(data['name'], 'String');
+      }
+    }
+    return obj;
+  }
+
+
+  /**
+   * @member {Integer} id
+   */
+  exports.prototype['id'] = undefined;
+
+  /**
+   * @member {String} name
+   */
+  exports.prototype['name'] = undefined;
+
+
+
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript-promise/src/model/Dog.js b/samples/client/petstore/javascript-promise/src/model/Dog.js
new file mode 100644
index 00000000000..e5e55581a70
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/src/model/Dog.js
@@ -0,0 +1,67 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient', './Animal'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'), require('./Animal'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.Dog = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Animal);
+  }
+}(this, function(ApiClient, Animal) {
+  'use strict';
+
+  /**
+   * The Dog model module.
+   * @module model/Dog
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new <code>Dog</code>.
+   * @alias module:model/Dog
+   * @class
+   * @extends module:model/Animal
+   * @param className
+   */
+  var exports = function(className) {
+    Animal.call(this, className);
+
+  };
+
+  /**
+   * Constructs a <code>Dog</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/Dog} obj Optional instance to populate.
+   * @return {module:model/Dog} The populated <code>Dog</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) { 
+      obj = obj || new exports();
+      Animal.constructFromObject(data, obj);
+      if (data.hasOwnProperty('breed')) {
+        obj['breed'] = ApiClient.convertToType(data['breed'], 'String');
+      }
+    }
+    return obj;
+  }
+
+  exports.prototype = Object.create(Animal.prototype);
+  exports.prototype.constructor = exports;
+
+
+  /**
+   * @member {String} breed
+   */
+  exports.prototype['breed'] = undefined;
+
+
+
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript-promise/src/model/InlineResponse200.js b/samples/client/petstore/javascript-promise/src/model/InlineResponse200.js
new file mode 100644
index 00000000000..f9ecda79491
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/src/model/InlineResponse200.js
@@ -0,0 +1,132 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient', './Tag'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'), require('./Tag'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.InlineResponse200 = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Tag);
+  }
+}(this, function(ApiClient, Tag) {
+  'use strict';
+
+  /**
+   * The InlineResponse200 model module.
+   * @module model/InlineResponse200
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new <code>InlineResponse200</code>.
+   * @alias module:model/InlineResponse200
+   * @class
+   * @param id
+   */
+  var exports = function(id) {
+
+
+    this['id'] = id;
+
+
+
+
+  };
+
+  /**
+   * Constructs a <code>InlineResponse200</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/InlineResponse200} obj Optional instance to populate.
+   * @return {module:model/InlineResponse200} The populated <code>InlineResponse200</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) { 
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('tags')) {
+        obj['tags'] = ApiClient.convertToType(data['tags'], [Tag]);
+      }
+      if (data.hasOwnProperty('id')) {
+        obj['id'] = ApiClient.convertToType(data['id'], 'Integer');
+      }
+      if (data.hasOwnProperty('category')) {
+        obj['category'] = ApiClient.convertToType(data['category'], Object);
+      }
+      if (data.hasOwnProperty('status')) {
+        obj['status'] = ApiClient.convertToType(data['status'], 'String');
+      }
+      if (data.hasOwnProperty('name')) {
+        obj['name'] = ApiClient.convertToType(data['name'], 'String');
+      }
+      if (data.hasOwnProperty('photoUrls')) {
+        obj['photoUrls'] = ApiClient.convertToType(data['photoUrls'], ['String']);
+      }
+    }
+    return obj;
+  }
+
+
+  /**
+   * @member {Array.<module:model/Tag>} tags
+   */
+  exports.prototype['tags'] = undefined;
+
+  /**
+   * @member {Integer} id
+   */
+  exports.prototype['id'] = undefined;
+
+  /**
+   * @member {Object} category
+   */
+  exports.prototype['category'] = undefined;
+
+  /**
+   * pet status in the store
+   * @member {module:model/InlineResponse200.StatusEnum} status
+   */
+  exports.prototype['status'] = undefined;
+
+  /**
+   * @member {String} name
+   */
+  exports.prototype['name'] = undefined;
+
+  /**
+   * @member {Array.<String>} photoUrls
+   */
+  exports.prototype['photoUrls'] = undefined;
+
+
+  /**
+   * Allowed values for the <code>status</code> property.
+   * @enum {String}
+   * @readonly
+   */
+  exports.StatusEnum = { 
+    /**
+     * value: available
+     * @const
+     */
+    AVAILABLE: "available",
+    
+    /**
+     * value: pending
+     * @const
+     */
+    PENDING: "pending",
+    
+    /**
+     * value: sold
+     * @const
+     */
+    SOLD: "sold"
+  };
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript-promise/src/model/Model200Response.js b/samples/client/petstore/javascript-promise/src/model/Model200Response.js
new file mode 100644
index 00000000000..fb559f5ebaa
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/src/model/Model200Response.js
@@ -0,0 +1,62 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.Model200Response = factory(root.SwaggerPetstore.ApiClient);
+  }
+}(this, function(ApiClient) {
+  'use strict';
+
+  /**
+   * The Model200Response model module.
+   * @module model/Model200Response
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new <code>Model200Response</code>.
+   * @alias module:model/Model200Response
+   * @class
+   */
+  var exports = function() {
+
+
+  };
+
+  /**
+   * Constructs a <code>Model200Response</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/Model200Response} obj Optional instance to populate.
+   * @return {module:model/Model200Response} The populated <code>Model200Response</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) { 
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('name')) {
+        obj['name'] = ApiClient.convertToType(data['name'], 'Integer');
+      }
+    }
+    return obj;
+  }
+
+
+  /**
+   * @member {Integer} name
+   */
+  exports.prototype['name'] = undefined;
+
+
+
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript-promise/src/model/ModelReturn.js b/samples/client/petstore/javascript-promise/src/model/ModelReturn.js
new file mode 100644
index 00000000000..d5036e230ea
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/src/model/ModelReturn.js
@@ -0,0 +1,62 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.ModelReturn = factory(root.SwaggerPetstore.ApiClient);
+  }
+}(this, function(ApiClient) {
+  'use strict';
+
+  /**
+   * The ModelReturn model module.
+   * @module model/ModelReturn
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new <code>ModelReturn</code>.
+   * @alias module:model/ModelReturn
+   * @class
+   */
+  var exports = function() {
+
+
+  };
+
+  /**
+   * Constructs a <code>ModelReturn</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/ModelReturn} obj Optional instance to populate.
+   * @return {module:model/ModelReturn} The populated <code>ModelReturn</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) { 
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('return')) {
+        obj['return'] = ApiClient.convertToType(data['return'], 'Integer');
+      }
+    }
+    return obj;
+  }
+
+
+  /**
+   * @member {Integer} return
+   */
+  exports.prototype['return'] = undefined;
+
+
+
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript-promise/src/model/Name.js b/samples/client/petstore/javascript-promise/src/model/Name.js
new file mode 100644
index 00000000000..a5a070025f7
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/src/model/Name.js
@@ -0,0 +1,71 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.Name = factory(root.SwaggerPetstore.ApiClient);
+  }
+}(this, function(ApiClient) {
+  'use strict';
+
+  /**
+   * The Name model module.
+   * @module model/Name
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new <code>Name</code>.
+   * @alias module:model/Name
+   * @class
+   */
+  var exports = function() {
+
+
+
+  };
+
+  /**
+   * Constructs a <code>Name</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/Name} obj Optional instance to populate.
+   * @return {module:model/Name} The populated <code>Name</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) { 
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('name')) {
+        obj['name'] = ApiClient.convertToType(data['name'], 'Integer');
+      }
+      if (data.hasOwnProperty('snake_case')) {
+        obj['snake_case'] = ApiClient.convertToType(data['snake_case'], 'Integer');
+      }
+    }
+    return obj;
+  }
+
+
+  /**
+   * @member {Integer} name
+   */
+  exports.prototype['name'] = undefined;
+
+  /**
+   * @member {Integer} snake_case
+   */
+  exports.prototype['snake_case'] = undefined;
+
+
+
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript-promise/src/model/Order.js b/samples/client/petstore/javascript-promise/src/model/Order.js
new file mode 100644
index 00000000000..81f1feb7800
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/src/model/Order.js
@@ -0,0 +1,131 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.Order = factory(root.SwaggerPetstore.ApiClient);
+  }
+}(this, function(ApiClient) {
+  'use strict';
+
+  /**
+   * The Order model module.
+   * @module model/Order
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new <code>Order</code>.
+   * @alias module:model/Order
+   * @class
+   */
+  var exports = function() {
+
+
+
+
+
+
+
+  };
+
+  /**
+   * Constructs a <code>Order</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/Order} obj Optional instance to populate.
+   * @return {module:model/Order} The populated <code>Order</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) { 
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('id')) {
+        obj['id'] = ApiClient.convertToType(data['id'], 'Integer');
+      }
+      if (data.hasOwnProperty('petId')) {
+        obj['petId'] = ApiClient.convertToType(data['petId'], 'Integer');
+      }
+      if (data.hasOwnProperty('quantity')) {
+        obj['quantity'] = ApiClient.convertToType(data['quantity'], 'Integer');
+      }
+      if (data.hasOwnProperty('shipDate')) {
+        obj['shipDate'] = ApiClient.convertToType(data['shipDate'], 'Date');
+      }
+      if (data.hasOwnProperty('status')) {
+        obj['status'] = ApiClient.convertToType(data['status'], 'String');
+      }
+      if (data.hasOwnProperty('complete')) {
+        obj['complete'] = ApiClient.convertToType(data['complete'], 'Boolean');
+      }
+    }
+    return obj;
+  }
+
+
+  /**
+   * @member {Integer} id
+   */
+  exports.prototype['id'] = undefined;
+
+  /**
+   * @member {Integer} petId
+   */
+  exports.prototype['petId'] = undefined;
+
+  /**
+   * @member {Integer} quantity
+   */
+  exports.prototype['quantity'] = undefined;
+
+  /**
+   * @member {Date} shipDate
+   */
+  exports.prototype['shipDate'] = undefined;
+
+  /**
+   * Order Status
+   * @member {module:model/Order.StatusEnum} status
+   */
+  exports.prototype['status'] = undefined;
+
+  /**
+   * @member {Boolean} complete
+   */
+  exports.prototype['complete'] = undefined;
+
+
+  /**
+   * Allowed values for the <code>status</code> property.
+   * @enum {String}
+   * @readonly
+   */
+  exports.StatusEnum = { 
+    /**
+     * value: placed
+     * @const
+     */
+    PLACED: "placed",
+    
+    /**
+     * value: approved
+     * @const
+     */
+    APPROVED: "approved",
+    
+    /**
+     * value: delivered
+     * @const
+     */
+    DELIVERED: "delivered"
+  };
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript-promise/src/model/Pet.js b/samples/client/petstore/javascript-promise/src/model/Pet.js
new file mode 100644
index 00000000000..39a09b47170
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/src/model/Pet.js
@@ -0,0 +1,133 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient', './Category', './Tag'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'), require('./Category'), require('./Tag'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.Pet = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Category, root.SwaggerPetstore.Tag);
+  }
+}(this, function(ApiClient, Category, Tag) {
+  'use strict';
+
+  /**
+   * The Pet model module.
+   * @module model/Pet
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new <code>Pet</code>.
+   * @alias module:model/Pet
+   * @class
+   * @param name
+   * @param photoUrls
+   */
+  var exports = function(name, photoUrls) {
+
+
+
+    this['name'] = name;
+    this['photoUrls'] = photoUrls;
+
+
+  };
+
+  /**
+   * Constructs a <code>Pet</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/Pet} obj Optional instance to populate.
+   * @return {module:model/Pet} The populated <code>Pet</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) { 
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('id')) {
+        obj['id'] = ApiClient.convertToType(data['id'], 'Integer');
+      }
+      if (data.hasOwnProperty('category')) {
+        obj['category'] = Category.constructFromObject(data['category']);
+      }
+      if (data.hasOwnProperty('name')) {
+        obj['name'] = ApiClient.convertToType(data['name'], 'String');
+      }
+      if (data.hasOwnProperty('photoUrls')) {
+        obj['photoUrls'] = ApiClient.convertToType(data['photoUrls'], ['String']);
+      }
+      if (data.hasOwnProperty('tags')) {
+        obj['tags'] = ApiClient.convertToType(data['tags'], [Tag]);
+      }
+      if (data.hasOwnProperty('status')) {
+        obj['status'] = ApiClient.convertToType(data['status'], 'String');
+      }
+    }
+    return obj;
+  }
+
+
+  /**
+   * @member {Integer} id
+   */
+  exports.prototype['id'] = undefined;
+
+  /**
+   * @member {module:model/Category} category
+   */
+  exports.prototype['category'] = undefined;
+
+  /**
+   * @member {String} name
+   */
+  exports.prototype['name'] = undefined;
+
+  /**
+   * @member {Array.<String>} photoUrls
+   */
+  exports.prototype['photoUrls'] = undefined;
+
+  /**
+   * @member {Array.<module:model/Tag>} tags
+   */
+  exports.prototype['tags'] = undefined;
+
+  /**
+   * pet status in the store
+   * @member {module:model/Pet.StatusEnum} status
+   */
+  exports.prototype['status'] = undefined;
+
+
+  /**
+   * Allowed values for the <code>status</code> property.
+   * @enum {String}
+   * @readonly
+   */
+  exports.StatusEnum = { 
+    /**
+     * value: available
+     * @const
+     */
+    AVAILABLE: "available",
+    
+    /**
+     * value: pending
+     * @const
+     */
+    PENDING: "pending",
+    
+    /**
+     * value: sold
+     * @const
+     */
+    SOLD: "sold"
+  };
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript-promise/src/model/SpecialModelName.js b/samples/client/petstore/javascript-promise/src/model/SpecialModelName.js
new file mode 100644
index 00000000000..fb6b4765d3f
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/src/model/SpecialModelName.js
@@ -0,0 +1,62 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.SpecialModelName = factory(root.SwaggerPetstore.ApiClient);
+  }
+}(this, function(ApiClient) {
+  'use strict';
+
+  /**
+   * The SpecialModelName model module.
+   * @module model/SpecialModelName
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new <code>SpecialModelName</code>.
+   * @alias module:model/SpecialModelName
+   * @class
+   */
+  var exports = function() {
+
+
+  };
+
+  /**
+   * Constructs a <code>SpecialModelName</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/SpecialModelName} obj Optional instance to populate.
+   * @return {module:model/SpecialModelName} The populated <code>SpecialModelName</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) { 
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('$special[property.name]')) {
+        obj['$special[property.name]'] = ApiClient.convertToType(data['$special[property.name]'], 'Integer');
+      }
+    }
+    return obj;
+  }
+
+
+  /**
+   * @member {Integer} $special[property.name]
+   */
+  exports.prototype['$special[property.name]'] = undefined;
+
+
+
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript-promise/src/model/Tag.js b/samples/client/petstore/javascript-promise/src/model/Tag.js
new file mode 100644
index 00000000000..8a0739b2ef5
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/src/model/Tag.js
@@ -0,0 +1,71 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.Tag = factory(root.SwaggerPetstore.ApiClient);
+  }
+}(this, function(ApiClient) {
+  'use strict';
+
+  /**
+   * The Tag model module.
+   * @module model/Tag
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new <code>Tag</code>.
+   * @alias module:model/Tag
+   * @class
+   */
+  var exports = function() {
+
+
+
+  };
+
+  /**
+   * Constructs a <code>Tag</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/Tag} obj Optional instance to populate.
+   * @return {module:model/Tag} The populated <code>Tag</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) { 
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('id')) {
+        obj['id'] = ApiClient.convertToType(data['id'], 'Integer');
+      }
+      if (data.hasOwnProperty('name')) {
+        obj['name'] = ApiClient.convertToType(data['name'], 'String');
+      }
+    }
+    return obj;
+  }
+
+
+  /**
+   * @member {Integer} id
+   */
+  exports.prototype['id'] = undefined;
+
+  /**
+   * @member {String} name
+   */
+  exports.prototype['name'] = undefined;
+
+
+
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript-promise/src/model/User.js b/samples/client/petstore/javascript-promise/src/model/User.js
new file mode 100644
index 00000000000..1d960a89914
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/src/model/User.js
@@ -0,0 +1,126 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.User = factory(root.SwaggerPetstore.ApiClient);
+  }
+}(this, function(ApiClient) {
+  'use strict';
+
+  /**
+   * The User model module.
+   * @module model/User
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new <code>User</code>.
+   * @alias module:model/User
+   * @class
+   */
+  var exports = function() {
+
+
+
+
+
+
+
+
+
+  };
+
+  /**
+   * Constructs a <code>User</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/User} obj Optional instance to populate.
+   * @return {module:model/User} The populated <code>User</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) { 
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('id')) {
+        obj['id'] = ApiClient.convertToType(data['id'], 'Integer');
+      }
+      if (data.hasOwnProperty('username')) {
+        obj['username'] = ApiClient.convertToType(data['username'], 'String');
+      }
+      if (data.hasOwnProperty('firstName')) {
+        obj['firstName'] = ApiClient.convertToType(data['firstName'], 'String');
+      }
+      if (data.hasOwnProperty('lastName')) {
+        obj['lastName'] = ApiClient.convertToType(data['lastName'], 'String');
+      }
+      if (data.hasOwnProperty('email')) {
+        obj['email'] = ApiClient.convertToType(data['email'], 'String');
+      }
+      if (data.hasOwnProperty('password')) {
+        obj['password'] = ApiClient.convertToType(data['password'], 'String');
+      }
+      if (data.hasOwnProperty('phone')) {
+        obj['phone'] = ApiClient.convertToType(data['phone'], 'String');
+      }
+      if (data.hasOwnProperty('userStatus')) {
+        obj['userStatus'] = ApiClient.convertToType(data['userStatus'], 'Integer');
+      }
+    }
+    return obj;
+  }
+
+
+  /**
+   * @member {Integer} id
+   */
+  exports.prototype['id'] = undefined;
+
+  /**
+   * @member {String} username
+   */
+  exports.prototype['username'] = undefined;
+
+  /**
+   * @member {String} firstName
+   */
+  exports.prototype['firstName'] = undefined;
+
+  /**
+   * @member {String} lastName
+   */
+  exports.prototype['lastName'] = undefined;
+
+  /**
+   * @member {String} email
+   */
+  exports.prototype['email'] = undefined;
+
+  /**
+   * @member {String} password
+   */
+  exports.prototype['password'] = undefined;
+
+  /**
+   * @member {String} phone
+   */
+  exports.prototype['phone'] = undefined;
+
+  /**
+   * User Status
+   * @member {Integer} userStatus
+   */
+  exports.prototype['userStatus'] = undefined;
+
+
+
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript-promise/test/ApiClientTest.js b/samples/client/petstore/javascript-promise/test/ApiClientTest.js
new file mode 100644
index 00000000000..c91fbb03783
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/test/ApiClientTest.js
@@ -0,0 +1,387 @@
+if (typeof module === 'object' && module.exports) {
+  var expect = require('expect.js');
+  var SwaggerPetstore = require('../src/index');
+  var sinon = require('sinon');
+}
+
+var apiClient = SwaggerPetstore.ApiClient.instance;
+
+describe('ApiClient', function() {
+  describe('defaults', function() {
+    it('should have correct default values with the default API client', function() {
+      expect(apiClient).to.be.ok();
+      expect(apiClient.basePath).to.be('http://petstore.swagger.io/v2');
+      expect(apiClient.authentications).to.eql({
+        petstore_auth: {type: 'oauth2'},
+        api_key: {type: 'apiKey', 'in': 'header', name: 'api_key'},
+        test_http_basic: {type: 'basic'},
+        test_api_client_id: {
+          type: 'apiKey',
+          'in': 'header',
+          name: 'x-test_api_client_id'
+        },
+        test_api_client_secret: {
+          type: 'apiKey',
+          'in': 'header',
+          name: 'x-test_api_client_secret'
+        },
+        test_api_key_query: {
+          type: 'apiKey',
+          'in': 'query',
+          name: 'test_api_key_query'
+        },
+        test_api_key_header: {
+          type: 'apiKey',
+          'in': 'header',
+          name: 'test_api_key_header'
+        }
+      });
+    });
+
+    it('should have correct default values with new API client and can customize it', function() {
+      var newClient = new SwaggerPetstore.ApiClient;
+      expect(newClient.basePath).to.be('http://petstore.swagger.io/v2');
+      expect(newClient.buildUrl('/abc', {})).to.be('http://petstore.swagger.io/v2/abc');
+
+      newClient.basePath = 'http://example.com';
+      expect(newClient.basePath).to.be('http://example.com');
+      expect(newClient.buildUrl('/abc', {})).to.be('http://example.com/abc');
+    });
+  });
+
+  describe('#paramToString', function() {
+    it('should return empty string for null and undefined', function() {
+      expect(apiClient.paramToString(null)).to.be('');
+      expect(apiClient.paramToString(undefined)).to.be('');
+    });
+
+    it('should return string', function() {
+      expect(apiClient.paramToString('')).to.be('');
+      expect(apiClient.paramToString('abc')).to.be('abc');
+      expect(apiClient.paramToString(123)).to.be('123');
+    });
+  });
+
+  describe('#buildCollectionParam', function() {
+    var param;
+
+    beforeEach(function() {
+      param = ['aa', 'bb', 123];
+    });
+
+    it('works for csv', function() {
+      expect(apiClient.buildCollectionParam(param, 'csv')).to.be('aa,bb,123');
+    });
+
+    it('works for ssv', function() {
+      expect(apiClient.buildCollectionParam(param, 'ssv')).to.be('aa bb 123');
+    });
+
+    it('works for tsv', function() {
+      expect(apiClient.buildCollectionParam(param, 'tsv')).to.be('aa\tbb\t123');
+    });
+
+    it('works for pipes', function() {
+      expect(apiClient.buildCollectionParam(param, 'pipes')).to.be('aa|bb|123');
+    });
+
+    it('works for multi', function() {
+      expect(apiClient.buildCollectionParam(param, 'multi')).to.eql(['aa', 'bb', '123']);
+    });
+
+    it('fails for invalid collection format', function() {
+      expect(function() { apiClient.buildCollectionParam(param, 'INVALID'); }).to.throwError();
+    });
+  });
+
+  describe('#buildUrl', function() {
+    it('should work without path parameters in the path', function() {
+      expect(apiClient.buildUrl('/abc', {})).to
+        .be('http://petstore.swagger.io/v2/abc');
+      expect(apiClient.buildUrl('/abc/def?ok', {id: 123})).to
+        .be('http://petstore.swagger.io/v2/abc/def?ok');
+    });
+
+    it('should work with path parameters in the path', function() {
+      expect(apiClient.buildUrl('/{id}', {id: 123})).to
+        .be('http://petstore.swagger.io/v2/123');
+      expect(apiClient.buildUrl('/abc/{id}/{name}?ok', {id: 456, name: 'a b'})).to.
+        be('http://petstore.swagger.io/v2/abc/456/a%20b?ok');
+    });
+  });
+
+  describe('#isJsonMime', function() {
+    it('should return true for JSON MIME', function() {
+      expect(apiClient.isJsonMime('application/json')).to.be(true);
+      expect(apiClient.isJsonMime('application/json; charset=UTF8')).to.be(true);
+      expect(apiClient.isJsonMime('APPLICATION/JSON')).to.be(true);
+    });
+
+    it('should return false for non-JSON MIME', function() {
+      expect(apiClient.isJsonMime('')).to.be(false);
+      expect(apiClient.isJsonMime('text/plain')).to.be(false);
+      expect(apiClient.isJsonMime('application/xml')).to.be(false);
+      expect(apiClient.isJsonMime('application/jsonp')).to.be(false);
+    });
+  });
+
+  describe('#applyAuthToRequest', function() {
+    var req, newClient;
+
+    beforeEach(function() {
+      req = {
+        auth: function() {},
+        set: function() {},
+        query: function() {}
+      };
+      sinon.stub(req, 'auth');
+      sinon.stub(req, 'set');
+      sinon.stub(req, 'query');
+      newClient = new SwaggerPetstore.ApiClient();
+    });
+
+    describe('basic', function() {
+      var authName = 'testBasicAuth';
+      var authNames = [authName];
+      var auth;
+
+      beforeEach(function() {
+        newClient.authentications[authName] = {type: 'basic'};
+        auth = newClient.authentications[authName];
+      });
+
+      it('sets auth header with username and password set', function() {
+        auth.username = 'user';
+        auth.password = 'pass';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.auth);
+        // 'dXNlcjpwYXNz' is base64-encoded string of 'user:pass'
+        sinon.assert.calledWithMatch(req.auth, 'user', 'pass');
+        sinon.assert.notCalled(req.set);
+        sinon.assert.notCalled(req.query);
+      });
+
+      it('sets header with only username set', function() {
+        auth.username = 'user';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.auth);
+        // 'dXNlcjo=' is base64-encoded string of 'user:'
+        sinon.assert.calledWithMatch(req.auth, 'user', '');
+        sinon.assert.notCalled(req.set);
+        sinon.assert.notCalled(req.query);
+      });
+
+      it('sets header with only password set', function() {
+        auth.password = 'pass';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.auth);
+        // 'OnBhc3M=' is base64-encoded string of ':pass'
+        sinon.assert.calledWithMatch(req.auth, '', 'pass');
+        sinon.assert.notCalled(req.set);
+        sinon.assert.notCalled(req.query);
+      });
+
+      it('does not set header when username and password are not set', function() {
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.set);
+        sinon.assert.notCalled(req.query);
+      });
+    });
+
+    describe('apiKey', function() {
+      var authName = 'testApiKey';
+      var authNames = [authName];
+      var auth;
+
+      beforeEach(function() {
+        newClient.authentications[authName] = {type: 'apiKey', name: 'api_key'};
+        auth = newClient.authentications[authName];
+      });
+
+      it('sets api key in header', function() {
+        auth.in = 'header';
+        auth.apiKey = 'my-api-key';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.set);
+        sinon.assert.calledWithMatch(req.set, {'api_key': 'my-api-key'});
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.query);
+      });
+
+      it('sets api key in query', function() {
+        auth.in = 'query';
+        auth.apiKey = 'my-api-key';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.query);
+        sinon.assert.calledWithMatch(req.query, {'api_key': 'my-api-key'});
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.set);
+      });
+
+      it('sets api key in header with prefix', function() {
+        auth.in = 'header';
+        auth.apiKey = 'my-api-key';
+        auth.apiKeyPrefix = 'Key';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.set);
+        sinon.assert.calledWithMatch(req.set, {'api_key': 'Key my-api-key'});
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.query);
+      });
+
+      it('works when api key is not set', function() {
+        auth.in = 'query';
+        auth.apiKey = null;
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.notCalled(req.query);
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.set);
+      });
+    });
+
+    describe('oauth2', function() {
+      var authName = 'testOAuth2';
+      var authNames = [authName];
+      var auth;
+
+      beforeEach(function() {
+        newClient.authentications[authName] = {type: 'oauth2'};
+        auth = newClient.authentications[authName];
+      });
+
+      it('sets access token in header', function() {
+        auth.accessToken = 'my-access-token';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.set);
+        sinon.assert.calledWithMatch(req.set, {'Authorization': 'Bearer my-access-token'});
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.query);
+      });
+
+      it('works when access token is not set', function() {
+        auth.accessToken = null;
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.notCalled(req.query);
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.set);
+      });
+    });
+
+    describe('apiKey and oauth2', function() {
+      var apiKeyAuthName = 'testApiKey';
+      var oauth2Name = 'testOAuth2';
+      var authNames = [apiKeyAuthName, oauth2Name];
+      var apiKeyAuth, oauth2;
+
+      beforeEach(function() {
+        newClient.authentications[apiKeyAuthName] = {type: 'apiKey', name: 'api_key', 'in': 'query'};
+        newClient.authentications[oauth2Name] = {type: 'oauth2'};
+        apiKeyAuth = newClient.authentications[apiKeyAuthName];
+        oauth2 = newClient.authentications[oauth2Name];
+      });
+
+      it('works when setting both api key and access token', function() {
+        apiKeyAuth.apiKey = 'my-api-key';
+        oauth2.accessToken = 'my-access-token';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.query);
+        sinon.assert.calledWithMatch(req.query, {'api_key': 'my-api-key'});
+        sinon.assert.calledOnce(req.set);
+        sinon.assert.calledWithMatch(req.set, {'Authorization': 'Bearer my-access-token'});
+        sinon.assert.notCalled(req.auth);
+      });
+
+      it('works when setting only api key', function() {
+        apiKeyAuth.apiKey = 'my-api-key';
+        oauth2.accessToken = null;
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.query);
+        sinon.assert.calledWithMatch(req.query, {'api_key': 'my-api-key'});
+        sinon.assert.notCalled(req.set);
+        sinon.assert.notCalled(req.auth);
+      });
+
+      it('works when neither api key nor access token is set', function() {
+        apiKeyAuth.apiKey = null;
+        oauth2.accessToken = null;
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.notCalled(req.query);
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.set);
+      });
+    });
+
+    describe('unknown type', function() {
+      var authName = 'unknown';
+      var authNames = [authName];
+
+      beforeEach(function() {
+        newClient.authentications[authName] = {type: 'UNKNOWN'};
+      });
+
+      it('throws error for unknown auth type', function() {
+        expect(function() {
+          newClient.applyAuthToRequest(req, authNames);
+        }).to.throwError();
+        sinon.assert.notCalled(req.set);
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.query);
+      });
+    });
+  });
+
+  /*
+  describe('#defaultHeaders', function() {
+    it('should initialize default headers to be an empty object', function() {
+      expect(apiClient.defaultHeaders).to.eql({});
+    });
+
+    it('should put default headers in request', function() {
+      var newClient = new SwaggerPetstore.ApiClient;
+      newClient.defaultHeaders['Content-Type'] = 'text/plain'
+      newClient.defaultHeaders['api_key'] = 'special-key'
+
+      var expected = {'Content-Type': 'text/plain', 'api_key': 'special-key'};
+      expect(newClient.defaultHeaders).to.eql(expected);
+      var req = makeDumbRequest(newClient);
+      req.unset('User-Agent');
+      expect(req.header).to.eql(expected);
+    });
+
+    it('should override default headers with provided header params', function() {
+      var newClient = new SwaggerPetstore.ApiClient;
+      newClient.defaultHeaders['Content-Type'] = 'text/plain'
+      newClient.defaultHeaders['api_key'] = 'special-key'
+
+      var headerParams = {'Content-Type': 'application/json', 'Authorization': 'Bearer test-token'}
+      var expected = {
+        'Content-Type': 'application/json',
+        'api_key': 'special-key',
+        'Authorization': 'Bearer test-token'
+      };
+      var req = makeDumbRequest(newClient, {headerParams: headerParams});
+      req.unset('User-Agent');
+      expect(req.header).to.eql(expected);
+    });
+  });
+*/
+
+});
+
+function makeDumbRequest(apiClient, opts) {
+  opts = opts || {};
+  var path = opts.path || '/store/inventory';
+  var httpMethod = opts.httpMethod || 'GET';
+  var pathParams = opts.pathParams || {};
+  var queryParams = opts.queryParams || {};
+  var headerParams = opts.headerParams || {};
+  var formParams = opts.formParams || {};
+  var bodyParam = opts.bodyParam;
+  var authNames = [];
+  var contentTypes = opts.contentTypes || [];
+  var accepts = opts.accepts || [];
+  var callback = opts.callback;
+  return apiClient.callApi(path, httpMethod, pathParams, queryParams,
+    headerParams, formParams, bodyParam, authNames, contentTypes, accepts);
+}
diff --git a/samples/client/petstore/javascript-promise/test/api/PetApiTest.js b/samples/client/petstore/javascript-promise/test/api/PetApiTest.js
new file mode 100644
index 00000000000..1119546014d
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/test/api/PetApiTest.js
@@ -0,0 +1,205 @@
+if (typeof module === 'object' && module.exports) {
+  var expect = require('expect.js');
+  var SwaggerPetstore = require('../../src/index');
+}
+
+// When testing in the Node.js environment, ApiClient will need access to a Promise constructor.
+if (typeof Promise == 'undefined')
+  Promise = require('promise');
+
+var api;
+
+beforeEach(function() {
+  api = new SwaggerPetstore.PetApi();
+});
+
+var getProperty = function(object, getter, property) {
+  // Use getter method if present; otherwise, get the property directly.
+  if (typeof object[getter] === 'function')
+    return object[getter]();
+  else
+    return object[property];
+}
+
+var setProperty = function(object, setter, property, value) {
+  // Use setter method if present; otherwise, set the property directly.
+  if (typeof object[setter] === 'function')
+    object[setter](value);
+  else
+    object[property] = value;
+}
+
+var createRandomPet = function() {
+  var id = new Date().getTime();
+  var pet = new SwaggerPetstore.Pet();
+  setProperty(pet, "setId", "id", id);
+  setProperty(pet, "setName", "name", "gorilla" + id);
+
+  var category = new SwaggerPetstore.Category();
+  setProperty(category, "setName", "name", "really-happy");
+  setProperty(pet, "setCategory", "category", category);
+
+  setProperty(pet, "setStatus", "status", "available");
+  var photos = ["http://foo.bar.com/1", "http://foo.bar.com/2"];
+  setProperty(pet, "setPhotoUrls", "photoUrls", photos);
+
+  return pet;
+};
+
+describe('PetApi', function() {
+  it('should create and get pet', function(done) {
+    var pet = createRandomPet();
+    api.addPet({body: pet})
+        .then(function() {
+            return api.getPetById(pet.id)
+        })
+        .then(function(fetched) {
+            expect(fetched).to.be.ok();
+            expect(fetched.id).to.be(pet.id);
+            expect(getProperty(fetched, "getPhotoUrls", "photoUrls"))
+              .to.eql(getProperty(pet, "getPhotoUrls", "photoUrls"));
+            expect(getProperty(fetched, "getCategory", "category")).to.be.ok();
+            expect(getProperty(getProperty(fetched, "getCategory", "category"), "getName", "name"))
+              .to.be(getProperty(getProperty(pet, "getCategory", "category"), "getName", "name"));
+
+            api.deletePet(pet.id);
+            done();   
+        });
+  });
+});
+
+/*
+    @Test
+    public void testUpdatePet() throws Exception {
+        Pet pet = createRandomPet();
+        pet.setName("programmer");
+
+        api.updatePet(pet);
+
+        Pet fetched = api.getPetById(pet.getId());
+        assertNotNull(fetched);
+        assertEquals(pet.getId(), fetched.getId());
+        assertNotNull(fetched.getCategory());
+        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
+    }
+
+    @Test
+    public void testFindPetsByStatus() throws Exception {
+        Pet pet = createRandomPet();
+        pet.setName("programmer");
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
+
+        api.updatePet(pet);
+
+        List<Pet> pets = api.findPetsByStatus(Arrays.asList(new String[]{"available"}));
+        assertNotNull(pets);
+
+        boolean found = false;
+        for (Pet fetched : pets) {
+            if (fetched.getId().equals(pet.getId())) {
+                found = true;
+                break;
+            }
+        }
+
+        assertTrue(found);
+    }
+
+    @Test
+    public void testFindPetsByTags() throws Exception {
+        Pet pet = createRandomPet();
+        pet.setName("monster");
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
+
+        List<Tag> tags = new ArrayList<Tag>();
+        Tag tag1 = new Tag();
+        tag1.setName("friendly");
+        tags.add(tag1);
+        pet.setTags(tags);
+
+        api.updatePet(pet);
+
+        List<Pet> pets = api.findPetsByTags(Arrays.asList(new String[]{"friendly"}));
+        assertNotNull(pets);
+
+        boolean found = false;
+        for (Pet fetched : pets) {
+            if (fetched.getId().equals(pet.getId())) {
+                found = true;
+                break;
+            }
+        }
+        assertTrue(found);
+    }
+
+    @Test
+    public void testUpdatePetWithForm() throws Exception {
+        Pet pet = createRandomPet();
+        pet.setName("frank");
+        api.addPet(pet);
+
+        Pet fetched = api.getPetById(pet.getId());
+
+        api.updatePetWithForm(String.valueOf(fetched.getId()), "furt", null);
+        Pet updated = api.getPetById(fetched.getId());
+
+        assertEquals(updated.getName(), "furt");
+    }
+
+    @Test
+    public void testDeletePet() throws Exception {
+        Pet pet = createRandomPet();
+        api.addPet(pet);
+
+        Pet fetched = api.getPetById(pet.getId());
+        api.deletePet(fetched.getId(), null);
+
+        try {
+            fetched = api.getPetById(fetched.getId());
+            fail("expected an error");
+        } catch (ApiException e) {
+            assertEquals(404, e.getCode());
+        }
+    }
+
+    @Test
+    public void testUploadFile() throws Exception {
+        Pet pet = createRandomPet();
+        api.addPet(pet);
+
+        File file = new File("hello.txt");
+        BufferedWriter writer = new BufferedWriter(new FileWriter(file));
+        writer.write("Hello world!");
+        writer.close();
+
+        api.uploadFile(pet.getId(), "a test file", new File(file.getAbsolutePath()));
+    }
+
+    @Test
+    public void testEqualsAndHashCode() {
+        Pet pet1 = new Pet();
+        Pet pet2 = new Pet();
+        assertTrue(pet1.equals(pet2));
+        assertTrue(pet2.equals(pet1));
+        assertTrue(pet1.hashCode() == pet2.hashCode());
+        assertTrue(pet1.equals(pet1));
+        assertTrue(pet1.hashCode() == pet1.hashCode());
+
+        pet2.setName("really-happy");
+        pet2.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
+        assertFalse(pet1.equals(pet2));
+        assertFalse(pet2.equals(pet1));
+        assertFalse(pet1.hashCode() == (pet2.hashCode()));
+        assertTrue(pet2.equals(pet2));
+        assertTrue(pet2.hashCode() == pet2.hashCode());
+
+        pet1.setName("really-happy");
+        pet1.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
+        assertTrue(pet1.equals(pet2));
+        assertTrue(pet2.equals(pet1));
+        assertTrue(pet1.hashCode() == pet2.hashCode());
+        assertTrue(pet1.equals(pet1));
+        assertTrue(pet1.hashCode() == pet1.hashCode());
+    }
+}
+*/
diff --git a/samples/client/petstore/javascript-promise/test/mocha.opts b/samples/client/petstore/javascript-promise/test/mocha.opts
new file mode 100644
index 00000000000..907011807d6
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/test/mocha.opts
@@ -0,0 +1 @@
+--timeout 10000
diff --git a/samples/client/petstore/javascript-promise/test/run_tests.html b/samples/client/petstore/javascript-promise/test/run_tests.html
new file mode 100644
index 00000000000..2f3e3f1e33a
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/test/run_tests.html
@@ -0,0 +1,41 @@
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Mocha Tests</title>
+  <link href="https://cdn.rawgit.com/mochajs/mocha/2.2.5/mocha.css" rel="stylesheet" />
+</head>
+<body>
+  <div id="mocha"></div>
+
+  <script src="https://cdn.rawgit.com/jquery/jquery/2.1.4/dist/jquery.min.js"></script>
+  <script src="https://cdn.rawgit.com/Automattic/expect.js/0.3.1/index.js"></script>
+  <script src="http://sinonjs.org/releases/sinon-1.17.3.js"></script>
+  <script src="https://cdn.rawgit.com/mochajs/mocha/2.2.5/mocha.js"></script>
+  <script>
+    mocha.setup({
+      ui: 'bdd',
+      timeout: 10000
+    });
+  </script>
+
+  <script src="../node_modules/superagent/superagent.js"></script>
+
+  <script src="../src/ApiClient.js"></script>
+
+  <script src="../src/model/Category.js"></script>
+  <script src="../src/model/Tag.js"></script>
+  <script src="../src/model/Pet.js"></script>
+  <script src="../src/model/User.js"></script>
+
+  <script src="../src/api/PetApi.js"></script>
+
+  <script src="ApiClientTest.js"></script>
+  <script src="api/PetApiTest.js"></script>
+
+  <script>
+    mocha.checkLeaks();
+    mocha.globals(['jQuery']);
+    mocha.run();
+  </script>
+</body>
+</html>
diff --git a/samples/client/petstore/javascript/README.md b/samples/client/petstore/javascript/README.md
new file mode 100644
index 00000000000..0867d3ec1d5
--- /dev/null
+++ b/samples/client/petstore/javascript/README.md
@@ -0,0 +1,174 @@
+# swagger-petstore
+
+SwaggerPetstore - JavaScript client for swagger-petstore
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This SDK is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
+
+- API version: 1.0.0
+- Package version: 1.0.0
+- Build date: 2016-03-30T20:58:07.996+08:00
+- Build package: class io.swagger.codegen.languages.JavascriptClientCodegen
+
+## Installation
+
+### For [Node.js](https://nodejs.org/)
+
+#### npm
+
+To publish the library as a [npm](https://www.npmjs.com/),
+please follow the procedure in ["Publishing npm packages"](https://docs.npmjs.com/getting-started/publishing-npm-packages).
+
+Then install it via:
+
+```shell
+npm install swagger-petstore --save
+```
+
+#### git
+#
+If the library is hosted at a git repository, e.g.
+https://github.com/YOUR_USERNAME/YOUR_GIT_REPO_ID
+then install it via:
+
+```shell
+npm install YOUR_USERNAME/YOUR_GIT_REPO_ID --save
+```
+
+### For browser
+
+The library also works in the browser environment via npm and [browserify](http://browserify.org/). After following
+the above steps with Node.js and installing browserify with `npm install -g browserify`,
+perform the following (assuming *main.js* is your entry file):
+
+```shell
+browserify main.js > bundle.js
+```
+
+Then include *bundle.js* in the HTML pages.
+
+## Getting Started
+
+Please follow the [installation](#installation) instruction and execute the following JS code:
+
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure OAuth2 access token for authorization: petstore_auth
+var petstore_auth = defaultClient.authentications['petstore_auth'];
+petstore_auth.accessToken = "YOUR ACCESS TOKEN"
+
+var api = new SwaggerPetstore.PetApi()
+
+var opts = { 
+  'body': new SwaggerPetstore.Pet() // {Pet} Pet object that needs to be added to the store
+};
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully.');
+  }
+};
+api.addPet(opts, callback);
+
+```
+
+## Documentation for API Endpoints
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*SwaggerPetstore.PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
+*SwaggerPetstore.PetApi* | [**addPetUsingByteArray**](docs/PetApi.md#addPetUsingByteArray) | **POST** /pet?testing_byte_array=true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
+*SwaggerPetstore.PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
+*SwaggerPetstore.PetApi* | [**findPetsByStatus**](docs/PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
+*SwaggerPetstore.PetApi* | [**findPetsByTags**](docs/PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags
+*SwaggerPetstore.PetApi* | [**getPetById**](docs/PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID
+*SwaggerPetstore.PetApi* | [**getPetByIdInObject**](docs/PetApi.md#getPetByIdInObject) | **GET** /pet/{petId}?response=inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+*SwaggerPetstore.PetApi* | [**petPetIdtestingByteArraytrueGet**](docs/PetApi.md#petPetIdtestingByteArraytrueGet) | **GET** /pet/{petId}?testing_byte_array=true | Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+*SwaggerPetstore.PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
+*SwaggerPetstore.PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
+*SwaggerPetstore.PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*SwaggerPetstore.StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
+*SwaggerPetstore.StoreApi* | [**findOrdersByStatus**](docs/StoreApi.md#findOrdersByStatus) | **GET** /store/findByStatus | Finds orders by status
+*SwaggerPetstore.StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
+*SwaggerPetstore.StoreApi* | [**getInventoryInObject**](docs/StoreApi.md#getInventoryInObject) | **GET** /store/inventory?response=arbitrary_object | Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+*SwaggerPetstore.StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{orderId} | Find purchase order by ID
+*SwaggerPetstore.StoreApi* | [**placeOrder**](docs/StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet
+*SwaggerPetstore.UserApi* | [**createUser**](docs/UserApi.md#createUser) | **POST** /user | Create user
+*SwaggerPetstore.UserApi* | [**createUsersWithArrayInput**](docs/UserApi.md#createUsersWithArrayInput) | **POST** /user/createWithArray | Creates list of users with given input array
+*SwaggerPetstore.UserApi* | [**createUsersWithListInput**](docs/UserApi.md#createUsersWithListInput) | **POST** /user/createWithList | Creates list of users with given input array
+*SwaggerPetstore.UserApi* | [**deleteUser**](docs/UserApi.md#deleteUser) | **DELETE** /user/{username} | Delete user
+*SwaggerPetstore.UserApi* | [**getUserByName**](docs/UserApi.md#getUserByName) | **GET** /user/{username} | Get user by user name
+*SwaggerPetstore.UserApi* | [**loginUser**](docs/UserApi.md#loginUser) | **GET** /user/login | Logs user into the system
+*SwaggerPetstore.UserApi* | [**logoutUser**](docs/UserApi.md#logoutUser) | **GET** /user/logout | Logs out current logged in user session
+*SwaggerPetstore.UserApi* | [**updateUser**](docs/UserApi.md#updateUser) | **PUT** /user/{username} | Updated user
+
+
+## Documentation for Models
+
+ - [SwaggerPetstore.Animal](docs/Animal.md)
+ - [SwaggerPetstore.Cat](docs/Cat.md)
+ - [SwaggerPetstore.Category](docs/Category.md)
+ - [SwaggerPetstore.Dog](docs/Dog.md)
+ - [SwaggerPetstore.InlineResponse200](docs/InlineResponse200.md)
+ - [SwaggerPetstore.Model200Response](docs/Model200Response.md)
+ - [SwaggerPetstore.ModelReturn](docs/ModelReturn.md)
+ - [SwaggerPetstore.Name](docs/Name.md)
+ - [SwaggerPetstore.Order](docs/Order.md)
+ - [SwaggerPetstore.Pet](docs/Pet.md)
+ - [SwaggerPetstore.SpecialModelName](docs/SpecialModelName.md)
+ - [SwaggerPetstore.Tag](docs/Tag.md)
+ - [SwaggerPetstore.User](docs/User.md)
+
+
+## Documentation for Authorization
+
+
+### test_api_key_header
+
+- **Type**: API key
+- **API key parameter name**: test_api_key_header
+- **Location**: HTTP header
+
+### api_key
+
+- **Type**: API key
+- **API key parameter name**: api_key
+- **Location**: HTTP header
+
+### test_http_basic
+
+- **Type**: HTTP basic authentication
+
+### test_api_client_secret
+
+- **Type**: API key
+- **API key parameter name**: x-test_api_client_secret
+- **Location**: HTTP header
+
+### test_api_client_id
+
+- **Type**: API key
+- **API key parameter name**: x-test_api_client_id
+- **Location**: HTTP header
+
+### test_api_key_query
+
+- **Type**: API key
+- **API key parameter name**: test_api_key_query
+- **Location**: URL query string
+
+### petstore_auth
+
+- **Type**: OAuth
+- **Flow**: implicit
+- **Authorizatoin URL**: http://petstore.swagger.io/api/oauth/dialog
+- **Scopes**: 
+  - write:pets: modify pets in your account
+  - read:pets: read your pets
+
diff --git a/samples/client/petstore/javascript/docs/Animal.md b/samples/client/petstore/javascript/docs/Animal.md
new file mode 100644
index 00000000000..c37d95695a0
--- /dev/null
+++ b/samples/client/petstore/javascript/docs/Animal.md
@@ -0,0 +1,8 @@
+# SwaggerPetstore.Animal
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**className** | **String** |  | 
+
+
diff --git a/samples/client/petstore/javascript/docs/Cat.md b/samples/client/petstore/javascript/docs/Cat.md
new file mode 100644
index 00000000000..8cd391bc911
--- /dev/null
+++ b/samples/client/petstore/javascript/docs/Cat.md
@@ -0,0 +1,8 @@
+# SwaggerPetstore.Cat
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**declawed** | **Boolean** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript/docs/Category.md b/samples/client/petstore/javascript/docs/Category.md
new file mode 100644
index 00000000000..47930eb882c
--- /dev/null
+++ b/samples/client/petstore/javascript/docs/Category.md
@@ -0,0 +1,9 @@
+# SwaggerPetstore.Category
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **Integer** |  | [optional] 
+**name** | **String** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript/docs/Dog.md b/samples/client/petstore/javascript/docs/Dog.md
new file mode 100644
index 00000000000..9253eace011
--- /dev/null
+++ b/samples/client/petstore/javascript/docs/Dog.md
@@ -0,0 +1,8 @@
+# SwaggerPetstore.Dog
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**breed** | **String** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript/docs/InlineResponse200.md b/samples/client/petstore/javascript/docs/InlineResponse200.md
new file mode 100644
index 00000000000..bbb11067e9a
--- /dev/null
+++ b/samples/client/petstore/javascript/docs/InlineResponse200.md
@@ -0,0 +1,13 @@
+# SwaggerPetstore.InlineResponse200
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**tags** | [**[Tag]**](Tag.md) |  | [optional] 
+**id** | **Integer** |  | 
+**category** | **Object** |  | [optional] 
+**status** | **String** | pet status in the store | [optional] 
+**name** | **String** |  | [optional] 
+**photoUrls** | **[String]** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript/docs/Model200Response.md b/samples/client/petstore/javascript/docs/Model200Response.md
new file mode 100644
index 00000000000..cc06fcd2d18
--- /dev/null
+++ b/samples/client/petstore/javascript/docs/Model200Response.md
@@ -0,0 +1,8 @@
+# SwaggerPetstore.Model200Response
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **Integer** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript/docs/ModelReturn.md b/samples/client/petstore/javascript/docs/ModelReturn.md
new file mode 100644
index 00000000000..88412c87197
--- /dev/null
+++ b/samples/client/petstore/javascript/docs/ModelReturn.md
@@ -0,0 +1,8 @@
+# SwaggerPetstore.ModelReturn
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**_return** | **Integer** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript/docs/Name.md b/samples/client/petstore/javascript/docs/Name.md
new file mode 100644
index 00000000000..5086f6c5a3e
--- /dev/null
+++ b/samples/client/petstore/javascript/docs/Name.md
@@ -0,0 +1,9 @@
+# SwaggerPetstore.Name
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **Integer** |  | [optional] 
+**snakeCase** | **Integer** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript/docs/Order.md b/samples/client/petstore/javascript/docs/Order.md
new file mode 100644
index 00000000000..b34b67d3a56
--- /dev/null
+++ b/samples/client/petstore/javascript/docs/Order.md
@@ -0,0 +1,13 @@
+# SwaggerPetstore.Order
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **Integer** |  | [optional] 
+**petId** | **Integer** |  | [optional] 
+**quantity** | **Integer** |  | [optional] 
+**shipDate** | **Date** |  | [optional] 
+**status** | **String** | Order Status | [optional] 
+**complete** | **Boolean** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript/docs/Pet.md b/samples/client/petstore/javascript/docs/Pet.md
new file mode 100644
index 00000000000..f1b049dcadd
--- /dev/null
+++ b/samples/client/petstore/javascript/docs/Pet.md
@@ -0,0 +1,13 @@
+# SwaggerPetstore.Pet
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **Integer** |  | [optional] 
+**category** | [**Category**](Category.md) |  | [optional] 
+**name** | **String** |  | 
+**photoUrls** | **[String]** |  | 
+**tags** | [**[Tag]**](Tag.md) |  | [optional] 
+**status** | **String** | pet status in the store | [optional] 
+
+
diff --git a/samples/client/petstore/javascript/docs/PetApi.md b/samples/client/petstore/javascript/docs/PetApi.md
new file mode 100644
index 00000000000..e33bf7c3b12
--- /dev/null
+++ b/samples/client/petstore/javascript/docs/PetApi.md
@@ -0,0 +1,619 @@
+# SwaggerPetstore.PetApi
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**addPet**](PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
+[**addPetUsingByteArray**](PetApi.md#addPetUsingByteArray) | **POST** /pet?testing_byte_array=true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
+[**deletePet**](PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
+[**findPetsByStatus**](PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
+[**findPetsByTags**](PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags
+[**getPetById**](PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID
+[**getPetByIdInObject**](PetApi.md#getPetByIdInObject) | **GET** /pet/{petId}?response=inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+[**petPetIdtestingByteArraytrueGet**](PetApi.md#petPetIdtestingByteArraytrueGet) | **GET** /pet/{petId}?testing_byte_array=true | Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+[**updatePet**](PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
+[**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
+[**uploadFile**](PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+
+
+<a name="addPet"></a>
+# **addPet**
+> addPet(opts)
+
+Add a new pet to the store
+
+
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure OAuth2 access token for authorization: petstore_auth
+var petstore_auth = defaultClient.authentications['petstore_auth'];
+petstore_auth.accessToken = "YOUR ACCESS TOKEN"
+
+var apiInstance = new SwaggerPetstore.PetApi()
+
+var opts = { 
+  'body': new SwaggerPetstore.Pet() // {Pet} Pet object that needs to be added to the store
+};
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully.');
+  }
+};
+api.addPet(opts, callback);
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | [optional] 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: application/json, application/xml
+
+<a name="addPetUsingByteArray"></a>
+# **addPetUsingByteArray**
+> addPetUsingByteArray(opts)
+
+Fake endpoint to test byte array in body parameter for adding a new pet to the store
+
+
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure OAuth2 access token for authorization: petstore_auth
+var petstore_auth = defaultClient.authentications['petstore_auth'];
+petstore_auth.accessToken = "YOUR ACCESS TOKEN"
+
+var apiInstance = new SwaggerPetstore.PetApi()
+
+var opts = { 
+  'body': "B" // {String} Pet object in the form of byte array
+};
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully.');
+  }
+};
+api.addPetUsingByteArray(opts, callback);
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | **String**| Pet object in the form of byte array | [optional] 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: application/json, application/xml
+
+<a name="deletePet"></a>
+# **deletePet**
+> deletePet(petId, opts)
+
+Deletes a pet
+
+
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure OAuth2 access token for authorization: petstore_auth
+var petstore_auth = defaultClient.authentications['petstore_auth'];
+petstore_auth.accessToken = "YOUR ACCESS TOKEN"
+
+var apiInstance = new SwaggerPetstore.PetApi()
+
+var petId = 789; // {Integer} Pet id to delete
+
+var opts = { 
+  'apiKey': "apiKey_example" // {String} 
+};
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully.');
+  }
+};
+api.deletePet(petId, opts, callback);
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Integer**| Pet id to delete | 
+ **apiKey** | **String**|  | [optional] 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="findPetsByStatus"></a>
+# **findPetsByStatus**
+> [Pet] findPetsByStatus(opts)
+
+Finds Pets by status
+
+Multiple status values can be provided with comma separated strings
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure OAuth2 access token for authorization: petstore_auth
+var petstore_auth = defaultClient.authentications['petstore_auth'];
+petstore_auth.accessToken = "YOUR ACCESS TOKEN"
+
+var apiInstance = new SwaggerPetstore.PetApi()
+
+var opts = { 
+  'status': ["available"] // {[String]} Status values that need to be considered for query
+};
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully. Returned data: ' + data);
+  }
+};
+api.findPetsByStatus(opts, callback);
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **status** | [**[String]**](String.md)| Status values that need to be considered for query | [optional] [default to available]
+
+### Return type
+
+[**[Pet]**](Pet.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="findPetsByTags"></a>
+# **findPetsByTags**
+> [Pet] findPetsByTags(opts)
+
+Finds Pets by tags
+
+Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure OAuth2 access token for authorization: petstore_auth
+var petstore_auth = defaultClient.authentications['petstore_auth'];
+petstore_auth.accessToken = "YOUR ACCESS TOKEN"
+
+var apiInstance = new SwaggerPetstore.PetApi()
+
+var opts = { 
+  'tags': ["tags_example"] // {[String]} Tags to filter by
+};
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully. Returned data: ' + data);
+  }
+};
+api.findPetsByTags(opts, callback);
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **tags** | [**[String]**](String.md)| Tags to filter by | [optional] 
+
+### Return type
+
+[**[Pet]**](Pet.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="getPetById"></a>
+# **getPetById**
+> Pet getPetById(petId)
+
+Find pet by ID
+
+Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure API key authorization: api_key
+var api_key = defaultClient.authentications['api_key'];
+api_key.apiKey = "YOUR API KEY"
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//api_key.apiKeyPrefix['api_key'] = "Token"
+
+// Configure OAuth2 access token for authorization: petstore_auth
+var petstore_auth = defaultClient.authentications['petstore_auth'];
+petstore_auth.accessToken = "YOUR ACCESS TOKEN"
+
+var apiInstance = new SwaggerPetstore.PetApi()
+
+var petId = 789; // {Integer} ID of pet that needs to be fetched
+
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully. Returned data: ' + data);
+  }
+};
+api.getPetById(petId, callback);
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Integer**| ID of pet that needs to be fetched | 
+
+### Return type
+
+[**Pet**](Pet.md)
+
+### Authorization
+
+[api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="getPetByIdInObject"></a>
+# **getPetByIdInObject**
+> InlineResponse200 getPetByIdInObject(petId)
+
+Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+
+Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure API key authorization: api_key
+var api_key = defaultClient.authentications['api_key'];
+api_key.apiKey = "YOUR API KEY"
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//api_key.apiKeyPrefix['api_key'] = "Token"
+
+// Configure OAuth2 access token for authorization: petstore_auth
+var petstore_auth = defaultClient.authentications['petstore_auth'];
+petstore_auth.accessToken = "YOUR ACCESS TOKEN"
+
+var apiInstance = new SwaggerPetstore.PetApi()
+
+var petId = 789; // {Integer} ID of pet that needs to be fetched
+
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully. Returned data: ' + data);
+  }
+};
+api.getPetByIdInObject(petId, callback);
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Integer**| ID of pet that needs to be fetched | 
+
+### Return type
+
+[**InlineResponse200**](InlineResponse200.md)
+
+### Authorization
+
+[api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="petPetIdtestingByteArraytrueGet"></a>
+# **petPetIdtestingByteArraytrueGet**
+> &#39;String&#39; petPetIdtestingByteArraytrueGet(petId)
+
+Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+
+Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure API key authorization: api_key
+var api_key = defaultClient.authentications['api_key'];
+api_key.apiKey = "YOUR API KEY"
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//api_key.apiKeyPrefix['api_key'] = "Token"
+
+// Configure OAuth2 access token for authorization: petstore_auth
+var petstore_auth = defaultClient.authentications['petstore_auth'];
+petstore_auth.accessToken = "YOUR ACCESS TOKEN"
+
+var apiInstance = new SwaggerPetstore.PetApi()
+
+var petId = 789; // {Integer} ID of pet that needs to be fetched
+
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully. Returned data: ' + data);
+  }
+};
+api.petPetIdtestingByteArraytrueGet(petId, callback);
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Integer**| ID of pet that needs to be fetched | 
+
+### Return type
+
+**&#39;String&#39;**
+
+### Authorization
+
+[api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="updatePet"></a>
+# **updatePet**
+> updatePet(opts)
+
+Update an existing pet
+
+
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure OAuth2 access token for authorization: petstore_auth
+var petstore_auth = defaultClient.authentications['petstore_auth'];
+petstore_auth.accessToken = "YOUR ACCESS TOKEN"
+
+var apiInstance = new SwaggerPetstore.PetApi()
+
+var opts = { 
+  'body': new SwaggerPetstore.Pet() // {Pet} Pet object that needs to be added to the store
+};
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully.');
+  }
+};
+api.updatePet(opts, callback);
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | [optional] 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: application/json, application/xml
+
+<a name="updatePetWithForm"></a>
+# **updatePetWithForm**
+> updatePetWithForm(petId, opts)
+
+Updates a pet in the store with form data
+
+
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure OAuth2 access token for authorization: petstore_auth
+var petstore_auth = defaultClient.authentications['petstore_auth'];
+petstore_auth.accessToken = "YOUR ACCESS TOKEN"
+
+var apiInstance = new SwaggerPetstore.PetApi()
+
+var petId = "petId_example"; // {String} ID of pet that needs to be updated
+
+var opts = { 
+  'name': "name_example", // {String} Updated name of the pet
+  'status': "status_example" // {String} Updated status of the pet
+};
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully.');
+  }
+};
+api.updatePetWithForm(petId, opts, callback);
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **String**| ID of pet that needs to be updated | 
+ **name** | **String**| Updated name of the pet | [optional] 
+ **status** | **String**| Updated status of the pet | [optional] 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: application/x-www-form-urlencoded
+ - **Accept**: application/json, application/xml
+
+<a name="uploadFile"></a>
+# **uploadFile**
+> uploadFile(petId, opts)
+
+uploads an image
+
+
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure OAuth2 access token for authorization: petstore_auth
+var petstore_auth = defaultClient.authentications['petstore_auth'];
+petstore_auth.accessToken = "YOUR ACCESS TOKEN"
+
+var apiInstance = new SwaggerPetstore.PetApi()
+
+var petId = 789; // {Integer} ID of pet to update
+
+var opts = { 
+  'additionalMetadata': "additionalMetadata_example", // {String} Additional data to pass to server
+  'file': "/path/to/file.txt" // {File} file to upload
+};
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully.');
+  }
+};
+api.uploadFile(petId, opts, callback);
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Integer**| ID of pet to update | 
+ **additionalMetadata** | **String**| Additional data to pass to server | [optional] 
+ **file** | **File**| file to upload | [optional] 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: multipart/form-data
+ - **Accept**: application/json, application/xml
+
diff --git a/samples/client/petstore/javascript/docs/SpecialModelName.md b/samples/client/petstore/javascript/docs/SpecialModelName.md
new file mode 100644
index 00000000000..03dffa54c3f
--- /dev/null
+++ b/samples/client/petstore/javascript/docs/SpecialModelName.md
@@ -0,0 +1,8 @@
+# SwaggerPetstore.SpecialModelName
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**specialPropertyName** | **Integer** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript/docs/StoreApi.md b/samples/client/petstore/javascript/docs/StoreApi.md
new file mode 100644
index 00000000000..b2ea41e35ee
--- /dev/null
+++ b/samples/client/petstore/javascript/docs/StoreApi.md
@@ -0,0 +1,333 @@
+# SwaggerPetstore.StoreApi
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**deleteOrder**](StoreApi.md#deleteOrder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
+[**findOrdersByStatus**](StoreApi.md#findOrdersByStatus) | **GET** /store/findByStatus | Finds orders by status
+[**getInventory**](StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
+[**getInventoryInObject**](StoreApi.md#getInventoryInObject) | **GET** /store/inventory?response=arbitrary_object | Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+[**getOrderById**](StoreApi.md#getOrderById) | **GET** /store/order/{orderId} | Find purchase order by ID
+[**placeOrder**](StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet
+
+
+<a name="deleteOrder"></a>
+# **deleteOrder**
+> deleteOrder(orderId)
+
+Delete purchase order by ID
+
+For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+
+var apiInstance = new SwaggerPetstore.StoreApi()
+
+var orderId = "orderId_example"; // {String} ID of the order that needs to be deleted
+
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully.');
+  }
+};
+api.deleteOrder(orderId, callback);
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **orderId** | **String**| ID of the order that needs to be deleted | 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="findOrdersByStatus"></a>
+# **findOrdersByStatus**
+> [Order] findOrdersByStatus(opts)
+
+Finds orders by status
+
+A single status value can be provided as a string
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure API key authorization: test_api_client_id
+var test_api_client_id = defaultClient.authentications['test_api_client_id'];
+test_api_client_id.apiKey = "YOUR API KEY"
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//test_api_client_id.apiKeyPrefix['x-test_api_client_id'] = "Token"
+
+// Configure API key authorization: test_api_client_secret
+var test_api_client_secret = defaultClient.authentications['test_api_client_secret'];
+test_api_client_secret.apiKey = "YOUR API KEY"
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//test_api_client_secret.apiKeyPrefix['x-test_api_client_secret'] = "Token"
+
+var apiInstance = new SwaggerPetstore.StoreApi()
+
+var opts = { 
+  'status': "placed" // {String} Status value that needs to be considered for query
+};
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully. Returned data: ' + data);
+  }
+};
+api.findOrdersByStatus(opts, callback);
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **status** | **String**| Status value that needs to be considered for query | [optional] [default to placed]
+
+### Return type
+
+[**[Order]**](Order.md)
+
+### Authorization
+
+[test_api_client_id](../README.md#test_api_client_id), [test_api_client_secret](../README.md#test_api_client_secret)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="getInventory"></a>
+# **getInventory**
+> {&#39;String&#39;: &#39;Integer&#39;} getInventory
+
+Returns pet inventories by status
+
+Returns a map of status codes to quantities
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure API key authorization: api_key
+var api_key = defaultClient.authentications['api_key'];
+api_key.apiKey = "YOUR API KEY"
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//api_key.apiKeyPrefix['api_key'] = "Token"
+
+var apiInstance = new SwaggerPetstore.StoreApi()
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully. Returned data: ' + data);
+  }
+};
+api.getInventory(callback);
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+**{&#39;String&#39;: &#39;Integer&#39;}**
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="getInventoryInObject"></a>
+# **getInventoryInObject**
+> Object getInventoryInObject
+
+Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+
+Returns an arbitrary object which is actually a map of status codes to quantities
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure API key authorization: api_key
+var api_key = defaultClient.authentications['api_key'];
+api_key.apiKey = "YOUR API KEY"
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//api_key.apiKeyPrefix['api_key'] = "Token"
+
+var apiInstance = new SwaggerPetstore.StoreApi()
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully. Returned data: ' + data);
+  }
+};
+api.getInventoryInObject(callback);
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+**Object**
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="getOrderById"></a>
+# **getOrderById**
+> Order getOrderById(orderId)
+
+Find purchase order by ID
+
+For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure API key authorization: test_api_key_header
+var test_api_key_header = defaultClient.authentications['test_api_key_header'];
+test_api_key_header.apiKey = "YOUR API KEY"
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//test_api_key_header.apiKeyPrefix['test_api_key_header'] = "Token"
+
+// Configure API key authorization: test_api_key_query
+var test_api_key_query = defaultClient.authentications['test_api_key_query'];
+test_api_key_query.apiKey = "YOUR API KEY"
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//test_api_key_query.apiKeyPrefix['test_api_key_query'] = "Token"
+
+var apiInstance = new SwaggerPetstore.StoreApi()
+
+var orderId = "orderId_example"; // {String} ID of pet that needs to be fetched
+
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully. Returned data: ' + data);
+  }
+};
+api.getOrderById(orderId, callback);
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **orderId** | **String**| ID of pet that needs to be fetched | 
+
+### Return type
+
+[**Order**](Order.md)
+
+### Authorization
+
+[test_api_key_header](../README.md#test_api_key_header), [test_api_key_query](../README.md#test_api_key_query)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="placeOrder"></a>
+# **placeOrder**
+> Order placeOrder(opts)
+
+Place an order for a pet
+
+
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure API key authorization: test_api_client_id
+var test_api_client_id = defaultClient.authentications['test_api_client_id'];
+test_api_client_id.apiKey = "YOUR API KEY"
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//test_api_client_id.apiKeyPrefix['x-test_api_client_id'] = "Token"
+
+// Configure API key authorization: test_api_client_secret
+var test_api_client_secret = defaultClient.authentications['test_api_client_secret'];
+test_api_client_secret.apiKey = "YOUR API KEY"
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//test_api_client_secret.apiKeyPrefix['x-test_api_client_secret'] = "Token"
+
+var apiInstance = new SwaggerPetstore.StoreApi()
+
+var opts = { 
+  'body': new SwaggerPetstore.Order() // {Order} order placed for purchasing the pet
+};
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully. Returned data: ' + data);
+  }
+};
+api.placeOrder(opts, callback);
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Order**](Order.md)| order placed for purchasing the pet | [optional] 
+
+### Return type
+
+[**Order**](Order.md)
+
+### Authorization
+
+[test_api_client_id](../README.md#test_api_client_id), [test_api_client_secret](../README.md#test_api_client_secret)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
diff --git a/samples/client/petstore/javascript/docs/Tag.md b/samples/client/petstore/javascript/docs/Tag.md
new file mode 100644
index 00000000000..6c109046fb3
--- /dev/null
+++ b/samples/client/petstore/javascript/docs/Tag.md
@@ -0,0 +1,9 @@
+# SwaggerPetstore.Tag
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **Integer** |  | [optional] 
+**name** | **String** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript/docs/User.md b/samples/client/petstore/javascript/docs/User.md
new file mode 100644
index 00000000000..071fbb46e47
--- /dev/null
+++ b/samples/client/petstore/javascript/docs/User.md
@@ -0,0 +1,15 @@
+# SwaggerPetstore.User
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **Integer** |  | [optional] 
+**username** | **String** |  | [optional] 
+**firstName** | **String** |  | [optional] 
+**lastName** | **String** |  | [optional] 
+**email** | **String** |  | [optional] 
+**password** | **String** |  | [optional] 
+**phone** | **String** |  | [optional] 
+**userStatus** | **Integer** | User Status | [optional] 
+
+
diff --git a/samples/client/petstore/javascript/docs/UserApi.md b/samples/client/petstore/javascript/docs/UserApi.md
new file mode 100644
index 00000000000..f2fcf2c4b52
--- /dev/null
+++ b/samples/client/petstore/javascript/docs/UserApi.md
@@ -0,0 +1,394 @@
+# SwaggerPetstore.UserApi
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**createUser**](UserApi.md#createUser) | **POST** /user | Create user
+[**createUsersWithArrayInput**](UserApi.md#createUsersWithArrayInput) | **POST** /user/createWithArray | Creates list of users with given input array
+[**createUsersWithListInput**](UserApi.md#createUsersWithListInput) | **POST** /user/createWithList | Creates list of users with given input array
+[**deleteUser**](UserApi.md#deleteUser) | **DELETE** /user/{username} | Delete user
+[**getUserByName**](UserApi.md#getUserByName) | **GET** /user/{username} | Get user by user name
+[**loginUser**](UserApi.md#loginUser) | **GET** /user/login | Logs user into the system
+[**logoutUser**](UserApi.md#logoutUser) | **GET** /user/logout | Logs out current logged in user session
+[**updateUser**](UserApi.md#updateUser) | **PUT** /user/{username} | Updated user
+
+
+<a name="createUser"></a>
+# **createUser**
+> createUser(opts)
+
+Create user
+
+This can only be done by the logged in user.
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+
+var apiInstance = new SwaggerPetstore.UserApi()
+
+var opts = { 
+  'body': new SwaggerPetstore.User() // {User} Created user object
+};
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully.');
+  }
+};
+api.createUser(opts, callback);
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**User**](User.md)| Created user object | [optional] 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="createUsersWithArrayInput"></a>
+# **createUsersWithArrayInput**
+> createUsersWithArrayInput(opts)
+
+Creates list of users with given input array
+
+
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+
+var apiInstance = new SwaggerPetstore.UserApi()
+
+var opts = { 
+  'body': [new SwaggerPetstore.User()] // {[User]} List of user object
+};
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully.');
+  }
+};
+api.createUsersWithArrayInput(opts, callback);
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**[User]**](User.md)| List of user object | [optional] 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="createUsersWithListInput"></a>
+# **createUsersWithListInput**
+> createUsersWithListInput(opts)
+
+Creates list of users with given input array
+
+
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+
+var apiInstance = new SwaggerPetstore.UserApi()
+
+var opts = { 
+  'body': [new SwaggerPetstore.User()] // {[User]} List of user object
+};
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully.');
+  }
+};
+api.createUsersWithListInput(opts, callback);
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**[User]**](User.md)| List of user object | [optional] 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="deleteUser"></a>
+# **deleteUser**
+> deleteUser(username)
+
+Delete user
+
+This can only be done by the logged in user.
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+var defaultClient = SwaggerPetstore.ApiClient.default;
+
+// Configure HTTP basic authorization: test_http_basic
+var test_http_basic = defaultClient.authentications['test_http_basic'];
+test_http_basic.username = 'YOUR USERNAME'
+test_http_basic.password = 'YOUR PASSWORD'
+
+var apiInstance = new SwaggerPetstore.UserApi()
+
+var username = "username_example"; // {String} The name that needs to be deleted
+
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully.');
+  }
+};
+api.deleteUser(username, callback);
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **String**| The name that needs to be deleted | 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+[test_http_basic](../README.md#test_http_basic)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="getUserByName"></a>
+# **getUserByName**
+> User getUserByName(username)
+
+Get user by user name
+
+
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+
+var apiInstance = new SwaggerPetstore.UserApi()
+
+var username = "username_example"; // {String} The name that needs to be fetched. Use user1 for testing.
+
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully. Returned data: ' + data);
+  }
+};
+api.getUserByName(username, callback);
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **String**| The name that needs to be fetched. Use user1 for testing. | 
+
+### Return type
+
+[**User**](User.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="loginUser"></a>
+# **loginUser**
+> &#39;String&#39; loginUser(opts)
+
+Logs user into the system
+
+
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+
+var apiInstance = new SwaggerPetstore.UserApi()
+
+var opts = { 
+  'username': "username_example", // {String} The user name for login
+  'password': "password_example" // {String} The password for login in clear text
+};
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully. Returned data: ' + data);
+  }
+};
+api.loginUser(opts, callback);
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **String**| The user name for login | [optional] 
+ **password** | **String**| The password for login in clear text | [optional] 
+
+### Return type
+
+**&#39;String&#39;**
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="logoutUser"></a>
+# **logoutUser**
+> logoutUser
+
+Logs out current logged in user session
+
+
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+
+var apiInstance = new SwaggerPetstore.UserApi()
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully.');
+  }
+};
+api.logoutUser(callback);
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+<a name="updateUser"></a>
+# **updateUser**
+> updateUser(username, opts)
+
+Updated user
+
+This can only be done by the logged in user.
+
+### Example
+```javascript
+var SwaggerPetstore = require('swagger-petstore');
+
+var apiInstance = new SwaggerPetstore.UserApi()
+
+var username = "username_example"; // {String} name that need to be deleted
+
+var opts = { 
+  'body': new SwaggerPetstore.User() // {User} Updated user object
+};
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully.');
+  }
+};
+api.updateUser(username, opts, callback);
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **String**| name that need to be deleted | 
+ **body** | [**User**](User.md)| Updated user object | [optional] 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
diff --git a/samples/client/petstore/javascript/git_push.sh b/samples/client/petstore/javascript/git_push.sh
new file mode 100644
index 00000000000..1a36388db02
--- /dev/null
+++ b/samples/client/petstore/javascript/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="YOUR_GIT_USR_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="YOUR_GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/client/petstore/javascript/package.json b/samples/client/petstore/javascript/package.json
index 6810fd633de..72a48ac71de 100644
--- a/samples/client/petstore/javascript/package.json
+++ b/samples/client/petstore/javascript/package.json
@@ -8,13 +8,11 @@
     "test": "./node_modules/mocha/bin/mocha --recursive"
   },
   "dependencies": {
-    "jquery": "~2.1.4"
+    "superagent": "1.7.1"
   },
   "devDependencies": {
     "mocha": "~2.3.4",
-    "expect.js": "~0.3.1",
-    "mockrequire": "~0.0.5",
-    "domino": "~1.0.20",
-    "xmlhttprequest": "~1.8.0"
+    "sinon": "1.17.3",
+    "expect.js": "~0.3.1"
   }
 }
diff --git a/samples/client/petstore/javascript/src/ApiClient.js b/samples/client/petstore/javascript/src/ApiClient.js
new file mode 100644
index 00000000000..71dd888d7d9
--- /dev/null
+++ b/samples/client/petstore/javascript/src/ApiClient.js
@@ -0,0 +1,479 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['superagent'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('superagent'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.ApiClient = factory(root.superagent);
+  }
+}(this, function(superagent) {
+  'use strict';
+
+  /**
+   * @module ApiClient
+   * @version 1.0.0
+   */
+
+  /**
+   * Manages low level client-server communications, parameter marshalling, etc. There should not be any need for an
+   * application to use this class directly - the *Api and model classes provide the public API for the service. The
+   * contents of this file should be regarded as internal but are documented for completeness.
+   * @alias module:ApiClient
+   * @class
+   */
+  var exports = function() {
+    /**
+     * The base URL against which to resolve every API call's (relative) path.
+     * @type {String}
+     * @default http://petstore.swagger.io/v2
+     */
+    this.basePath = 'http://petstore.swagger.io/v2'.replace(/\/+$/, '');
+
+    /**
+     * The authentication methods to be included for all API calls.
+     * @type {Array.<String>}
+     */
+    this.authentications = {
+      'test_api_key_header': {type: 'apiKey', 'in': 'header', name: 'test_api_key_header'},
+      'api_key': {type: 'apiKey', 'in': 'header', name: 'api_key'},
+      'test_http_basic': {type: 'basic'},
+      'test_api_client_secret': {type: 'apiKey', 'in': 'header', name: 'x-test_api_client_secret'},
+      'test_api_client_id': {type: 'apiKey', 'in': 'header', name: 'x-test_api_client_id'},
+      'test_api_key_query': {type: 'apiKey', 'in': 'query', name: 'test_api_key_query'},
+      'petstore_auth': {type: 'oauth2'}
+    };
+
+    /**
+     * The default HTTP headers to be included for all API calls.
+     * @type {Array.<String>}
+     * @default {}
+     */
+    this.defaultHeaders = {};
+
+    /**
+     * The default HTTP timeout for all API calls.
+     * @type {Number}
+     * @default 60000
+     */
+    this.timeout = 60000;
+  };
+
+  /**
+   * Returns a string representation for an actual parameter.
+   * @param param The actual parameter.
+   * @returns {String} The string representation of <code>param</code>.
+   */
+  exports.prototype.paramToString = function(param) {
+    if (param == undefined || param == null) {
+      return '';
+    }
+    if (param instanceof Date) {
+      return param.toJSON();
+    }
+    return param.toString();
+  };
+
+  /**
+   * Builds full URL by appending the given path to the base URL and replacing path parameter place-holders with parameter values.
+   * NOTE: query parameters are not handled here.
+   * @param {String} path The path to append to the base URL.
+   * @param {Object} pathParams The parameter values to append.
+   * @returns {String} The encoded path with parameter values substituted.
+   */
+  exports.prototype.buildUrl = function(path, pathParams) {
+    if (!path.match(/^\//)) {
+      path = '/' + path;
+    }
+    var url = this.basePath + path;
+    var _this = this;
+    url = url.replace(/\{([\w-]+)\}/g, function(fullMatch, key) {
+      var value;
+      if (pathParams.hasOwnProperty(key)) {
+        value = _this.paramToString(pathParams[key]);
+      } else {
+        value = fullMatch;
+      }
+      return encodeURIComponent(value);
+    });
+    return url;
+  };
+
+  /**
+   * Checks whether the given content type represents JSON.<br>
+   * JSON content type examples:<br>
+   * <ul>
+   * <li>application/json</li>
+   * <li>application/json; charset=UTF8</li>
+   * <li>APPLICATION/JSON</li>
+   * </ul>
+   * @param {String} contentType The MIME content type to check.
+   * @returns {Boolean} <code>true</code> if <code>contentType</code> represents JSON, otherwise <code>false</code>.
+   */
+  exports.prototype.isJsonMime = function(contentType) {
+    return Boolean(contentType != null && contentType.match(/^application\/json(;.*)?$/i));
+  };
+
+  /**
+   * Chooses a content type from the given array, with JSON preferred; i.e. return JSON if included, otherwise return the first.
+   * @param {Array.<String>} contentTypes
+   * @returns {String} The chosen content type, preferring JSON.
+   */
+  exports.prototype.jsonPreferredMime = function(contentTypes) {
+    for (var i = 0; i < contentTypes.length; i++) {
+      if (this.isJsonMime(contentTypes[i])) {
+        return contentTypes[i];
+      }
+    }
+    return contentTypes[0];
+  };
+
+  /**
+   * Checks whether the given parameter value represents file-like content.
+   * @param param The parameter to check.
+   * @returns {Boolean} <code>true</code> if <code>param</code> represents a file. 
+   */
+  exports.prototype.isFileParam = function(param) {
+    // fs.ReadStream in Node.js (but not in runtime like browserify)
+    if (typeof window === 'undefined' &&
+        typeof require === 'function' &&
+        require('fs') &&
+        param instanceof require('fs').ReadStream) {
+      return true;
+    }
+    // Buffer in Node.js
+    if (typeof Buffer === 'function' && param instanceof Buffer) {
+      return true;
+    }
+    // Blob in browser
+    if (typeof Blob === 'function' && param instanceof Blob) {
+      return true;
+    }
+    // File in browser (it seems File object is also instance of Blob, but keep this for safe)
+    if (typeof File === 'function' && param instanceof File) {
+      return true;
+    }
+    return false;
+  };
+
+  /**
+   * Normalizes parameter values:
+   * <ul>
+   * <li>remove nils</li>
+   * <li>keep files and arrays</li>
+   * <li>format to string with `paramToString` for other cases</li>
+   * </ul>
+   * @param {Object.<String, Object>} params The parameters as object properties.
+   * @returns {Object.<String, Object>} normalized parameters.
+   */
+  exports.prototype.normalizeParams = function(params) {
+    var newParams = {};
+    for (var key in params) {
+      if (params.hasOwnProperty(key) && params[key] != undefined && params[key] != null) {
+        var value = params[key];
+        if (this.isFileParam(value) || Array.isArray(value)) {
+          newParams[key] = value;
+        } else {
+          newParams[key] = this.paramToString(value);
+        }
+      }
+    }
+    return newParams;
+  };
+
+  /**
+   * Enumeration of collection format separator strategies.
+   * @enum {String} 
+   * @readonly
+   */
+  exports.CollectionFormatEnum = {
+    /**
+     * Comma-separated values. Value: <code>csv</code>
+     * @const
+     */
+    CSV: ',',
+    /**
+     * Space-separated values. Value: <code>ssv</code>
+     * @const
+     */
+    SSV: ' ',
+    /**
+     * Tab-separated values. Value: <code>tsv</code>
+     * @const
+     */
+    TSV: '\t',
+    /**
+     * Pipe(|)-separated values. Value: <code>pipes</code>
+     * @const
+     */
+    PIPES: '|',
+    /**
+     * Native array. Value: <code>multi</code>
+     * @const
+     */
+    MULTI: 'multi'
+  };
+
+  /**
+   * Builds a string representation of an array-type actual parameter, according to the given collection format.
+   * @param {Array} param An array parameter.
+   * @param {module:ApiClient.CollectionFormatEnum} collectionFormat The array element separator strategy.
+   * @returns {String|Array} A string representation of the supplied collection, using the specified delimiter. Returns
+   * <code>param</code> as is if <code>collectionFormat</code> is <code>multi</code>.
+   */
+  exports.prototype.buildCollectionParam = function buildCollectionParam(param, collectionFormat) {
+    if (param == null) {
+      return null;
+    }
+    switch (collectionFormat) {
+      case 'csv':
+        return param.map(this.paramToString).join(',');
+      case 'ssv':
+        return param.map(this.paramToString).join(' ');
+      case 'tsv':
+        return param.map(this.paramToString).join('\t');
+      case 'pipes':
+        return param.map(this.paramToString).join('|');
+      case 'multi':
+        // return the array directly as SuperAgent will handle it as expected
+        return param.map(this.paramToString);
+      default:
+        throw new Error('Unknown collection format: ' + collectionFormat);
+    }
+  };
+
+  /**
+   * Applies authentication headers to the request.
+   * @param {Object} request The request object created by a <code>superagent()</code> call.
+   * @param {Array.<String>} authNames An array of authentication method names.
+   */
+  exports.prototype.applyAuthToRequest = function(request, authNames) {
+    var _this = this;
+    authNames.forEach(function(authName) {
+      var auth = _this.authentications[authName];
+      switch (auth.type) {
+        case 'basic':
+          if (auth.username || auth.password) {
+            request.auth(auth.username || '', auth.password || '');
+          }
+          break;
+        case 'apiKey':
+          if (auth.apiKey) {
+            var data = {};
+            if (auth.apiKeyPrefix) {
+              data[auth.name] = auth.apiKeyPrefix + ' ' + auth.apiKey;
+            } else {
+              data[auth.name] = auth.apiKey;
+            }
+            if (auth['in'] === 'header') {
+              request.set(data);
+            } else {
+              request.query(data);
+            }
+          }
+          break;
+        case 'oauth2':
+          if (auth.accessToken) {
+            request.set({'Authorization': 'Bearer ' + auth.accessToken});
+          }
+          break;
+        default:
+          throw new Error('Unknown authentication type: ' + auth.type);
+      }
+    });
+  };
+
+  /**
+   * Deserializes an HTTP response body into a value of the specified type.
+   * @param {Object} response A SuperAgent response object.
+   * @param {(String|Array.<String>|Object.<String, Object>|Function)} returnType The type to return. Pass a string for simple types
+   * or the constructor function for a complex type. Pass an array containing the type name to return an array of that type. To
+   * return an object, pass an object with one property whose name is the key type and whose value is the corresponding value type:
+   * all properties on <code>data<code> will be converted to this type.
+   * @returns A value of the specified type.
+   */
+  exports.prototype.deserialize = function deserialize(response, returnType) {
+    if (response == null || returnType == null) {
+      return null;
+    }
+    // Rely on SuperAgent for parsing response body.
+    // See http://visionmedia.github.io/superagent/#parsing-response-bodies
+    var data = response.body;
+    if (data == null) {
+      // SuperAgent does not always produce a body; use the unparsed response as a fallback
+      data = response.text;
+    }
+    return exports.convertToType(data, returnType);
+  };
+
+  /**
+   * Callback function to receive the result of the operation.
+   * @callback module:ApiClient~callApiCallback
+   * @param {String} error Error message, if any.
+   * @param data The data returned by the service call.
+   * @param {String} response The complete HTTP response.
+   */
+
+  /**
+   * Invokes the REST service using the supplied settings and parameters.
+   * @param {String} path The base URL to invoke.
+   * @param {String} httpMethod The HTTP method to use.
+   * @param {Object.<String, String>} pathParams A map of path parameters and their values.
+   * @param {Object.<String, Object>} queryParams A map of query parameters and their values.
+   * @param {Object.<String, Object>} headerParams A map of header parameters and their values.
+   * @param {Object.<String, Object>} formParams A map of form parameters and their values.
+   * @param {Object} bodyParam The value to pass as the request body.
+   * @param {Array.<String>} authNames An array of authentication type names.
+   * @param {Array.<String>} contentTypes An array of request MIME types.
+   * @param {Array.<String>} accepts An array of acceptable response MIME types.
+   * @param {(String|Array|ObjectFunction)} returnType The required type to return; can be a string for simple types or the
+   * constructor for a complex type.
+   * @param {module:ApiClient~callApiCallback} callback The callback function.
+   * @returns {Object} The SuperAgent request object.
+   */
+  exports.prototype.callApi = function callApi(path, httpMethod, pathParams,
+      queryParams, headerParams, formParams, bodyParam, authNames, contentTypes, accepts,
+      returnType, callback) {
+
+    var _this = this;
+    var url = this.buildUrl(path, pathParams);
+    var request = superagent(httpMethod, url);
+
+    // apply authentications
+    this.applyAuthToRequest(request, authNames);
+
+    // set query parameters
+    request.query(this.normalizeParams(queryParams));
+
+    // set header parameters
+    request.set(this.defaultHeaders).set(this.normalizeParams(headerParams));
+
+    // set request timeout
+    request.timeout(this.timeout);
+
+    var contentType = this.jsonPreferredMime(contentTypes);
+    if (contentType) {
+      request.type(contentType);
+    } else if (!request.header['Content-Type']) {
+      request.type('application/json');
+    }
+
+    if (contentType === 'application/x-www-form-urlencoded') {
+      request.send(this.normalizeParams(formParams));
+    } else if (contentType == 'multipart/form-data') {
+      var _formParams = this.normalizeParams(formParams);
+      for (var key in _formParams) {
+        if (_formParams.hasOwnProperty(key)) {
+          if (this.isFileParam(_formParams[key])) {
+            // file field
+            request.attach(key, _formParams[key]);
+          } else {
+            request.field(key, _formParams[key]);
+          }
+        }
+      }
+    } else if (bodyParam) {
+      request.send(bodyParam);
+    }
+
+    var accept = this.jsonPreferredMime(accepts);
+    if (accept) {
+      request.accept(accept);
+    }
+
+
+    request.end(function(error, response) {
+      if (callback) {
+        var data = null;
+        if (!error) {
+          data = _this.deserialize(response, returnType);
+        }
+        callback(error, data, response);
+      }
+    });
+
+    return request;
+  };
+
+  /**
+   * Parses an ISO-8601 string representation of a date value.
+   * @param {String} str The date value as a string.
+   * @returns {Date} The parsed date object.
+   */
+  exports.parseDate = function(str) {
+    return new Date(str.replace(/T/i, ' '));
+  };
+
+  /**
+   * Converts a value to the specified type.
+   * @param {(String|Object)} data The data to convert, as a string or object.
+   * @param {(String|Array.<String>|Object.<String, Object>|Function)} type The type to return. Pass a string for simple types
+   * or the constructor function for a complex type. Pass an array containing the type name to return an array of that type. To
+   * return an object, pass an object with one property whose name is the key type and whose value is the corresponding value type:
+   * all properties on <code>data<code> will be converted to this type.
+   * @returns An instance of the specified type.
+   */
+  exports.convertToType = function(data, type) {
+    switch (type) {
+      case 'Boolean':
+        return Boolean(data);
+      case 'Integer':
+        return parseInt(data, 10);
+      case 'Number':
+        return parseFloat(data);
+      case 'String':
+        return String(data);
+      case 'Date':
+        return this.parseDate(String(data));
+      default:
+        if (type === Object) {
+          // generic object, return directly
+          return data;
+        } else if (typeof type === 'function') {
+          // for model type like: User
+          return type.constructFromObject(data);
+        } else if (Array.isArray(type)) {
+          // for array type like: ['String']
+          var itemType = type[0];
+          return data.map(function(item) {
+            return exports.convertToType(item, itemType);
+          });
+        } else if (typeof type === 'object') {
+          // for plain object type like: {'String': 'Integer'}
+          var keyType, valueType;
+          for (var k in type) {
+            if (type.hasOwnProperty(k)) {
+              keyType = k;
+              valueType = type[k];
+              break;
+            }
+          }
+          var result = {};
+          for (var k in data) {
+            if (data.hasOwnProperty(k)) {
+              var key = exports.convertToType(k, keyType);
+              var value = exports.convertToType(data[k], valueType);
+              result[key] = value;
+            }
+          }
+          return result;
+        } else {
+          // for unknown type, return the data directly
+          return data;
+        }
+    }
+  };
+
+  /**
+   * The default API client implementation.
+   * @type {module:ApiClient}
+   */
+  exports.instance = new exports();
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript/src/api/PetApi.js b/samples/client/petstore/javascript/src/api/PetApi.js
index 3b6d9c5b4c6..3bfc6ffd4f0 100644
--- a/samples/client/petstore/javascript/src/api/PetApi.js
+++ b/samples/client/petstore/javascript/src/api/PetApi.js
@@ -1,527 +1,535 @@
-// require files in Node.js environment
-var $, Pet;
-if (typeof module === 'object' && module.exports) {
-  $ = require('jquery');
-  Pet = require('../model/Pet.js');
-}
-
-// export module for AMD
-if ( typeof define === "function" && define.amd ) {     
-	define(['jquery', 'Pet'], function($, Pet) {
-        return PetApi;
-	 });
-}
-
-var PetApi = function PetApi() {
-	var self = this;
-  
-  
-  /**
-   * Update an existing pet
-   * 
-   * @param {Pet}  body Pet object that needs to be added to the store
-   * @param {function} callback the callback function
-   * @return void
-   */
-  self.updatePet = function(body, callback) {
-    var postBody = JSON.stringify(body);
-    var postBinaryBody = null;
-    
-    // create path and map variables
-    var basePath = 'http://petstore.swagger.io/v2';
-    // if basePath ends with a /, remove it as path starts with a leading /
-    if (basePath.substring(basePath.length-1, basePath.length)=='/') {
-    	basePath = basePath.substring(0, basePath.length-1);
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient', '../model/Pet', '../model/InlineResponse200'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'), require('../model/Pet'), require('../model/InlineResponse200'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
     }
-    
-    var path = basePath + replaceAll(replaceAll("/pet", "\\{format\\}","json"));
-
-    var queryParams = {};
-    var headerParams =  {};
-    var formParams =  {};
-
-    
-    
-    
-
-    path += createQueryString(queryParams);
-
-    var options = {type: "PUT", async: true, contentType: "application/json", dataType: "json", data: postBody};
-    var request = $.ajax(path, options);
-
-    request.fail(function(jqXHR, textStatus, errorThrown){
-      if (callback) {
-        var error = errorThrown || textStatus || jqXHR.statusText || 'error';
-        callback(null, textStatus, jqXHR, error);
-      }
-    });
-		
-    request.done(function(response, textStatus, jqXHR){
-      
-      if (callback) {
-        callback(response, textStatus, jqXHR);
-      }
-      
-    });
- 
-    return request;
+    root.SwaggerPetstore.PetApi = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Pet, root.SwaggerPetstore.InlineResponse200);
   }
-  
+}(this, function(ApiClient, Pet, InlineResponse200) {
+  'use strict';
+
   /**
-   * Add a new pet to the store
-   * 
-   * @param {Pet}  body Pet object that needs to be added to the store
-   * @param {function} callback the callback function
-   * @return void
+   * Pet service.
+   * @module api/PetApi
+   * @version 1.0.0
    */
-  self.addPet = function(body, callback) {
-    var postBody = JSON.stringify(body);
-    var postBinaryBody = null;
-    
-    // create path and map variables
-    var basePath = 'http://petstore.swagger.io/v2';
-    // if basePath ends with a /, remove it as path starts with a leading /
-    if (basePath.substring(basePath.length-1, basePath.length)=='/') {
-    	basePath = basePath.substring(0, basePath.length-1);
-    }
-    
-    var path = basePath + replaceAll(replaceAll("/pet", "\\{format\\}","json"));
 
-    var queryParams = {};
-    var headerParams =  {};
-    var formParams =  {};
-
-    
-    
-    
-
-    path += createQueryString(queryParams);
-
-    var options = {type: "POST", async: true, contentType: "application/json", dataType: "json", data: postBody};
-    var request = $.ajax(path, options);
-
-    request.fail(function(jqXHR, textStatus, errorThrown){
-      if (callback) {
-        var error = errorThrown || textStatus || jqXHR.statusText || 'error';
-        callback(null, textStatus, jqXHR, error);
-      }
-    });
-		
-    request.done(function(response, textStatus, jqXHR){
-      
-      if (callback) {
-        callback(response, textStatus, jqXHR);
-      }
-      
-    });
- 
-    return request;
-  }
-  
   /**
-   * Finds Pets by status
-   * Multiple status values can be provided with comma seperated strings
-   * @param {Array}  status Status values that need to be considered for filter
-   * @param {function} callback the callback function
-   * @return Array
+   * Constructs a new PetApi. 
+   * @alias module:api/PetApi
+   * @class
+   * @param {module:ApiClient} apiClient Optional API client implementation to use, default to {@link module:ApiClient#instance}
+   * if unspecified.
    */
-  self.findPetsByStatus = function(status, callback) {
-    var postBody = null;
-    var postBinaryBody = null;
-    
-    // create path and map variables
-    var basePath = 'http://petstore.swagger.io/v2';
-    // if basePath ends with a /, remove it as path starts with a leading /
-    if (basePath.substring(basePath.length-1, basePath.length)=='/') {
-    	basePath = basePath.substring(0, basePath.length-1);
+  var exports = function(apiClient) {
+    this.apiClient = apiClient || ApiClient.instance;
+
+
+    /**
+     * Callback function to receive the result of the addPet operation.
+     * @callback module:api/PetApi~addPetCallback
+     * @param {String} error Error message, if any.
+     * @param data This operation does not return a value.
+     * @param {String} response The complete HTTP response.
+     */
+
+    /**
+     * Add a new pet to the store
+     * 
+     * @param {Object} opts Optional parameters
+     * @param {module:model/Pet} opts.body Pet object that needs to be added to the store
+     * @param {module:api/PetApi~addPetCallback} callback The callback function, accepting three arguments: error, data, response
+     */
+    this.addPet = function(opts, callback) {
+      opts = opts || {};
+      var postBody = opts['body'];
+
+
+      var pathParams = {
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = ['petstore_auth'];
+      var contentTypes = ['application/json', 'application/xml'];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = null;
+
+      return this.apiClient.callApi(
+        '/pet', 'POST',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
     }
-    
-    var path = basePath + replaceAll(replaceAll("/pet/findByStatus", "\\{format\\}","json"));
 
-    var queryParams = {};
-    var headerParams =  {};
-    var formParams =  {};
+    /**
+     * Callback function to receive the result of the addPetUsingByteArray operation.
+     * @callback module:api/PetApi~addPetUsingByteArrayCallback
+     * @param {String} error Error message, if any.
+     * @param data This operation does not return a value.
+     * @param {String} response The complete HTTP response.
+     */
 
-    
-    queryParams.status = status;
-    
-    
-    
+    /**
+     * Fake endpoint to test byte array in body parameter for adding a new pet to the store
+     * 
+     * @param {Object} opts Optional parameters
+     * @param {String} opts.body Pet object in the form of byte array
+     * @param {module:api/PetApi~addPetUsingByteArrayCallback} callback The callback function, accepting three arguments: error, data, response
+     */
+    this.addPetUsingByteArray = function(opts, callback) {
+      opts = opts || {};
+      var postBody = opts['body'];
 
-    path += createQueryString(queryParams);
 
-    var options = {type: "GET", async: true, contentType: "application/json", dataType: "json", data: postBody};
-    var request = $.ajax(path, options);
+      var pathParams = {
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
 
-    request.fail(function(jqXHR, textStatus, errorThrown){
-      if (callback) {
-        var error = errorThrown || textStatus || jqXHR.statusText || 'error';
-        callback(null, textStatus, jqXHR, error);
-      }
-    });
-		
-    request.done(function(response, textStatus, jqXHR){
-      
-      /**
-        * @returns Array
-        */
-      
-      var myResponse = new Array();
-      myResponse.constructFromObject(response);
-      if (callback) {
-        callback(myResponse, textStatus, jqXHR);
-      }
-      
-    });
- 
-    return request;
-  }
-  
-  /**
-   * Finds Pets by tags
-   * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-   * @param {Array}  tags Tags to filter by
-   * @param {function} callback the callback function
-   * @return Array
-   */
-  self.findPetsByTags = function(tags, callback) {
-    var postBody = null;
-    var postBinaryBody = null;
-    
-    // create path and map variables
-    var basePath = 'http://petstore.swagger.io/v2';
-    // if basePath ends with a /, remove it as path starts with a leading /
-    if (basePath.substring(basePath.length-1, basePath.length)=='/') {
-    	basePath = basePath.substring(0, basePath.length-1);
+      var authNames = ['petstore_auth'];
+      var contentTypes = ['application/json', 'application/xml'];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = null;
+
+      return this.apiClient.callApi(
+        '/pet?testing_byte_array=true', 'POST',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
     }
-    
-    var path = basePath + replaceAll(replaceAll("/pet/findByTags", "\\{format\\}","json"));
 
-    var queryParams = {};
-    var headerParams =  {};
-    var formParams =  {};
+    /**
+     * Callback function to receive the result of the deletePet operation.
+     * @callback module:api/PetApi~deletePetCallback
+     * @param {String} error Error message, if any.
+     * @param data This operation does not return a value.
+     * @param {String} response The complete HTTP response.
+     */
 
-    
-    queryParams.tags = tags;
-    
-    
-    
+    /**
+     * Deletes a pet
+     * 
+     * @param {Integer} petId Pet id to delete
+     * @param {Object} opts Optional parameters
+     * @param {String} opts.apiKey 
+     * @param {module:api/PetApi~deletePetCallback} callback The callback function, accepting three arguments: error, data, response
+     */
+    this.deletePet = function(petId, opts, callback) {
+      opts = opts || {};
+      var postBody = null;
 
-    path += createQueryString(queryParams);
-
-    var options = {type: "GET", async: true, contentType: "application/json", dataType: "json", data: postBody};
-    var request = $.ajax(path, options);
-
-    request.fail(function(jqXHR, textStatus, errorThrown){
-      if (callback) {
-        var error = errorThrown || textStatus || jqXHR.statusText || 'error';
-        callback(null, textStatus, jqXHR, error);
+      // verify the required parameter 'petId' is set
+      if (petId == undefined || petId == null) {
+        throw "Missing the required parameter 'petId' when calling deletePet";
       }
-    });
-		
-    request.done(function(response, textStatus, jqXHR){
-      
-      /**
-        * @returns Array
-        */
-      
-      var myResponse = new Array();
-      myResponse.constructFromObject(response);
-      if (callback) {
-        callback(myResponse, textStatus, jqXHR);
-      }
-      
-    });
- 
-    return request;
-  }
-  
-  /**
-   * Find pet by ID
-   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-   * @param {Integer}  petId ID of pet that needs to be fetched
-   * @param {function} callback the callback function
-   * @return Pet
-   */
-  self.getPetById = function(petId, callback) {
-    var postBody = null;
-    var postBinaryBody = null;
-    
-     // verify the required parameter 'petId' is set
-     if (petId == null) {
-        //throw new ApiException(400, "Missing the required parameter 'petId' when calling getPetById");
-        var errorRequiredMsg = "Missing the required parameter 'petId' when calling getPetById";
-        throw errorRequiredMsg;
-     }
-     
-    // create path and map variables
-    var basePath = 'http://petstore.swagger.io/v2';
-    // if basePath ends with a /, remove it as path starts with a leading /
-    if (basePath.substring(basePath.length-1, basePath.length)=='/') {
-    	basePath = basePath.substring(0, basePath.length-1);
+
+
+      var pathParams = {
+        'petId': petId
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+        'api_key': opts['apiKey']
+      };
+      var formParams = {
+      };
+
+      var authNames = ['petstore_auth'];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = null;
+
+      return this.apiClient.callApi(
+        '/pet/{petId}', 'DELETE',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
     }
-    
-    var path = basePath + replaceAll(replaceAll("/pet/{petId}", "\\{format\\}","json")
-, "\\{" + "petId" + "\\}", encodeURIComponent(petId.toString()));
 
-    var queryParams = {};
-    var headerParams =  {};
-    var formParams =  {};
+    /**
+     * Callback function to receive the result of the findPetsByStatus operation.
+     * @callback module:api/PetApi~findPetsByStatusCallback
+     * @param {String} error Error message, if any.
+     * @param {Array.<module:model/Pet>} data The data returned by the service call.
+     * @param {String} response The complete HTTP response.
+     */
 
-    
-    
-    
+    /**
+     * Finds Pets by status
+     * Multiple status values can be provided with comma separated strings
+     * @param {Object} opts Optional parameters
+     * @param {Array.<String>} opts.status Status values that need to be considered for query (default to available)
+     * @param {module:api/PetApi~findPetsByStatusCallback} callback The callback function, accepting three arguments: error, data, response
+     * data is of type: {Array.<module:model/Pet>}
+     */
+    this.findPetsByStatus = function(opts, callback) {
+      opts = opts || {};
+      var postBody = null;
 
-    path += createQueryString(queryParams);
 
-    var options = {type: "GET", async: true, contentType: "application/json", dataType: "json", data: postBody};
-    var request = $.ajax(path, options);
+      var pathParams = {
+      };
+      var queryParams = {
+        'status': this.apiClient.buildCollectionParam(opts['status'], 'multi')
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
 
-    request.fail(function(jqXHR, textStatus, errorThrown){
-      if (callback) {
-        var error = errorThrown || textStatus || jqXHR.statusText || 'error';
-        callback(null, textStatus, jqXHR, error);
-      }
-    });
-		
-    request.done(function(response, textStatus, jqXHR){
-      
-      /**
-        * @returns Pet
-        */
-      
-      var myResponse = new Pet();
-      myResponse.constructFromObject(response);
-      if (callback) {
-        callback(myResponse, textStatus, jqXHR);
-      }
-      
-    });
- 
-    return request;
-  }
-  
-  /**
-   * Updates a pet in the store with form data
-   * 
-   * @param {String}  petId ID of pet that needs to be updated
-   * @param {String}  name Updated name of the pet
-   * @param {String}  status Updated status of the pet
-   * @param {function} callback the callback function
-   * @return void
-   */
-  self.updatePetWithForm = function(petId, name, status, callback) {
-    var postBody = null;
-    var postBinaryBody = null;
-    
-     // verify the required parameter 'petId' is set
-     if (petId == null) {
-        //throw new ApiException(400, "Missing the required parameter 'petId' when calling updatePetWithForm");
-        var errorRequiredMsg = "Missing the required parameter 'petId' when calling updatePetWithForm";
-        throw errorRequiredMsg;
-     }
-     
-    // create path and map variables
-    var basePath = 'http://petstore.swagger.io/v2';
-    // if basePath ends with a /, remove it as path starts with a leading /
-    if (basePath.substring(basePath.length-1, basePath.length)=='/') {
-    	basePath = basePath.substring(0, basePath.length-1);
+      var authNames = ['petstore_auth'];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = [Pet];
+
+      return this.apiClient.callApi(
+        '/pet/findByStatus', 'GET',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
     }
-    
-    var path = basePath + replaceAll(replaceAll("/pet/{petId}", "\\{format\\}","json")
-, "\\{" + "petId" + "\\}", encodeURIComponent(petId.toString()));
 
-    var queryParams = {};
-    var headerParams =  {};
-    var formParams =  {};
+    /**
+     * Callback function to receive the result of the findPetsByTags operation.
+     * @callback module:api/PetApi~findPetsByTagsCallback
+     * @param {String} error Error message, if any.
+     * @param {Array.<module:model/Pet>} data The data returned by the service call.
+     * @param {String} response The complete HTTP response.
+     */
 
-    
-    
-    if (name != null)
-      formParams.put("name", name);
-    if (status != null)
-      formParams.put("status", status);
-    
+    /**
+     * Finds Pets by tags
+     * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+     * @param {Object} opts Optional parameters
+     * @param {Array.<String>} opts.tags Tags to filter by
+     * @param {module:api/PetApi~findPetsByTagsCallback} callback The callback function, accepting three arguments: error, data, response
+     * data is of type: {Array.<module:model/Pet>}
+     */
+    this.findPetsByTags = function(opts, callback) {
+      opts = opts || {};
+      var postBody = null;
 
-    path += createQueryString(queryParams);
 
-    var options = {type: "POST", async: true, contentType: "application/json", dataType: "json", data: postBody};
-    var request = $.ajax(path, options);
+      var pathParams = {
+      };
+      var queryParams = {
+        'tags': this.apiClient.buildCollectionParam(opts['tags'], 'multi')
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
 
-    request.fail(function(jqXHR, textStatus, errorThrown){
-      if (callback) {
-        var error = errorThrown || textStatus || jqXHR.statusText || 'error';
-        callback(null, textStatus, jqXHR, error);
-      }
-    });
-		
-    request.done(function(response, textStatus, jqXHR){
-      
-      if (callback) {
-        callback(response, textStatus, jqXHR);
-      }
-      
-    });
- 
-    return request;
-  }
-  
-  /**
-   * Deletes a pet
-   * 
-   * @param {Integer}  petId Pet id to delete
-   * @param {String}  apiKey 
-   * @param {function} callback the callback function
-   * @return void
-   */
-  self.deletePet = function(petId, apiKey, callback) {
-    var postBody = null;
-    var postBinaryBody = null;
-    
-     // verify the required parameter 'petId' is set
-     if (petId == null) {
-        //throw new ApiException(400, "Missing the required parameter 'petId' when calling deletePet");
-        var errorRequiredMsg = "Missing the required parameter 'petId' when calling deletePet";
-        throw errorRequiredMsg;
-     }
-     
-    // create path and map variables
-    var basePath = 'http://petstore.swagger.io/v2';
-    // if basePath ends with a /, remove it as path starts with a leading /
-    if (basePath.substring(basePath.length-1, basePath.length)=='/') {
-    	basePath = basePath.substring(0, basePath.length-1);
+      var authNames = ['petstore_auth'];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = [Pet];
+
+      return this.apiClient.callApi(
+        '/pet/findByTags', 'GET',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
     }
-    
-    var path = basePath + replaceAll(replaceAll("/pet/{petId}", "\\{format\\}","json")
-, "\\{" + "petId" + "\\}", encodeURIComponent(petId.toString()));
 
-    var queryParams = {};
-    var headerParams =  {};
-    var formParams =  {};
+    /**
+     * Callback function to receive the result of the getPetById operation.
+     * @callback module:api/PetApi~getPetByIdCallback
+     * @param {String} error Error message, if any.
+     * @param {module:model/Pet} data The data returned by the service call.
+     * @param {String} response The complete HTTP response.
+     */
 
-    
-    if (apiKey != null)
-    headerParams.put("api_key", apiKey);
-    
-    
+    /**
+     * Find pet by ID
+     * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+     * @param {Integer} petId ID of pet that needs to be fetched
+     * @param {module:api/PetApi~getPetByIdCallback} callback The callback function, accepting three arguments: error, data, response
+     * data is of type: {module:model/Pet}
+     */
+    this.getPetById = function(petId, callback) {
+      var postBody = null;
 
-    path += createQueryString(queryParams);
-
-    var options = {type: "DELETE", async: true, contentType: "application/json", dataType: "json", data: postBody};
-    var request = $.ajax(path, options);
-
-    request.fail(function(jqXHR, textStatus, errorThrown){
-      if (callback) {
-        var error = errorThrown || textStatus || jqXHR.statusText || 'error';
-        callback(null, textStatus, jqXHR, error);
+      // verify the required parameter 'petId' is set
+      if (petId == undefined || petId == null) {
+        throw "Missing the required parameter 'petId' when calling getPetById";
       }
-    });
-		
-    request.done(function(response, textStatus, jqXHR){
-      
-      if (callback) {
-        callback(response, textStatus, jqXHR);
-      }
-      
-    });
- 
-    return request;
-  }
-  
-  /**
-   * uploads an image
-   * 
-   * @param {Integer}  petId ID of pet to update
-   * @param {String}  additionalMetadata Additional data to pass to server
-   * @param {File}  file file to upload
-   * @param {function} callback the callback function
-   * @return void
-   */
-  self.uploadFile = function(petId, additionalMetadata, file, callback) {
-    var postBody = null;
-    var postBinaryBody = null;
-    
-     // verify the required parameter 'petId' is set
-     if (petId == null) {
-        //throw new ApiException(400, "Missing the required parameter 'petId' when calling uploadFile");
-        var errorRequiredMsg = "Missing the required parameter 'petId' when calling uploadFile";
-        throw errorRequiredMsg;
-     }
-     
-    // create path and map variables
-    var basePath = 'http://petstore.swagger.io/v2';
-    // if basePath ends with a /, remove it as path starts with a leading /
-    if (basePath.substring(basePath.length-1, basePath.length)=='/') {
-    	basePath = basePath.substring(0, basePath.length-1);
+
+
+      var pathParams = {
+        'petId': petId
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = ['api_key', 'petstore_auth'];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = Pet;
+
+      return this.apiClient.callApi(
+        '/pet/{petId}', 'GET',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
     }
-    
-    var path = basePath + replaceAll(replaceAll("/pet/{petId}/uploadImage", "\\{format\\}","json")
-, "\\{" + "petId" + "\\}", encodeURIComponent(petId.toString()));
 
-    var queryParams = {};
-    var headerParams =  {};
-    var formParams =  {};
+    /**
+     * Callback function to receive the result of the getPetByIdInObject operation.
+     * @callback module:api/PetApi~getPetByIdInObjectCallback
+     * @param {String} error Error message, if any.
+     * @param {module:model/InlineResponse200} data The data returned by the service call.
+     * @param {String} response The complete HTTP response.
+     */
 
-    
-    
-    if (additionalMetadata != null)
-      formParams.put("additionalMetadata", additionalMetadata);
-    if (file != null)
-      formParams.put("file", file);
-    
+    /**
+     * Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+     * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+     * @param {Integer} petId ID of pet that needs to be fetched
+     * @param {module:api/PetApi~getPetByIdInObjectCallback} callback The callback function, accepting three arguments: error, data, response
+     * data is of type: {module:model/InlineResponse200}
+     */
+    this.getPetByIdInObject = function(petId, callback) {
+      var postBody = null;
 
-    path += createQueryString(queryParams);
-
-    var options = {type: "POST", async: true, contentType: "application/json", dataType: "json", data: postBody};
-    var request = $.ajax(path, options);
-
-    request.fail(function(jqXHR, textStatus, errorThrown){
-      if (callback) {
-        var error = errorThrown || textStatus || jqXHR.statusText || 'error';
-        callback(null, textStatus, jqXHR, error);
+      // verify the required parameter 'petId' is set
+      if (petId == undefined || petId == null) {
+        throw "Missing the required parameter 'petId' when calling getPetByIdInObject";
       }
-    });
-		
-    request.done(function(response, textStatus, jqXHR){
-      
-      if (callback) {
-        callback(response, textStatus, jqXHR);
+
+
+      var pathParams = {
+        'petId': petId
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = ['api_key', 'petstore_auth'];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = InlineResponse200;
+
+      return this.apiClient.callApi(
+        '/pet/{petId}?response=inline_arbitrary_object', 'GET',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
+    }
+
+    /**
+     * Callback function to receive the result of the petPetIdtestingByteArraytrueGet operation.
+     * @callback module:api/PetApi~petPetIdtestingByteArraytrueGetCallback
+     * @param {String} error Error message, if any.
+     * @param {'String'} data The data returned by the service call.
+     * @param {String} response The complete HTTP response.
+     */
+
+    /**
+     * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+     * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+     * @param {Integer} petId ID of pet that needs to be fetched
+     * @param {module:api/PetApi~petPetIdtestingByteArraytrueGetCallback} callback The callback function, accepting three arguments: error, data, response
+     * data is of type: {'String'}
+     */
+    this.petPetIdtestingByteArraytrueGet = function(petId, callback) {
+      var postBody = null;
+
+      // verify the required parameter 'petId' is set
+      if (petId == undefined || petId == null) {
+        throw "Missing the required parameter 'petId' when calling petPetIdtestingByteArraytrueGet";
       }
-      
-    });
- 
-    return request;
-  }
-  
-  
 
- 	function replaceAll (haystack, needle, replace) {
-		var result= haystack;
-		if (needle !=null && replace!=null) {
-			result= haystack.replace(new RegExp(needle, 'g'), replace);
-		}
-		return result;
-	}
 
- 	function createQueryString (queryParams) {
-		var queryString ='';
-		var i = 0;
-		for (var queryParamName in queryParams) {
-			if (i==0) {
-				queryString += '?' ;
-			} else {
-				queryString += '&' ;
-			}
-			
-			queryString +=  queryParamName + '=' + encodeURIComponent(queryParams[queryParamName]);
-			i++;
-		}
-		
-		return queryString;
-	}
-}
+      var pathParams = {
+        'petId': petId
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
 
-// export module for Node.js
-if (typeof module === 'object' && module.exports) {
-  module.exports = PetApi;
-}
+      var authNames = ['api_key', 'petstore_auth'];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = 'String';
+
+      return this.apiClient.callApi(
+        '/pet/{petId}?testing_byte_array=true', 'GET',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
+    }
+
+    /**
+     * Callback function to receive the result of the updatePet operation.
+     * @callback module:api/PetApi~updatePetCallback
+     * @param {String} error Error message, if any.
+     * @param data This operation does not return a value.
+     * @param {String} response The complete HTTP response.
+     */
+
+    /**
+     * Update an existing pet
+     * 
+     * @param {Object} opts Optional parameters
+     * @param {module:model/Pet} opts.body Pet object that needs to be added to the store
+     * @param {module:api/PetApi~updatePetCallback} callback The callback function, accepting three arguments: error, data, response
+     */
+    this.updatePet = function(opts, callback) {
+      opts = opts || {};
+      var postBody = opts['body'];
+
+
+      var pathParams = {
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = ['petstore_auth'];
+      var contentTypes = ['application/json', 'application/xml'];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = null;
+
+      return this.apiClient.callApi(
+        '/pet', 'PUT',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
+    }
+
+    /**
+     * Callback function to receive the result of the updatePetWithForm operation.
+     * @callback module:api/PetApi~updatePetWithFormCallback
+     * @param {String} error Error message, if any.
+     * @param data This operation does not return a value.
+     * @param {String} response The complete HTTP response.
+     */
+
+    /**
+     * Updates a pet in the store with form data
+     * 
+     * @param {String} petId ID of pet that needs to be updated
+     * @param {Object} opts Optional parameters
+     * @param {String} opts.name Updated name of the pet
+     * @param {String} opts.status Updated status of the pet
+     * @param {module:api/PetApi~updatePetWithFormCallback} callback The callback function, accepting three arguments: error, data, response
+     */
+    this.updatePetWithForm = function(petId, opts, callback) {
+      opts = opts || {};
+      var postBody = null;
+
+      // verify the required parameter 'petId' is set
+      if (petId == undefined || petId == null) {
+        throw "Missing the required parameter 'petId' when calling updatePetWithForm";
+      }
+
+
+      var pathParams = {
+        'petId': petId
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+        'name': opts['name'],
+        'status': opts['status']
+      };
+
+      var authNames = ['petstore_auth'];
+      var contentTypes = ['application/x-www-form-urlencoded'];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = null;
+
+      return this.apiClient.callApi(
+        '/pet/{petId}', 'POST',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
+    }
+
+    /**
+     * Callback function to receive the result of the uploadFile operation.
+     * @callback module:api/PetApi~uploadFileCallback
+     * @param {String} error Error message, if any.
+     * @param data This operation does not return a value.
+     * @param {String} response The complete HTTP response.
+     */
+
+    /**
+     * uploads an image
+     * 
+     * @param {Integer} petId ID of pet to update
+     * @param {Object} opts Optional parameters
+     * @param {String} opts.additionalMetadata Additional data to pass to server
+     * @param {File} opts.file file to upload
+     * @param {module:api/PetApi~uploadFileCallback} callback The callback function, accepting three arguments: error, data, response
+     */
+    this.uploadFile = function(petId, opts, callback) {
+      opts = opts || {};
+      var postBody = null;
+
+      // verify the required parameter 'petId' is set
+      if (petId == undefined || petId == null) {
+        throw "Missing the required parameter 'petId' when calling uploadFile";
+      }
+
+
+      var pathParams = {
+        'petId': petId
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+        'additionalMetadata': opts['additionalMetadata'],
+        'file': opts['file']
+      };
+
+      var authNames = ['petstore_auth'];
+      var contentTypes = ['multipart/form-data'];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = null;
+
+      return this.apiClient.callApi(
+        '/pet/{petId}/uploadImage', 'POST',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
+    }
+  };
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript/src/api/StoreApi.js b/samples/client/petstore/javascript/src/api/StoreApi.js
index e52a3105964..bcef8b433c1 100644
--- a/samples/client/petstore/javascript/src/api/StoreApi.js
+++ b/samples/client/petstore/javascript/src/api/StoreApi.js
@@ -1,286 +1,291 @@
-// require files in Node.js environment
-var $, Order;
-if (typeof module === 'object' && module.exports) {
-  $ = require('jquery');
-  Order = require('../model/Order.js');
-}
-
-// export module for AMD
-if ( typeof define === "function" && define.amd ) {     
-	define(['jquery', 'Order'], function($, Order) {
-        return StoreApi;
-	 });
-}
-
-var StoreApi = function StoreApi() {
-	var self = this;
-  
-  
-  /**
-   * Returns pet inventories by status
-   * Returns a map of status codes to quantities
-   * @param {function} callback the callback function
-   * @return Object<String, Integer>
-   */
-  self.getInventory = function(callback) {
-    var postBody = null;
-    var postBinaryBody = null;
-    
-    // create path and map variables
-    var basePath = 'http://petstore.swagger.io/v2';
-    // if basePath ends with a /, remove it as path starts with a leading /
-    if (basePath.substring(basePath.length-1, basePath.length)=='/') {
-    	basePath = basePath.substring(0, basePath.length-1);
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient', '../model/Order'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'), require('../model/Order'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
     }
-    
-    var path = basePath + replaceAll(replaceAll("/store/inventory", "\\{format\\}","json"));
-
-    var queryParams = {};
-    var headerParams =  {};
-    var formParams =  {};
-
-    
-    
-    
-
-    path += createQueryString(queryParams);
-
-    var options = {type: "GET", async: true, contentType: "application/json", dataType: "json", data: postBody};
-    var request = $.ajax(path, options);
-
-    request.fail(function(jqXHR, textStatus, errorThrown){
-      if (callback) {
-        var error = errorThrown || textStatus || jqXHR.statusText || 'error';
-        callback(null, textStatus, jqXHR, error);
-      }
-    });
-		
-    request.done(function(response, textStatus, jqXHR){
-      
-      /**
-        * @returns Object<String, Integer>
-        */
-      var myResponse = response;
-      
-      if (callback) {
-        callback(myResponse, textStatus, jqXHR);
-      }
-      
-    });
- 
-    return request;
+    root.SwaggerPetstore.StoreApi = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Order);
   }
-  
+}(this, function(ApiClient, Order) {
+  'use strict';
+
   /**
-   * Place an order for a pet
-   * 
-   * @param {Order}  body order placed for purchasing the pet
-   * @param {function} callback the callback function
-   * @return Order
+   * Store service.
+   * @module api/StoreApi
+   * @version 1.0.0
    */
-  self.placeOrder = function(body, callback) {
-    var postBody = JSON.stringify(body);
-    var postBinaryBody = null;
-    
-    // create path and map variables
-    var basePath = 'http://petstore.swagger.io/v2';
-    // if basePath ends with a /, remove it as path starts with a leading /
-    if (basePath.substring(basePath.length-1, basePath.length)=='/') {
-    	basePath = basePath.substring(0, basePath.length-1);
-    }
-    
-    var path = basePath + replaceAll(replaceAll("/store/order", "\\{format\\}","json"));
 
-    var queryParams = {};
-    var headerParams =  {};
-    var formParams =  {};
-
-    
-    
-    
-
-    path += createQueryString(queryParams);
-
-    var options = {type: "POST", async: true, contentType: "application/json", dataType: "json", data: postBody};
-    var request = $.ajax(path, options);
-
-    request.fail(function(jqXHR, textStatus, errorThrown){
-      if (callback) {
-        var error = errorThrown || textStatus || jqXHR.statusText || 'error';
-        callback(null, textStatus, jqXHR, error);
-      }
-    });
-		
-    request.done(function(response, textStatus, jqXHR){
-      
-      /**
-        * @returns Order
-        */
-      
-      var myResponse = new Order();
-      myResponse.constructFromObject(response);
-      if (callback) {
-        callback(myResponse, textStatus, jqXHR);
-      }
-      
-    });
- 
-    return request;
-  }
-  
   /**
-   * Find purchase order by ID
-   * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-   * @param {String}  orderId ID of pet that needs to be fetched
-   * @param {function} callback the callback function
-   * @return Order
+   * Constructs a new StoreApi. 
+   * @alias module:api/StoreApi
+   * @class
+   * @param {module:ApiClient} apiClient Optional API client implementation to use, default to {@link module:ApiClient#instance}
+   * if unspecified.
    */
-  self.getOrderById = function(orderId, callback) {
-    var postBody = null;
-    var postBinaryBody = null;
-    
-     // verify the required parameter 'orderId' is set
-     if (orderId == null) {
-        //throw new ApiException(400, "Missing the required parameter 'orderId' when calling getOrderById");
-        var errorRequiredMsg = "Missing the required parameter 'orderId' when calling getOrderById";
-        throw errorRequiredMsg;
-     }
-     
-    // create path and map variables
-    var basePath = 'http://petstore.swagger.io/v2';
-    // if basePath ends with a /, remove it as path starts with a leading /
-    if (basePath.substring(basePath.length-1, basePath.length)=='/') {
-    	basePath = basePath.substring(0, basePath.length-1);
+  var exports = function(apiClient) {
+    this.apiClient = apiClient || ApiClient.instance;
+
+
+    /**
+     * Callback function to receive the result of the deleteOrder operation.
+     * @callback module:api/StoreApi~deleteOrderCallback
+     * @param {String} error Error message, if any.
+     * @param data This operation does not return a value.
+     * @param {String} response The complete HTTP response.
+     */
+
+    /**
+     * Delete purchase order by ID
+     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+     * @param {String} orderId ID of the order that needs to be deleted
+     * @param {module:api/StoreApi~deleteOrderCallback} callback The callback function, accepting three arguments: error, data, response
+     */
+    this.deleteOrder = function(orderId, callback) {
+      var postBody = null;
+
+      // verify the required parameter 'orderId' is set
+      if (orderId == undefined || orderId == null) {
+        throw "Missing the required parameter 'orderId' when calling deleteOrder";
+      }
+
+
+      var pathParams = {
+        'orderId': orderId
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = [];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = null;
+
+      return this.apiClient.callApi(
+        '/store/order/{orderId}', 'DELETE',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
     }
-    
-    var path = basePath + replaceAll(replaceAll("/store/order/{orderId}", "\\{format\\}","json")
-, "\\{" + "orderId" + "\\}", encodeURIComponent(orderId.toString()));
 
-    var queryParams = {};
-    var headerParams =  {};
-    var formParams =  {};
+    /**
+     * Callback function to receive the result of the findOrdersByStatus operation.
+     * @callback module:api/StoreApi~findOrdersByStatusCallback
+     * @param {String} error Error message, if any.
+     * @param {Array.<module:model/Order>} data The data returned by the service call.
+     * @param {String} response The complete HTTP response.
+     */
 
-    
-    
-    
+    /**
+     * Finds orders by status
+     * A single status value can be provided as a string
+     * @param {Object} opts Optional parameters
+     * @param {module:model/String} opts.status Status value that needs to be considered for query (default to placed)
+     * @param {module:api/StoreApi~findOrdersByStatusCallback} callback The callback function, accepting three arguments: error, data, response
+     * data is of type: {Array.<module:model/Order>}
+     */
+    this.findOrdersByStatus = function(opts, callback) {
+      opts = opts || {};
+      var postBody = null;
 
-    path += createQueryString(queryParams);
 
-    var options = {type: "GET", async: true, contentType: "application/json", dataType: "json", data: postBody};
-    var request = $.ajax(path, options);
+      var pathParams = {
+      };
+      var queryParams = {
+        'status': opts['status']
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
 
-    request.fail(function(jqXHR, textStatus, errorThrown){
-      if (callback) {
-        var error = errorThrown || textStatus || jqXHR.statusText || 'error';
-        callback(null, textStatus, jqXHR, error);
-      }
-    });
-		
-    request.done(function(response, textStatus, jqXHR){
-      
-      /**
-        * @returns Order
-        */
-      
-      var myResponse = new Order();
-      myResponse.constructFromObject(response);
-      if (callback) {
-        callback(myResponse, textStatus, jqXHR);
-      }
-      
-    });
- 
-    return request;
-  }
-  
-  /**
-   * Delete purchase order by ID
-   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-   * @param {String}  orderId ID of the order that needs to be deleted
-   * @param {function} callback the callback function
-   * @return void
-   */
-  self.deleteOrder = function(orderId, callback) {
-    var postBody = null;
-    var postBinaryBody = null;
-    
-     // verify the required parameter 'orderId' is set
-     if (orderId == null) {
-        //throw new ApiException(400, "Missing the required parameter 'orderId' when calling deleteOrder");
-        var errorRequiredMsg = "Missing the required parameter 'orderId' when calling deleteOrder";
-        throw errorRequiredMsg;
-     }
-     
-    // create path and map variables
-    var basePath = 'http://petstore.swagger.io/v2';
-    // if basePath ends with a /, remove it as path starts with a leading /
-    if (basePath.substring(basePath.length-1, basePath.length)=='/') {
-    	basePath = basePath.substring(0, basePath.length-1);
+      var authNames = ['test_api_client_id', 'test_api_client_secret'];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = [Order];
+
+      return this.apiClient.callApi(
+        '/store/findByStatus', 'GET',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
     }
-    
-    var path = basePath + replaceAll(replaceAll("/store/order/{orderId}", "\\{format\\}","json")
-, "\\{" + "orderId" + "\\}", encodeURIComponent(orderId.toString()));
 
-    var queryParams = {};
-    var headerParams =  {};
-    var formParams =  {};
+    /**
+     * Callback function to receive the result of the getInventory operation.
+     * @callback module:api/StoreApi~getInventoryCallback
+     * @param {String} error Error message, if any.
+     * @param {Object.<String, {'String': 'Integer'}>} data The data returned by the service call.
+     * @param {String} response The complete HTTP response.
+     */
 
-    
-    
-    
+    /**
+     * Returns pet inventories by status
+     * Returns a map of status codes to quantities
+     * @param {module:api/StoreApi~getInventoryCallback} callback The callback function, accepting three arguments: error, data, response
+     * data is of type: {Object.<String, {'String': 'Integer'}>}
+     */
+    this.getInventory = function(callback) {
+      var postBody = null;
 
-    path += createQueryString(queryParams);
 
-    var options = {type: "DELETE", async: true, contentType: "application/json", dataType: "json", data: postBody};
-    var request = $.ajax(path, options);
+      var pathParams = {
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
 
-    request.fail(function(jqXHR, textStatus, errorThrown){
-      if (callback) {
-        var error = errorThrown || textStatus || jqXHR.statusText || 'error';
-        callback(null, textStatus, jqXHR, error);
+      var authNames = ['api_key'];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = {'String': 'Integer'};
+
+      return this.apiClient.callApi(
+        '/store/inventory', 'GET',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
+    }
+
+    /**
+     * Callback function to receive the result of the getInventoryInObject operation.
+     * @callback module:api/StoreApi~getInventoryInObjectCallback
+     * @param {String} error Error message, if any.
+     * @param {Object} data The data returned by the service call.
+     * @param {String} response The complete HTTP response.
+     */
+
+    /**
+     * Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+     * Returns an arbitrary object which is actually a map of status codes to quantities
+     * @param {module:api/StoreApi~getInventoryInObjectCallback} callback The callback function, accepting three arguments: error, data, response
+     * data is of type: {Object}
+     */
+    this.getInventoryInObject = function(callback) {
+      var postBody = null;
+
+
+      var pathParams = {
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = ['api_key'];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = Object;
+
+      return this.apiClient.callApi(
+        '/store/inventory?response=arbitrary_object', 'GET',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
+    }
+
+    /**
+     * Callback function to receive the result of the getOrderById operation.
+     * @callback module:api/StoreApi~getOrderByIdCallback
+     * @param {String} error Error message, if any.
+     * @param {module:model/Order} data The data returned by the service call.
+     * @param {String} response The complete HTTP response.
+     */
+
+    /**
+     * Find purchase order by ID
+     * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+     * @param {String} orderId ID of pet that needs to be fetched
+     * @param {module:api/StoreApi~getOrderByIdCallback} callback The callback function, accepting three arguments: error, data, response
+     * data is of type: {module:model/Order}
+     */
+    this.getOrderById = function(orderId, callback) {
+      var postBody = null;
+
+      // verify the required parameter 'orderId' is set
+      if (orderId == undefined || orderId == null) {
+        throw "Missing the required parameter 'orderId' when calling getOrderById";
       }
-    });
-		
-    request.done(function(response, textStatus, jqXHR){
-      
-      if (callback) {
-        callback(response, textStatus, jqXHR);
-      }
-      
-    });
- 
-    return request;
-  }
-  
-  
 
- 	function replaceAll (haystack, needle, replace) {
-		var result= haystack;
-		if (needle !=null && replace!=null) {
-			result= haystack.replace(new RegExp(needle, 'g'), replace);
-		}
-		return result;
-	}
 
- 	function createQueryString (queryParams) {
-		var queryString ='';
-		var i = 0;
-		for (var queryParamName in queryParams) {
-			if (i==0) {
-				queryString += '?' ;
-			} else {
-				queryString += '&' ;
-			}
-			
-			queryString +=  queryParamName + '=' + encodeURIComponent(queryParams[queryParamName]);
-			i++;
-		}
-		
-		return queryString;
-	}
-}
+      var pathParams = {
+        'orderId': orderId
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
 
-// export module for Node.js
-if (typeof module === 'object' && module.exports) {
-  module.exports = StoreApi;
-}
+      var authNames = ['test_api_key_header', 'test_api_key_query'];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = Order;
+
+      return this.apiClient.callApi(
+        '/store/order/{orderId}', 'GET',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
+    }
+
+    /**
+     * Callback function to receive the result of the placeOrder operation.
+     * @callback module:api/StoreApi~placeOrderCallback
+     * @param {String} error Error message, if any.
+     * @param {module:model/Order} data The data returned by the service call.
+     * @param {String} response The complete HTTP response.
+     */
+
+    /**
+     * Place an order for a pet
+     * 
+     * @param {Object} opts Optional parameters
+     * @param {module:model/Order} opts.body order placed for purchasing the pet
+     * @param {module:api/StoreApi~placeOrderCallback} callback The callback function, accepting three arguments: error, data, response
+     * data is of type: {module:model/Order}
+     */
+    this.placeOrder = function(opts, callback) {
+      opts = opts || {};
+      var postBody = opts['body'];
+
+
+      var pathParams = {
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = ['test_api_client_id', 'test_api_client_secret'];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = Order;
+
+      return this.apiClient.callApi(
+        '/store/order', 'POST',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
+    }
+  };
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript/src/api/UserApi.js b/samples/client/petstore/javascript/src/api/UserApi.js
index 148e6171ed4..3060a13e70c 100644
--- a/samples/client/petstore/javascript/src/api/UserApi.js
+++ b/samples/client/petstore/javascript/src/api/UserApi.js
@@ -1,498 +1,382 @@
-// require files in Node.js environment
-var $, User;
-if (typeof module === 'object' && module.exports) {
-  $ = require('jquery');
-  User = require('../model/User.js');
-}
-
-// export module for AMD
-if ( typeof define === "function" && define.amd ) {     
-	define(['jquery', 'User'], function($, User) {
-        return UserApi;
-	 });
-}
-
-var UserApi = function UserApi() {
-	var self = this;
-  
-  
-  /**
-   * Create user
-   * This can only be done by the logged in user.
-   * @param {User}  body Created user object
-   * @param {function} callback the callback function
-   * @return void
-   */
-  self.createUser = function(body, callback) {
-    var postBody = JSON.stringify(body);
-    var postBinaryBody = null;
-    
-    // create path and map variables
-    var basePath = 'http://petstore.swagger.io/v2';
-    // if basePath ends with a /, remove it as path starts with a leading /
-    if (basePath.substring(basePath.length-1, basePath.length)=='/') {
-    	basePath = basePath.substring(0, basePath.length-1);
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient', '../model/User'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'), require('../model/User'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
     }
-    
-    var path = basePath + replaceAll(replaceAll("/user", "\\{format\\}","json"));
-
-    var queryParams = {};
-    var headerParams =  {};
-    var formParams =  {};
-
-    
-    
-    
-
-    path += createQueryString(queryParams);
-
-    var options = {type: "POST", async: true, contentType: "application/json", dataType: "json", data: postBody};
-    var request = $.ajax(path, options);
-
-    request.fail(function(jqXHR, textStatus, errorThrown){
-      if (callback) {
-        var error = errorThrown || textStatus || jqXHR.statusText || 'error';
-        callback(null, textStatus, jqXHR, error);
-      }
-    });
-		
-    request.done(function(response, textStatus, jqXHR){
-      
-      if (callback) {
-        callback(response, textStatus, jqXHR);
-      }
-      
-    });
- 
-    return request;
+    root.SwaggerPetstore.UserApi = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.User);
   }
-  
+}(this, function(ApiClient, User) {
+  'use strict';
+
   /**
-   * Creates list of users with given input array
-   * 
-   * @param {Array}  body List of user object
-   * @param {function} callback the callback function
-   * @return void
+   * User service.
+   * @module api/UserApi
+   * @version 1.0.0
    */
-  self.createUsersWithArrayInput = function(body, callback) {
-    var postBody = JSON.stringify(body);
-    var postBinaryBody = null;
-    
-    // create path and map variables
-    var basePath = 'http://petstore.swagger.io/v2';
-    // if basePath ends with a /, remove it as path starts with a leading /
-    if (basePath.substring(basePath.length-1, basePath.length)=='/') {
-    	basePath = basePath.substring(0, basePath.length-1);
-    }
-    
-    var path = basePath + replaceAll(replaceAll("/user/createWithArray", "\\{format\\}","json"));
 
-    var queryParams = {};
-    var headerParams =  {};
-    var formParams =  {};
-
-    
-    
-    
-
-    path += createQueryString(queryParams);
-
-    var options = {type: "POST", async: true, contentType: "application/json", dataType: "json", data: postBody};
-    var request = $.ajax(path, options);
-
-    request.fail(function(jqXHR, textStatus, errorThrown){
-      if (callback) {
-        var error = errorThrown || textStatus || jqXHR.statusText || 'error';
-        callback(null, textStatus, jqXHR, error);
-      }
-    });
-		
-    request.done(function(response, textStatus, jqXHR){
-      
-      if (callback) {
-        callback(response, textStatus, jqXHR);
-      }
-      
-    });
- 
-    return request;
-  }
-  
   /**
-   * Creates list of users with given input array
-   * 
-   * @param {Array}  body List of user object
-   * @param {function} callback the callback function
-   * @return void
+   * Constructs a new UserApi. 
+   * @alias module:api/UserApi
+   * @class
+   * @param {module:ApiClient} apiClient Optional API client implementation to use, default to {@link module:ApiClient#instance}
+   * if unspecified.
    */
-  self.createUsersWithListInput = function(body, callback) {
-    var postBody = JSON.stringify(body);
-    var postBinaryBody = null;
-    
-    // create path and map variables
-    var basePath = 'http://petstore.swagger.io/v2';
-    // if basePath ends with a /, remove it as path starts with a leading /
-    if (basePath.substring(basePath.length-1, basePath.length)=='/') {
-    	basePath = basePath.substring(0, basePath.length-1);
+  var exports = function(apiClient) {
+    this.apiClient = apiClient || ApiClient.instance;
+
+
+    /**
+     * Callback function to receive the result of the createUser operation.
+     * @callback module:api/UserApi~createUserCallback
+     * @param {String} error Error message, if any.
+     * @param data This operation does not return a value.
+     * @param {String} response The complete HTTP response.
+     */
+
+    /**
+     * Create user
+     * This can only be done by the logged in user.
+     * @param {Object} opts Optional parameters
+     * @param {module:model/User} opts.body Created user object
+     * @param {module:api/UserApi~createUserCallback} callback The callback function, accepting three arguments: error, data, response
+     */
+    this.createUser = function(opts, callback) {
+      opts = opts || {};
+      var postBody = opts['body'];
+
+
+      var pathParams = {
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = [];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = null;
+
+      return this.apiClient.callApi(
+        '/user', 'POST',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
     }
-    
-    var path = basePath + replaceAll(replaceAll("/user/createWithList", "\\{format\\}","json"));
 
-    var queryParams = {};
-    var headerParams =  {};
-    var formParams =  {};
+    /**
+     * Callback function to receive the result of the createUsersWithArrayInput operation.
+     * @callback module:api/UserApi~createUsersWithArrayInputCallback
+     * @param {String} error Error message, if any.
+     * @param data This operation does not return a value.
+     * @param {String} response The complete HTTP response.
+     */
 
-    
-    
-    
+    /**
+     * Creates list of users with given input array
+     * 
+     * @param {Object} opts Optional parameters
+     * @param {Array.<module:model/User>} opts.body List of user object
+     * @param {module:api/UserApi~createUsersWithArrayInputCallback} callback The callback function, accepting three arguments: error, data, response
+     */
+    this.createUsersWithArrayInput = function(opts, callback) {
+      opts = opts || {};
+      var postBody = opts['body'];
 
-    path += createQueryString(queryParams);
 
-    var options = {type: "POST", async: true, contentType: "application/json", dataType: "json", data: postBody};
-    var request = $.ajax(path, options);
+      var pathParams = {
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
 
-    request.fail(function(jqXHR, textStatus, errorThrown){
-      if (callback) {
-        var error = errorThrown || textStatus || jqXHR.statusText || 'error';
-        callback(null, textStatus, jqXHR, error);
-      }
-    });
-		
-    request.done(function(response, textStatus, jqXHR){
-      
-      if (callback) {
-        callback(response, textStatus, jqXHR);
-      }
-      
-    });
- 
-    return request;
-  }
-  
-  /**
-   * Logs user into the system
-   * 
-   * @param {String}  username The user name for login
-   * @param {String}  password The password for login in clear text
-   * @param {function} callback the callback function
-   * @return String
-   */
-  self.loginUser = function(username, password, callback) {
-    var postBody = null;
-    var postBinaryBody = null;
-    
-    // create path and map variables
-    var basePath = 'http://petstore.swagger.io/v2';
-    // if basePath ends with a /, remove it as path starts with a leading /
-    if (basePath.substring(basePath.length-1, basePath.length)=='/') {
-    	basePath = basePath.substring(0, basePath.length-1);
+      var authNames = [];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = null;
+
+      return this.apiClient.callApi(
+        '/user/createWithArray', 'POST',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
     }
-    
-    var path = basePath + replaceAll(replaceAll("/user/login", "\\{format\\}","json"));
 
-    var queryParams = {};
-    var headerParams =  {};
-    var formParams =  {};
+    /**
+     * Callback function to receive the result of the createUsersWithListInput operation.
+     * @callback module:api/UserApi~createUsersWithListInputCallback
+     * @param {String} error Error message, if any.
+     * @param data This operation does not return a value.
+     * @param {String} response The complete HTTP response.
+     */
 
-    
-    queryParams.username = username;
-    
-    queryParams.password = password;
-    
-    
-    
+    /**
+     * Creates list of users with given input array
+     * 
+     * @param {Object} opts Optional parameters
+     * @param {Array.<module:model/User>} opts.body List of user object
+     * @param {module:api/UserApi~createUsersWithListInputCallback} callback The callback function, accepting three arguments: error, data, response
+     */
+    this.createUsersWithListInput = function(opts, callback) {
+      opts = opts || {};
+      var postBody = opts['body'];
 
-    path += createQueryString(queryParams);
 
-    var options = {type: "GET", async: true, contentType: "application/json", dataType: "json", data: postBody};
-    var request = $.ajax(path, options);
+      var pathParams = {
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
 
-    request.fail(function(jqXHR, textStatus, errorThrown){
-      if (callback) {
-        var error = errorThrown || textStatus || jqXHR.statusText || 'error';
-        callback(null, textStatus, jqXHR, error);
-      }
-    });
-		
-    request.done(function(response, textStatus, jqXHR){
-      
-      /**
-        * @returns String
-        */
-      var myResponse = response;
-      
-      if (callback) {
-        callback(myResponse, textStatus, jqXHR);
-      }
-      
-    });
- 
-    return request;
-  }
-  
-  /**
-   * Logs out current logged in user session
-   * 
-   * @param {function} callback the callback function
-   * @return void
-   */
-  self.logoutUser = function(callback) {
-    var postBody = null;
-    var postBinaryBody = null;
-    
-    // create path and map variables
-    var basePath = 'http://petstore.swagger.io/v2';
-    // if basePath ends with a /, remove it as path starts with a leading /
-    if (basePath.substring(basePath.length-1, basePath.length)=='/') {
-    	basePath = basePath.substring(0, basePath.length-1);
+      var authNames = [];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = null;
+
+      return this.apiClient.callApi(
+        '/user/createWithList', 'POST',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
     }
-    
-    var path = basePath + replaceAll(replaceAll("/user/logout", "\\{format\\}","json"));
 
-    var queryParams = {};
-    var headerParams =  {};
-    var formParams =  {};
+    /**
+     * Callback function to receive the result of the deleteUser operation.
+     * @callback module:api/UserApi~deleteUserCallback
+     * @param {String} error Error message, if any.
+     * @param data This operation does not return a value.
+     * @param {String} response The complete HTTP response.
+     */
 
-    
-    
-    
+    /**
+     * Delete user
+     * This can only be done by the logged in user.
+     * @param {String} username The name that needs to be deleted
+     * @param {module:api/UserApi~deleteUserCallback} callback The callback function, accepting three arguments: error, data, response
+     */
+    this.deleteUser = function(username, callback) {
+      var postBody = null;
 
-    path += createQueryString(queryParams);
-
-    var options = {type: "GET", async: true, contentType: "application/json", dataType: "json", data: postBody};
-    var request = $.ajax(path, options);
-
-    request.fail(function(jqXHR, textStatus, errorThrown){
-      if (callback) {
-        var error = errorThrown || textStatus || jqXHR.statusText || 'error';
-        callback(null, textStatus, jqXHR, error);
+      // verify the required parameter 'username' is set
+      if (username == undefined || username == null) {
+        throw "Missing the required parameter 'username' when calling deleteUser";
       }
-    });
-		
-    request.done(function(response, textStatus, jqXHR){
-      
-      if (callback) {
-        callback(response, textStatus, jqXHR);
-      }
-      
-    });
- 
-    return request;
-  }
-  
-  /**
-   * Get user by user name
-   * 
-   * @param {String}  username The name that needs to be fetched. Use user1 for testing.
-   * @param {function} callback the callback function
-   * @return User
-   */
-  self.getUserByName = function(username, callback) {
-    var postBody = null;
-    var postBinaryBody = null;
-    
-     // verify the required parameter 'username' is set
-     if (username == null) {
-        //throw new ApiException(400, "Missing the required parameter 'username' when calling getUserByName");
-        var errorRequiredMsg = "Missing the required parameter 'username' when calling getUserByName";
-        throw errorRequiredMsg;
-     }
-     
-    // create path and map variables
-    var basePath = 'http://petstore.swagger.io/v2';
-    // if basePath ends with a /, remove it as path starts with a leading /
-    if (basePath.substring(basePath.length-1, basePath.length)=='/') {
-    	basePath = basePath.substring(0, basePath.length-1);
+
+
+      var pathParams = {
+        'username': username
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = ['test_http_basic'];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = null;
+
+      return this.apiClient.callApi(
+        '/user/{username}', 'DELETE',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
     }
-    
-    var path = basePath + replaceAll(replaceAll("/user/{username}", "\\{format\\}","json")
-, "\\{" + "username" + "\\}", encodeURIComponent(username.toString()));
 
-    var queryParams = {};
-    var headerParams =  {};
-    var formParams =  {};
+    /**
+     * Callback function to receive the result of the getUserByName operation.
+     * @callback module:api/UserApi~getUserByNameCallback
+     * @param {String} error Error message, if any.
+     * @param {module:model/User} data The data returned by the service call.
+     * @param {String} response The complete HTTP response.
+     */
 
-    
-    
-    
+    /**
+     * Get user by user name
+     * 
+     * @param {String} username The name that needs to be fetched. Use user1 for testing.
+     * @param {module:api/UserApi~getUserByNameCallback} callback The callback function, accepting three arguments: error, data, response
+     * data is of type: {module:model/User}
+     */
+    this.getUserByName = function(username, callback) {
+      var postBody = null;
 
-    path += createQueryString(queryParams);
-
-    var options = {type: "GET", async: true, contentType: "application/json", dataType: "json", data: postBody};
-    var request = $.ajax(path, options);
-
-    request.fail(function(jqXHR, textStatus, errorThrown){
-      if (callback) {
-        var error = errorThrown || textStatus || jqXHR.statusText || 'error';
-        callback(null, textStatus, jqXHR, error);
+      // verify the required parameter 'username' is set
+      if (username == undefined || username == null) {
+        throw "Missing the required parameter 'username' when calling getUserByName";
       }
-    });
-		
-    request.done(function(response, textStatus, jqXHR){
-      
-      /**
-        * @returns User
-        */
-      
-      var myResponse = new User();
-      myResponse.constructFromObject(response);
-      if (callback) {
-        callback(myResponse, textStatus, jqXHR);
-      }
-      
-    });
- 
-    return request;
-  }
-  
-  /**
-   * Updated user
-   * This can only be done by the logged in user.
-   * @param {String}  username name that need to be deleted
-   * @param {User}  body Updated user object
-   * @param {function} callback the callback function
-   * @return void
-   */
-  self.updateUser = function(username, body, callback) {
-    var postBody = JSON.stringify(body);
-    var postBinaryBody = null;
-    
-     // verify the required parameter 'username' is set
-     if (username == null) {
-        //throw new ApiException(400, "Missing the required parameter 'username' when calling updateUser");
-        var errorRequiredMsg = "Missing the required parameter 'username' when calling updateUser";
-        throw errorRequiredMsg;
-     }
-     
-    // create path and map variables
-    var basePath = 'http://petstore.swagger.io/v2';
-    // if basePath ends with a /, remove it as path starts with a leading /
-    if (basePath.substring(basePath.length-1, basePath.length)=='/') {
-    	basePath = basePath.substring(0, basePath.length-1);
+
+
+      var pathParams = {
+        'username': username
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
+
+      var authNames = [];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = User;
+
+      return this.apiClient.callApi(
+        '/user/{username}', 'GET',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
     }
-    
-    var path = basePath + replaceAll(replaceAll("/user/{username}", "\\{format\\}","json")
-, "\\{" + "username" + "\\}", encodeURIComponent(username.toString()));
 
-    var queryParams = {};
-    var headerParams =  {};
-    var formParams =  {};
+    /**
+     * Callback function to receive the result of the loginUser operation.
+     * @callback module:api/UserApi~loginUserCallback
+     * @param {String} error Error message, if any.
+     * @param {'String'} data The data returned by the service call.
+     * @param {String} response The complete HTTP response.
+     */
 
-    
-    
-    
+    /**
+     * Logs user into the system
+     * 
+     * @param {Object} opts Optional parameters
+     * @param {String} opts.username The user name for login
+     * @param {String} opts.password The password for login in clear text
+     * @param {module:api/UserApi~loginUserCallback} callback The callback function, accepting three arguments: error, data, response
+     * data is of type: {'String'}
+     */
+    this.loginUser = function(opts, callback) {
+      opts = opts || {};
+      var postBody = null;
 
-    path += createQueryString(queryParams);
 
-    var options = {type: "PUT", async: true, contentType: "application/json", dataType: "json", data: postBody};
-    var request = $.ajax(path, options);
+      var pathParams = {
+      };
+      var queryParams = {
+        'username': opts['username'],
+        'password': opts['password']
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
 
-    request.fail(function(jqXHR, textStatus, errorThrown){
-      if (callback) {
-        var error = errorThrown || textStatus || jqXHR.statusText || 'error';
-        callback(null, textStatus, jqXHR, error);
-      }
-    });
-		
-    request.done(function(response, textStatus, jqXHR){
-      
-      if (callback) {
-        callback(response, textStatus, jqXHR);
-      }
-      
-    });
- 
-    return request;
-  }
-  
-  /**
-   * Delete user
-   * This can only be done by the logged in user.
-   * @param {String}  username The name that needs to be deleted
-   * @param {function} callback the callback function
-   * @return void
-   */
-  self.deleteUser = function(username, callback) {
-    var postBody = null;
-    var postBinaryBody = null;
-    
-     // verify the required parameter 'username' is set
-     if (username == null) {
-        //throw new ApiException(400, "Missing the required parameter 'username' when calling deleteUser");
-        var errorRequiredMsg = "Missing the required parameter 'username' when calling deleteUser";
-        throw errorRequiredMsg;
-     }
-     
-    // create path and map variables
-    var basePath = 'http://petstore.swagger.io/v2';
-    // if basePath ends with a /, remove it as path starts with a leading /
-    if (basePath.substring(basePath.length-1, basePath.length)=='/') {
-    	basePath = basePath.substring(0, basePath.length-1);
+      var authNames = [];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = 'String';
+
+      return this.apiClient.callApi(
+        '/user/login', 'GET',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
     }
-    
-    var path = basePath + replaceAll(replaceAll("/user/{username}", "\\{format\\}","json")
-, "\\{" + "username" + "\\}", encodeURIComponent(username.toString()));
 
-    var queryParams = {};
-    var headerParams =  {};
-    var formParams =  {};
+    /**
+     * Callback function to receive the result of the logoutUser operation.
+     * @callback module:api/UserApi~logoutUserCallback
+     * @param {String} error Error message, if any.
+     * @param data This operation does not return a value.
+     * @param {String} response The complete HTTP response.
+     */
 
-    
-    
-    
+    /**
+     * Logs out current logged in user session
+     * 
+     * @param {module:api/UserApi~logoutUserCallback} callback The callback function, accepting three arguments: error, data, response
+     */
+    this.logoutUser = function(callback) {
+      var postBody = null;
 
-    path += createQueryString(queryParams);
 
-    var options = {type: "DELETE", async: true, contentType: "application/json", dataType: "json", data: postBody};
-    var request = $.ajax(path, options);
+      var pathParams = {
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
 
-    request.fail(function(jqXHR, textStatus, errorThrown){
-      if (callback) {
-        var error = errorThrown || textStatus || jqXHR.statusText || 'error';
-        callback(null, textStatus, jqXHR, error);
+      var authNames = [];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = null;
+
+      return this.apiClient.callApi(
+        '/user/logout', 'GET',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
+    }
+
+    /**
+     * Callback function to receive the result of the updateUser operation.
+     * @callback module:api/UserApi~updateUserCallback
+     * @param {String} error Error message, if any.
+     * @param data This operation does not return a value.
+     * @param {String} response The complete HTTP response.
+     */
+
+    /**
+     * Updated user
+     * This can only be done by the logged in user.
+     * @param {String} username name that need to be deleted
+     * @param {Object} opts Optional parameters
+     * @param {module:model/User} opts.body Updated user object
+     * @param {module:api/UserApi~updateUserCallback} callback The callback function, accepting three arguments: error, data, response
+     */
+    this.updateUser = function(username, opts, callback) {
+      opts = opts || {};
+      var postBody = opts['body'];
+
+      // verify the required parameter 'username' is set
+      if (username == undefined || username == null) {
+        throw "Missing the required parameter 'username' when calling updateUser";
       }
-    });
-		
-    request.done(function(response, textStatus, jqXHR){
-      
-      if (callback) {
-        callback(response, textStatus, jqXHR);
-      }
-      
-    });
- 
-    return request;
-  }
-  
-  
 
- 	function replaceAll (haystack, needle, replace) {
-		var result= haystack;
-		if (needle !=null && replace!=null) {
-			result= haystack.replace(new RegExp(needle, 'g'), replace);
-		}
-		return result;
-	}
 
- 	function createQueryString (queryParams) {
-		var queryString ='';
-		var i = 0;
-		for (var queryParamName in queryParams) {
-			if (i==0) {
-				queryString += '?' ;
-			} else {
-				queryString += '&' ;
-			}
-			
-			queryString +=  queryParamName + '=' + encodeURIComponent(queryParams[queryParamName]);
-			i++;
-		}
-		
-		return queryString;
-	}
-}
+      var pathParams = {
+        'username': username
+      };
+      var queryParams = {
+      };
+      var headerParams = {
+      };
+      var formParams = {
+      };
 
-// export module for Node.js
-if (typeof module === 'object' && module.exports) {
-  module.exports = UserApi;
-}
+      var authNames = [];
+      var contentTypes = [];
+      var accepts = ['application/json', 'application/xml'];
+      var returnType = null;
+
+      return this.apiClient.callApi(
+        '/user/{username}', 'PUT',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
+    }
+  };
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript/src/index.js b/samples/client/petstore/javascript/src/index.js
index b772f6024dc..da193f80e4d 100644
--- a/samples/client/petstore/javascript/src/index.js
+++ b/samples/client/petstore/javascript/src/index.js
@@ -1,22 +1,132 @@
-if (typeof module === 'object' && module.exports) {
-  var SwaggerPetstore = {};
-  
-  SwaggerPetstore.User = require('./model/User.js');
-  
-  SwaggerPetstore.Category = require('./model/Category.js');
-  
-  SwaggerPetstore.Pet = require('./model/Pet.js');
-  
-  SwaggerPetstore.Tag = require('./model/Tag.js');
-  
-  SwaggerPetstore.Order = require('./model/Order.js');
-  
-  
-  SwaggerPetstore.UserApi = require('./api/UserApi.js');
-  
-  SwaggerPetstore.StoreApi = require('./api/StoreApi.js');
-  
-  SwaggerPetstore.PetApi = require('./api/PetApi.js');
-  
-  module.exports = SwaggerPetstore;
-}
\ No newline at end of file
+(function(factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['./ApiClient', './model/Animal', './model/Cat', './model/Category', './model/Dog', './model/InlineResponse200', './model/Model200Response', './model/ModelReturn', './model/Name', './model/Order', './model/Pet', './model/SpecialModelName', './model/Tag', './model/User', './api/PetApi', './api/StoreApi', './api/UserApi'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('./ApiClient'), require('./model/Animal'), require('./model/Cat'), require('./model/Category'), require('./model/Dog'), require('./model/InlineResponse200'), require('./model/Model200Response'), require('./model/ModelReturn'), require('./model/Name'), require('./model/Order'), require('./model/Pet'), require('./model/SpecialModelName'), require('./model/Tag'), require('./model/User'), require('./api/PetApi'), require('./api/StoreApi'), require('./api/UserApi'));
+  }
+}(function(ApiClient, Animal, Cat, Category, Dog, InlineResponse200, Model200Response, ModelReturn, Name, Order, Pet, SpecialModelName, Tag, User, PetApi, StoreApi, UserApi) {
+  'use strict';
+
+  /**
+   * This is a sample server Petstore server.  You can find out more about Swagger at &lt;a href=\&quot;http://swagger.io\&quot;&gt;http://swagger.io&lt;/a&gt; or on irc.freenode.net, #swagger.  For this sample, you can use the api key \&quot;special-key\&quot; to test the authorization filters.<br>
+   * The <code>index</code> module provides access to constructors for all the classes which comprise the public API.
+   * <p>
+   * An AMD (recommended!) or CommonJS application will generally do something equivalent to the following:
+   * <pre>
+   * var SwaggerPetstore = require('./index'); // See note below*.
+   * var xxxSvc = new SwaggerPetstore.XxxApi(); // Allocate the API class we're going to use.
+   * var yyyModel = new SwaggerPetstore.Yyy(); // Construct a model instance.
+   * yyyModel.someProperty = 'someValue';
+   * ...
+   * var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
+   * ...
+   * </pre>
+   * <em>*NOTE: For a top-level AMD script, use require(['./index'], function(){...}) and put the application logic within the
+   * callback function.</em>
+   * </p>
+   * <p>
+   * A non-AMD browser application (discouraged) might do something like this:
+   * <pre>
+   * var xxxSvc = new SwaggerPetstore.XxxApi(); // Allocate the API class we're going to use.
+   * var yyy = new SwaggerPetstore.Yyy(); // Construct a model instance.
+   * yyyModel.someProperty = 'someValue';
+   * ...
+   * var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
+   * ...
+   * </pre>
+   * </p>
+   * @module index
+   * @version 1.0.0
+   */
+  var exports = {
+    /**
+     * The ApiClient constructor.
+     * @property {module:ApiClient}
+     */
+    ApiClient: ApiClient,
+    /**
+     * The Animal model constructor.
+     * @property {module:model/Animal}
+     */
+    Animal: Animal,
+    /**
+     * The Cat model constructor.
+     * @property {module:model/Cat}
+     */
+    Cat: Cat,
+    /**
+     * The Category model constructor.
+     * @property {module:model/Category}
+     */
+    Category: Category,
+    /**
+     * The Dog model constructor.
+     * @property {module:model/Dog}
+     */
+    Dog: Dog,
+    /**
+     * The InlineResponse200 model constructor.
+     * @property {module:model/InlineResponse200}
+     */
+    InlineResponse200: InlineResponse200,
+    /**
+     * The Model200Response model constructor.
+     * @property {module:model/Model200Response}
+     */
+    Model200Response: Model200Response,
+    /**
+     * The ModelReturn model constructor.
+     * @property {module:model/ModelReturn}
+     */
+    ModelReturn: ModelReturn,
+    /**
+     * The Name model constructor.
+     * @property {module:model/Name}
+     */
+    Name: Name,
+    /**
+     * The Order model constructor.
+     * @property {module:model/Order}
+     */
+    Order: Order,
+    /**
+     * The Pet model constructor.
+     * @property {module:model/Pet}
+     */
+    Pet: Pet,
+    /**
+     * The SpecialModelName model constructor.
+     * @property {module:model/SpecialModelName}
+     */
+    SpecialModelName: SpecialModelName,
+    /**
+     * The Tag model constructor.
+     * @property {module:model/Tag}
+     */
+    Tag: Tag,
+    /**
+     * The User model constructor.
+     * @property {module:model/User}
+     */
+    User: User,
+    /**
+     * The PetApi service constructor.
+     * @property {module:api/PetApi}
+     */
+    PetApi: PetApi,
+    /**
+     * The StoreApi service constructor.
+     * @property {module:api/StoreApi}
+     */
+    StoreApi: StoreApi,
+    /**
+     * The UserApi service constructor.
+     * @property {module:api/UserApi}
+     */
+    UserApi: UserApi
+  };
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript/src/model/Animal.js b/samples/client/petstore/javascript/src/model/Animal.js
new file mode 100644
index 00000000000..674471a30ee
--- /dev/null
+++ b/samples/client/petstore/javascript/src/model/Animal.js
@@ -0,0 +1,63 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.Animal = factory(root.SwaggerPetstore.ApiClient);
+  }
+}(this, function(ApiClient) {
+  'use strict';
+
+  /**
+   * The Animal model module.
+   * @module model/Animal
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new <code>Animal</code>.
+   * @alias module:model/Animal
+   * @class
+   * @param className
+   */
+  var exports = function(className) {
+
+    this['className'] = className;
+  };
+
+  /**
+   * Constructs a <code>Animal</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/Animal} obj Optional instance to populate.
+   * @return {module:model/Animal} The populated <code>Animal</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) { 
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('className')) {
+        obj['className'] = ApiClient.convertToType(data['className'], 'String');
+      }
+    }
+    return obj;
+  }
+
+
+  /**
+   * @member {String} className
+   */
+  exports.prototype['className'] = undefined;
+
+
+
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript/src/model/Cat.js b/samples/client/petstore/javascript/src/model/Cat.js
new file mode 100644
index 00000000000..c878af6edec
--- /dev/null
+++ b/samples/client/petstore/javascript/src/model/Cat.js
@@ -0,0 +1,67 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient', './Animal'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'), require('./Animal'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.Cat = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Animal);
+  }
+}(this, function(ApiClient, Animal) {
+  'use strict';
+
+  /**
+   * The Cat model module.
+   * @module model/Cat
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new <code>Cat</code>.
+   * @alias module:model/Cat
+   * @class
+   * @extends module:model/Animal
+   * @param className
+   */
+  var exports = function(className) {
+    Animal.call(this, className);
+
+  };
+
+  /**
+   * Constructs a <code>Cat</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/Cat} obj Optional instance to populate.
+   * @return {module:model/Cat} The populated <code>Cat</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) { 
+      obj = obj || new exports();
+      Animal.constructFromObject(data, obj);
+      if (data.hasOwnProperty('declawed')) {
+        obj['declawed'] = ApiClient.convertToType(data['declawed'], 'Boolean');
+      }
+    }
+    return obj;
+  }
+
+  exports.prototype = Object.create(Animal.prototype);
+  exports.prototype.constructor = exports;
+
+
+  /**
+   * @member {Boolean} declawed
+   */
+  exports.prototype['declawed'] = undefined;
+
+
+
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript/src/model/Category.js b/samples/client/petstore/javascript/src/model/Category.js
index ff40497a61a..473f4b783d5 100644
--- a/samples/client/petstore/javascript/src/model/Category.js
+++ b/samples/client/petstore/javascript/src/model/Category.js
@@ -1,81 +1,71 @@
-// require files in Node.js environment
-
-if (typeof module === 'object' && module.exports) {
-  
-}
-
-
-
-
-//export module
-if ( typeof define === "function" && define.amd ) {
-  define('Category', ['jquery'],
-    function($) {
-      return Category;
-   });
-}
-
-
-var Category = function Category() { 
-  var self = this;
-  
-  /**
-   * datatype: Integer
-   **/
-  self.id = null;
-  
-  /**
-   * datatype: String
-   **/
-  self.name = null;
-  
-  
-  self.constructFromObject = function(data) {
-    if (!data) {
-      return;
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
     }
-    
-    self.id = data.id;
-    
-    self.name = data.name;
-    
-  }
-
-  
-  /**
-   * @return {Integer}
-   **/
-  self.getId = function() {
-    return self.id;
+    root.SwaggerPetstore.Category = factory(root.SwaggerPetstore.ApiClient);
   }
+}(this, function(ApiClient) {
+  'use strict';
 
   /**
-   * @param {Integer} id
-   **/
-  self.setId = function (id) {
-    self.id = id;
-  }
-  
-  /**
-   * @return {String}
-   **/
-  self.getName = function() {
-    return self.name;
-  }
+   * The Category model module.
+   * @module model/Category
+   * @version 1.0.0
+   */
 
   /**
-   * @param {String} name
-   **/
-  self.setName = function (name) {
-    self.name = name;
-  }
-  
+   * Constructs a new <code>Category</code>.
+   * @alias module:model/Category
+   * @class
+   */
+  var exports = function() {
 
-  self.toJson = function () {
-    return JSON.stringify(self);
-  }
-}
 
-if (typeof module === 'object' && module.exports) {
-  module.exports = Category;
-}
+
+  };
+
+  /**
+   * Constructs a <code>Category</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/Category} obj Optional instance to populate.
+   * @return {module:model/Category} The populated <code>Category</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) { 
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('id')) {
+        obj['id'] = ApiClient.convertToType(data['id'], 'Integer');
+      }
+      if (data.hasOwnProperty('name')) {
+        obj['name'] = ApiClient.convertToType(data['name'], 'String');
+      }
+    }
+    return obj;
+  }
+
+
+  /**
+   * @member {Integer} id
+   */
+  exports.prototype['id'] = undefined;
+
+  /**
+   * @member {String} name
+   */
+  exports.prototype['name'] = undefined;
+
+
+
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript/src/model/Dog.js b/samples/client/petstore/javascript/src/model/Dog.js
new file mode 100644
index 00000000000..e5e55581a70
--- /dev/null
+++ b/samples/client/petstore/javascript/src/model/Dog.js
@@ -0,0 +1,67 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient', './Animal'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'), require('./Animal'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.Dog = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Animal);
+  }
+}(this, function(ApiClient, Animal) {
+  'use strict';
+
+  /**
+   * The Dog model module.
+   * @module model/Dog
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new <code>Dog</code>.
+   * @alias module:model/Dog
+   * @class
+   * @extends module:model/Animal
+   * @param className
+   */
+  var exports = function(className) {
+    Animal.call(this, className);
+
+  };
+
+  /**
+   * Constructs a <code>Dog</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/Dog} obj Optional instance to populate.
+   * @return {module:model/Dog} The populated <code>Dog</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) { 
+      obj = obj || new exports();
+      Animal.constructFromObject(data, obj);
+      if (data.hasOwnProperty('breed')) {
+        obj['breed'] = ApiClient.convertToType(data['breed'], 'String');
+      }
+    }
+    return obj;
+  }
+
+  exports.prototype = Object.create(Animal.prototype);
+  exports.prototype.constructor = exports;
+
+
+  /**
+   * @member {String} breed
+   */
+  exports.prototype['breed'] = undefined;
+
+
+
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript/src/model/InlineResponse200.js b/samples/client/petstore/javascript/src/model/InlineResponse200.js
new file mode 100644
index 00000000000..f9ecda79491
--- /dev/null
+++ b/samples/client/petstore/javascript/src/model/InlineResponse200.js
@@ -0,0 +1,132 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient', './Tag'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'), require('./Tag'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.InlineResponse200 = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Tag);
+  }
+}(this, function(ApiClient, Tag) {
+  'use strict';
+
+  /**
+   * The InlineResponse200 model module.
+   * @module model/InlineResponse200
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new <code>InlineResponse200</code>.
+   * @alias module:model/InlineResponse200
+   * @class
+   * @param id
+   */
+  var exports = function(id) {
+
+
+    this['id'] = id;
+
+
+
+
+  };
+
+  /**
+   * Constructs a <code>InlineResponse200</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/InlineResponse200} obj Optional instance to populate.
+   * @return {module:model/InlineResponse200} The populated <code>InlineResponse200</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) { 
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('tags')) {
+        obj['tags'] = ApiClient.convertToType(data['tags'], [Tag]);
+      }
+      if (data.hasOwnProperty('id')) {
+        obj['id'] = ApiClient.convertToType(data['id'], 'Integer');
+      }
+      if (data.hasOwnProperty('category')) {
+        obj['category'] = ApiClient.convertToType(data['category'], Object);
+      }
+      if (data.hasOwnProperty('status')) {
+        obj['status'] = ApiClient.convertToType(data['status'], 'String');
+      }
+      if (data.hasOwnProperty('name')) {
+        obj['name'] = ApiClient.convertToType(data['name'], 'String');
+      }
+      if (data.hasOwnProperty('photoUrls')) {
+        obj['photoUrls'] = ApiClient.convertToType(data['photoUrls'], ['String']);
+      }
+    }
+    return obj;
+  }
+
+
+  /**
+   * @member {Array.<module:model/Tag>} tags
+   */
+  exports.prototype['tags'] = undefined;
+
+  /**
+   * @member {Integer} id
+   */
+  exports.prototype['id'] = undefined;
+
+  /**
+   * @member {Object} category
+   */
+  exports.prototype['category'] = undefined;
+
+  /**
+   * pet status in the store
+   * @member {module:model/InlineResponse200.StatusEnum} status
+   */
+  exports.prototype['status'] = undefined;
+
+  /**
+   * @member {String} name
+   */
+  exports.prototype['name'] = undefined;
+
+  /**
+   * @member {Array.<String>} photoUrls
+   */
+  exports.prototype['photoUrls'] = undefined;
+
+
+  /**
+   * Allowed values for the <code>status</code> property.
+   * @enum {String}
+   * @readonly
+   */
+  exports.StatusEnum = { 
+    /**
+     * value: available
+     * @const
+     */
+    AVAILABLE: "available",
+    
+    /**
+     * value: pending
+     * @const
+     */
+    PENDING: "pending",
+    
+    /**
+     * value: sold
+     * @const
+     */
+    SOLD: "sold"
+  };
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript/src/model/Model200Response.js b/samples/client/petstore/javascript/src/model/Model200Response.js
new file mode 100644
index 00000000000..fb559f5ebaa
--- /dev/null
+++ b/samples/client/petstore/javascript/src/model/Model200Response.js
@@ -0,0 +1,62 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.Model200Response = factory(root.SwaggerPetstore.ApiClient);
+  }
+}(this, function(ApiClient) {
+  'use strict';
+
+  /**
+   * The Model200Response model module.
+   * @module model/Model200Response
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new <code>Model200Response</code>.
+   * @alias module:model/Model200Response
+   * @class
+   */
+  var exports = function() {
+
+
+  };
+
+  /**
+   * Constructs a <code>Model200Response</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/Model200Response} obj Optional instance to populate.
+   * @return {module:model/Model200Response} The populated <code>Model200Response</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) { 
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('name')) {
+        obj['name'] = ApiClient.convertToType(data['name'], 'Integer');
+      }
+    }
+    return obj;
+  }
+
+
+  /**
+   * @member {Integer} name
+   */
+  exports.prototype['name'] = undefined;
+
+
+
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript/src/model/ModelReturn.js b/samples/client/petstore/javascript/src/model/ModelReturn.js
new file mode 100644
index 00000000000..d5036e230ea
--- /dev/null
+++ b/samples/client/petstore/javascript/src/model/ModelReturn.js
@@ -0,0 +1,62 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.ModelReturn = factory(root.SwaggerPetstore.ApiClient);
+  }
+}(this, function(ApiClient) {
+  'use strict';
+
+  /**
+   * The ModelReturn model module.
+   * @module model/ModelReturn
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new <code>ModelReturn</code>.
+   * @alias module:model/ModelReturn
+   * @class
+   */
+  var exports = function() {
+
+
+  };
+
+  /**
+   * Constructs a <code>ModelReturn</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/ModelReturn} obj Optional instance to populate.
+   * @return {module:model/ModelReturn} The populated <code>ModelReturn</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) { 
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('return')) {
+        obj['return'] = ApiClient.convertToType(data['return'], 'Integer');
+      }
+    }
+    return obj;
+  }
+
+
+  /**
+   * @member {Integer} return
+   */
+  exports.prototype['return'] = undefined;
+
+
+
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript/src/model/Name.js b/samples/client/petstore/javascript/src/model/Name.js
new file mode 100644
index 00000000000..a5a070025f7
--- /dev/null
+++ b/samples/client/petstore/javascript/src/model/Name.js
@@ -0,0 +1,71 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.Name = factory(root.SwaggerPetstore.ApiClient);
+  }
+}(this, function(ApiClient) {
+  'use strict';
+
+  /**
+   * The Name model module.
+   * @module model/Name
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new <code>Name</code>.
+   * @alias module:model/Name
+   * @class
+   */
+  var exports = function() {
+
+
+
+  };
+
+  /**
+   * Constructs a <code>Name</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/Name} obj Optional instance to populate.
+   * @return {module:model/Name} The populated <code>Name</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) { 
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('name')) {
+        obj['name'] = ApiClient.convertToType(data['name'], 'Integer');
+      }
+      if (data.hasOwnProperty('snake_case')) {
+        obj['snake_case'] = ApiClient.convertToType(data['snake_case'], 'Integer');
+      }
+    }
+    return obj;
+  }
+
+
+  /**
+   * @member {Integer} name
+   */
+  exports.prototype['name'] = undefined;
+
+  /**
+   * @member {Integer} snake_case
+   */
+  exports.prototype['snake_case'] = undefined;
+
+
+
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript/src/model/Order.js b/samples/client/petstore/javascript/src/model/Order.js
index 3cf2335b535..81f1feb7800 100644
--- a/samples/client/petstore/javascript/src/model/Order.js
+++ b/samples/client/petstore/javascript/src/model/Order.js
@@ -1,196 +1,131 @@
-// require files in Node.js environment
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.Order = factory(root.SwaggerPetstore.ApiClient);
+  }
+}(this, function(ApiClient) {
+  'use strict';
 
-if (typeof module === 'object' && module.exports) {
-  
-}
-
-
-
-//export module
-if ( typeof define === "function" && define.amd ) {     
-	define('StatusEnum', ['jquery'], function($) {
-        return StatusEnum;
-	 });
-}
-
-var StatusEnum = function StatusEnum() {
-	var self = this;
-	
-
-	/**
-	 * @const 
-	 */ 
-	self.PLACED = "placed",
-	
-	/**
-	 * @const 
-	 */ 
-	self.APPROVED = "approved",
-	
-	/**
-	 * @const 
-	 */ 
-	self.DELIVERED = "delivered";
-
-}
-
-
-//export module
-if ( typeof define === "function" && define.amd ) {
-  define('Order', ['jquery'],
-    function($) {
-      return Order;
-   });
-}
-
-
-var Order = function Order() { 
-  var self = this;
-  
   /**
-   * datatype: Integer
-   **/
-  self.id = null;
-  
+   * The Order model module.
+   * @module model/Order
+   * @version 1.0.0
+   */
+
   /**
-   * datatype: Integer
-   **/
-  self.petId = null;
-  
+   * Constructs a new <code>Order</code>.
+   * @alias module:model/Order
+   * @class
+   */
+  var exports = function() {
+
+
+
+
+
+
+
+  };
+
   /**
-   * datatype: Integer
-   **/
-  self.quantity = null;
-  
+   * Constructs a <code>Order</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/Order} obj Optional instance to populate.
+   * @return {module:model/Order} The populated <code>Order</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) { 
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('id')) {
+        obj['id'] = ApiClient.convertToType(data['id'], 'Integer');
+      }
+      if (data.hasOwnProperty('petId')) {
+        obj['petId'] = ApiClient.convertToType(data['petId'], 'Integer');
+      }
+      if (data.hasOwnProperty('quantity')) {
+        obj['quantity'] = ApiClient.convertToType(data['quantity'], 'Integer');
+      }
+      if (data.hasOwnProperty('shipDate')) {
+        obj['shipDate'] = ApiClient.convertToType(data['shipDate'], 'Date');
+      }
+      if (data.hasOwnProperty('status')) {
+        obj['status'] = ApiClient.convertToType(data['status'], 'String');
+      }
+      if (data.hasOwnProperty('complete')) {
+        obj['complete'] = ApiClient.convertToType(data['complete'], 'Boolean');
+      }
+    }
+    return obj;
+  }
+
+
   /**
-   * datatype: Date
-   **/
-  self.shipDate = null;
-  
+   * @member {Integer} id
+   */
+  exports.prototype['id'] = undefined;
+
+  /**
+   * @member {Integer} petId
+   */
+  exports.prototype['petId'] = undefined;
+
+  /**
+   * @member {Integer} quantity
+   */
+  exports.prototype['quantity'] = undefined;
+
+  /**
+   * @member {Date} shipDate
+   */
+  exports.prototype['shipDate'] = undefined;
+
   /**
    * Order Status
-   * datatype: StatusEnum
-   **/
-  self.status = null;
-  
+   * @member {module:model/Order.StatusEnum} status
+   */
+  exports.prototype['status'] = undefined;
+
   /**
-   * datatype: Boolean
-   **/
-  self.complete = null;
-  
-  
-  self.constructFromObject = function(data) {
-    if (!data) {
-      return;
-    }
+   * @member {Boolean} complete
+   */
+  exports.prototype['complete'] = undefined;
+
+
+  /**
+   * Allowed values for the <code>status</code> property.
+   * @enum {String}
+   * @readonly
+   */
+  exports.StatusEnum = { 
+    /**
+     * value: placed
+     * @const
+     */
+    PLACED: "placed",
     
-    self.id = data.id;
+    /**
+     * value: approved
+     * @const
+     */
+    APPROVED: "approved",
     
-    self.petId = data.petId;
-    
-    self.quantity = data.quantity;
-    
-    self.shipDate = data.shipDate;
-    
-    self.status = data.status;
-    
-    self.complete = data.complete;
-    
-  }
+    /**
+     * value: delivered
+     * @const
+     */
+    DELIVERED: "delivered"
+  };
 
-  
-  /**
-   * @return {Integer}
-   **/
-  self.getId = function() {
-    return self.id;
-  }
-
-  /**
-   * @param {Integer} id
-   **/
-  self.setId = function (id) {
-    self.id = id;
-  }
-  
-  /**
-   * @return {Integer}
-   **/
-  self.getPetId = function() {
-    return self.petId;
-  }
-
-  /**
-   * @param {Integer} petId
-   **/
-  self.setPetId = function (petId) {
-    self.petId = petId;
-  }
-  
-  /**
-   * @return {Integer}
-   **/
-  self.getQuantity = function() {
-    return self.quantity;
-  }
-
-  /**
-   * @param {Integer} quantity
-   **/
-  self.setQuantity = function (quantity) {
-    self.quantity = quantity;
-  }
-  
-  /**
-   * @return {Date}
-   **/
-  self.getShipDate = function() {
-    return self.shipDate;
-  }
-
-  /**
-   * @param {Date} shipDate
-   **/
-  self.setShipDate = function (shipDate) {
-    self.shipDate = shipDate;
-  }
-  
-  /**
-   * get Order Status
-   * @return {StatusEnum}
-   **/
-  self.getStatus = function() {
-    return self.status;
-  }
-
-  /**
-   * set Order Status
-   * @param {StatusEnum} status
-   **/
-  self.setStatus = function (status) {
-    self.status = status;
-  }
-  
-  /**
-   * @return {Boolean}
-   **/
-  self.getComplete = function() {
-    return self.complete;
-  }
-
-  /**
-   * @param {Boolean} complete
-   **/
-  self.setComplete = function (complete) {
-    self.complete = complete;
-  }
-  
-
-  self.toJson = function () {
-    return JSON.stringify(self);
-  }
-}
-
-if (typeof module === 'object' && module.exports) {
-  module.exports = Order;
-}
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript/src/model/Pet.js b/samples/client/petstore/javascript/src/model/Pet.js
index 25ae2e951c8..39a09b47170 100644
--- a/samples/client/petstore/javascript/src/model/Pet.js
+++ b/samples/client/petstore/javascript/src/model/Pet.js
@@ -1,200 +1,133 @@
-// require files in Node.js environment
-var Category;var Tag;
-if (typeof module === 'object' && module.exports) {
-  
-  Category = require('./Category.js');
-  Tag = require('./Tag.js');
-}
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient', './Category', './Tag'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'), require('./Category'), require('./Tag'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.Pet = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Category, root.SwaggerPetstore.Tag);
+  }
+}(this, function(ApiClient, Category, Tag) {
+  'use strict';
 
-
-
-//export module
-if ( typeof define === "function" && define.amd ) {     
-	define('StatusEnum', ['jquery'], function($) {
-        return StatusEnum;
-	 });
-}
-
-var StatusEnum = function StatusEnum() {
-	var self = this;
-	
-
-	/**
-	 * @const 
-	 */ 
-	self.AVAILABLE = "available",
-	
-	/**
-	 * @const 
-	 */ 
-	self.PENDING = "pending",
-	
-	/**
-	 * @const 
-	 */ 
-	self.SOLD = "sold";
-
-}
-
-
-//export module
-if ( typeof define === "function" && define.amd ) {
-  define('Pet', ['jquery', 'Category', 'Array'],
-    function($, Category, Array) {
-      return Pet;
-   });
-}
-
-
-var Pet = function Pet(photoUrls, name) { 
-  var self = this;
-  
   /**
-   * datatype: Integer
-   **/
-  self.id = null;
-  
+   * The Pet model module.
+   * @module model/Pet
+   * @version 1.0.0
+   */
+
   /**
-   * datatype: Category
-   **/
-  self.category = new Category();
-  
+   * Constructs a new <code>Pet</code>.
+   * @alias module:model/Pet
+   * @class
+   * @param name
+   * @param photoUrls
+   */
+  var exports = function(name, photoUrls) {
+
+
+
+    this['name'] = name;
+    this['photoUrls'] = photoUrls;
+
+
+  };
+
   /**
-   * datatype: String
-   * required
-   **/
-  self.name = name;
-  
+   * Constructs a <code>Pet</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/Pet} obj Optional instance to populate.
+   * @return {module:model/Pet} The populated <code>Pet</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) { 
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('id')) {
+        obj['id'] = ApiClient.convertToType(data['id'], 'Integer');
+      }
+      if (data.hasOwnProperty('category')) {
+        obj['category'] = Category.constructFromObject(data['category']);
+      }
+      if (data.hasOwnProperty('name')) {
+        obj['name'] = ApiClient.convertToType(data['name'], 'String');
+      }
+      if (data.hasOwnProperty('photoUrls')) {
+        obj['photoUrls'] = ApiClient.convertToType(data['photoUrls'], ['String']);
+      }
+      if (data.hasOwnProperty('tags')) {
+        obj['tags'] = ApiClient.convertToType(data['tags'], [Tag]);
+      }
+      if (data.hasOwnProperty('status')) {
+        obj['status'] = ApiClient.convertToType(data['status'], 'String');
+      }
+    }
+    return obj;
+  }
+
+
   /**
-   * datatype: Array
-   * required
-   **/
-  self.photoUrls = photoUrls;
-  
+   * @member {Integer} id
+   */
+  exports.prototype['id'] = undefined;
+
   /**
-   * datatype: Array
-   **/
-  self.tags = [];
-  
+   * @member {module:model/Category} category
+   */
+  exports.prototype['category'] = undefined;
+
+  /**
+   * @member {String} name
+   */
+  exports.prototype['name'] = undefined;
+
+  /**
+   * @member {Array.<String>} photoUrls
+   */
+  exports.prototype['photoUrls'] = undefined;
+
+  /**
+   * @member {Array.<module:model/Tag>} tags
+   */
+  exports.prototype['tags'] = undefined;
+
   /**
    * pet status in the store
-   * datatype: StatusEnum
-   **/
-  self.status = null;
-  
-  
-  self.constructFromObject = function(data) {
-    if (!data) {
-      return;
-    }
+   * @member {module:model/Pet.StatusEnum} status
+   */
+  exports.prototype['status'] = undefined;
+
+
+  /**
+   * Allowed values for the <code>status</code> property.
+   * @enum {String}
+   * @readonly
+   */
+  exports.StatusEnum = { 
+    /**
+     * value: available
+     * @const
+     */
+    AVAILABLE: "available",
     
-    self.id = data.id;
+    /**
+     * value: pending
+     * @const
+     */
+    PENDING: "pending",
     
-    self.category.constructFromObject(data.category);
-    
-    self.name = data.name;
-    
-    self.photoUrls = new Array();
-    
-    self.tags = new Array();
-    
-    self.status = data.status;
-    
-  }
+    /**
+     * value: sold
+     * @const
+     */
+    SOLD: "sold"
+  };
 
-  
-  /**
-   * @return {Integer}
-   **/
-  self.getId = function() {
-    return self.id;
-  }
-
-  /**
-   * @param {Integer} id
-   **/
-  self.setId = function (id) {
-    self.id = id;
-  }
-  
-  /**
-   * @return {Category}
-   **/
-  self.getCategory = function() {
-    return self.category;
-  }
-
-  /**
-   * @param {Category} category
-   **/
-  self.setCategory = function (category) {
-    self.category = category;
-  }
-  
-  /**
-   * @return {String}
-   **/
-  self.getName = function() {
-    return self.name;
-  }
-
-  /**
-   * @param {String} name
-   **/
-  self.setName = function (name) {
-    self.name = name;
-  }
-  
-  /**
-   * @return {Array}
-   **/
-  self.getPhotoUrls = function() {
-    return self.photoUrls;
-  }
-
-  /**
-   * @param {Array} photoUrls
-   **/
-  self.setPhotoUrls = function (photoUrls) {
-    self.photoUrls = photoUrls;
-  }
-  
-  /**
-   * @return {Array}
-   **/
-  self.getTags = function() {
-    return self.tags;
-  }
-
-  /**
-   * @param {Array} tags
-   **/
-  self.setTags = function (tags) {
-    self.tags = tags;
-  }
-  
-  /**
-   * get pet status in the store
-   * @return {StatusEnum}
-   **/
-  self.getStatus = function() {
-    return self.status;
-  }
-
-  /**
-   * set pet status in the store
-   * @param {StatusEnum} status
-   **/
-  self.setStatus = function (status) {
-    self.status = status;
-  }
-  
-
-  self.toJson = function () {
-    return JSON.stringify(self);
-  }
-}
-
-if (typeof module === 'object' && module.exports) {
-  module.exports = Pet;
-}
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript/src/model/SpecialModelName.js b/samples/client/petstore/javascript/src/model/SpecialModelName.js
new file mode 100644
index 00000000000..fb6b4765d3f
--- /dev/null
+++ b/samples/client/petstore/javascript/src/model/SpecialModelName.js
@@ -0,0 +1,62 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.SpecialModelName = factory(root.SwaggerPetstore.ApiClient);
+  }
+}(this, function(ApiClient) {
+  'use strict';
+
+  /**
+   * The SpecialModelName model module.
+   * @module model/SpecialModelName
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new <code>SpecialModelName</code>.
+   * @alias module:model/SpecialModelName
+   * @class
+   */
+  var exports = function() {
+
+
+  };
+
+  /**
+   * Constructs a <code>SpecialModelName</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/SpecialModelName} obj Optional instance to populate.
+   * @return {module:model/SpecialModelName} The populated <code>SpecialModelName</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) { 
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('$special[property.name]')) {
+        obj['$special[property.name]'] = ApiClient.convertToType(data['$special[property.name]'], 'Integer');
+      }
+    }
+    return obj;
+  }
+
+
+  /**
+   * @member {Integer} $special[property.name]
+   */
+  exports.prototype['$special[property.name]'] = undefined;
+
+
+
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript/src/model/Tag.js b/samples/client/petstore/javascript/src/model/Tag.js
index 0fa97bd8c78..8a0739b2ef5 100644
--- a/samples/client/petstore/javascript/src/model/Tag.js
+++ b/samples/client/petstore/javascript/src/model/Tag.js
@@ -1,81 +1,71 @@
-// require files in Node.js environment
-
-if (typeof module === 'object' && module.exports) {
-  
-}
-
-
-
-
-//export module
-if ( typeof define === "function" && define.amd ) {
-  define('Tag', ['jquery'],
-    function($) {
-      return Tag;
-   });
-}
-
-
-var Tag = function Tag() { 
-  var self = this;
-  
-  /**
-   * datatype: Integer
-   **/
-  self.id = null;
-  
-  /**
-   * datatype: String
-   **/
-  self.name = null;
-  
-  
-  self.constructFromObject = function(data) {
-    if (!data) {
-      return;
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
     }
-    
-    self.id = data.id;
-    
-    self.name = data.name;
-    
-  }
-
-  
-  /**
-   * @return {Integer}
-   **/
-  self.getId = function() {
-    return self.id;
+    root.SwaggerPetstore.Tag = factory(root.SwaggerPetstore.ApiClient);
   }
+}(this, function(ApiClient) {
+  'use strict';
 
   /**
-   * @param {Integer} id
-   **/
-  self.setId = function (id) {
-    self.id = id;
-  }
-  
-  /**
-   * @return {String}
-   **/
-  self.getName = function() {
-    return self.name;
-  }
+   * The Tag model module.
+   * @module model/Tag
+   * @version 1.0.0
+   */
 
   /**
-   * @param {String} name
-   **/
-  self.setName = function (name) {
-    self.name = name;
-  }
-  
+   * Constructs a new <code>Tag</code>.
+   * @alias module:model/Tag
+   * @class
+   */
+  var exports = function() {
 
-  self.toJson = function () {
-    return JSON.stringify(self);
-  }
-}
 
-if (typeof module === 'object' && module.exports) {
-  module.exports = Tag;
-}
+
+  };
+
+  /**
+   * Constructs a <code>Tag</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/Tag} obj Optional instance to populate.
+   * @return {module:model/Tag} The populated <code>Tag</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) { 
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('id')) {
+        obj['id'] = ApiClient.convertToType(data['id'], 'Integer');
+      }
+      if (data.hasOwnProperty('name')) {
+        obj['name'] = ApiClient.convertToType(data['name'], 'String');
+      }
+    }
+    return obj;
+  }
+
+
+  /**
+   * @member {Integer} id
+   */
+  exports.prototype['id'] = undefined;
+
+  /**
+   * @member {String} name
+   */
+  exports.prototype['name'] = undefined;
+
+
+
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript/src/model/User.js b/samples/client/petstore/javascript/src/model/User.js
index 632208a523c..1d960a89914 100644
--- a/samples/client/petstore/javascript/src/model/User.js
+++ b/samples/client/petstore/javascript/src/model/User.js
@@ -1,210 +1,126 @@
-// require files in Node.js environment
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.User = factory(root.SwaggerPetstore.ApiClient);
+  }
+}(this, function(ApiClient) {
+  'use strict';
 
-if (typeof module === 'object' && module.exports) {
-  
-}
+  /**
+   * The User model module.
+   * @module model/User
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new <code>User</code>.
+   * @alias module:model/User
+   * @class
+   */
+  var exports = function() {
 
 
 
 
-//export module
-if ( typeof define === "function" && define.amd ) {
-  define('User', ['jquery'],
-    function($) {
-      return User;
-   });
-}
 
 
-var User = function User() { 
-  var self = this;
-  
+
+
+
+  };
+
   /**
-   * datatype: Integer
-   **/
-  self.id = null;
-  
+   * Constructs a <code>User</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/User} obj Optional instance to populate.
+   * @return {module:model/User} The populated <code>User</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) { 
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('id')) {
+        obj['id'] = ApiClient.convertToType(data['id'], 'Integer');
+      }
+      if (data.hasOwnProperty('username')) {
+        obj['username'] = ApiClient.convertToType(data['username'], 'String');
+      }
+      if (data.hasOwnProperty('firstName')) {
+        obj['firstName'] = ApiClient.convertToType(data['firstName'], 'String');
+      }
+      if (data.hasOwnProperty('lastName')) {
+        obj['lastName'] = ApiClient.convertToType(data['lastName'], 'String');
+      }
+      if (data.hasOwnProperty('email')) {
+        obj['email'] = ApiClient.convertToType(data['email'], 'String');
+      }
+      if (data.hasOwnProperty('password')) {
+        obj['password'] = ApiClient.convertToType(data['password'], 'String');
+      }
+      if (data.hasOwnProperty('phone')) {
+        obj['phone'] = ApiClient.convertToType(data['phone'], 'String');
+      }
+      if (data.hasOwnProperty('userStatus')) {
+        obj['userStatus'] = ApiClient.convertToType(data['userStatus'], 'Integer');
+      }
+    }
+    return obj;
+  }
+
+
   /**
-   * datatype: String
-   **/
-  self.username = null;
-  
+   * @member {Integer} id
+   */
+  exports.prototype['id'] = undefined;
+
   /**
-   * datatype: String
-   **/
-  self.firstName = null;
-  
+   * @member {String} username
+   */
+  exports.prototype['username'] = undefined;
+
   /**
-   * datatype: String
-   **/
-  self.lastName = null;
-  
+   * @member {String} firstName
+   */
+  exports.prototype['firstName'] = undefined;
+
   /**
-   * datatype: String
-   **/
-  self.email = null;
-  
+   * @member {String} lastName
+   */
+  exports.prototype['lastName'] = undefined;
+
   /**
-   * datatype: String
-   **/
-  self.password = null;
-  
+   * @member {String} email
+   */
+  exports.prototype['email'] = undefined;
+
   /**
-   * datatype: String
-   **/
-  self.phone = null;
-  
+   * @member {String} password
+   */
+  exports.prototype['password'] = undefined;
+
+  /**
+   * @member {String} phone
+   */
+  exports.prototype['phone'] = undefined;
+
   /**
    * User Status
-   * datatype: Integer
-   **/
-  self.userStatus = null;
-  
-  
-  self.constructFromObject = function(data) {
-    if (!data) {
-      return;
-    }
-    
-    self.id = data.id;
-    
-    self.username = data.username;
-    
-    self.firstName = data.firstName;
-    
-    self.lastName = data.lastName;
-    
-    self.email = data.email;
-    
-    self.password = data.password;
-    
-    self.phone = data.phone;
-    
-    self.userStatus = data.userStatus;
-    
-  }
+   * @member {Integer} userStatus
+   */
+  exports.prototype['userStatus'] = undefined;
 
-  
-  /**
-   * @return {Integer}
-   **/
-  self.getId = function() {
-    return self.id;
-  }
 
-  /**
-   * @param {Integer} id
-   **/
-  self.setId = function (id) {
-    self.id = id;
-  }
-  
-  /**
-   * @return {String}
-   **/
-  self.getUsername = function() {
-    return self.username;
-  }
 
-  /**
-   * @param {String} username
-   **/
-  self.setUsername = function (username) {
-    self.username = username;
-  }
-  
-  /**
-   * @return {String}
-   **/
-  self.getFirstName = function() {
-    return self.firstName;
-  }
 
-  /**
-   * @param {String} firstName
-   **/
-  self.setFirstName = function (firstName) {
-    self.firstName = firstName;
-  }
-  
-  /**
-   * @return {String}
-   **/
-  self.getLastName = function() {
-    return self.lastName;
-  }
-
-  /**
-   * @param {String} lastName
-   **/
-  self.setLastName = function (lastName) {
-    self.lastName = lastName;
-  }
-  
-  /**
-   * @return {String}
-   **/
-  self.getEmail = function() {
-    return self.email;
-  }
-
-  /**
-   * @param {String} email
-   **/
-  self.setEmail = function (email) {
-    self.email = email;
-  }
-  
-  /**
-   * @return {String}
-   **/
-  self.getPassword = function() {
-    return self.password;
-  }
-
-  /**
-   * @param {String} password
-   **/
-  self.setPassword = function (password) {
-    self.password = password;
-  }
-  
-  /**
-   * @return {String}
-   **/
-  self.getPhone = function() {
-    return self.phone;
-  }
-
-  /**
-   * @param {String} phone
-   **/
-  self.setPhone = function (phone) {
-    self.phone = phone;
-  }
-  
-  /**
-   * get User Status
-   * @return {Integer}
-   **/
-  self.getUserStatus = function() {
-    return self.userStatus;
-  }
-
-  /**
-   * set User Status
-   * @param {Integer} userStatus
-   **/
-  self.setUserStatus = function (userStatus) {
-    self.userStatus = userStatus;
-  }
-  
-
-  self.toJson = function () {
-    return JSON.stringify(self);
-  }
-}
-
-if (typeof module === 'object' && module.exports) {
-  module.exports = User;
-}
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript/test/ApiClientTest.js b/samples/client/petstore/javascript/test/ApiClientTest.js
new file mode 100644
index 00000000000..d259ad54c14
--- /dev/null
+++ b/samples/client/petstore/javascript/test/ApiClientTest.js
@@ -0,0 +1,386 @@
+if (typeof module === 'object' && module.exports) {
+  var expect = require('expect.js');
+  var SwaggerPetstore = require('../src/index');
+  var sinon = require('sinon');
+}
+
+var apiClient = SwaggerPetstore.ApiClient.instance;
+
+describe('ApiClient', function() {
+  describe('defaults', function() {
+    it('should have correct default values with the default API client', function() {
+      expect(apiClient).to.be.ok();
+      expect(apiClient.basePath).to.be('http://petstore.swagger.io/v2');
+      expect(apiClient.authentications).to.eql({
+        petstore_auth: {type: 'oauth2'},
+        api_key: {type: 'apiKey', 'in': 'header', name: 'api_key'},
+        test_http_basic: {type: 'basic'},
+        test_api_client_id: {
+          type: 'apiKey',
+          'in': 'header',
+          name: 'x-test_api_client_id'
+        },
+        test_api_client_secret: {
+          type: 'apiKey',
+          'in': 'header',
+          name: 'x-test_api_client_secret'
+        },
+        test_api_key_query: {
+          type: 'apiKey',
+          'in': 'query',
+          name: 'test_api_key_query'
+        },
+        test_api_key_header: {
+          type: 'apiKey',
+          'in': 'header',
+          name: 'test_api_key_header'
+        }
+      });
+    });
+
+    it('should have correct default values with new API client and can customize it', function() {
+      var newClient = new SwaggerPetstore.ApiClient;
+      expect(newClient.basePath).to.be('http://petstore.swagger.io/v2');
+      expect(newClient.buildUrl('/abc', {})).to.be('http://petstore.swagger.io/v2/abc');
+
+      newClient.basePath = 'http://example.com';
+      expect(newClient.basePath).to.be('http://example.com');
+      expect(newClient.buildUrl('/abc', {})).to.be('http://example.com/abc');
+    });
+  });
+
+  describe('#paramToString', function() {
+    it('should return empty string for null and undefined', function() {
+      expect(apiClient.paramToString(null)).to.be('');
+      expect(apiClient.paramToString(undefined)).to.be('');
+    });
+
+    it('should return string', function() {
+      expect(apiClient.paramToString('')).to.be('');
+      expect(apiClient.paramToString('abc')).to.be('abc');
+      expect(apiClient.paramToString(123)).to.be('123');
+    });
+  });
+
+  describe('#buildCollectionParam', function() {
+    var param;
+
+    beforeEach(function() {
+      param = ['aa', 'bb', 123];
+    });
+
+    it('works for csv', function() {
+      expect(apiClient.buildCollectionParam(param, 'csv')).to.be('aa,bb,123');
+    });
+
+    it('works for ssv', function() {
+      expect(apiClient.buildCollectionParam(param, 'ssv')).to.be('aa bb 123');
+    });
+
+    it('works for tsv', function() {
+      expect(apiClient.buildCollectionParam(param, 'tsv')).to.be('aa\tbb\t123');
+    });
+
+    it('works for pipes', function() {
+      expect(apiClient.buildCollectionParam(param, 'pipes')).to.be('aa|bb|123');
+    });
+
+    it('works for multi', function() {
+      expect(apiClient.buildCollectionParam(param, 'multi')).to.eql(['aa', 'bb', '123']);
+    });
+
+    it('fails for invalid collection format', function() {
+      expect(function() { apiClient.buildCollectionParam(param, 'INVALID'); }).to.throwError();
+    });
+  });
+
+  describe('#buildUrl', function() {
+    it('should work without path parameters in the path', function() {
+      expect(apiClient.buildUrl('/abc', {})).to
+        .be('http://petstore.swagger.io/v2/abc');
+      expect(apiClient.buildUrl('/abc/def?ok', {id: 123})).to
+        .be('http://petstore.swagger.io/v2/abc/def?ok');
+    });
+
+    it('should work with path parameters in the path', function() {
+      expect(apiClient.buildUrl('/{id}', {id: 123})).to
+        .be('http://petstore.swagger.io/v2/123');
+      expect(apiClient.buildUrl('/abc/{id}/{name}?ok', {id: 456, name: 'a b'})).to.
+        be('http://petstore.swagger.io/v2/abc/456/a%20b?ok');
+    });
+  });
+
+  describe('#isJsonMime', function() {
+    it('should return true for JSON MIME', function() {
+      expect(apiClient.isJsonMime('application/json')).to.be(true);
+      expect(apiClient.isJsonMime('application/json; charset=UTF8')).to.be(true);
+      expect(apiClient.isJsonMime('APPLICATION/JSON')).to.be(true);
+    });
+
+    it('should return false for non-JSON MIME', function() {
+      expect(apiClient.isJsonMime('')).to.be(false);
+      expect(apiClient.isJsonMime('text/plain')).to.be(false);
+      expect(apiClient.isJsonMime('application/xml')).to.be(false);
+      expect(apiClient.isJsonMime('application/jsonp')).to.be(false);
+    });
+  });
+
+  describe('#applyAuthToRequest', function() {
+    var req, newClient;
+
+    beforeEach(function() {
+      req = {
+        auth: function() {},
+        set: function() {},
+        query: function() {}
+      };
+      sinon.stub(req, 'auth');
+      sinon.stub(req, 'set');
+      sinon.stub(req, 'query');
+      newClient = new SwaggerPetstore.ApiClient();
+    });
+
+    describe('basic', function() {
+      var authName = 'testBasicAuth';
+      var authNames = [authName];
+      var auth;
+
+      beforeEach(function() {
+        newClient.authentications[authName] = {type: 'basic'};
+        auth = newClient.authentications[authName];
+      });
+
+      it('sets auth header with username and password set', function() {
+        auth.username = 'user';
+        auth.password = 'pass';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.auth);
+        // 'dXNlcjpwYXNz' is base64-encoded string of 'user:pass'
+        sinon.assert.calledWithMatch(req.auth, 'user', 'pass');
+        sinon.assert.notCalled(req.set);
+        sinon.assert.notCalled(req.query);
+      });
+
+      it('sets header with only username set', function() {
+        auth.username = 'user';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.auth);
+        // 'dXNlcjo=' is base64-encoded string of 'user:'
+        sinon.assert.calledWithMatch(req.auth, 'user', '');
+        sinon.assert.notCalled(req.set);
+        sinon.assert.notCalled(req.query);
+      });
+
+      it('sets header with only password set', function() {
+        auth.password = 'pass';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.auth);
+        // 'OnBhc3M=' is base64-encoded string of ':pass'
+        sinon.assert.calledWithMatch(req.auth, '', 'pass');
+        sinon.assert.notCalled(req.set);
+        sinon.assert.notCalled(req.query);
+      });
+
+      it('does not set header when username and password are not set', function() {
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.set);
+        sinon.assert.notCalled(req.query);
+      });
+    });
+
+    describe('apiKey', function() {
+      var authName = 'testApiKey';
+      var authNames = [authName];
+      var auth;
+
+      beforeEach(function() {
+        newClient.authentications[authName] = {type: 'apiKey', name: 'api_key'};
+        auth = newClient.authentications[authName];
+      });
+
+      it('sets api key in header', function() {
+        auth.in = 'header';
+        auth.apiKey = 'my-api-key';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.set);
+        sinon.assert.calledWithMatch(req.set, {'api_key': 'my-api-key'});
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.query);
+      });
+
+      it('sets api key in query', function() {
+        auth.in = 'query';
+        auth.apiKey = 'my-api-key';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.query);
+        sinon.assert.calledWithMatch(req.query, {'api_key': 'my-api-key'});
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.set);
+      });
+
+      it('sets api key in header with prefix', function() {
+        auth.in = 'header';
+        auth.apiKey = 'my-api-key';
+        auth.apiKeyPrefix = 'Key';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.set);
+        sinon.assert.calledWithMatch(req.set, {'api_key': 'Key my-api-key'});
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.query);
+      });
+
+      it('works when api key is not set', function() {
+        auth.in = 'query';
+        auth.apiKey = null;
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.notCalled(req.query);
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.set);
+      });
+    });
+
+    describe('oauth2', function() {
+      var authName = 'testOAuth2';
+      var authNames = [authName];
+      var auth;
+
+      beforeEach(function() {
+        newClient.authentications[authName] = {type: 'oauth2'};
+        auth = newClient.authentications[authName];
+      });
+
+      it('sets access token in header', function() {
+        auth.accessToken = 'my-access-token';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.set);
+        sinon.assert.calledWithMatch(req.set, {'Authorization': 'Bearer my-access-token'});
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.query);
+      });
+
+      it('works when access token is not set', function() {
+        auth.accessToken = null;
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.notCalled(req.query);
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.set);
+      });
+    });
+
+    describe('apiKey and oauth2', function() {
+      var apiKeyAuthName = 'testApiKey';
+      var oauth2Name = 'testOAuth2';
+      var authNames = [apiKeyAuthName, oauth2Name];
+      var apiKeyAuth, oauth2;
+
+      beforeEach(function() {
+        newClient.authentications[apiKeyAuthName] = {type: 'apiKey', name: 'api_key', 'in': 'query'};
+        newClient.authentications[oauth2Name] = {type: 'oauth2'};
+        apiKeyAuth = newClient.authentications[apiKeyAuthName];
+        oauth2 = newClient.authentications[oauth2Name];
+      });
+
+      it('works when setting both api key and access token', function() {
+        apiKeyAuth.apiKey = 'my-api-key';
+        oauth2.accessToken = 'my-access-token';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.query);
+        sinon.assert.calledWithMatch(req.query, {'api_key': 'my-api-key'});
+        sinon.assert.calledOnce(req.set);
+        sinon.assert.calledWithMatch(req.set, {'Authorization': 'Bearer my-access-token'});
+        sinon.assert.notCalled(req.auth);
+      });
+
+      it('works when setting only api key', function() {
+        apiKeyAuth.apiKey = 'my-api-key';
+        oauth2.accessToken = null;
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.query);
+        sinon.assert.calledWithMatch(req.query, {'api_key': 'my-api-key'});
+        sinon.assert.notCalled(req.set);
+        sinon.assert.notCalled(req.auth);
+      });
+
+      it('works when neither api key nor access token is set', function() {
+        apiKeyAuth.apiKey = null;
+        oauth2.accessToken = null;
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.notCalled(req.query);
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.set);
+      });
+    });
+
+    describe('unknown type', function() {
+      var authName = 'unknown';
+      var authNames = [authName];
+
+      beforeEach(function() {
+        newClient.authentications[authName] = {type: 'UNKNOWN'};
+      });
+
+      it('throws error for unknown auth type', function() {
+        expect(function() {
+          newClient.applyAuthToRequest(req, authNames);
+        }).to.throwError();
+        sinon.assert.notCalled(req.set);
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.query);
+      });
+    });
+  });
+
+  describe('#defaultHeaders', function() {
+    it('should initialize default headers to be an empty object', function() {
+      expect(apiClient.defaultHeaders).to.eql({});
+    });
+
+    it('should put default headers in request', function() {
+      var newClient = new SwaggerPetstore.ApiClient;
+      newClient.defaultHeaders['Content-Type'] = 'text/plain'
+      newClient.defaultHeaders['api_key'] = 'special-key'
+
+      var expected = {'Content-Type': 'text/plain', 'api_key': 'special-key'};
+      expect(newClient.defaultHeaders).to.eql(expected);
+      var req = makeDumbRequest(newClient);
+      req.unset('User-Agent');
+      expect(req.header).to.eql(expected);
+    });
+
+    it('should override default headers with provided header params', function() {
+      var newClient = new SwaggerPetstore.ApiClient;
+      newClient.defaultHeaders['Content-Type'] = 'text/plain'
+      newClient.defaultHeaders['api_key'] = 'special-key'
+
+      var headerParams = {'Content-Type': 'application/json', 'Authorization': 'Bearer test-token'}
+      var expected = {
+        'Content-Type': 'application/json',
+        'api_key': 'special-key',
+        'Authorization': 'Bearer test-token'
+      };
+      var req = makeDumbRequest(newClient, {headerParams: headerParams});
+      req.unset('User-Agent');
+      expect(req.header).to.eql(expected);
+    });
+  });
+});
+
+function makeDumbRequest(apiClient, opts) {
+  opts = opts || {};
+  var path = opts.path || '/store/inventory';
+  var httpMethod = opts.httpMethod || 'GET';
+  var pathParams = opts.pathParams || {};
+  var queryParams = opts.queryParams || {};
+  var headerParams = opts.headerParams || {};
+  var formParams = opts.formParams || {};
+  var bodyParam = opts.bodyParam;
+  var authNames = [];
+  var contentTypes = opts.contentTypes || [];
+  var accepts = opts.accepts || [];
+  var callback = opts.callback;
+  return apiClient.callApi(path, httpMethod, pathParams, queryParams,
+    headerParams, formParams, bodyParam, authNames, contentTypes, accepts,
+    callback
+  );
+}
diff --git a/samples/client/petstore/javascript/test/api/PetApiTest.js b/samples/client/petstore/javascript/test/api/PetApiTest.js
index 325cc16b616..d5f7ba3424c 100644
--- a/samples/client/petstore/javascript/test/api/PetApiTest.js
+++ b/samples/client/petstore/javascript/test/api/PetApiTest.js
@@ -1,189 +1,109 @@
-if (typeof module === 'object' && module.exports) {
-  var expect = require('expect.js');
-  var requireApiWithMocks = require('../helper.js').requireApiWithMocks;
-  var PetApi = requireApiWithMocks('PetApi');
-  var Pet = require('../../src/model/Pet');
-  var Category = require('../../src/model/Category');
-  var Tag = require('../../src/model/Tag');
-}
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
 
-var api;
+  var api;
 
-beforeEach(function() {
-  api = new PetApi();
-});
+  beforeEach(function() {
+    api = new SwaggerPetstore.PetApi();
+  });
 
-var createRandomPet = function() {
-  var id = new Date().getTime();
-  var pet = new Pet();
-  pet.setId(id);
-  pet.setName("gorilla" + id);
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
 
-  var category = new Category();
-  category.setName("really-happy");
-  pet.setCategory(category);
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
 
-  pet.setStatus('available');
-  var photos = ["http://foo.bar.com/1", "http://foo.bar.com/2"];
-  pet.setPhotoUrls(photos);
+  var createRandomPet = function() {
+    var id = new Date().getTime();
+    var pet = new SwaggerPetstore.Pet();
+    setProperty(pet, "setId", "id", id);
+    setProperty(pet, "setName", "name", "pet" + id);
 
-  return pet;
-};
+    var category = new SwaggerPetstore.Category();
+    setProperty(category, "setId", "id", id);
+    setProperty(category, "setName", "name", "category" + id);
+    setProperty(pet, "setCategory", "category", category);
 
-describe('PetApi', function() {
-  it('should create and get pet', function (done) {
-    var pet = createRandomPet();
-    api.addPet(pet).then(function() {
-      api.getPetById(pet.id, function(fetched, textStatus, jqXHR, error) {
+    setProperty(pet, "setStatus", "status", "available");
+    var photos = ["http://foo.bar.com/1", "http://foo.bar.com/2"];
+    setProperty(pet, "setPhotoUrls", "photoUrls", photos);
+
+    return pet;
+  };
+
+  describe('PetApi', function() {
+    it('should create and get pet', function(done) {
+      var pet = createRandomPet();
+      api.addPet({body: pet}, function(error) {
         if (error) throw error;
 
-        expect(textStatus).to.be('success');
-        expect(fetched).to.be.ok();
-        expect(fetched.id).to.be(pet.id);
-        expect(fetched.getCategory()).to.be.ok();
-        expect(fetched.getCategory().getName()).to.be(pet.getCategory().getName());
+        api.getPetById(pet.id, function(error, fetched, response) {
+          if (error) throw error;
+          expect(response.status).to.be(200);
+          expect(response.ok).to.be(true);
+          expect(response.get('Content-Type')).to.be('application/json');
 
-        api.deletePet(pet.id);
-        done();
+          expect(fetched).to.be.a(SwaggerPetstore.Pet);
+          expect(fetched.id).to.be(pet.id);
+          expect(getProperty(fetched, "getPhotoUrls", "photoUrls"))
+            .to.eql(getProperty(pet, "getPhotoUrls", "photoUrls"));
+          expect(getProperty(fetched, "getCategory", "category"))
+            .to.be.a(SwaggerPetstore.Category);
+          expect(getProperty(getProperty(fetched, "getCategory", "category"), "getName", "name"))
+            .to.be(getProperty(getProperty(pet, "getCategory", "category"), "getName", "name"));
+
+          api.deletePet(pet.id);
+          done();
+        });
+      });
+    });
+
+    it('getPetByIdInObject', function(done) {
+      var pet = createRandomPet();
+      api.addPet({body: pet}, function(error) {
+        if (error) throw error;
+
+        api.getPetByIdInObject(pet.id, function(error, fetched) {
+          if (error) throw error;
+
+          expect(fetched).to.be.a(SwaggerPetstore.InlineResponse200);
+          expect(fetched.id).to.be(pet.id);
+          expect(fetched.name).to.be(pet.name);
+
+          var categoryObj = fetched.category;
+          expect(categoryObj).to.be.a(Object);
+          expect(categoryObj).not.to.be.a(SwaggerPetstore.Category);
+          expect(categoryObj.id)
+            .to.be(getProperty(getProperty(pet, "getCategory", "category"), "getId", "id"));
+          expect(categoryObj.name)
+            .to.be(getProperty(getProperty(pet, "getCategory", "category"), "getName", "name"));
+
+          api.deletePet(pet.id);
+          done();
+        });
       });
-    }, function(jqXHR, textStatus, errorThrown) {
-      throw errorThrown || textStatus;
     });
   });
-});
 
-/*
-    @Test
-    public void testUpdatePet() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("programmer");
-
-        api.updatePet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-        assertNotNull(fetched);
-        assertEquals(pet.getId(), fetched.getId());
-        assertNotNull(fetched.getCategory());
-        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
-    }
-
-    @Test
-    public void testFindPetsByStatus() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("programmer");
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-
-        api.updatePet(pet);
-
-        List<Pet> pets = api.findPetsByStatus(Arrays.asList(new String[]{"available"}));
-        assertNotNull(pets);
-
-        boolean found = false;
-        for (Pet fetched : pets) {
-            if (fetched.getId().equals(pet.getId())) {
-                found = true;
-                break;
-            }
-        }
-
-        assertTrue(found);
-    }
-
-    @Test
-    public void testFindPetsByTags() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("monster");
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-
-        List<Tag> tags = new ArrayList<Tag>();
-        Tag tag1 = new Tag();
-        tag1.setName("friendly");
-        tags.add(tag1);
-        pet.setTags(tags);
-
-        api.updatePet(pet);
-
-        List<Pet> pets = api.findPetsByTags(Arrays.asList(new String[]{"friendly"}));
-        assertNotNull(pets);
-
-        boolean found = false;
-        for (Pet fetched : pets) {
-            if (fetched.getId().equals(pet.getId())) {
-                found = true;
-                break;
-            }
-        }
-        assertTrue(found);
-    }
-
-    @Test
-    public void testUpdatePetWithForm() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("frank");
-        api.addPet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-
-        api.updatePetWithForm(String.valueOf(fetched.getId()), "furt", null);
-        Pet updated = api.getPetById(fetched.getId());
-
-        assertEquals(updated.getName(), "furt");
-    }
-
-    @Test
-    public void testDeletePet() throws Exception {
-        Pet pet = createRandomPet();
-        api.addPet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-        api.deletePet(fetched.getId(), null);
-
-        try {
-            fetched = api.getPetById(fetched.getId());
-            fail("expected an error");
-        } catch (ApiException e) {
-            assertEquals(404, e.getCode());
-        }
-    }
-
-    @Test
-    public void testUploadFile() throws Exception {
-        Pet pet = createRandomPet();
-        api.addPet(pet);
-
-        File file = new File("hello.txt");
-        BufferedWriter writer = new BufferedWriter(new FileWriter(file));
-        writer.write("Hello world!");
-        writer.close();
-
-        api.uploadFile(pet.getId(), "a test file", new File(file.getAbsolutePath()));
-    }
-
-    @Test
-    public void testEqualsAndHashCode() {
-        Pet pet1 = new Pet();
-        Pet pet2 = new Pet();
-        assertTrue(pet1.equals(pet2));
-        assertTrue(pet2.equals(pet1));
-        assertTrue(pet1.hashCode() == pet2.hashCode());
-        assertTrue(pet1.equals(pet1));
-        assertTrue(pet1.hashCode() == pet1.hashCode());
-
-        pet2.setName("really-happy");
-        pet2.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
-        assertFalse(pet1.equals(pet2));
-        assertFalse(pet2.equals(pet1));
-        assertFalse(pet1.hashCode() == (pet2.hashCode()));
-        assertTrue(pet2.equals(pet2));
-        assertTrue(pet2.hashCode() == pet2.hashCode());
-
-        pet1.setName("really-happy");
-        pet1.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
-        assertTrue(pet1.equals(pet2));
-        assertTrue(pet2.equals(pet1));
-        assertTrue(pet1.hashCode() == pet2.hashCode());
-        assertTrue(pet1.equals(pet1));
-        assertTrue(pet1.hashCode() == pet1.hashCode());
-    }
-}
-*/
+}));
diff --git a/samples/client/petstore/javascript/test/api/StoreApiTest.java b/samples/client/petstore/javascript/test/api/StoreApiTest.java
deleted file mode 100644
index 6094f2242e1..00000000000
--- a/samples/client/petstore/javascript/test/api/StoreApiTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package io.swagger.petstore.test;
-
-import io.swagger.client.ApiException;
-
-import io.swagger.client.*;
-import io.swagger.client.api.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-
-import java.util.Map;
-import java.text.SimpleDateFormat;
-
-import org.junit.*;
-import static org.junit.Assert.*;
-
-public class StoreApiTest {
-    StoreApi api = null;
-
-    @Before
-    public void setup() {
-        api = new StoreApi();
-        // setup authentication
-        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
-        apiKeyAuth.setApiKey("special-key");
-        // set custom date format that is used by the petstore server
-        api.getApiClient().setDateFormat(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"));
-    }
-
-    @Test
-    public void testGetInventory() throws Exception {
-        Map<String, Integer> inventory = api.getInventory();
-        assertTrue(inventory.keySet().size() > 0);
-    }
-
-    @Test
-    public void testPlaceOrder() throws Exception {
-        Order order = createOrder();
-        api.placeOrder(order);
-
-        Order fetched = api.getOrderById(String.valueOf(order.getId()));
-        assertEquals(order.getId(), fetched.getId());
-        assertEquals(order.getPetId(), fetched.getPetId());
-        assertEquals(order.getQuantity(), fetched.getQuantity());
-    }
-
-    @Test
-    public void testDeleteOrder() throws Exception {
-        Order order = createOrder();
-        api.placeOrder(order);
-
-        Order fetched = api.getOrderById(String.valueOf(order.getId()));
-        assertEquals(fetched.getId(), order.getId());
-
-        api.deleteOrder(String.valueOf(order.getId()));
-
-        try {
-            api.getOrderById(String.valueOf(order.getId()));
-            // fail("expected an error");
-        } catch (ApiException e) {
-            // ok
-        }
-    }
-
-    private Order createOrder() {
-        Order order = new Order();
-        order.setId(new Long(System.currentTimeMillis()));
-        order.setPetId(new Long(200));
-        order.setQuantity(new Integer(13));
-        order.setShipDate(new java.util.Date());
-        order.setStatus(Order.StatusEnum.PLACED);
-        order.setComplete(true);
-
-        return order;
-    }
-}
diff --git a/samples/client/petstore/javascript/test/api/StoreApiTest.js b/samples/client/petstore/javascript/test/api/StoreApiTest.js
new file mode 100644
index 00000000000..6347148221a
--- /dev/null
+++ b/samples/client/petstore/javascript/test/api/StoreApiTest.js
@@ -0,0 +1,41 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var api;
+
+  beforeEach(function() {
+    api = new SwaggerPetstore.StoreApi();
+  });
+
+  describe('StoreApi', function() {
+    it('getInventoryInObject', function(done) {
+      api.getInventoryInObject(function(error, obj) {
+        if (error) throw error;
+
+        expect(obj).to.be.a(Object);
+        var hasKey = false;
+        for (var key in obj) {
+          if (obj.hasOwnProperty(key)) {
+            hasKey = true;
+            expect(obj[key]).to.be.a('number');
+          }
+        }
+        expect(hasKey).to.be(true);
+
+        done();
+      });
+    });
+  });
+
+}));
diff --git a/samples/client/petstore/javascript/test/api/UserApiTest.java b/samples/client/petstore/javascript/test/api/UserApiTest.java
deleted file mode 100644
index a3f257f568b..00000000000
--- a/samples/client/petstore/javascript/test/api/UserApiTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package io.swagger.petstore.test;
-
-import io.swagger.client.api.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-
-import java.util.Arrays;
-
-import org.junit.*;
-import static org.junit.Assert.*;
-
-public class UserApiTest {
-    UserApi api = null;
-
-    @Before
-    public void setup() {
-        api = new UserApi();
-        // setup authentication
-        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
-        apiKeyAuth.setApiKey("special-key");
-    }
-
-    @Test
-    public void testCreateUser() throws Exception {
-        User user = createUser();
-
-        api.createUser(user);
-
-        User fetched = api.getUserByName(user.getUsername());
-        assertEquals(user.getId(), fetched.getId());
-    }
-
-    @Test
-    public void testCreateUsersWithArray() throws Exception {
-        User user1 = createUser();
-        user1.setUsername("abc123");
-        User user2 = createUser();
-        user2.setUsername("123abc");
-
-        api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2}));
-
-        User fetched = api.getUserByName(user1.getUsername());
-        assertEquals(user1.getId(), fetched.getId());
-    }
-
-    @Test
-    public void testCreateUsersWithList() throws Exception {
-        User user1 = createUser();
-        user1.setUsername("abc123");
-        User user2 = createUser();
-        user2.setUsername("123abc");
-
-        api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2}));
-
-        User fetched = api.getUserByName(user1.getUsername());
-        assertEquals(user1.getId(), fetched.getId());
-    }
-
-    @Test
-    public void testLoginUser() throws Exception {
-        User user = createUser();
-        api.createUser(user);
-
-        String token = api.loginUser(user.getUsername(), user.getPassword());
-        assertTrue(token.startsWith("logged in user session:"));
-    }
-
-    @Test
-    public void logoutUser() throws Exception {
-        api.logoutUser();
-    }
-
-    private User createUser() {
-        User user = new User();
-        user.setId(System.currentTimeMillis());
-        user.setUsername("fred" + user.getId());
-        user.setFirstName("Fred");
-        user.setLastName("Meyer");
-        user.setEmail("fred@fredmeyer.com");
-        user.setPassword("xxXXxx");
-        user.setPhone("408-867-5309");
-        user.setUserStatus(123);
-
-        return user;
-    }
-}
diff --git a/samples/client/petstore/javascript/test/helper.js b/samples/client/petstore/javascript/test/helper.js
deleted file mode 100644
index 018b6428af6..00000000000
--- a/samples/client/petstore/javascript/test/helper.js
+++ /dev/null
@@ -1,19 +0,0 @@
-var mockrequire = require('mockrequire');
-
-var jquery = require('jquery');
-var domino = require('domino');
-var XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest;
-var window = domino.createWindow();
-var $ = jquery(window);
-$.support.cors = true;
-$.ajaxSettings.xhr = function() {
-  return new XMLHttpRequest();
-};
-
-var requireApiWithMocks = function(path) {
-  return mockrequire('../src/api/' + path, {
-    'jquery': $
-  });
-};
-
-exports.requireApiWithMocks = requireApiWithMocks;
diff --git a/samples/client/petstore/javascript/test/run_tests.html b/samples/client/petstore/javascript/test/run_tests.html
index c5655275cc5..059f3a112ad 100644
--- a/samples/client/petstore/javascript/test/run_tests.html
+++ b/samples/client/petstore/javascript/test/run_tests.html
@@ -9,8 +9,8 @@
 
   <script src="https://cdn.rawgit.com/jquery/jquery/2.1.4/dist/jquery.min.js"></script>
   <script src="https://cdn.rawgit.com/Automattic/expect.js/0.3.1/index.js"></script>
+  <script src="http://sinonjs.org/releases/sinon-1.17.3.js"></script>
   <script src="https://cdn.rawgit.com/mochajs/mocha/2.2.5/mocha.js"></script>
-
   <script>
     mocha.setup({
       ui: 'bdd',
@@ -18,12 +18,24 @@
     });
   </script>
 
+  <script src="../node_modules/superagent/superagent.js"></script>
+
+  <script src="../src/ApiClient.js"></script>
+
   <script src="../src/model/Category.js"></script>
   <script src="../src/model/Tag.js"></script>
+  <script src="../src/model/InlineResponse200.js"></script>
   <script src="../src/model/Pet.js"></script>
+  <script src="../src/model/Order.js"></script>
   <script src="../src/model/User.js"></script>
+
   <script src="../src/api/PetApi.js"></script>
+  <script src="../src/api/StoreApi.js"></script>
+
+  <script src="ApiClientTest.js"></script>
   <script src="api/PetApiTest.js"></script>
+  <script src="api/StoreApiTest.js"></script>
+
   <script>
     mocha.checkLeaks();
     mocha.globals(['jQuery']);
diff --git a/samples/client/petstore/objc/.gitignore b/samples/client/petstore/objc/.gitignore
new file mode 100644
index 00000000000..79d9331b6d4
--- /dev/null
+++ b/samples/client/petstore/objc/.gitignore
@@ -0,0 +1,53 @@
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+
+## Other
+*.xccheckout
+*.moved-aside
+*.xcuserstate
+*.xcscmblueprint
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# Pods/
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the 
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
+
+fastlane/report.xml
+fastlane/screenshots
diff --git a/samples/client/petstore/objc/SwaggerClient/SWG200Response.h b/samples/client/petstore/objc/SwaggerClient/SWG200Response.h
new file mode 100644
index 00000000000..c576bc204ad
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/SWG200Response.h
@@ -0,0 +1,20 @@
+#import <Foundation/Foundation.h>
+#import "SWGObject.h"
+
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+
+
+@protocol SWG200Response
+@end
+
+@interface SWG200Response : SWGObject
+
+
+@property(nonatomic) NSNumber* name;
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/SWG200Response.m b/samples/client/petstore/objc/SwaggerClient/SWG200Response.m
new file mode 100644
index 00000000000..9cafc782f1a
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/SWG200Response.m
@@ -0,0 +1,51 @@
+#import "SWG200Response.h"
+
+@implementation SWG200Response
+
+- (instancetype)init {
+  self = [super init];
+
+  if (self) {
+    // initalise property's default value, if any
+    
+  }
+
+  return self;
+}
+
+
+/**
+ * Maps json key to property name.
+ * This method is used by `JSONModel`.
+ */
++ (JSONKeyMapper *)keyMapper
+{
+  return [[JSONKeyMapper alloc] initWithDictionary:@{ @"name": @"name" }];
+}
+
+/**
+ * Indicates whether the property with the given name is optional.
+ * If `propertyName` is optional, then return `YES`, otherwise return `NO`.
+ * This method is used by `JSONModel`.
+ */
++ (BOOL)propertyIsOptional:(NSString *)propertyName
+{
+  NSArray *optionalProperties = @[@"name"];
+
+  if ([optionalProperties containsObject:propertyName]) {
+    return YES;
+  }
+  else {
+    return NO;
+  }
+}
+
+/**
+ * Gets the string presentation of the object.
+ * This method will be called when logging model object using `NSLog`.
+ */
+- (NSString *)description {
+    return [[self toDictionary] description];
+}
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGApiClient.h b/samples/client/petstore/objc/SwaggerClient/SWGApiClient.h
index 2c78694bbde..a9e9590610e 100644
--- a/samples/client/petstore/objc/SwaggerClient/SWGApiClient.h
+++ b/samples/client/petstore/objc/SwaggerClient/SWGApiClient.h
@@ -12,11 +12,16 @@
  * Do not edit the class manually.
  */
 
-#import "SWGUser.h"
+#import "SWG200Response.h"
 #import "SWGCategory.h"
-#import "SWGPet.h"
-#import "SWGTag.h"
+#import "SWGInlineResponse200.h"
+#import "SWGName.h"
 #import "SWGOrder.h"
+#import "SWGPet.h"
+#import "SWGReturn.h"
+#import "SWGSpecialModelName_.h"
+#import "SWGTag.h"
+#import "SWGUser.h"
 
 
 @class SWGConfiguration;
@@ -68,6 +73,20 @@ extern NSString *const SWGResponseObjectErrorKey;
  */
 +(void) setOfflineState:(BOOL) state;
 
+/**
+ * Gets if the client is unreachable
+ *
+ * @return The client offline state
+ */
++(bool) getOfflineState;
+
+/**
+ * Sets the client reachability, this may be override by the reachability manager if reachability changes
+ *
+ * @param The client reachability.
+ */
++(void) setReachabilityStatus:(AFNetworkReachabilityStatus) status;
+
 /**
  * Gets the client reachability
  *
@@ -190,19 +209,19 @@ extern NSString *const SWGResponseObjectErrorKey;
  *
  * @return The request id.
  */
--(NSNumber*)  requestWithCompletionBlock:(NSString*) path
-                                  method:(NSString*) method
-                              pathParams:(NSDictionary *) pathParams
-                             queryParams:(NSDictionary*) queryParams
-                              formParams:(NSDictionary *) formParams
-                                   files:(NSDictionary *) files
-                                    body:(id) body
-                            headerParams:(NSDictionary*) headerParams
-                            authSettings: (NSArray *) authSettings
-                      requestContentType:(NSString*) requestContentType
-                     responseContentType:(NSString*) responseContentType
-                            responseType:(NSString *) responseType
-                         completionBlock:(void (^)(id, NSError *))completionBlock;
+-(NSNumber*) requestWithPath:(NSString*) path
+                      method:(NSString*) method
+                  pathParams:(NSDictionary *) pathParams
+                 queryParams:(NSDictionary*) queryParams
+                  formParams:(NSDictionary *) formParams
+                       files:(NSDictionary *) files
+                        body:(id) body
+                headerParams:(NSDictionary*) headerParams
+                authSettings:(NSArray *) authSettings
+          requestContentType:(NSString*) requestContentType
+         responseContentType:(NSString*) responseContentType
+                responseType:(NSString *) responseType
+             completionBlock:(void (^)(id, NSError *))completionBlock;
 
 /**
  * Sanitize object for request
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGApiClient.m b/samples/client/petstore/objc/SwaggerClient/SWGApiClient.m
index 4dce6d2fa8b..042f282b885 100644
--- a/samples/client/petstore/objc/SwaggerClient/SWGApiClient.m
+++ b/samples/client/petstore/objc/SwaggerClient/SWGApiClient.m
@@ -53,6 +53,10 @@ static void (^reachabilityChangeBlock)(int);
     cacheEnabled = enabled;
 }
 
++(void) setReachabilityStatus:(AFNetworkReachabilityStatus)status {
+    reachabilityStatus = status;
+}
+
 - (void)setHeaderValue:(NSString*) value
                 forKey:(NSString*) forKey {
     [self.requestSerializer setValue:value forHTTPHeaderField:forKey];
@@ -136,7 +140,8 @@ static void (^reachabilityChangeBlock)(int);
     NSMutableArray *lowerAccepts = [[NSMutableArray alloc] initWithCapacity:[accepts count]];
     for (NSString *string in accepts) {
         NSString * lowerAccept = [string lowercaseString];
-        if ([lowerAccept containsString:@"application/json"]) {
+	// use rangeOfString instead of containsString for iOS 7 support
+	if ([lowerAccept rangeOfString:@"application/json"].location != NSNotFound) {
             return @"application/json";
         }
         [lowerAccepts addObject:lowerAccept];
@@ -237,6 +242,10 @@ static void (^reachabilityChangeBlock)(int);
     return reachabilityStatus;
 }
 
++(bool) getOfflineState {
+    return offlineState;
+}
+
 +(void) setReachabilityChangeBlock:(void(^)(int))changeBlock {
     reachabilityChangeBlock = changeBlock;
 }
@@ -499,19 +508,19 @@ static void (^reachabilityChangeBlock)(int);
 
 #pragma mark - Perform Request Methods
 
--(NSNumber*)  requestWithCompletionBlock: (NSString*) path
-                                  method: (NSString*) method
-                              pathParams: (NSDictionary *) pathParams
-                             queryParams: (NSDictionary*) queryParams
-                              formParams: (NSDictionary *) formParams
-                                   files: (NSDictionary *) files
-                                    body: (id) body
-                            headerParams: (NSDictionary*) headerParams
-                            authSettings: (NSArray *) authSettings
-                      requestContentType: (NSString*) requestContentType
-                     responseContentType: (NSString*) responseContentType
-                            responseType: (NSString *) responseType
-                         completionBlock: (void (^)(id, NSError *))completionBlock {
+-(NSNumber*) requestWithPath: (NSString*) path
+                      method: (NSString*) method
+                  pathParams: (NSDictionary *) pathParams
+                 queryParams: (NSDictionary*) queryParams
+                  formParams: (NSDictionary *) formParams
+                       files: (NSDictionary *) files
+                        body: (id) body
+                headerParams: (NSDictionary*) headerParams
+                authSettings: (NSArray *) authSettings
+          requestContentType: (NSString*) requestContentType
+         responseContentType: (NSString*) responseContentType
+                responseType: (NSString *) responseType
+             completionBlock: (void (^)(id, NSError *))completionBlock {
     // setting request serializer
     if ([requestContentType isEqualToString:@"application/json"]) {
         self.requestSerializer = [SWGJSONRequestSerializer serializer];
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGCategory.m b/samples/client/petstore/objc/SwaggerClient/SWGCategory.m
index 0d10e25426e..c323eda5a0a 100644
--- a/samples/client/petstore/objc/SwaggerClient/SWGCategory.m
+++ b/samples/client/petstore/objc/SwaggerClient/SWGCategory.m
@@ -13,6 +13,7 @@
   return self;
 }
 
+
 /**
  * Maps json key to property name.
  * This method is used by `JSONModel`.
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGConfiguration.m b/samples/client/petstore/objc/SwaggerClient/SWGConfiguration.m
index 16ce311c59e..af44693778e 100644
--- a/samples/client/petstore/objc/SwaggerClient/SWGConfiguration.m
+++ b/samples/client/petstore/objc/SwaggerClient/SWGConfiguration.m
@@ -107,6 +107,13 @@
 
 - (NSDictionary *) authSettings {
     return @{
+               @"test_api_key_header":
+                   @{
+                       @"type": @"api_key",
+                       @"in": @"header",
+                       @"key": @"test_api_key_header",
+                       @"value": [self getApiKeyWithPrefix:@"test_api_key_header"]
+                   },
                @"api_key":
                    @{
                        @"type": @"api_key",
@@ -114,6 +121,34 @@
                        @"key": @"api_key",
                        @"value": [self getApiKeyWithPrefix:@"api_key"]
                    },
+               @"test_http_basic":
+                   @{
+                       @"type": @"basic",
+                       @"in": @"header",
+                       @"key": @"Authorization",
+                       @"value": [self getBasicAuthToken]
+                   },
+               @"test_api_client_secret":
+                   @{
+                       @"type": @"api_key",
+                       @"in": @"header",
+                       @"key": @"x-test_api_client_secret",
+                       @"value": [self getApiKeyWithPrefix:@"x-test_api_client_secret"]
+                   },
+               @"test_api_client_id":
+                   @{
+                       @"type": @"api_key",
+                       @"in": @"header",
+                       @"key": @"x-test_api_client_id",
+                       @"value": [self getApiKeyWithPrefix:@"x-test_api_client_id"]
+                   },
+               @"test_api_key_query":
+                   @{
+                       @"type": @"api_key",
+                       @"in": @"query",
+                       @"key": @"test_api_key_query",
+                       @"value": [self getApiKeyWithPrefix:@"test_api_key_query"]
+                   },
                };
 }
 
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGInlineResponse200.h b/samples/client/petstore/objc/SwaggerClient/SWGInlineResponse200.h
new file mode 100644
index 00000000000..aeb69eafa69
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/SWGInlineResponse200.h
@@ -0,0 +1,32 @@
+#import <Foundation/Foundation.h>
+#import "SWGObject.h"
+
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+#import "SWGTag.h"
+
+
+@protocol SWGInlineResponse200
+@end
+
+@interface SWGInlineResponse200 : SWGObject
+
+
+@property(nonatomic) NSArray<SWGTag>* tags;
+
+@property(nonatomic) NSNumber* _id;
+
+@property(nonatomic) NSObject* category;
+/* pet status in the store [optional]
+ */
+@property(nonatomic) NSString* status;
+
+@property(nonatomic) NSString* name;
+
+@property(nonatomic) NSArray* /* NSString */ photoUrls;
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGInlineResponse200.m b/samples/client/petstore/objc/SwaggerClient/SWGInlineResponse200.m
new file mode 100644
index 00000000000..5ac2e7b4057
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/SWGInlineResponse200.m
@@ -0,0 +1,51 @@
+#import "SWGInlineResponse200.h"
+
+@implementation SWGInlineResponse200
+
+- (instancetype)init {
+  self = [super init];
+
+  if (self) {
+    // initalise property's default value, if any
+    
+  }
+
+  return self;
+}
+
+
+/**
+ * Maps json key to property name.
+ * This method is used by `JSONModel`.
+ */
++ (JSONKeyMapper *)keyMapper
+{
+  return [[JSONKeyMapper alloc] initWithDictionary:@{ @"tags": @"tags", @"id": @"_id", @"category": @"category", @"status": @"status", @"name": @"name", @"photoUrls": @"photoUrls" }];
+}
+
+/**
+ * Indicates whether the property with the given name is optional.
+ * If `propertyName` is optional, then return `YES`, otherwise return `NO`.
+ * This method is used by `JSONModel`.
+ */
++ (BOOL)propertyIsOptional:(NSString *)propertyName
+{
+  NSArray *optionalProperties = @[@"tags", @"category", @"status", @"name", @"photoUrls"];
+
+  if ([optionalProperties containsObject:propertyName]) {
+    return YES;
+  }
+  else {
+    return NO;
+  }
+}
+
+/**
+ * Gets the string presentation of the object.
+ * This method will be called when logging model object using `NSLog`.
+ */
+- (NSString *)description {
+    return [[self toDictionary] description];
+}
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGName.h b/samples/client/petstore/objc/SwaggerClient/SWGName.h
new file mode 100644
index 00000000000..fd34af7b66a
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/SWGName.h
@@ -0,0 +1,22 @@
+#import <Foundation/Foundation.h>
+#import "SWGObject.h"
+
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+
+
+@protocol SWGName
+@end
+
+@interface SWGName : SWGObject
+
+
+@property(nonatomic) NSNumber* name;
+
+@property(nonatomic) NSNumber* snakeCase;
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGName.m b/samples/client/petstore/objc/SwaggerClient/SWGName.m
new file mode 100644
index 00000000000..e11242833c1
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/SWGName.m
@@ -0,0 +1,51 @@
+#import "SWGName.h"
+
+@implementation SWGName
+
+- (instancetype)init {
+  self = [super init];
+
+  if (self) {
+    // initalise property's default value, if any
+    
+  }
+
+  return self;
+}
+
+
+/**
+ * Maps json key to property name.
+ * This method is used by `JSONModel`.
+ */
++ (JSONKeyMapper *)keyMapper
+{
+  return [[JSONKeyMapper alloc] initWithDictionary:@{ @"name": @"name", @"snake_case": @"snakeCase" }];
+}
+
+/**
+ * Indicates whether the property with the given name is optional.
+ * If `propertyName` is optional, then return `YES`, otherwise return `NO`.
+ * This method is used by `JSONModel`.
+ */
++ (BOOL)propertyIsOptional:(NSString *)propertyName
+{
+  NSArray *optionalProperties = @[@"name", @"snakeCase"];
+
+  if ([optionalProperties containsObject:propertyName]) {
+    return YES;
+  }
+  else {
+    return NO;
+  }
+}
+
+/**
+ * Gets the string presentation of the object.
+ * This method will be called when logging model object using `NSLog`.
+ */
+- (NSString *)description {
+    return [[self toDictionary] description];
+}
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGOrder.m b/samples/client/petstore/objc/SwaggerClient/SWGOrder.m
index abf77a7b399..e41bc7a188d 100644
--- a/samples/client/petstore/objc/SwaggerClient/SWGOrder.m
+++ b/samples/client/petstore/objc/SwaggerClient/SWGOrder.m
@@ -13,6 +13,7 @@
   return self;
 }
 
+
 /**
  * Maps json key to property name.
  * This method is used by `JSONModel`.
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGPet.m b/samples/client/petstore/objc/SwaggerClient/SWGPet.m
index f4fd77ea33f..86389c2590b 100644
--- a/samples/client/petstore/objc/SwaggerClient/SWGPet.m
+++ b/samples/client/petstore/objc/SwaggerClient/SWGPet.m
@@ -13,6 +13,7 @@
   return self;
 }
 
+
 /**
  * Maps json key to property name.
  * This method is used by `JSONModel`.
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGPetApi.h b/samples/client/petstore/objc/SwaggerClient/SWGPetApi.h
index 7ea1821e575..1142ff5311f 100644
--- a/samples/client/petstore/objc/SwaggerClient/SWGPetApi.h
+++ b/samples/client/petstore/objc/SwaggerClient/SWGPetApi.h
@@ -1,5 +1,6 @@
 #import <Foundation/Foundation.h>
 #import "SWGPet.h"
+#import "SWGInlineResponse200.h"
 #import "SWGObject.h"
 #import "SWGApiClient.h"
 
@@ -19,21 +20,6 @@
 -(unsigned long) requestQueueSize;
 +(SWGPetApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key;
 +(SWGPetApi*) sharedAPI;
-///
-///
-/// Update an existing pet
-/// 
-///
-/// @param body Pet object that needs to be added to the store
-/// 
-///
-/// @return 
--(NSNumber*) updatePetWithCompletionBlock :(SWGPet*) body 
-    
-    
-    completionHandler: (void (^)(NSError* error))completionBlock;
-
-
 ///
 ///
 /// Add a new pet to the store
@@ -43,25 +29,49 @@
 /// 
 ///
 /// @return 
--(NSNumber*) addPetWithCompletionBlock :(SWGPet*) body 
-    
-    
-    completionHandler: (void (^)(NSError* error))completionBlock;
+-(NSNumber*) addPetWithBody: (SWGPet*) body
+    completionHandler: (void (^)(NSError* error)) handler;
+
+
+///
+///
+/// Fake endpoint to test byte array in body parameter for adding a new pet to the store
+/// 
+///
+/// @param body Pet object in the form of byte array
+/// 
+///
+/// @return 
+-(NSNumber*) addPetUsingByteArrayWithBody: (NSString*) body
+    completionHandler: (void (^)(NSError* error)) handler;
+
+
+///
+///
+/// Deletes a pet
+/// 
+///
+/// @param petId Pet id to delete
+/// @param apiKey 
+/// 
+///
+/// @return 
+-(NSNumber*) deletePetWithPetId: (NSNumber*) petId
+    apiKey: (NSString*) apiKey
+    completionHandler: (void (^)(NSError* error)) handler;
 
 
 ///
 ///
 /// Finds Pets by status
-/// Multiple status values can be provided with comma seperated strings
+/// Multiple status values can be provided with comma separated strings
 ///
-/// @param status Status values that need to be considered for filter
+/// @param status Status values that need to be considered for query
 /// 
 ///
 /// @return NSArray<SWGPet>*
--(NSNumber*) findPetsByStatusWithCompletionBlock :(NSArray* /* NSString */) status 
-    
-    completionHandler: (void (^)(NSArray<SWGPet>* output, NSError* error))completionBlock;
-    
+-(NSNumber*) findPetsByStatusWithStatus: (NSArray* /* NSString */) status
+    completionHandler: (void (^)(NSArray<SWGPet>* output, NSError* error)) handler;
 
 
 ///
@@ -73,10 +83,8 @@
 /// 
 ///
 /// @return NSArray<SWGPet>*
--(NSNumber*) findPetsByTagsWithCompletionBlock :(NSArray* /* NSString */) tags 
-    
-    completionHandler: (void (^)(NSArray<SWGPet>* output, NSError* error))completionBlock;
-    
+-(NSNumber*) findPetsByTagsWithTags: (NSArray* /* NSString */) tags
+    completionHandler: (void (^)(NSArray<SWGPet>* output, NSError* error)) handler;
 
 
 ///
@@ -88,10 +96,47 @@
 /// 
 ///
 /// @return SWGPet*
--(NSNumber*) getPetByIdWithCompletionBlock :(NSNumber*) petId 
-    
-    completionHandler: (void (^)(SWGPet* output, NSError* error))completionBlock;
-    
+-(NSNumber*) getPetByIdWithPetId: (NSNumber*) petId
+    completionHandler: (void (^)(SWGPet* output, NSError* error)) handler;
+
+
+///
+///
+/// Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
+/// Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
+///
+/// @param petId ID of pet that needs to be fetched
+/// 
+///
+/// @return SWGInlineResponse200*
+-(NSNumber*) getPetByIdInObjectWithPetId: (NSNumber*) petId
+    completionHandler: (void (^)(SWGInlineResponse200* output, NSError* error)) handler;
+
+
+///
+///
+/// Fake endpoint to test byte array return by 'Find pet by ID'
+/// Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
+///
+/// @param petId ID of pet that needs to be fetched
+/// 
+///
+/// @return NSString*
+-(NSNumber*) petPetIdtestingByteArraytrueGetWithPetId: (NSNumber*) petId
+    completionHandler: (void (^)(NSString* output, NSError* error)) handler;
+
+
+///
+///
+/// Update an existing pet
+/// 
+///
+/// @param body Pet object that needs to be added to the store
+/// 
+///
+/// @return 
+-(NSNumber*) updatePetWithBody: (SWGPet*) body
+    completionHandler: (void (^)(NSError* error)) handler;
 
 
 ///
@@ -105,29 +150,10 @@
 /// 
 ///
 /// @return 
--(NSNumber*) updatePetWithFormWithCompletionBlock :(NSString*) petId 
-     name:(NSString*) name 
-     status:(NSString*) status 
-    
-    
-    completionHandler: (void (^)(NSError* error))completionBlock;
-
-
-///
-///
-/// Deletes a pet
-/// 
-///
-/// @param petId Pet id to delete
-/// @param apiKey 
-/// 
-///
-/// @return 
--(NSNumber*) deletePetWithCompletionBlock :(NSNumber*) petId 
-     apiKey:(NSString*) apiKey 
-    
-    
-    completionHandler: (void (^)(NSError* error))completionBlock;
+-(NSNumber*) updatePetWithFormWithPetId: (NSString*) petId
+    name: (NSString*) name
+    status: (NSString*) status
+    completionHandler: (void (^)(NSError* error)) handler;
 
 
 ///
@@ -141,12 +167,10 @@
 /// 
 ///
 /// @return 
--(NSNumber*) uploadFileWithCompletionBlock :(NSNumber*) petId 
-     additionalMetadata:(NSString*) additionalMetadata 
-     file:(NSURL*) file 
-    
-    
-    completionHandler: (void (^)(NSError* error))completionBlock;
+-(NSNumber*) uploadFileWithPetId: (NSNumber*) petId
+    additionalMetadata: (NSString*) additionalMetadata
+    file: (NSURL*) file
+    completionHandler: (void (^)(NSError* error)) handler;
 
 
 
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGPetApi.m b/samples/client/petstore/objc/SwaggerClient/SWGPetApi.m
index c7c2ed175c6..2b7bab6144a 100644
--- a/samples/client/petstore/objc/SwaggerClient/SWGPetApi.m
+++ b/samples/client/petstore/objc/SwaggerClient/SWGPetApi.m
@@ -1,6 +1,7 @@
 #import "SWGPetApi.h"
 #import "SWGQueryParamCollection.h"
 #import "SWGPet.h"
+#import "SWGInlineResponse200.h"
 
 
 @interface SWGPetApi ()
@@ -69,95 +70,15 @@ static SWGPetApi* singletonAPI = nil;
 
 #pragma mark - Api Methods
 
-///
-/// Update an existing pet
-/// 
-///  @param body Pet object that needs to be added to the store
-///
-///  @returns void
-///
--(NSNumber*) updatePetWithCompletionBlock: (SWGPet*) body
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock { 
-
-    
-
-    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/pet"];
-
-    // remove format in URL if needed
-    if ([resourcePath rangeOfString:@".{format}"].location != NSNotFound) {
-        [resourcePath replaceCharactersInRange: [resourcePath rangeOfString:@".{format}"] withString:@".json"];
-    }
-
-    NSMutableDictionary *pathParams = [[NSMutableDictionary alloc] init];
-    
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    
-    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
-
-    
-
-    // HTTP header `Accept`
-    headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]];
-    if ([headerParams[@"Accept"] length] == 0) {
-        [headerParams removeObjectForKey:@"Accept"];
-    }
-
-    // response content type
-    NSString *responseContentType;
-    if ([headerParams objectForKey:@"Accept"]) {
-        responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0];
-    }
-    else {
-        responseContentType = @"";
-    }
-
-    // request content type
-    NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[@"application/json", @"application/xml"]];
-
-    // Authentication setting
-    NSArray *authSettings = @[@"petstore_auth"];
-
-    id bodyParam = nil;
-    NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
-    
-    bodyParam = body;
-    
-
-    
-    return [self.apiClient requestWithCompletionBlock: resourcePath
-                                               method: @"PUT"
-                                           pathParams: pathParams
-                                          queryParams: queryParams
-                                           formParams: formParams
-                                                files: files
-                                                 body: bodyParam
-                                         headerParams: headerParams
-                                         authSettings: authSettings
-                                   requestContentType: requestContentType
-                                  responseContentType: responseContentType
-                                         responseType: nil
-                                      completionBlock: ^(id data, NSError *error) {
-                  completionBlock(error);
-                  
-              }
-          ];
-}
-
 ///
 /// Add a new pet to the store
 /// 
-///  @param body Pet object that needs to be added to the store
+///  @param body Pet object that needs to be added to the store (optional)
 ///
 ///  @returns void
 ///
--(NSNumber*) addPetWithCompletionBlock: (SWGPet*) body
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock { 
+-(NSNumber*) addPetWithBody: (SWGPet*) body
+    completionHandler: (void (^)(NSError* error)) handler {
 
     
 
@@ -200,311 +121,43 @@ static SWGPetApi* singletonAPI = nil;
 
     id bodyParam = nil;
     NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
     
     bodyParam = body;
     
 
     
-    return [self.apiClient requestWithCompletionBlock: resourcePath
-                                               method: @"POST"
-                                           pathParams: pathParams
-                                          queryParams: queryParams
-                                           formParams: formParams
-                                                files: files
-                                                 body: bodyParam
-                                         headerParams: headerParams
-                                         authSettings: authSettings
-                                   requestContentType: requestContentType
-                                  responseContentType: responseContentType
-                                         responseType: nil
-                                      completionBlock: ^(id data, NSError *error) {
-                  completionBlock(error);
-                  
-              }
+    return [self.apiClient requestWithPath: resourcePath
+                                    method: @"POST"
+                                pathParams: pathParams
+                               queryParams: queryParams
+                                formParams: formParams
+                                     files: localVarFiles
+                                      body: bodyParam
+                              headerParams: headerParams
+                              authSettings: authSettings
+                        requestContentType: requestContentType
+                       responseContentType: responseContentType
+                              responseType: nil
+                           completionBlock: ^(id data, NSError *error) {
+                               handler(error);
+                           }
           ];
 }
 
 ///
-/// Finds Pets by status
-/// Multiple status values can be provided with comma seperated strings
-///  @param status Status values that need to be considered for filter
-///
-///  @returns NSArray<SWGPet>*
-///
--(NSNumber*) findPetsByStatusWithCompletionBlock: (NSArray* /* NSString */) status
-        
-        completionHandler: (void (^)(NSArray<SWGPet>* output, NSError* error))completionBlock { 
-        
-
-    
-
-    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/pet/findByStatus"];
-
-    // remove format in URL if needed
-    if ([resourcePath rangeOfString:@".{format}"].location != NSNotFound) {
-        [resourcePath replaceCharactersInRange: [resourcePath rangeOfString:@".{format}"] withString:@".json"];
-    }
-
-    NSMutableDictionary *pathParams = [[NSMutableDictionary alloc] init];
-    
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if (status != nil) {
-        
-        queryParams[@"status"] = [[SWGQueryParamCollection alloc] initWithValuesAndFormat: status format: @"multi"];
-        
-        
-    }
-    
-    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
-
-    
-
-    // HTTP header `Accept`
-    headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]];
-    if ([headerParams[@"Accept"] length] == 0) {
-        [headerParams removeObjectForKey:@"Accept"];
-    }
-
-    // response content type
-    NSString *responseContentType;
-    if ([headerParams objectForKey:@"Accept"]) {
-        responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0];
-    }
-    else {
-        responseContentType = @"";
-    }
-
-    // request content type
-    NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]];
-
-    // Authentication setting
-    NSArray *authSettings = @[@"petstore_auth"];
-
-    id bodyParam = nil;
-    NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
-    
-    
-    
-
-    
-    return [self.apiClient requestWithCompletionBlock: resourcePath
-                                               method: @"GET"
-                                           pathParams: pathParams
-                                          queryParams: queryParams
-                                           formParams: formParams
-                                                files: files
-                                                 body: bodyParam
-                                         headerParams: headerParams
-                                         authSettings: authSettings
-                                   requestContentType: requestContentType
-                                  responseContentType: responseContentType
-                                         responseType: @"NSArray<SWGPet>*"
-                                      completionBlock: ^(id data, NSError *error) {
-                  
-                  completionBlock((NSArray<SWGPet>*)data, error);
-              }
-          ];
-}
-
-///
-/// Finds Pets by tags
-/// Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-///  @param tags Tags to filter by
-///
-///  @returns NSArray<SWGPet>*
-///
--(NSNumber*) findPetsByTagsWithCompletionBlock: (NSArray* /* NSString */) tags
-        
-        completionHandler: (void (^)(NSArray<SWGPet>* output, NSError* error))completionBlock { 
-        
-
-    
-
-    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/pet/findByTags"];
-
-    // remove format in URL if needed
-    if ([resourcePath rangeOfString:@".{format}"].location != NSNotFound) {
-        [resourcePath replaceCharactersInRange: [resourcePath rangeOfString:@".{format}"] withString:@".json"];
-    }
-
-    NSMutableDictionary *pathParams = [[NSMutableDictionary alloc] init];
-    
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if (tags != nil) {
-        
-        queryParams[@"tags"] = [[SWGQueryParamCollection alloc] initWithValuesAndFormat: tags format: @"multi"];
-        
-        
-    }
-    
-    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
-
-    
-
-    // HTTP header `Accept`
-    headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]];
-    if ([headerParams[@"Accept"] length] == 0) {
-        [headerParams removeObjectForKey:@"Accept"];
-    }
-
-    // response content type
-    NSString *responseContentType;
-    if ([headerParams objectForKey:@"Accept"]) {
-        responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0];
-    }
-    else {
-        responseContentType = @"";
-    }
-
-    // request content type
-    NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]];
-
-    // Authentication setting
-    NSArray *authSettings = @[@"petstore_auth"];
-
-    id bodyParam = nil;
-    NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
-    
-    
-    
-
-    
-    return [self.apiClient requestWithCompletionBlock: resourcePath
-                                               method: @"GET"
-                                           pathParams: pathParams
-                                          queryParams: queryParams
-                                           formParams: formParams
-                                                files: files
-                                                 body: bodyParam
-                                         headerParams: headerParams
-                                         authSettings: authSettings
-                                   requestContentType: requestContentType
-                                  responseContentType: responseContentType
-                                         responseType: @"NSArray<SWGPet>*"
-                                      completionBlock: ^(id data, NSError *error) {
-                  
-                  completionBlock((NSArray<SWGPet>*)data, error);
-              }
-          ];
-}
-
-///
-/// Find pet by ID
-/// Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
-///  @param petId ID of pet that needs to be fetched
-///
-///  @returns SWGPet*
-///
--(NSNumber*) getPetByIdWithCompletionBlock: (NSNumber*) petId
-        
-        completionHandler: (void (^)(SWGPet* output, NSError* error))completionBlock { 
-        
-
-    
-    // verify the required parameter 'petId' is set
-    if (petId == nil) {
-        [NSException raise:@"Invalid parameter" format:@"Missing the required parameter `petId` when calling `getPetById`"];
-    }
-    
-
-    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/pet/{petId}"];
-
-    // remove format in URL if needed
-    if ([resourcePath rangeOfString:@".{format}"].location != NSNotFound) {
-        [resourcePath replaceCharactersInRange: [resourcePath rangeOfString:@".{format}"] withString:@".json"];
-    }
-
-    NSMutableDictionary *pathParams = [[NSMutableDictionary alloc] init];
-    if (petId != nil) {
-        pathParams[@"petId"] = petId;
-    }
-    
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    
-    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
-
-    
-
-    // HTTP header `Accept`
-    headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]];
-    if ([headerParams[@"Accept"] length] == 0) {
-        [headerParams removeObjectForKey:@"Accept"];
-    }
-
-    // response content type
-    NSString *responseContentType;
-    if ([headerParams objectForKey:@"Accept"]) {
-        responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0];
-    }
-    else {
-        responseContentType = @"";
-    }
-
-    // request content type
-    NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]];
-
-    // Authentication setting
-    NSArray *authSettings = @[@"api_key"];
-
-    id bodyParam = nil;
-    NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
-    
-    
-    
-
-    
-    return [self.apiClient requestWithCompletionBlock: resourcePath
-                                               method: @"GET"
-                                           pathParams: pathParams
-                                          queryParams: queryParams
-                                           formParams: formParams
-                                                files: files
-                                                 body: bodyParam
-                                         headerParams: headerParams
-                                         authSettings: authSettings
-                                   requestContentType: requestContentType
-                                  responseContentType: responseContentType
-                                         responseType: @"SWGPet*"
-                                      completionBlock: ^(id data, NSError *error) {
-                  
-                  completionBlock((SWGPet*)data, error);
-              }
-          ];
-}
-
-///
-/// Updates a pet in the store with form data
+/// Fake endpoint to test byte array in body parameter for adding a new pet to the store
 /// 
-///  @param petId ID of pet that needs to be updated
-///
-///  @param name Updated name of the pet
-///
-///  @param status Updated status of the pet
+///  @param body Pet object in the form of byte array (optional)
 ///
 ///  @returns void
 ///
--(NSNumber*) updatePetWithFormWithCompletionBlock: (NSString*) petId
-         name: (NSString*) name
-         status: (NSString*) status
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock { 
+-(NSNumber*) addPetUsingByteArrayWithBody: (NSString*) body
+    completionHandler: (void (^)(NSError* error)) handler {
 
     
-    // verify the required parameter 'petId' is set
-    if (petId == nil) {
-        [NSException raise:@"Invalid parameter" format:@"Missing the required parameter `petId` when calling `updatePetWithForm`"];
-    }
-    
 
-    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/pet/{petId}"];
+    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/pet?testing_byte_array=true"];
 
     // remove format in URL if needed
     if ([resourcePath rangeOfString:@".{format}"].location != NSNotFound) {
@@ -512,9 +165,6 @@ static SWGPetApi* singletonAPI = nil;
     }
 
     NSMutableDictionary *pathParams = [[NSMutableDictionary alloc] init];
-    if (petId != nil) {
-        pathParams[@"petId"] = petId;
-    }
     
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
@@ -539,64 +189,49 @@ static SWGPetApi* singletonAPI = nil;
     }
 
     // request content type
-    NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[@"application/x-www-form-urlencoded"]];
+    NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[@"application/json", @"application/xml"]];
 
     // Authentication setting
     NSArray *authSettings = @[@"petstore_auth"];
 
     id bodyParam = nil;
     NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
-    
-    
-    
-    if (name) {
-        formParams[@"name"] = name;
-    }
-    
-    
-    
-    if (status) {
-        formParams[@"status"] = status;
-    }
-    
+    NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
     
+    bodyParam = body;
     
 
     
-    return [self.apiClient requestWithCompletionBlock: resourcePath
-                                               method: @"POST"
-                                           pathParams: pathParams
-                                          queryParams: queryParams
-                                           formParams: formParams
-                                                files: files
-                                                 body: bodyParam
-                                         headerParams: headerParams
-                                         authSettings: authSettings
-                                   requestContentType: requestContentType
-                                  responseContentType: responseContentType
-                                         responseType: nil
-                                      completionBlock: ^(id data, NSError *error) {
-                  completionBlock(error);
-                  
-              }
+    return [self.apiClient requestWithPath: resourcePath
+                                    method: @"POST"
+                                pathParams: pathParams
+                               queryParams: queryParams
+                                formParams: formParams
+                                     files: localVarFiles
+                                      body: bodyParam
+                              headerParams: headerParams
+                              authSettings: authSettings
+                        requestContentType: requestContentType
+                       responseContentType: responseContentType
+                              responseType: nil
+                           completionBlock: ^(id data, NSError *error) {
+                               handler(error);
+                           }
           ];
 }
 
 ///
 /// Deletes a pet
 /// 
-///  @param petId Pet id to delete
+///  @param petId Pet id to delete 
 ///
-///  @param apiKey 
+///  @param apiKey  (optional)
 ///
 ///  @returns void
 ///
--(NSNumber*) deletePetWithCompletionBlock: (NSNumber*) petId
-         apiKey: (NSString*) apiKey
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock { 
+-(NSNumber*) deletePetWithPetId: (NSNumber*) petId
+    apiKey: (NSString*) apiKey
+    completionHandler: (void (^)(NSError* error)) handler {
 
     
     // verify the required parameter 'petId' is set
@@ -650,48 +285,632 @@ static SWGPetApi* singletonAPI = nil;
 
     id bodyParam = nil;
     NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
     
     
     
 
     
-    return [self.apiClient requestWithCompletionBlock: resourcePath
-                                               method: @"DELETE"
-                                           pathParams: pathParams
-                                          queryParams: queryParams
-                                           formParams: formParams
-                                                files: files
-                                                 body: bodyParam
-                                         headerParams: headerParams
-                                         authSettings: authSettings
-                                   requestContentType: requestContentType
-                                  responseContentType: responseContentType
-                                         responseType: nil
-                                      completionBlock: ^(id data, NSError *error) {
-                  completionBlock(error);
-                  
-              }
+    return [self.apiClient requestWithPath: resourcePath
+                                    method: @"DELETE"
+                                pathParams: pathParams
+                               queryParams: queryParams
+                                formParams: formParams
+                                     files: localVarFiles
+                                      body: bodyParam
+                              headerParams: headerParams
+                              authSettings: authSettings
+                        requestContentType: requestContentType
+                       responseContentType: responseContentType
+                              responseType: nil
+                           completionBlock: ^(id data, NSError *error) {
+                               handler(error);
+                           }
+          ];
+}
+
+///
+/// Finds Pets by status
+/// Multiple status values can be provided with comma separated strings
+///  @param status Status values that need to be considered for query (optional, default to available)
+///
+///  @returns NSArray<SWGPet>*
+///
+-(NSNumber*) findPetsByStatusWithStatus: (NSArray* /* NSString */) status
+    completionHandler: (void (^)(NSArray<SWGPet>* output, NSError* error)) handler {
+
+    
+
+    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/pet/findByStatus"];
+
+    // remove format in URL if needed
+    if ([resourcePath rangeOfString:@".{format}"].location != NSNotFound) {
+        [resourcePath replaceCharactersInRange: [resourcePath rangeOfString:@".{format}"] withString:@".json"];
+    }
+
+    NSMutableDictionary *pathParams = [[NSMutableDictionary alloc] init];
+    
+
+    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
+    if (status != nil) {
+        
+        queryParams[@"status"] = [[SWGQueryParamCollection alloc] initWithValuesAndFormat: status format: @"multi"];
+        
+        
+    }
+    
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
+    
+
+    // HTTP header `Accept`
+    headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]];
+    if ([headerParams[@"Accept"] length] == 0) {
+        [headerParams removeObjectForKey:@"Accept"];
+    }
+
+    // response content type
+    NSString *responseContentType;
+    if ([headerParams objectForKey:@"Accept"]) {
+        responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0];
+    }
+    else {
+        responseContentType = @"";
+    }
+
+    // request content type
+    NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]];
+
+    // Authentication setting
+    NSArray *authSettings = @[@"petstore_auth"];
+
+    id bodyParam = nil;
+    NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
+    
+    
+    
+
+    
+    return [self.apiClient requestWithPath: resourcePath
+                                    method: @"GET"
+                                pathParams: pathParams
+                               queryParams: queryParams
+                                formParams: formParams
+                                     files: localVarFiles
+                                      body: bodyParam
+                              headerParams: headerParams
+                              authSettings: authSettings
+                        requestContentType: requestContentType
+                       responseContentType: responseContentType
+                              responseType: @"NSArray<SWGPet>*"
+                           completionBlock: ^(id data, NSError *error) {
+                               handler((NSArray<SWGPet>*)data, error);
+                           }
+          ];
+}
+
+///
+/// Finds Pets by tags
+/// Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+///  @param tags Tags to filter by (optional)
+///
+///  @returns NSArray<SWGPet>*
+///
+-(NSNumber*) findPetsByTagsWithTags: (NSArray* /* NSString */) tags
+    completionHandler: (void (^)(NSArray<SWGPet>* output, NSError* error)) handler {
+
+    
+
+    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/pet/findByTags"];
+
+    // remove format in URL if needed
+    if ([resourcePath rangeOfString:@".{format}"].location != NSNotFound) {
+        [resourcePath replaceCharactersInRange: [resourcePath rangeOfString:@".{format}"] withString:@".json"];
+    }
+
+    NSMutableDictionary *pathParams = [[NSMutableDictionary alloc] init];
+    
+
+    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
+    if (tags != nil) {
+        
+        queryParams[@"tags"] = [[SWGQueryParamCollection alloc] initWithValuesAndFormat: tags format: @"multi"];
+        
+        
+    }
+    
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
+    
+
+    // HTTP header `Accept`
+    headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]];
+    if ([headerParams[@"Accept"] length] == 0) {
+        [headerParams removeObjectForKey:@"Accept"];
+    }
+
+    // response content type
+    NSString *responseContentType;
+    if ([headerParams objectForKey:@"Accept"]) {
+        responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0];
+    }
+    else {
+        responseContentType = @"";
+    }
+
+    // request content type
+    NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]];
+
+    // Authentication setting
+    NSArray *authSettings = @[@"petstore_auth"];
+
+    id bodyParam = nil;
+    NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
+    
+    
+    
+
+    
+    return [self.apiClient requestWithPath: resourcePath
+                                    method: @"GET"
+                                pathParams: pathParams
+                               queryParams: queryParams
+                                formParams: formParams
+                                     files: localVarFiles
+                                      body: bodyParam
+                              headerParams: headerParams
+                              authSettings: authSettings
+                        requestContentType: requestContentType
+                       responseContentType: responseContentType
+                              responseType: @"NSArray<SWGPet>*"
+                           completionBlock: ^(id data, NSError *error) {
+                               handler((NSArray<SWGPet>*)data, error);
+                           }
+          ];
+}
+
+///
+/// Find pet by ID
+/// Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
+///  @param petId ID of pet that needs to be fetched 
+///
+///  @returns SWGPet*
+///
+-(NSNumber*) getPetByIdWithPetId: (NSNumber*) petId
+    completionHandler: (void (^)(SWGPet* output, NSError* error)) handler {
+
+    
+    // verify the required parameter 'petId' is set
+    if (petId == nil) {
+        [NSException raise:@"Invalid parameter" format:@"Missing the required parameter `petId` when calling `getPetById`"];
+    }
+    
+
+    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/pet/{petId}"];
+
+    // remove format in URL if needed
+    if ([resourcePath rangeOfString:@".{format}"].location != NSNotFound) {
+        [resourcePath replaceCharactersInRange: [resourcePath rangeOfString:@".{format}"] withString:@".json"];
+    }
+
+    NSMutableDictionary *pathParams = [[NSMutableDictionary alloc] init];
+    if (petId != nil) {
+        pathParams[@"petId"] = petId;
+    }
+    
+
+    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
+    
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
+    
+
+    // HTTP header `Accept`
+    headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]];
+    if ([headerParams[@"Accept"] length] == 0) {
+        [headerParams removeObjectForKey:@"Accept"];
+    }
+
+    // response content type
+    NSString *responseContentType;
+    if ([headerParams objectForKey:@"Accept"]) {
+        responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0];
+    }
+    else {
+        responseContentType = @"";
+    }
+
+    // request content type
+    NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]];
+
+    // Authentication setting
+    NSArray *authSettings = @[@"api_key", @"petstore_auth"];
+
+    id bodyParam = nil;
+    NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
+    
+    
+    
+
+    
+    return [self.apiClient requestWithPath: resourcePath
+                                    method: @"GET"
+                                pathParams: pathParams
+                               queryParams: queryParams
+                                formParams: formParams
+                                     files: localVarFiles
+                                      body: bodyParam
+                              headerParams: headerParams
+                              authSettings: authSettings
+                        requestContentType: requestContentType
+                       responseContentType: responseContentType
+                              responseType: @"SWGPet*"
+                           completionBlock: ^(id data, NSError *error) {
+                               handler((SWGPet*)data, error);
+                           }
+          ];
+}
+
+///
+/// Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
+/// Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
+///  @param petId ID of pet that needs to be fetched 
+///
+///  @returns SWGInlineResponse200*
+///
+-(NSNumber*) getPetByIdInObjectWithPetId: (NSNumber*) petId
+    completionHandler: (void (^)(SWGInlineResponse200* output, NSError* error)) handler {
+
+    
+    // verify the required parameter 'petId' is set
+    if (petId == nil) {
+        [NSException raise:@"Invalid parameter" format:@"Missing the required parameter `petId` when calling `getPetByIdInObject`"];
+    }
+    
+
+    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/pet/{petId}?response=inline_arbitrary_object"];
+
+    // remove format in URL if needed
+    if ([resourcePath rangeOfString:@".{format}"].location != NSNotFound) {
+        [resourcePath replaceCharactersInRange: [resourcePath rangeOfString:@".{format}"] withString:@".json"];
+    }
+
+    NSMutableDictionary *pathParams = [[NSMutableDictionary alloc] init];
+    if (petId != nil) {
+        pathParams[@"petId"] = petId;
+    }
+    
+
+    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
+    
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
+    
+
+    // HTTP header `Accept`
+    headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]];
+    if ([headerParams[@"Accept"] length] == 0) {
+        [headerParams removeObjectForKey:@"Accept"];
+    }
+
+    // response content type
+    NSString *responseContentType;
+    if ([headerParams objectForKey:@"Accept"]) {
+        responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0];
+    }
+    else {
+        responseContentType = @"";
+    }
+
+    // request content type
+    NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]];
+
+    // Authentication setting
+    NSArray *authSettings = @[@"api_key", @"petstore_auth"];
+
+    id bodyParam = nil;
+    NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
+    
+    
+    
+
+    
+    return [self.apiClient requestWithPath: resourcePath
+                                    method: @"GET"
+                                pathParams: pathParams
+                               queryParams: queryParams
+                                formParams: formParams
+                                     files: localVarFiles
+                                      body: bodyParam
+                              headerParams: headerParams
+                              authSettings: authSettings
+                        requestContentType: requestContentType
+                       responseContentType: responseContentType
+                              responseType: @"SWGInlineResponse200*"
+                           completionBlock: ^(id data, NSError *error) {
+                               handler((SWGInlineResponse200*)data, error);
+                           }
+          ];
+}
+
+///
+/// Fake endpoint to test byte array return by 'Find pet by ID'
+/// Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
+///  @param petId ID of pet that needs to be fetched 
+///
+///  @returns NSString*
+///
+-(NSNumber*) petPetIdtestingByteArraytrueGetWithPetId: (NSNumber*) petId
+    completionHandler: (void (^)(NSString* output, NSError* error)) handler {
+
+    
+    // verify the required parameter 'petId' is set
+    if (petId == nil) {
+        [NSException raise:@"Invalid parameter" format:@"Missing the required parameter `petId` when calling `petPetIdtestingByteArraytrueGet`"];
+    }
+    
+
+    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/pet/{petId}?testing_byte_array=true"];
+
+    // remove format in URL if needed
+    if ([resourcePath rangeOfString:@".{format}"].location != NSNotFound) {
+        [resourcePath replaceCharactersInRange: [resourcePath rangeOfString:@".{format}"] withString:@".json"];
+    }
+
+    NSMutableDictionary *pathParams = [[NSMutableDictionary alloc] init];
+    if (petId != nil) {
+        pathParams[@"petId"] = petId;
+    }
+    
+
+    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
+    
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
+    
+
+    // HTTP header `Accept`
+    headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]];
+    if ([headerParams[@"Accept"] length] == 0) {
+        [headerParams removeObjectForKey:@"Accept"];
+    }
+
+    // response content type
+    NSString *responseContentType;
+    if ([headerParams objectForKey:@"Accept"]) {
+        responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0];
+    }
+    else {
+        responseContentType = @"";
+    }
+
+    // request content type
+    NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]];
+
+    // Authentication setting
+    NSArray *authSettings = @[@"api_key", @"petstore_auth"];
+
+    id bodyParam = nil;
+    NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
+    
+    
+    
+
+    
+    return [self.apiClient requestWithPath: resourcePath
+                                    method: @"GET"
+                                pathParams: pathParams
+                               queryParams: queryParams
+                                formParams: formParams
+                                     files: localVarFiles
+                                      body: bodyParam
+                              headerParams: headerParams
+                              authSettings: authSettings
+                        requestContentType: requestContentType
+                       responseContentType: responseContentType
+                              responseType: @"NSString*"
+                           completionBlock: ^(id data, NSError *error) {
+                               handler((NSString*)data, error);
+                           }
+          ];
+}
+
+///
+/// Update an existing pet
+/// 
+///  @param body Pet object that needs to be added to the store (optional)
+///
+///  @returns void
+///
+-(NSNumber*) updatePetWithBody: (SWGPet*) body
+    completionHandler: (void (^)(NSError* error)) handler {
+
+    
+
+    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/pet"];
+
+    // remove format in URL if needed
+    if ([resourcePath rangeOfString:@".{format}"].location != NSNotFound) {
+        [resourcePath replaceCharactersInRange: [resourcePath rangeOfString:@".{format}"] withString:@".json"];
+    }
+
+    NSMutableDictionary *pathParams = [[NSMutableDictionary alloc] init];
+    
+
+    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
+    
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
+    
+
+    // HTTP header `Accept`
+    headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]];
+    if ([headerParams[@"Accept"] length] == 0) {
+        [headerParams removeObjectForKey:@"Accept"];
+    }
+
+    // response content type
+    NSString *responseContentType;
+    if ([headerParams objectForKey:@"Accept"]) {
+        responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0];
+    }
+    else {
+        responseContentType = @"";
+    }
+
+    // request content type
+    NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[@"application/json", @"application/xml"]];
+
+    // Authentication setting
+    NSArray *authSettings = @[@"petstore_auth"];
+
+    id bodyParam = nil;
+    NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
+    
+    bodyParam = body;
+    
+
+    
+    return [self.apiClient requestWithPath: resourcePath
+                                    method: @"PUT"
+                                pathParams: pathParams
+                               queryParams: queryParams
+                                formParams: formParams
+                                     files: localVarFiles
+                                      body: bodyParam
+                              headerParams: headerParams
+                              authSettings: authSettings
+                        requestContentType: requestContentType
+                       responseContentType: responseContentType
+                              responseType: nil
+                           completionBlock: ^(id data, NSError *error) {
+                               handler(error);
+                           }
+          ];
+}
+
+///
+/// Updates a pet in the store with form data
+/// 
+///  @param petId ID of pet that needs to be updated 
+///
+///  @param name Updated name of the pet (optional)
+///
+///  @param status Updated status of the pet (optional)
+///
+///  @returns void
+///
+-(NSNumber*) updatePetWithFormWithPetId: (NSString*) petId
+    name: (NSString*) name
+    status: (NSString*) status
+    completionHandler: (void (^)(NSError* error)) handler {
+
+    
+    // verify the required parameter 'petId' is set
+    if (petId == nil) {
+        [NSException raise:@"Invalid parameter" format:@"Missing the required parameter `petId` when calling `updatePetWithForm`"];
+    }
+    
+
+    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/pet/{petId}"];
+
+    // remove format in URL if needed
+    if ([resourcePath rangeOfString:@".{format}"].location != NSNotFound) {
+        [resourcePath replaceCharactersInRange: [resourcePath rangeOfString:@".{format}"] withString:@".json"];
+    }
+
+    NSMutableDictionary *pathParams = [[NSMutableDictionary alloc] init];
+    if (petId != nil) {
+        pathParams[@"petId"] = petId;
+    }
+    
+
+    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
+    
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
+    
+
+    // HTTP header `Accept`
+    headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]];
+    if ([headerParams[@"Accept"] length] == 0) {
+        [headerParams removeObjectForKey:@"Accept"];
+    }
+
+    // response content type
+    NSString *responseContentType;
+    if ([headerParams objectForKey:@"Accept"]) {
+        responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0];
+    }
+    else {
+        responseContentType = @"";
+    }
+
+    // request content type
+    NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[@"application/x-www-form-urlencoded"]];
+
+    // Authentication setting
+    NSArray *authSettings = @[@"petstore_auth"];
+
+    id bodyParam = nil;
+    NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
+    
+    
+    
+    if (name) {
+        formParams[@"name"] = name;
+    }
+    
+    
+    
+    if (status) {
+        formParams[@"status"] = status;
+    }
+    
+    
+    
+
+    
+    return [self.apiClient requestWithPath: resourcePath
+                                    method: @"POST"
+                                pathParams: pathParams
+                               queryParams: queryParams
+                                formParams: formParams
+                                     files: localVarFiles
+                                      body: bodyParam
+                              headerParams: headerParams
+                              authSettings: authSettings
+                        requestContentType: requestContentType
+                       responseContentType: responseContentType
+                              responseType: nil
+                           completionBlock: ^(id data, NSError *error) {
+                               handler(error);
+                           }
           ];
 }
 
 ///
 /// uploads an image
 /// 
-///  @param petId ID of pet to update
+///  @param petId ID of pet to update 
 ///
-///  @param additionalMetadata Additional data to pass to server
+///  @param additionalMetadata Additional data to pass to server (optional)
 ///
-///  @param file file to upload
+///  @param file file to upload (optional)
 ///
 ///  @returns void
 ///
--(NSNumber*) uploadFileWithCompletionBlock: (NSNumber*) petId
-         additionalMetadata: (NSString*) additionalMetadata
-         file: (NSURL*) file
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock { 
+-(NSNumber*) uploadFileWithPetId: (NSNumber*) petId
+    additionalMetadata: (NSString*) additionalMetadata
+    file: (NSURL*) file
+    completionHandler: (void (^)(NSError* error)) handler {
 
     
     // verify the required parameter 'petId' is set
@@ -742,7 +961,7 @@ static SWGPetApi* singletonAPI = nil;
 
     id bodyParam = nil;
     NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
     
     
     
@@ -752,28 +971,27 @@ static SWGPetApi* singletonAPI = nil;
     
     
     
-    files[@"file"] = file;
+    localVarFiles[@"file"] = file;
     
     
     
 
     
-    return [self.apiClient requestWithCompletionBlock: resourcePath
-                                               method: @"POST"
-                                           pathParams: pathParams
-                                          queryParams: queryParams
-                                           formParams: formParams
-                                                files: files
-                                                 body: bodyParam
-                                         headerParams: headerParams
-                                         authSettings: authSettings
-                                   requestContentType: requestContentType
-                                  responseContentType: responseContentType
-                                         responseType: nil
-                                      completionBlock: ^(id data, NSError *error) {
-                  completionBlock(error);
-                  
-              }
+    return [self.apiClient requestWithPath: resourcePath
+                                    method: @"POST"
+                                pathParams: pathParams
+                               queryParams: queryParams
+                                formParams: formParams
+                                     files: localVarFiles
+                                      body: bodyParam
+                              headerParams: headerParams
+                              authSettings: authSettings
+                        requestContentType: requestContentType
+                       responseContentType: responseContentType
+                              responseType: nil
+                           completionBlock: ^(id data, NSError *error) {
+                               handler(error);
+                           }
           ];
 }
 
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGReturn.h b/samples/client/petstore/objc/SwaggerClient/SWGReturn.h
new file mode 100644
index 00000000000..fcce78f3681
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/SWGReturn.h
@@ -0,0 +1,20 @@
+#import <Foundation/Foundation.h>
+#import "SWGObject.h"
+
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+
+
+@protocol SWGReturn
+@end
+
+@interface SWGReturn : SWGObject
+
+
+@property(nonatomic) NSNumber* _return;
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGReturn.m b/samples/client/petstore/objc/SwaggerClient/SWGReturn.m
new file mode 100644
index 00000000000..ad97f1b15e9
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/SWGReturn.m
@@ -0,0 +1,51 @@
+#import "SWGReturn.h"
+
+@implementation SWGReturn
+
+- (instancetype)init {
+  self = [super init];
+
+  if (self) {
+    // initalise property's default value, if any
+    
+  }
+
+  return self;
+}
+
+
+/**
+ * Maps json key to property name.
+ * This method is used by `JSONModel`.
+ */
++ (JSONKeyMapper *)keyMapper
+{
+  return [[JSONKeyMapper alloc] initWithDictionary:@{ @"return": @"_return" }];
+}
+
+/**
+ * Indicates whether the property with the given name is optional.
+ * If `propertyName` is optional, then return `YES`, otherwise return `NO`.
+ * This method is used by `JSONModel`.
+ */
++ (BOOL)propertyIsOptional:(NSString *)propertyName
+{
+  NSArray *optionalProperties = @[@"_return"];
+
+  if ([optionalProperties containsObject:propertyName]) {
+    return YES;
+  }
+  else {
+    return NO;
+  }
+}
+
+/**
+ * Gets the string presentation of the object.
+ * This method will be called when logging model object using `NSLog`.
+ */
+- (NSString *)description {
+    return [[self toDictionary] description];
+}
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGSpecialModelName_.h b/samples/client/petstore/objc/SwaggerClient/SWGSpecialModelName_.h
new file mode 100644
index 00000000000..88187b28877
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/SWGSpecialModelName_.h
@@ -0,0 +1,20 @@
+#import <Foundation/Foundation.h>
+#import "SWGObject.h"
+
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+
+
+@protocol SWGSpecialModelName_
+@end
+
+@interface SWGSpecialModelName_ : SWGObject
+
+
+@property(nonatomic) NSNumber* specialPropertyName;
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGSpecialModelName_.m b/samples/client/petstore/objc/SwaggerClient/SWGSpecialModelName_.m
new file mode 100644
index 00000000000..9e1e680787d
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/SWGSpecialModelName_.m
@@ -0,0 +1,51 @@
+#import "SWGSpecialModelName_.h"
+
+@implementation SWGSpecialModelName_
+
+- (instancetype)init {
+  self = [super init];
+
+  if (self) {
+    // initalise property's default value, if any
+    
+  }
+
+  return self;
+}
+
+
+/**
+ * Maps json key to property name.
+ * This method is used by `JSONModel`.
+ */
++ (JSONKeyMapper *)keyMapper
+{
+  return [[JSONKeyMapper alloc] initWithDictionary:@{ @"$special[property.name]": @"specialPropertyName" }];
+}
+
+/**
+ * Indicates whether the property with the given name is optional.
+ * If `propertyName` is optional, then return `YES`, otherwise return `NO`.
+ * This method is used by `JSONModel`.
+ */
++ (BOOL)propertyIsOptional:(NSString *)propertyName
+{
+  NSArray *optionalProperties = @[@"specialPropertyName"];
+
+  if ([optionalProperties containsObject:propertyName]) {
+    return YES;
+  }
+  else {
+    return NO;
+  }
+}
+
+/**
+ * Gets the string presentation of the object.
+ * This method will be called when logging model object using `NSLog`.
+ */
+- (NSString *)description {
+    return [[self toDictionary] description];
+}
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGStoreApi.h b/samples/client/petstore/objc/SwaggerClient/SWGStoreApi.h
index e1c644ef5f4..d565a01e15b 100644
--- a/samples/client/petstore/objc/SwaggerClient/SWGStoreApi.h
+++ b/samples/client/petstore/objc/SwaggerClient/SWGStoreApi.h
@@ -19,6 +19,32 @@
 -(unsigned long) requestQueueSize;
 +(SWGStoreApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key;
 +(SWGStoreApi*) sharedAPI;
+///
+///
+/// Delete purchase order by ID
+/// For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+///
+/// @param orderId ID of the order that needs to be deleted
+/// 
+///
+/// @return 
+-(NSNumber*) deleteOrderWithOrderId: (NSString*) orderId
+    completionHandler: (void (^)(NSError* error)) handler;
+
+
+///
+///
+/// Finds orders by status
+/// A single status value can be provided as a string
+///
+/// @param status Status value that needs to be considered for query
+/// 
+///
+/// @return NSArray<SWGOrder>*
+-(NSNumber*) findOrdersByStatusWithStatus: (NSString*) status
+    completionHandler: (void (^)(NSArray<SWGOrder>* output, NSError* error)) handler;
+
+
 ///
 ///
 /// Returns pet inventories by status
@@ -27,24 +53,20 @@
 /// 
 ///
 /// @return NSDictionary* /* NSString, NSNumber */
--(NSNumber*) getInventoryWithCompletionBlock :
-    (void (^)(NSDictionary* /* NSString, NSNumber */ output, NSError* error))completionBlock;
-    
+-(NSNumber*) getInventoryWithCompletionHandler: 
+    (void (^)(NSDictionary* /* NSString, NSNumber */ output, NSError* error)) handler;
 
 
 ///
 ///
-/// Place an order for a pet
+/// Fake endpoint to test arbitrary object return by 'Get inventory'
+/// Returns an arbitrary object which is actually a map of status codes to quantities
+///
 /// 
 ///
-/// @param body order placed for purchasing the pet
-/// 
-///
-/// @return SWGOrder*
--(NSNumber*) placeOrderWithCompletionBlock :(SWGOrder*) body 
-    
-    completionHandler: (void (^)(SWGOrder* output, NSError* error))completionBlock;
-    
+/// @return NSObject*
+-(NSNumber*) getInventoryInObjectWithCompletionHandler: 
+    (void (^)(NSObject* output, NSError* error)) handler;
 
 
 ///
@@ -56,25 +78,21 @@
 /// 
 ///
 /// @return SWGOrder*
--(NSNumber*) getOrderByIdWithCompletionBlock :(NSString*) orderId 
-    
-    completionHandler: (void (^)(SWGOrder* output, NSError* error))completionBlock;
-    
+-(NSNumber*) getOrderByIdWithOrderId: (NSString*) orderId
+    completionHandler: (void (^)(SWGOrder* output, NSError* error)) handler;
 
 
 ///
 ///
-/// Delete purchase order by ID
-/// For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
-///
-/// @param orderId ID of the order that needs to be deleted
+/// Place an order for a pet
 /// 
 ///
-/// @return 
--(NSNumber*) deleteOrderWithCompletionBlock :(NSString*) orderId 
-    
-    
-    completionHandler: (void (^)(NSError* error))completionBlock;
+/// @param body order placed for purchasing the pet
+/// 
+///
+/// @return SWGOrder*
+-(NSNumber*) placeOrderWithBody: (SWGOrder*) body
+    completionHandler: (void (^)(SWGOrder* output, NSError* error)) handler;
 
 
 
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGStoreApi.m b/samples/client/petstore/objc/SwaggerClient/SWGStoreApi.m
index 5fdf86b43af..b66ba1f125b 100644
--- a/samples/client/petstore/objc/SwaggerClient/SWGStoreApi.m
+++ b/samples/client/petstore/objc/SwaggerClient/SWGStoreApi.m
@@ -69,256 +69,15 @@ static SWGStoreApi* singletonAPI = nil;
 
 #pragma mark - Api Methods
 
-///
-/// Returns pet inventories by status
-/// Returns a map of status codes to quantities
-///  @returns NSDictionary* /* NSString, NSNumber */
-///
--(NSNumber*) getInventoryWithCompletionBlock: 
-        (void (^)(NSDictionary* /* NSString, NSNumber */ output, NSError* error))completionBlock { 
-        
-
-    
-
-    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/store/inventory"];
-
-    // remove format in URL if needed
-    if ([resourcePath rangeOfString:@".{format}"].location != NSNotFound) {
-        [resourcePath replaceCharactersInRange: [resourcePath rangeOfString:@".{format}"] withString:@".json"];
-    }
-
-    NSMutableDictionary *pathParams = [[NSMutableDictionary alloc] init];
-    
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    
-    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
-
-    
-
-    // HTTP header `Accept`
-    headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]];
-    if ([headerParams[@"Accept"] length] == 0) {
-        [headerParams removeObjectForKey:@"Accept"];
-    }
-
-    // response content type
-    NSString *responseContentType;
-    if ([headerParams objectForKey:@"Accept"]) {
-        responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0];
-    }
-    else {
-        responseContentType = @"";
-    }
-
-    // request content type
-    NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]];
-
-    // Authentication setting
-    NSArray *authSettings = @[@"api_key"];
-
-    id bodyParam = nil;
-    NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
-    
-    
-    
-
-    
-    return [self.apiClient requestWithCompletionBlock: resourcePath
-                                               method: @"GET"
-                                           pathParams: pathParams
-                                          queryParams: queryParams
-                                           formParams: formParams
-                                                files: files
-                                                 body: bodyParam
-                                         headerParams: headerParams
-                                         authSettings: authSettings
-                                   requestContentType: requestContentType
-                                  responseContentType: responseContentType
-                                         responseType: @"NSDictionary* /* NSString, NSNumber */"
-                                      completionBlock: ^(id data, NSError *error) {
-                  
-                  completionBlock((NSDictionary* /* NSString, NSNumber */)data, error);
-              }
-          ];
-}
-
-///
-/// Place an order for a pet
-/// 
-///  @param body order placed for purchasing the pet
-///
-///  @returns SWGOrder*
-///
--(NSNumber*) placeOrderWithCompletionBlock: (SWGOrder*) body
-        
-        completionHandler: (void (^)(SWGOrder* output, NSError* error))completionBlock { 
-        
-
-    
-
-    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/store/order"];
-
-    // remove format in URL if needed
-    if ([resourcePath rangeOfString:@".{format}"].location != NSNotFound) {
-        [resourcePath replaceCharactersInRange: [resourcePath rangeOfString:@".{format}"] withString:@".json"];
-    }
-
-    NSMutableDictionary *pathParams = [[NSMutableDictionary alloc] init];
-    
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    
-    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
-
-    
-
-    // HTTP header `Accept`
-    headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]];
-    if ([headerParams[@"Accept"] length] == 0) {
-        [headerParams removeObjectForKey:@"Accept"];
-    }
-
-    // response content type
-    NSString *responseContentType;
-    if ([headerParams objectForKey:@"Accept"]) {
-        responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0];
-    }
-    else {
-        responseContentType = @"";
-    }
-
-    // request content type
-    NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]];
-
-    // Authentication setting
-    NSArray *authSettings = @[];
-
-    id bodyParam = nil;
-    NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
-    
-    bodyParam = body;
-    
-
-    
-    return [self.apiClient requestWithCompletionBlock: resourcePath
-                                               method: @"POST"
-                                           pathParams: pathParams
-                                          queryParams: queryParams
-                                           formParams: formParams
-                                                files: files
-                                                 body: bodyParam
-                                         headerParams: headerParams
-                                         authSettings: authSettings
-                                   requestContentType: requestContentType
-                                  responseContentType: responseContentType
-                                         responseType: @"SWGOrder*"
-                                      completionBlock: ^(id data, NSError *error) {
-                  
-                  completionBlock((SWGOrder*)data, error);
-              }
-          ];
-}
-
-///
-/// Find purchase order by ID
-/// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
-///  @param orderId ID of pet that needs to be fetched
-///
-///  @returns SWGOrder*
-///
--(NSNumber*) getOrderByIdWithCompletionBlock: (NSString*) orderId
-        
-        completionHandler: (void (^)(SWGOrder* output, NSError* error))completionBlock { 
-        
-
-    
-    // verify the required parameter 'orderId' is set
-    if (orderId == nil) {
-        [NSException raise:@"Invalid parameter" format:@"Missing the required parameter `orderId` when calling `getOrderById`"];
-    }
-    
-
-    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/store/order/{orderId}"];
-
-    // remove format in URL if needed
-    if ([resourcePath rangeOfString:@".{format}"].location != NSNotFound) {
-        [resourcePath replaceCharactersInRange: [resourcePath rangeOfString:@".{format}"] withString:@".json"];
-    }
-
-    NSMutableDictionary *pathParams = [[NSMutableDictionary alloc] init];
-    if (orderId != nil) {
-        pathParams[@"orderId"] = orderId;
-    }
-    
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    
-    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
-
-    
-
-    // HTTP header `Accept`
-    headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]];
-    if ([headerParams[@"Accept"] length] == 0) {
-        [headerParams removeObjectForKey:@"Accept"];
-    }
-
-    // response content type
-    NSString *responseContentType;
-    if ([headerParams objectForKey:@"Accept"]) {
-        responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0];
-    }
-    else {
-        responseContentType = @"";
-    }
-
-    // request content type
-    NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]];
-
-    // Authentication setting
-    NSArray *authSettings = @[];
-
-    id bodyParam = nil;
-    NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
-    
-    
-    
-
-    
-    return [self.apiClient requestWithCompletionBlock: resourcePath
-                                               method: @"GET"
-                                           pathParams: pathParams
-                                          queryParams: queryParams
-                                           formParams: formParams
-                                                files: files
-                                                 body: bodyParam
-                                         headerParams: headerParams
-                                         authSettings: authSettings
-                                   requestContentType: requestContentType
-                                  responseContentType: responseContentType
-                                         responseType: @"SWGOrder*"
-                                      completionBlock: ^(id data, NSError *error) {
-                  
-                  completionBlock((SWGOrder*)data, error);
-              }
-          ];
-}
-
 ///
 /// Delete purchase order by ID
 /// For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
-///  @param orderId ID of the order that needs to be deleted
+///  @param orderId ID of the order that needs to be deleted 
 ///
 ///  @returns void
 ///
--(NSNumber*) deleteOrderWithCompletionBlock: (NSString*) orderId
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock { 
+-(NSNumber*) deleteOrderWithOrderId: (NSString*) orderId
+    completionHandler: (void (^)(NSError* error)) handler {
 
     
     // verify the required parameter 'orderId' is set
@@ -369,28 +128,410 @@ static SWGStoreApi* singletonAPI = nil;
 
     id bodyParam = nil;
     NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
     
     
     
 
     
-    return [self.apiClient requestWithCompletionBlock: resourcePath
-                                               method: @"DELETE"
-                                           pathParams: pathParams
-                                          queryParams: queryParams
-                                           formParams: formParams
-                                                files: files
-                                                 body: bodyParam
-                                         headerParams: headerParams
-                                         authSettings: authSettings
-                                   requestContentType: requestContentType
-                                  responseContentType: responseContentType
-                                         responseType: nil
-                                      completionBlock: ^(id data, NSError *error) {
-                  completionBlock(error);
-                  
-              }
+    return [self.apiClient requestWithPath: resourcePath
+                                    method: @"DELETE"
+                                pathParams: pathParams
+                               queryParams: queryParams
+                                formParams: formParams
+                                     files: localVarFiles
+                                      body: bodyParam
+                              headerParams: headerParams
+                              authSettings: authSettings
+                        requestContentType: requestContentType
+                       responseContentType: responseContentType
+                              responseType: nil
+                           completionBlock: ^(id data, NSError *error) {
+                               handler(error);
+                           }
+          ];
+}
+
+///
+/// Finds orders by status
+/// A single status value can be provided as a string
+///  @param status Status value that needs to be considered for query (optional, default to placed)
+///
+///  @returns NSArray<SWGOrder>*
+///
+-(NSNumber*) findOrdersByStatusWithStatus: (NSString*) status
+    completionHandler: (void (^)(NSArray<SWGOrder>* output, NSError* error)) handler {
+
+    
+
+    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/store/findByStatus"];
+
+    // remove format in URL if needed
+    if ([resourcePath rangeOfString:@".{format}"].location != NSNotFound) {
+        [resourcePath replaceCharactersInRange: [resourcePath rangeOfString:@".{format}"] withString:@".json"];
+    }
+
+    NSMutableDictionary *pathParams = [[NSMutableDictionary alloc] init];
+    
+
+    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
+    if (status != nil) {
+        
+        queryParams[@"status"] = status;
+    }
+    
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
+    
+
+    // HTTP header `Accept`
+    headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]];
+    if ([headerParams[@"Accept"] length] == 0) {
+        [headerParams removeObjectForKey:@"Accept"];
+    }
+
+    // response content type
+    NSString *responseContentType;
+    if ([headerParams objectForKey:@"Accept"]) {
+        responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0];
+    }
+    else {
+        responseContentType = @"";
+    }
+
+    // request content type
+    NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]];
+
+    // Authentication setting
+    NSArray *authSettings = @[@"test_api_client_id", @"test_api_client_secret"];
+
+    id bodyParam = nil;
+    NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
+    
+    
+    
+
+    
+    return [self.apiClient requestWithPath: resourcePath
+                                    method: @"GET"
+                                pathParams: pathParams
+                               queryParams: queryParams
+                                formParams: formParams
+                                     files: localVarFiles
+                                      body: bodyParam
+                              headerParams: headerParams
+                              authSettings: authSettings
+                        requestContentType: requestContentType
+                       responseContentType: responseContentType
+                              responseType: @"NSArray<SWGOrder>*"
+                           completionBlock: ^(id data, NSError *error) {
+                               handler((NSArray<SWGOrder>*)data, error);
+                           }
+          ];
+}
+
+///
+/// Returns pet inventories by status
+/// Returns a map of status codes to quantities
+///  @returns NSDictionary* /* NSString, NSNumber */
+///
+-(NSNumber*) getInventoryWithCompletionHandler: 
+    (void (^)(NSDictionary* /* NSString, NSNumber */ output, NSError* error)) handler {
+
+    
+
+    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/store/inventory"];
+
+    // remove format in URL if needed
+    if ([resourcePath rangeOfString:@".{format}"].location != NSNotFound) {
+        [resourcePath replaceCharactersInRange: [resourcePath rangeOfString:@".{format}"] withString:@".json"];
+    }
+
+    NSMutableDictionary *pathParams = [[NSMutableDictionary alloc] init];
+    
+
+    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
+    
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
+    
+
+    // HTTP header `Accept`
+    headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]];
+    if ([headerParams[@"Accept"] length] == 0) {
+        [headerParams removeObjectForKey:@"Accept"];
+    }
+
+    // response content type
+    NSString *responseContentType;
+    if ([headerParams objectForKey:@"Accept"]) {
+        responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0];
+    }
+    else {
+        responseContentType = @"";
+    }
+
+    // request content type
+    NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]];
+
+    // Authentication setting
+    NSArray *authSettings = @[@"api_key"];
+
+    id bodyParam = nil;
+    NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
+    
+    
+    
+
+    
+    return [self.apiClient requestWithPath: resourcePath
+                                    method: @"GET"
+                                pathParams: pathParams
+                               queryParams: queryParams
+                                formParams: formParams
+                                     files: localVarFiles
+                                      body: bodyParam
+                              headerParams: headerParams
+                              authSettings: authSettings
+                        requestContentType: requestContentType
+                       responseContentType: responseContentType
+                              responseType: @"NSDictionary* /* NSString, NSNumber */"
+                           completionBlock: ^(id data, NSError *error) {
+                               handler((NSDictionary* /* NSString, NSNumber */)data, error);
+                           }
+          ];
+}
+
+///
+/// Fake endpoint to test arbitrary object return by 'Get inventory'
+/// Returns an arbitrary object which is actually a map of status codes to quantities
+///  @returns NSObject*
+///
+-(NSNumber*) getInventoryInObjectWithCompletionHandler: 
+    (void (^)(NSObject* output, NSError* error)) handler {
+
+    
+
+    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/store/inventory?response=arbitrary_object"];
+
+    // remove format in URL if needed
+    if ([resourcePath rangeOfString:@".{format}"].location != NSNotFound) {
+        [resourcePath replaceCharactersInRange: [resourcePath rangeOfString:@".{format}"] withString:@".json"];
+    }
+
+    NSMutableDictionary *pathParams = [[NSMutableDictionary alloc] init];
+    
+
+    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
+    
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
+    
+
+    // HTTP header `Accept`
+    headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]];
+    if ([headerParams[@"Accept"] length] == 0) {
+        [headerParams removeObjectForKey:@"Accept"];
+    }
+
+    // response content type
+    NSString *responseContentType;
+    if ([headerParams objectForKey:@"Accept"]) {
+        responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0];
+    }
+    else {
+        responseContentType = @"";
+    }
+
+    // request content type
+    NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]];
+
+    // Authentication setting
+    NSArray *authSettings = @[@"api_key"];
+
+    id bodyParam = nil;
+    NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
+    
+    
+    
+
+    
+    return [self.apiClient requestWithPath: resourcePath
+                                    method: @"GET"
+                                pathParams: pathParams
+                               queryParams: queryParams
+                                formParams: formParams
+                                     files: localVarFiles
+                                      body: bodyParam
+                              headerParams: headerParams
+                              authSettings: authSettings
+                        requestContentType: requestContentType
+                       responseContentType: responseContentType
+                              responseType: @"NSObject*"
+                           completionBlock: ^(id data, NSError *error) {
+                               handler((NSObject*)data, error);
+                           }
+          ];
+}
+
+///
+/// Find purchase order by ID
+/// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+///  @param orderId ID of pet that needs to be fetched 
+///
+///  @returns SWGOrder*
+///
+-(NSNumber*) getOrderByIdWithOrderId: (NSString*) orderId
+    completionHandler: (void (^)(SWGOrder* output, NSError* error)) handler {
+
+    
+    // verify the required parameter 'orderId' is set
+    if (orderId == nil) {
+        [NSException raise:@"Invalid parameter" format:@"Missing the required parameter `orderId` when calling `getOrderById`"];
+    }
+    
+
+    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/store/order/{orderId}"];
+
+    // remove format in URL if needed
+    if ([resourcePath rangeOfString:@".{format}"].location != NSNotFound) {
+        [resourcePath replaceCharactersInRange: [resourcePath rangeOfString:@".{format}"] withString:@".json"];
+    }
+
+    NSMutableDictionary *pathParams = [[NSMutableDictionary alloc] init];
+    if (orderId != nil) {
+        pathParams[@"orderId"] = orderId;
+    }
+    
+
+    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
+    
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
+    
+
+    // HTTP header `Accept`
+    headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]];
+    if ([headerParams[@"Accept"] length] == 0) {
+        [headerParams removeObjectForKey:@"Accept"];
+    }
+
+    // response content type
+    NSString *responseContentType;
+    if ([headerParams objectForKey:@"Accept"]) {
+        responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0];
+    }
+    else {
+        responseContentType = @"";
+    }
+
+    // request content type
+    NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]];
+
+    // Authentication setting
+    NSArray *authSettings = @[@"test_api_key_header", @"test_api_key_query"];
+
+    id bodyParam = nil;
+    NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
+    
+    
+    
+
+    
+    return [self.apiClient requestWithPath: resourcePath
+                                    method: @"GET"
+                                pathParams: pathParams
+                               queryParams: queryParams
+                                formParams: formParams
+                                     files: localVarFiles
+                                      body: bodyParam
+                              headerParams: headerParams
+                              authSettings: authSettings
+                        requestContentType: requestContentType
+                       responseContentType: responseContentType
+                              responseType: @"SWGOrder*"
+                           completionBlock: ^(id data, NSError *error) {
+                               handler((SWGOrder*)data, error);
+                           }
+          ];
+}
+
+///
+/// Place an order for a pet
+/// 
+///  @param body order placed for purchasing the pet (optional)
+///
+///  @returns SWGOrder*
+///
+-(NSNumber*) placeOrderWithBody: (SWGOrder*) body
+    completionHandler: (void (^)(SWGOrder* output, NSError* error)) handler {
+
+    
+
+    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/store/order"];
+
+    // remove format in URL if needed
+    if ([resourcePath rangeOfString:@".{format}"].location != NSNotFound) {
+        [resourcePath replaceCharactersInRange: [resourcePath rangeOfString:@".{format}"] withString:@".json"];
+    }
+
+    NSMutableDictionary *pathParams = [[NSMutableDictionary alloc] init];
+    
+
+    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
+    
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
+    
+
+    // HTTP header `Accept`
+    headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]];
+    if ([headerParams[@"Accept"] length] == 0) {
+        [headerParams removeObjectForKey:@"Accept"];
+    }
+
+    // response content type
+    NSString *responseContentType;
+    if ([headerParams objectForKey:@"Accept"]) {
+        responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0];
+    }
+    else {
+        responseContentType = @"";
+    }
+
+    // request content type
+    NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]];
+
+    // Authentication setting
+    NSArray *authSettings = @[@"test_api_client_id", @"test_api_client_secret"];
+
+    id bodyParam = nil;
+    NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
+    
+    bodyParam = body;
+    
+
+    
+    return [self.apiClient requestWithPath: resourcePath
+                                    method: @"POST"
+                                pathParams: pathParams
+                               queryParams: queryParams
+                                formParams: formParams
+                                     files: localVarFiles
+                                      body: bodyParam
+                              headerParams: headerParams
+                              authSettings: authSettings
+                        requestContentType: requestContentType
+                       responseContentType: responseContentType
+                              responseType: @"SWGOrder*"
+                           completionBlock: ^(id data, NSError *error) {
+                               handler((SWGOrder*)data, error);
+                           }
           ];
 }
 
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGTag.m b/samples/client/petstore/objc/SwaggerClient/SWGTag.m
index b19085e2e6b..9eb00a157e3 100644
--- a/samples/client/petstore/objc/SwaggerClient/SWGTag.m
+++ b/samples/client/petstore/objc/SwaggerClient/SWGTag.m
@@ -13,6 +13,7 @@
   return self;
 }
 
+
 /**
  * Maps json key to property name.
  * This method is used by `JSONModel`.
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGUser.m b/samples/client/petstore/objc/SwaggerClient/SWGUser.m
index ac059240e7f..2445dd37854 100644
--- a/samples/client/petstore/objc/SwaggerClient/SWGUser.m
+++ b/samples/client/petstore/objc/SwaggerClient/SWGUser.m
@@ -13,6 +13,7 @@
   return self;
 }
 
+
 /**
  * Maps json key to property name.
  * This method is used by `JSONModel`.
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGUserApi.h b/samples/client/petstore/objc/SwaggerClient/SWGUserApi.h
index 21f314684fd..209e0c4a1d6 100644
--- a/samples/client/petstore/objc/SwaggerClient/SWGUserApi.h
+++ b/samples/client/petstore/objc/SwaggerClient/SWGUserApi.h
@@ -28,10 +28,8 @@
 /// 
 ///
 /// @return 
--(NSNumber*) createUserWithCompletionBlock :(SWGUser*) body 
-    
-    
-    completionHandler: (void (^)(NSError* error))completionBlock;
+-(NSNumber*) createUserWithBody: (SWGUser*) body
+    completionHandler: (void (^)(NSError* error)) handler;
 
 
 ///
@@ -43,10 +41,8 @@
 /// 
 ///
 /// @return 
--(NSNumber*) createUsersWithArrayInputWithCompletionBlock :(NSArray<SWGUser>*) body 
-    
-    
-    completionHandler: (void (^)(NSError* error))completionBlock;
+-(NSNumber*) createUsersWithArrayInputWithBody: (NSArray<SWGUser>*) body
+    completionHandler: (void (^)(NSError* error)) handler;
 
 
 ///
@@ -58,10 +54,34 @@
 /// 
 ///
 /// @return 
--(NSNumber*) createUsersWithListInputWithCompletionBlock :(NSArray<SWGUser>*) body 
-    
-    
-    completionHandler: (void (^)(NSError* error))completionBlock;
+-(NSNumber*) createUsersWithListInputWithBody: (NSArray<SWGUser>*) body
+    completionHandler: (void (^)(NSError* error)) handler;
+
+
+///
+///
+/// Delete user
+/// This can only be done by the logged in user.
+///
+/// @param username The name that needs to be deleted
+/// 
+///
+/// @return 
+-(NSNumber*) deleteUserWithUsername: (NSString*) username
+    completionHandler: (void (^)(NSError* error)) handler;
+
+
+///
+///
+/// Get user by user name
+/// 
+///
+/// @param username The name that needs to be fetched. Use user1 for testing.
+/// 
+///
+/// @return SWGUser*
+-(NSNumber*) getUserByNameWithUsername: (NSString*) username
+    completionHandler: (void (^)(SWGUser* output, NSError* error)) handler;
 
 
 ///
@@ -74,11 +94,9 @@
 /// 
 ///
 /// @return NSString*
--(NSNumber*) loginUserWithCompletionBlock :(NSString*) username 
-     password:(NSString*) password 
-    
-    completionHandler: (void (^)(NSString* output, NSError* error))completionBlock;
-    
+-(NSNumber*) loginUserWithUsername: (NSString*) username
+    password: (NSString*) password
+    completionHandler: (void (^)(NSString* output, NSError* error)) handler;
 
 
 ///
@@ -89,24 +107,8 @@
 /// 
 ///
 /// @return 
--(NSNumber*) logoutUserWithCompletionBlock :
-    
-    (void (^)(NSError* error))completionBlock;
-
-
-///
-///
-/// Get user by user name
-/// 
-///
-/// @param username The name that needs to be fetched. Use user1 for testing.
-/// 
-///
-/// @return SWGUser*
--(NSNumber*) getUserByNameWithCompletionBlock :(NSString*) username 
-    
-    completionHandler: (void (^)(SWGUser* output, NSError* error))completionBlock;
-    
+-(NSNumber*) logoutUserWithCompletionHandler: 
+    (void (^)(NSError* error)) handler;
 
 
 ///
@@ -119,26 +121,9 @@
 /// 
 ///
 /// @return 
--(NSNumber*) updateUserWithCompletionBlock :(NSString*) username 
-     body:(SWGUser*) body 
-    
-    
-    completionHandler: (void (^)(NSError* error))completionBlock;
-
-
-///
-///
-/// Delete user
-/// This can only be done by the logged in user.
-///
-/// @param username The name that needs to be deleted
-/// 
-///
-/// @return 
--(NSNumber*) deleteUserWithCompletionBlock :(NSString*) username 
-    
-    
-    completionHandler: (void (^)(NSError* error))completionBlock;
+-(NSNumber*) updateUserWithUsername: (NSString*) username
+    body: (SWGUser*) body
+    completionHandler: (void (^)(NSError* error)) handler;
 
 
 
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGUserApi.m b/samples/client/petstore/objc/SwaggerClient/SWGUserApi.m
index faf0f928baf..7699ca74bcf 100644
--- a/samples/client/petstore/objc/SwaggerClient/SWGUserApi.m
+++ b/samples/client/petstore/objc/SwaggerClient/SWGUserApi.m
@@ -72,14 +72,12 @@ static SWGUserApi* singletonAPI = nil;
 ///
 /// Create user
 /// This can only be done by the logged in user.
-///  @param body Created user object
+///  @param body Created user object (optional)
 ///
 ///  @returns void
 ///
--(NSNumber*) createUserWithCompletionBlock: (SWGUser*) body
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock { 
+-(NSNumber*) createUserWithBody: (SWGUser*) body
+    completionHandler: (void (^)(NSError* error)) handler {
 
     
 
@@ -122,42 +120,39 @@ static SWGUserApi* singletonAPI = nil;
 
     id bodyParam = nil;
     NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
     
     bodyParam = body;
     
 
     
-    return [self.apiClient requestWithCompletionBlock: resourcePath
-                                               method: @"POST"
-                                           pathParams: pathParams
-                                          queryParams: queryParams
-                                           formParams: formParams
-                                                files: files
-                                                 body: bodyParam
-                                         headerParams: headerParams
-                                         authSettings: authSettings
-                                   requestContentType: requestContentType
-                                  responseContentType: responseContentType
-                                         responseType: nil
-                                      completionBlock: ^(id data, NSError *error) {
-                  completionBlock(error);
-                  
-              }
+    return [self.apiClient requestWithPath: resourcePath
+                                    method: @"POST"
+                                pathParams: pathParams
+                               queryParams: queryParams
+                                formParams: formParams
+                                     files: localVarFiles
+                                      body: bodyParam
+                              headerParams: headerParams
+                              authSettings: authSettings
+                        requestContentType: requestContentType
+                       responseContentType: responseContentType
+                              responseType: nil
+                           completionBlock: ^(id data, NSError *error) {
+                               handler(error);
+                           }
           ];
 }
 
 ///
 /// Creates list of users with given input array
 /// 
-///  @param body List of user object
+///  @param body List of user object (optional)
 ///
 ///  @returns void
 ///
--(NSNumber*) createUsersWithArrayInputWithCompletionBlock: (NSArray<SWGUser>*) body
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock { 
+-(NSNumber*) createUsersWithArrayInputWithBody: (NSArray<SWGUser>*) body
+    completionHandler: (void (^)(NSError* error)) handler {
 
     
 
@@ -200,42 +195,39 @@ static SWGUserApi* singletonAPI = nil;
 
     id bodyParam = nil;
     NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
     
     bodyParam = body;
     
 
     
-    return [self.apiClient requestWithCompletionBlock: resourcePath
-                                               method: @"POST"
-                                           pathParams: pathParams
-                                          queryParams: queryParams
-                                           formParams: formParams
-                                                files: files
-                                                 body: bodyParam
-                                         headerParams: headerParams
-                                         authSettings: authSettings
-                                   requestContentType: requestContentType
-                                  responseContentType: responseContentType
-                                         responseType: nil
-                                      completionBlock: ^(id data, NSError *error) {
-                  completionBlock(error);
-                  
-              }
+    return [self.apiClient requestWithPath: resourcePath
+                                    method: @"POST"
+                                pathParams: pathParams
+                               queryParams: queryParams
+                                formParams: formParams
+                                     files: localVarFiles
+                                      body: bodyParam
+                              headerParams: headerParams
+                              authSettings: authSettings
+                        requestContentType: requestContentType
+                       responseContentType: responseContentType
+                              responseType: nil
+                           completionBlock: ^(id data, NSError *error) {
+                               handler(error);
+                           }
           ];
 }
 
 ///
 /// Creates list of users with given input array
 /// 
-///  @param body List of user object
+///  @param body List of user object (optional)
 ///
 ///  @returns void
 ///
--(NSNumber*) createUsersWithListInputWithCompletionBlock: (NSArray<SWGUser>*) body
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock { 
+-(NSNumber*) createUsersWithListInputWithBody: (NSArray<SWGUser>*) body
+    completionHandler: (void (^)(NSError* error)) handler {
 
     
 
@@ -278,132 +270,48 @@ static SWGUserApi* singletonAPI = nil;
 
     id bodyParam = nil;
     NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
     
     bodyParam = body;
     
 
     
-    return [self.apiClient requestWithCompletionBlock: resourcePath
-                                               method: @"POST"
-                                           pathParams: pathParams
-                                          queryParams: queryParams
-                                           formParams: formParams
-                                                files: files
-                                                 body: bodyParam
-                                         headerParams: headerParams
-                                         authSettings: authSettings
-                                   requestContentType: requestContentType
-                                  responseContentType: responseContentType
-                                         responseType: nil
-                                      completionBlock: ^(id data, NSError *error) {
-                  completionBlock(error);
-                  
-              }
+    return [self.apiClient requestWithPath: resourcePath
+                                    method: @"POST"
+                                pathParams: pathParams
+                               queryParams: queryParams
+                                formParams: formParams
+                                     files: localVarFiles
+                                      body: bodyParam
+                              headerParams: headerParams
+                              authSettings: authSettings
+                        requestContentType: requestContentType
+                       responseContentType: responseContentType
+                              responseType: nil
+                           completionBlock: ^(id data, NSError *error) {
+                               handler(error);
+                           }
           ];
 }
 
 ///
-/// Logs user into the system
-/// 
-///  @param username The user name for login
+/// Delete user
+/// This can only be done by the logged in user.
+///  @param username The name that needs to be deleted 
 ///
-///  @param password The password for login in clear text
-///
-///  @returns NSString*
-///
--(NSNumber*) loginUserWithCompletionBlock: (NSString*) username
-         password: (NSString*) password
-        
-        completionHandler: (void (^)(NSString* output, NSError* error))completionBlock { 
-        
-
-    
-
-    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/user/login"];
-
-    // remove format in URL if needed
-    if ([resourcePath rangeOfString:@".{format}"].location != NSNotFound) {
-        [resourcePath replaceCharactersInRange: [resourcePath rangeOfString:@".{format}"] withString:@".json"];
-    }
-
-    NSMutableDictionary *pathParams = [[NSMutableDictionary alloc] init];
-    
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if (username != nil) {
-        
-        queryParams[@"username"] = username;
-    }
-    if (password != nil) {
-        
-        queryParams[@"password"] = password;
-    }
-    
-    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
-
-    
-
-    // HTTP header `Accept`
-    headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]];
-    if ([headerParams[@"Accept"] length] == 0) {
-        [headerParams removeObjectForKey:@"Accept"];
-    }
-
-    // response content type
-    NSString *responseContentType;
-    if ([headerParams objectForKey:@"Accept"]) {
-        responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0];
-    }
-    else {
-        responseContentType = @"";
-    }
-
-    // request content type
-    NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]];
-
-    // Authentication setting
-    NSArray *authSettings = @[];
-
-    id bodyParam = nil;
-    NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
-    
-    
-    
-
-    
-    return [self.apiClient requestWithCompletionBlock: resourcePath
-                                               method: @"GET"
-                                           pathParams: pathParams
-                                          queryParams: queryParams
-                                           formParams: formParams
-                                                files: files
-                                                 body: bodyParam
-                                         headerParams: headerParams
-                                         authSettings: authSettings
-                                   requestContentType: requestContentType
-                                  responseContentType: responseContentType
-                                         responseType: @"NSString*"
-                                      completionBlock: ^(id data, NSError *error) {
-                  
-                  completionBlock((NSString*)data, error);
-              }
-          ];
-}
-
-///
-/// Logs out current logged in user session
-/// 
 ///  @returns void
 ///
--(NSNumber*) logoutUserWithCompletionBlock: 
-        
-        (void (^)(NSError* error))completionBlock { 
+-(NSNumber*) deleteUserWithUsername: (NSString*) username
+    completionHandler: (void (^)(NSError* error)) handler {
 
     
+    // verify the required parameter 'username' is set
+    if (username == nil) {
+        [NSException raise:@"Invalid parameter" format:@"Missing the required parameter `username` when calling `deleteUser`"];
+    }
+    
 
-    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/user/logout"];
+    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/user/{username}"];
 
     // remove format in URL if needed
     if ([resourcePath rangeOfString:@".{format}"].location != NSNotFound) {
@@ -411,6 +319,9 @@ static SWGUserApi* singletonAPI = nil;
     }
 
     NSMutableDictionary *pathParams = [[NSMutableDictionary alloc] init];
+    if (username != nil) {
+        pathParams[@"username"] = username;
+    }
     
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
@@ -438,46 +349,43 @@ static SWGUserApi* singletonAPI = nil;
     NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]];
 
     // Authentication setting
-    NSArray *authSettings = @[];
+    NSArray *authSettings = @[@"test_http_basic"];
 
     id bodyParam = nil;
     NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
     
     
     
 
     
-    return [self.apiClient requestWithCompletionBlock: resourcePath
-                                               method: @"GET"
-                                           pathParams: pathParams
-                                          queryParams: queryParams
-                                           formParams: formParams
-                                                files: files
-                                                 body: bodyParam
-                                         headerParams: headerParams
-                                         authSettings: authSettings
-                                   requestContentType: requestContentType
-                                  responseContentType: responseContentType
-                                         responseType: nil
-                                      completionBlock: ^(id data, NSError *error) {
-                  completionBlock(error);
-                  
-              }
+    return [self.apiClient requestWithPath: resourcePath
+                                    method: @"DELETE"
+                                pathParams: pathParams
+                               queryParams: queryParams
+                                formParams: formParams
+                                     files: localVarFiles
+                                      body: bodyParam
+                              headerParams: headerParams
+                              authSettings: authSettings
+                        requestContentType: requestContentType
+                       responseContentType: responseContentType
+                              responseType: nil
+                           completionBlock: ^(id data, NSError *error) {
+                               handler(error);
+                           }
           ];
 }
 
 ///
 /// Get user by user name
 /// 
-///  @param username The name that needs to be fetched. Use user1 for testing.
+///  @param username The name that needs to be fetched. Use user1 for testing. 
 ///
 ///  @returns SWGUser*
 ///
--(NSNumber*) getUserByNameWithCompletionBlock: (NSString*) username
-        
-        completionHandler: (void (^)(SWGUser* output, NSError* error))completionBlock { 
-        
+-(NSNumber*) getUserByNameWithUsername: (NSString*) username
+    completionHandler: (void (^)(SWGUser* output, NSError* error)) handler {
 
     
     // verify the required parameter 'username' is set
@@ -528,45 +436,201 @@ static SWGUserApi* singletonAPI = nil;
 
     id bodyParam = nil;
     NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
     
     
     
 
     
-    return [self.apiClient requestWithCompletionBlock: resourcePath
-                                               method: @"GET"
-                                           pathParams: pathParams
-                                          queryParams: queryParams
-                                           formParams: formParams
-                                                files: files
-                                                 body: bodyParam
-                                         headerParams: headerParams
-                                         authSettings: authSettings
-                                   requestContentType: requestContentType
-                                  responseContentType: responseContentType
-                                         responseType: @"SWGUser*"
-                                      completionBlock: ^(id data, NSError *error) {
-                  
-                  completionBlock((SWGUser*)data, error);
-              }
+    return [self.apiClient requestWithPath: resourcePath
+                                    method: @"GET"
+                                pathParams: pathParams
+                               queryParams: queryParams
+                                formParams: formParams
+                                     files: localVarFiles
+                                      body: bodyParam
+                              headerParams: headerParams
+                              authSettings: authSettings
+                        requestContentType: requestContentType
+                       responseContentType: responseContentType
+                              responseType: @"SWGUser*"
+                           completionBlock: ^(id data, NSError *error) {
+                               handler((SWGUser*)data, error);
+                           }
+          ];
+}
+
+///
+/// Logs user into the system
+/// 
+///  @param username The user name for login (optional)
+///
+///  @param password The password for login in clear text (optional)
+///
+///  @returns NSString*
+///
+-(NSNumber*) loginUserWithUsername: (NSString*) username
+    password: (NSString*) password
+    completionHandler: (void (^)(NSString* output, NSError* error)) handler {
+
+    
+
+    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/user/login"];
+
+    // remove format in URL if needed
+    if ([resourcePath rangeOfString:@".{format}"].location != NSNotFound) {
+        [resourcePath replaceCharactersInRange: [resourcePath rangeOfString:@".{format}"] withString:@".json"];
+    }
+
+    NSMutableDictionary *pathParams = [[NSMutableDictionary alloc] init];
+    
+
+    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
+    if (username != nil) {
+        
+        queryParams[@"username"] = username;
+    }
+    if (password != nil) {
+        
+        queryParams[@"password"] = password;
+    }
+    
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
+    
+
+    // HTTP header `Accept`
+    headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]];
+    if ([headerParams[@"Accept"] length] == 0) {
+        [headerParams removeObjectForKey:@"Accept"];
+    }
+
+    // response content type
+    NSString *responseContentType;
+    if ([headerParams objectForKey:@"Accept"]) {
+        responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0];
+    }
+    else {
+        responseContentType = @"";
+    }
+
+    // request content type
+    NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]];
+
+    // Authentication setting
+    NSArray *authSettings = @[];
+
+    id bodyParam = nil;
+    NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
+    
+    
+    
+
+    
+    return [self.apiClient requestWithPath: resourcePath
+                                    method: @"GET"
+                                pathParams: pathParams
+                               queryParams: queryParams
+                                formParams: formParams
+                                     files: localVarFiles
+                                      body: bodyParam
+                              headerParams: headerParams
+                              authSettings: authSettings
+                        requestContentType: requestContentType
+                       responseContentType: responseContentType
+                              responseType: @"NSString*"
+                           completionBlock: ^(id data, NSError *error) {
+                               handler((NSString*)data, error);
+                           }
+          ];
+}
+
+///
+/// Logs out current logged in user session
+/// 
+///  @returns void
+///
+-(NSNumber*) logoutUserWithCompletionHandler: 
+    (void (^)(NSError* error)) handler {
+
+    
+
+    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/user/logout"];
+
+    // remove format in URL if needed
+    if ([resourcePath rangeOfString:@".{format}"].location != NSNotFound) {
+        [resourcePath replaceCharactersInRange: [resourcePath rangeOfString:@".{format}"] withString:@".json"];
+    }
+
+    NSMutableDictionary *pathParams = [[NSMutableDictionary alloc] init];
+    
+
+    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
+    
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
+    
+
+    // HTTP header `Accept`
+    headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]];
+    if ([headerParams[@"Accept"] length] == 0) {
+        [headerParams removeObjectForKey:@"Accept"];
+    }
+
+    // response content type
+    NSString *responseContentType;
+    if ([headerParams objectForKey:@"Accept"]) {
+        responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0];
+    }
+    else {
+        responseContentType = @"";
+    }
+
+    // request content type
+    NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]];
+
+    // Authentication setting
+    NSArray *authSettings = @[];
+
+    id bodyParam = nil;
+    NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
+    
+    
+    
+
+    
+    return [self.apiClient requestWithPath: resourcePath
+                                    method: @"GET"
+                                pathParams: pathParams
+                               queryParams: queryParams
+                                formParams: formParams
+                                     files: localVarFiles
+                                      body: bodyParam
+                              headerParams: headerParams
+                              authSettings: authSettings
+                        requestContentType: requestContentType
+                       responseContentType: responseContentType
+                              responseType: nil
+                           completionBlock: ^(id data, NSError *error) {
+                               handler(error);
+                           }
           ];
 }
 
 ///
 /// Updated user
 /// This can only be done by the logged in user.
-///  @param username name that need to be deleted
+///  @param username name that need to be deleted 
 ///
-///  @param body Updated user object
+///  @param body Updated user object (optional)
 ///
 ///  @returns void
 ///
--(NSNumber*) updateUserWithCompletionBlock: (NSString*) username
-         body: (SWGUser*) body
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock { 
+-(NSNumber*) updateUserWithUsername: (NSString*) username
+    body: (SWGUser*) body
+    completionHandler: (void (^)(NSError* error)) handler {
 
     
     // verify the required parameter 'username' is set
@@ -617,114 +681,27 @@ static SWGUserApi* singletonAPI = nil;
 
     id bodyParam = nil;
     NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
     
     bodyParam = body;
     
 
     
-    return [self.apiClient requestWithCompletionBlock: resourcePath
-                                               method: @"PUT"
-                                           pathParams: pathParams
-                                          queryParams: queryParams
-                                           formParams: formParams
-                                                files: files
-                                                 body: bodyParam
-                                         headerParams: headerParams
-                                         authSettings: authSettings
-                                   requestContentType: requestContentType
-                                  responseContentType: responseContentType
-                                         responseType: nil
-                                      completionBlock: ^(id data, NSError *error) {
-                  completionBlock(error);
-                  
-              }
-          ];
-}
-
-///
-/// Delete user
-/// This can only be done by the logged in user.
-///  @param username The name that needs to be deleted
-///
-///  @returns void
-///
--(NSNumber*) deleteUserWithCompletionBlock: (NSString*) username
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock { 
-
-    
-    // verify the required parameter 'username' is set
-    if (username == nil) {
-        [NSException raise:@"Invalid parameter" format:@"Missing the required parameter `username` when calling `deleteUser`"];
-    }
-    
-
-    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/user/{username}"];
-
-    // remove format in URL if needed
-    if ([resourcePath rangeOfString:@".{format}"].location != NSNotFound) {
-        [resourcePath replaceCharactersInRange: [resourcePath rangeOfString:@".{format}"] withString:@".json"];
-    }
-
-    NSMutableDictionary *pathParams = [[NSMutableDictionary alloc] init];
-    if (username != nil) {
-        pathParams[@"username"] = username;
-    }
-    
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    
-    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
-
-    
-
-    // HTTP header `Accept`
-    headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[@"application/json", @"application/xml"]];
-    if ([headerParams[@"Accept"] length] == 0) {
-        [headerParams removeObjectForKey:@"Accept"];
-    }
-
-    // response content type
-    NSString *responseContentType;
-    if ([headerParams objectForKey:@"Accept"]) {
-        responseContentType = [headerParams[@"Accept"] componentsSeparatedByString:@", "][0];
-    }
-    else {
-        responseContentType = @"";
-    }
-
-    // request content type
-    NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]];
-
-    // Authentication setting
-    NSArray *authSettings = @[];
-
-    id bodyParam = nil;
-    NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
-    
-    
-    
-
-    
-    return [self.apiClient requestWithCompletionBlock: resourcePath
-                                               method: @"DELETE"
-                                           pathParams: pathParams
-                                          queryParams: queryParams
-                                           formParams: formParams
-                                                files: files
-                                                 body: bodyParam
-                                         headerParams: headerParams
-                                         authSettings: authSettings
-                                   requestContentType: requestContentType
-                                  responseContentType: responseContentType
-                                         responseType: nil
-                                      completionBlock: ^(id data, NSError *error) {
-                  completionBlock(error);
-                  
-              }
+    return [self.apiClient requestWithPath: resourcePath
+                                    method: @"PUT"
+                                pathParams: pathParams
+                               queryParams: queryParams
+                                formParams: formParams
+                                     files: localVarFiles
+                                      body: bodyParam
+                              headerParams: headerParams
+                              authSettings: authSettings
+                        requestContentType: requestContentType
+                       responseContentType: responseContentType
+                              responseType: nil
+                           completionBlock: ^(id data, NSError *error) {
+                               handler(error);
+                           }
           ];
 }
 
diff --git a/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/SWGViewController.m b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/SWGViewController.m
index ec80b4e52b1..57fd9828e03 100644
--- a/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/SWGViewController.m
+++ b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/SWGViewController.m
@@ -27,7 +27,7 @@
     
     SWGPetApi *api = [[SWGPetApi alloc] init];
     NSURL *file = [NSURL fileURLWithPath:@"/Users/geekerzp/tmp/test.jpg"];
-    [api uploadFileWithCompletionBlock:@2 additionalMetadata:@2 file:file completionHandler:^(NSError *error) {
+    [api uploadFileWithPetId:@2 additionalMetadata:@2 file:file completionHandler:^(NSError *error) {
         NSLog(@"*** error: %@", error);
     }];
 }
diff --git a/samples/client/petstore/objc/SwaggerClientTests/Tests/PetApiTest.m b/samples/client/petstore/objc/SwaggerClientTests/Tests/PetApiTest.m
index 421292bbf10..7fd3d4f97c8 100644
--- a/samples/client/petstore/objc/SwaggerClientTests/Tests/PetApiTest.m
+++ b/samples/client/petstore/objc/SwaggerClientTests/Tests/PetApiTest.m
@@ -35,12 +35,12 @@
     XCTestExpectation *expectation = [self expectationWithDescription:@"testGetPetById"];
     SWGPet* pet = [self createPet];
 
-    [api addPetWithCompletionBlock:pet completionHandler:^(NSError *error) {
+    [api addPetWithBody:pet completionHandler:^(NSError *error) {
         if(error){
             XCTFail(@"got error %@", error);
         }
         NSLog(@"%@", [pet _id]);
-        [api getPetByIdWithCompletionBlock:[pet _id] completionHandler:^(SWGPet *output, NSError *error) {
+        [api getPetByIdWithPetId:[pet _id] completionHandler:^(SWGPet *output, NSError *error) {
             if(error){
                 XCTFail(@"got error %@", error);
             }
@@ -75,12 +75,12 @@
     XCTestExpectation *expectation = [self expectationWithDescription:@"testUpdatePet"];
     SWGPet* pet = [self createPet];
 
-    [api addPetWithCompletionBlock:pet completionHandler:^(NSError *error) {
+    [api addPetWithBody:pet completionHandler:^(NSError *error) {
         if(error) {
             XCTFail(@"got error %@", error);
         }
         else {
-            [api getPetByIdWithCompletionBlock:[NSString stringWithFormat:@"%@",[pet _id]] completionHandler:^(SWGPet *output, NSError *error) {
+            [api getPetByIdWithPetId:[pet _id] completionHandler:^(SWGPet *output, NSError *error) {
                 if(error) {
                     XCTFail(@"got error %@", error);
                 }
@@ -94,12 +94,12 @@
                     [pet setName:@"programmer"];
                     [pet setStatus:@"confused"];
 
-                    [api updatePetWithCompletionBlock:pet
+                    [api updatePetWithBody:pet
                                     completionHandler:^(NSError *error) {
                                         if(error) {
                                             XCTFail(@"got error %@", error);
                                         }
-                                        [api getPetByIdWithCompletionBlock:[pet _id] completionHandler:^(SWGPet *output, NSError *error) {
+                                        [api getPetByIdWithPetId:[pet _id] completionHandler:^(SWGPet *output, NSError *error) {
                                             if(error) {
                                                 XCTFail(@"got error %@", error);
                                             }
@@ -167,13 +167,13 @@ which causes an exception when deserializing the data
     NSLog(@"%@", pet._id);
     pet.tags = [[NSArray alloc] initWithObjects:tag, nil];
 
-    [api addPetWithCompletionBlock:pet completionHandler:^(NSError *error) {
+    [api addPetWithBody:pet completionHandler:^(NSError *error) {
         if(error) {
             XCTFail(@"got error %@", error);
         }
         NSArray* tags = [[NSArray alloc] initWithObjects:@"tony", nil];
 
-        [api findPetsByTagsWithCompletionBlock:tags completionHandler:^(NSArray *output, NSError *error) {
+        [api findPetsByTagsWithTags:tags completionHandler:^(NSArray *output, NSError *error) {
             if(error){
                 XCTFail(@"got error %@", error);
             }
@@ -200,15 +200,15 @@ which causes an exception when deserializing the data
 
     SWGPet* pet = [self createPet];
 
-    [api addPetWithCompletionBlock:pet completionHandler:^(NSError *error) {
+    [api addPetWithBody:pet completionHandler:^(NSError *error) {
         if(error){
             XCTFail(@"got error %@", error);
         }
-        [api deletePetWithCompletionBlock:pet._id apiKey:@"" completionHandler:^(NSError *error) {
+        [api deletePetWithPetId:pet._id apiKey:@"" completionHandler:^(NSError *error) {
             if(error){
                 XCTFail(@"got error %@", error);
             }
-            [api getPetByIdWithCompletionBlock:[pet _id] completionHandler:^(SWGPet *output, NSError *error) {
+            [api getPetByIdWithPetId:[pet _id] completionHandler:^(SWGPet *output, NSError *error) {
                 if(error) {
                     // good
                     [expectation fulfill];
@@ -228,7 +228,7 @@ which causes an exception when deserializing the data
     
     NSURL *fileURL = [self createTempFile];
     
-    [api uploadFileWithCompletionBlock:@1 additionalMetadata:@"special-metadata" file:fileURL completionHandler:^(NSError *error) {
+    [api uploadFileWithPetId:@1 additionalMetadata:@"special-metadata" file:fileURL completionHandler:^(NSError *error) {
         if(error) {
             // good
             XCTFail(@"expected a failure");
@@ -246,7 +246,7 @@ which causes an exception when deserializing the data
     
     NSURL *fileURL = [self createTempFile];
     
-    [api uploadFileWithCompletionBlock:@1 additionalMetadata:nil file:fileURL completionHandler:^(NSError *error) {
+    [api uploadFileWithPetId:@1 additionalMetadata:nil file:fileURL completionHandler:^(NSError *error) {
         if (error) {
             XCTFail(@"expected a failure");
         }
@@ -261,7 +261,7 @@ which causes an exception when deserializing the data
 - (void)TestUploadWithoutFile {
     XCTestExpectation *expectation = [self expectationWithDescription:@"testUploadWithoutFile"];
     
-    [api uploadFileWithCompletionBlock:@1 additionalMetadata:@"special-metadata" file:nil completionHandler:^(NSError *error) {
+    [api uploadFileWithPetId:@1 additionalMetadata:@"special-metadata" file:nil completionHandler:^(NSError *error) {
         if(error) {
             XCTFail(@"failed to upload");
             
diff --git a/samples/client/petstore/objc/SwaggerClientTests/Tests/StoreApiTest.m b/samples/client/petstore/objc/SwaggerClientTests/Tests/StoreApiTest.m
index 9a250e1cb3a..334258fdaf1 100644
--- a/samples/client/petstore/objc/SwaggerClientTests/Tests/StoreApiTest.m
+++ b/samples/client/petstore/objc/SwaggerClientTests/Tests/StoreApiTest.m
@@ -22,7 +22,7 @@
 - (void)testGetInventory {
     XCTestExpectation *expectation = [self expectationWithDescription:@"testGetPetByStatus"];
     
-    [self.api getInventoryWithCompletionBlock:^(NSDictionary *output, NSError *error) {
+    [self.api getInventoryWithCompletionHandler:^(NSDictionary *output, NSError *error) {
         
         if (error) {
             XCTFail(@"got error %@", error);
diff --git a/samples/client/petstore/objc/SwaggerClientTests/Tests/UserApiTest.m b/samples/client/petstore/objc/SwaggerClientTests/Tests/UserApiTest.m
index 620a6922e9f..e9123647b75 100644
--- a/samples/client/petstore/objc/SwaggerClientTests/Tests/UserApiTest.m
+++ b/samples/client/petstore/objc/SwaggerClientTests/Tests/UserApiTest.m
@@ -22,7 +22,7 @@
 - (void)testLoginUser {
     XCTestExpectation *expectation = [self expectationWithDescription:@"test login user"];
     
-    [self.api loginUserWithCompletionBlock:@"test username" password:@"test password" completionHandler:^(NSString *output, NSError *error) {
+    [self.api loginUserWithUsername:@"test username" password:@"test password" completionHandler:^(NSString *output, NSError *error) {
         if (error) {
             XCTFail(@"got error %@", error);
         }
diff --git a/samples/client/petstore/objc/git_push.sh b/samples/client/petstore/objc/git_push.sh
new file mode 100644
index 00000000000..1a36388db02
--- /dev/null
+++ b/samples/client/petstore/objc/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="YOUR_GIT_USR_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="YOUR_GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/client/petstore/perl/.gitignore b/samples/client/petstore/perl/.gitignore
new file mode 100644
index 00000000000..ae2ad536abb
--- /dev/null
+++ b/samples/client/petstore/perl/.gitignore
@@ -0,0 +1,20 @@
+/blib/
+/.build/
+_build/
+cover_db/
+inc/
+Build
+!Build/
+Build.bat
+.last_cover_stats
+/Makefile
+/Makefile.old
+/MANIFEST.bak
+/META.yml
+/META.json
+/MYMETA.*
+nytprof.out
+/pm_to_blib
+*.o
+*.bs
+/_eumm/
diff --git a/samples/client/petstore/perl/README.md b/samples/client/petstore/perl/README.md
index e50a07a5418..72fc2e26429 100644
--- a/samples/client/petstore/perl/README.md
+++ b/samples/client/petstore/perl/README.md
@@ -1,16 +1,17 @@
 # NAME
 
-WWW::SwaggerClient::Role - a Moose role for the Swagger Petstore 
+WWW::SwaggerClient::Role - a Moose role for the Swagger Petstore
 
-## Swagger Petstore version: 1.0.0
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
 
 # VERSION
 
-Automatically generated by the Perl Swagger Codegen project: 
+Automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
-- Build date: 2015-12-29T16:27:28.775+08:00
+- API version: 1.0.0
+- Package version: 1.0.0
+- Build date: 2016-03-30T20:57:51.908+08:00
 - Build package: class io.swagger.codegen.languages.PerlClientCodegen
-- Codegen version: 
 
 ## A note on Moose
 
@@ -162,12 +163,12 @@ you could also call them on class names.
 
 See the homepage `https://github.com/swagger-api/swagger-codegen` for full details. 
 But briefly, clone the git repository, build the codegen codebase, set up your build 
-config file, then run the API build script. You will need git, Java 7 and Apache 
+config file, then run the API build script. You will need git, Java 7 or 8 and Apache
 maven 3.0.3 or better already installed.
 
 The config file should specify the project name for the generated library: 
 
-        {"moduleName":"MyProjectName"}
+        {"moduleName":"WWW::MyProjectName"}
 
 Your library files will be built under `WWW::MyProjectName`.
 
@@ -216,4 +217,174 @@ spec. If so, this is available via the `class_documentation()` and
         my $omdoc = $api->get_pet_by_id->(pet_id => $pet_id)->method_documentation->{method_name}; 
         
 
-Each of these calls returns a hashref with various useful pieces of information.	
+Each of these calls returns a hashref with various useful pieces of information.
+
+# LOAD THE MODULES
+
+To load the API packages:
+```perl
+use WWW::SwaggerClient::PetApi;
+use WWW::SwaggerClient::StoreApi;
+use WWW::SwaggerClient::UserApi;
+
+```
+
+To load the models:
+```perl
+use WWW::SwaggerClient::Object::Animal;
+use WWW::SwaggerClient::Object::Cat;
+use WWW::SwaggerClient::Object::Category;
+use WWW::SwaggerClient::Object::Dog;
+use WWW::SwaggerClient::Object::InlineResponse200;
+use WWW::SwaggerClient::Object::Model200Response;
+use WWW::SwaggerClient::Object::ModelReturn;
+use WWW::SwaggerClient::Object::Name;
+use WWW::SwaggerClient::Object::Order;
+use WWW::SwaggerClient::Object::Pet;
+use WWW::SwaggerClient::Object::SpecialModelName;
+use WWW::SwaggerClient::Object::Tag;
+use WWW::SwaggerClient::Object::User;
+
+````
+
+# GETTING STARTED
+Put the Perl SDK under the 'lib' folder in your project directory, then run the following
+```perl
+#!/usr/bin/perl
+use lib 'lib';
+use strict;
+use warnings;
+# load the API package
+use WWW::SwaggerClient::PetApi;
+use WWW::SwaggerClient::StoreApi;
+use WWW::SwaggerClient::UserApi;
+
+# load the models
+use WWW::SwaggerClient::Object::Animal;
+use WWW::SwaggerClient::Object::Cat;
+use WWW::SwaggerClient::Object::Category;
+use WWW::SwaggerClient::Object::Dog;
+use WWW::SwaggerClient::Object::InlineResponse200;
+use WWW::SwaggerClient::Object::Model200Response;
+use WWW::SwaggerClient::Object::ModelReturn;
+use WWW::SwaggerClient::Object::Name;
+use WWW::SwaggerClient::Object::Order;
+use WWW::SwaggerClient::Object::Pet;
+use WWW::SwaggerClient::Object::SpecialModelName;
+use WWW::SwaggerClient::Object::Tag;
+use WWW::SwaggerClient::Object::User;
+
+# for displaying the API response data
+use Data::Dumper;
+
+# Configure OAuth2 access token for authorization: petstore_auth
+$WWW::SwaggerClient::Configuration::access_token = 'YOUR_ACCESS_TOKEN';
+
+my $api_instance = WWW::SwaggerClient::PetApi->new();
+my $body = WWW::SwaggerClient::Object::Pet->new(); # Pet | Pet object that needs to be added to the store
+
+eval {
+    $api_instance->add_pet(body => $body);
+};
+if ($@) {
+    warn "Exception when calling PetApi->add_pet: $@\n";
+}
+
+```
+
+# DOCUMENTATION FOR API ENDPOINTS
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*PetApi* | [**add_pet**](docs/PetApi.md#add_pet) | **POST** /pet | Add a new pet to the store
+*PetApi* | [**add_pet_using_byte_array**](docs/PetApi.md#add_pet_using_byte_array) | **POST** /pet?testing_byte_array=true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
+*PetApi* | [**delete_pet**](docs/PetApi.md#delete_pet) | **DELETE** /pet/{petId} | Deletes a pet
+*PetApi* | [**find_pets_by_status**](docs/PetApi.md#find_pets_by_status) | **GET** /pet/findByStatus | Finds Pets by status
+*PetApi* | [**find_pets_by_tags**](docs/PetApi.md#find_pets_by_tags) | **GET** /pet/findByTags | Finds Pets by tags
+*PetApi* | [**get_pet_by_id**](docs/PetApi.md#get_pet_by_id) | **GET** /pet/{petId} | Find pet by ID
+*PetApi* | [**get_pet_by_id_in_object**](docs/PetApi.md#get_pet_by_id_in_object) | **GET** /pet/{petId}?response=inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+*PetApi* | [**pet_pet_idtesting_byte_arraytrue_get**](docs/PetApi.md#pet_pet_idtesting_byte_arraytrue_get) | **GET** /pet/{petId}?testing_byte_array=true | Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+*PetApi* | [**update_pet**](docs/PetApi.md#update_pet) | **PUT** /pet | Update an existing pet
+*PetApi* | [**update_pet_with_form**](docs/PetApi.md#update_pet_with_form) | **POST** /pet/{petId} | Updates a pet in the store with form data
+*PetApi* | [**upload_file**](docs/PetApi.md#upload_file) | **POST** /pet/{petId}/uploadImage | uploads an image
+*StoreApi* | [**delete_order**](docs/StoreApi.md#delete_order) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
+*StoreApi* | [**find_orders_by_status**](docs/StoreApi.md#find_orders_by_status) | **GET** /store/findByStatus | Finds orders by status
+*StoreApi* | [**get_inventory**](docs/StoreApi.md#get_inventory) | **GET** /store/inventory | Returns pet inventories by status
+*StoreApi* | [**get_inventory_in_object**](docs/StoreApi.md#get_inventory_in_object) | **GET** /store/inventory?response=arbitrary_object | Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+*StoreApi* | [**get_order_by_id**](docs/StoreApi.md#get_order_by_id) | **GET** /store/order/{orderId} | Find purchase order by ID
+*StoreApi* | [**place_order**](docs/StoreApi.md#place_order) | **POST** /store/order | Place an order for a pet
+*UserApi* | [**create_user**](docs/UserApi.md#create_user) | **POST** /user | Create user
+*UserApi* | [**create_users_with_array_input**](docs/UserApi.md#create_users_with_array_input) | **POST** /user/createWithArray | Creates list of users with given input array
+*UserApi* | [**create_users_with_list_input**](docs/UserApi.md#create_users_with_list_input) | **POST** /user/createWithList | Creates list of users with given input array
+*UserApi* | [**delete_user**](docs/UserApi.md#delete_user) | **DELETE** /user/{username} | Delete user
+*UserApi* | [**get_user_by_name**](docs/UserApi.md#get_user_by_name) | **GET** /user/{username} | Get user by user name
+*UserApi* | [**login_user**](docs/UserApi.md#login_user) | **GET** /user/login | Logs user into the system
+*UserApi* | [**logout_user**](docs/UserApi.md#logout_user) | **GET** /user/logout | Logs out current logged in user session
+*UserApi* | [**update_user**](docs/UserApi.md#update_user) | **PUT** /user/{username} | Updated user
+
+
+# DOCUMENTATION FOR MODELS
+ - [WWW::SwaggerClient::Object::Animal](docs/Animal.md)
+ - [WWW::SwaggerClient::Object::Cat](docs/Cat.md)
+ - [WWW::SwaggerClient::Object::Category](docs/Category.md)
+ - [WWW::SwaggerClient::Object::Dog](docs/Dog.md)
+ - [WWW::SwaggerClient::Object::InlineResponse200](docs/InlineResponse200.md)
+ - [WWW::SwaggerClient::Object::Model200Response](docs/Model200Response.md)
+ - [WWW::SwaggerClient::Object::ModelReturn](docs/ModelReturn.md)
+ - [WWW::SwaggerClient::Object::Name](docs/Name.md)
+ - [WWW::SwaggerClient::Object::Order](docs/Order.md)
+ - [WWW::SwaggerClient::Object::Pet](docs/Pet.md)
+ - [WWW::SwaggerClient::Object::SpecialModelName](docs/SpecialModelName.md)
+ - [WWW::SwaggerClient::Object::Tag](docs/Tag.md)
+ - [WWW::SwaggerClient::Object::User](docs/User.md)
+
+
+# DOCUMENTATION FOR AUTHORIATION
+
+## test_api_key_header
+
+- **Type**: API key 
+- **API key parameter name**: test_api_key_header
+- **Location**: HTTP header
+
+## api_key
+
+- **Type**: API key 
+- **API key parameter name**: api_key
+- **Location**: HTTP header
+
+## test_http_basic
+
+- **Type**: HTTP basic authentication
+
+## test_api_client_secret
+
+- **Type**: API key 
+- **API key parameter name**: x-test_api_client_secret
+- **Location**: HTTP header
+
+## test_api_client_id
+
+- **Type**: API key 
+- **API key parameter name**: x-test_api_client_id
+- **Location**: HTTP header
+
+## test_api_key_query
+
+- **Type**: API key 
+- **API key parameter name**: test_api_key_query
+- **Location**: URL query string
+
+## petstore_auth
+
+- **Type**: OAuth
+- **Flow**: implicit
+- **Authorizatoin URL**: http://petstore.swagger.io/api/oauth/dialog
+- **Scopes**: 
+  - **write:pets**: modify pets in your account
+  - **read:pets**: read your pets
+
+
+
diff --git a/samples/client/petstore/perl/docs/Animal.md b/samples/client/petstore/perl/docs/Animal.md
new file mode 100644
index 00000000000..d243a90905d
--- /dev/null
+++ b/samples/client/petstore/perl/docs/Animal.md
@@ -0,0 +1,15 @@
+# WWW::SwaggerClient::Object::Animal
+
+## Load the model package
+```perl
+use WWW::SwaggerClient::Object::Animal;
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**class_name** | **string** |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/perl/docs/Cat.md b/samples/client/petstore/perl/docs/Cat.md
new file mode 100644
index 00000000000..978e4202394
--- /dev/null
+++ b/samples/client/petstore/perl/docs/Cat.md
@@ -0,0 +1,16 @@
+# WWW::SwaggerClient::Object::Cat
+
+## Load the model package
+```perl
+use WWW::SwaggerClient::Object::Cat;
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**class_name** | **string** |  | 
+**declawed** | **boolean** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/perl/docs/Category.md b/samples/client/petstore/perl/docs/Category.md
new file mode 100644
index 00000000000..aa69032fc1c
--- /dev/null
+++ b/samples/client/petstore/perl/docs/Category.md
@@ -0,0 +1,16 @@
+# WWW::SwaggerClient::Object::Category
+
+## Load the model package
+```perl
+use WWW::SwaggerClient::Object::Category;
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **int** |  | [optional] 
+**name** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/perl/docs/Dog.md b/samples/client/petstore/perl/docs/Dog.md
new file mode 100644
index 00000000000..16e399c3aae
--- /dev/null
+++ b/samples/client/petstore/perl/docs/Dog.md
@@ -0,0 +1,16 @@
+# WWW::SwaggerClient::Object::Dog
+
+## Load the model package
+```perl
+use WWW::SwaggerClient::Object::Dog;
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**class_name** | **string** |  | 
+**breed** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/perl/docs/InlineResponse200.md b/samples/client/petstore/perl/docs/InlineResponse200.md
new file mode 100644
index 00000000000..96d4ec3ff79
--- /dev/null
+++ b/samples/client/petstore/perl/docs/InlineResponse200.md
@@ -0,0 +1,20 @@
+# WWW::SwaggerClient::Object::InlineResponse200
+
+## Load the model package
+```perl
+use WWW::SwaggerClient::Object::InlineResponse200;
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**tags** | [**ARRAY[Tag]**](Tag.md) |  | [optional] 
+**id** | **int** |  | 
+**category** | **object** |  | [optional] 
+**status** | **string** | pet status in the store | [optional] 
+**name** | **string** |  | [optional] 
+**photo_urls** | **ARRAY[string]** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/perl/docs/Model200Response.md b/samples/client/petstore/perl/docs/Model200Response.md
new file mode 100644
index 00000000000..197c00eeb6a
--- /dev/null
+++ b/samples/client/petstore/perl/docs/Model200Response.md
@@ -0,0 +1,15 @@
+# WWW::SwaggerClient::Object::Model200Response
+
+## Load the model package
+```perl
+use WWW::SwaggerClient::Object::Model200Response;
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **int** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/perl/docs/ModelReturn.md b/samples/client/petstore/perl/docs/ModelReturn.md
new file mode 100644
index 00000000000..57afb49ae53
--- /dev/null
+++ b/samples/client/petstore/perl/docs/ModelReturn.md
@@ -0,0 +1,15 @@
+# WWW::SwaggerClient::Object::ModelReturn
+
+## Load the model package
+```perl
+use WWW::SwaggerClient::Object::ModelReturn;
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**return** | **int** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/perl/docs/Name.md b/samples/client/petstore/perl/docs/Name.md
new file mode 100644
index 00000000000..13b5d0dde82
--- /dev/null
+++ b/samples/client/petstore/perl/docs/Name.md
@@ -0,0 +1,16 @@
+# WWW::SwaggerClient::Object::Name
+
+## Load the model package
+```perl
+use WWW::SwaggerClient::Object::Name;
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **int** |  | [optional] 
+**snake_case** | **int** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/perl/docs/ObjectReturn.md b/samples/client/petstore/perl/docs/ObjectReturn.md
new file mode 100644
index 00000000000..2bd4ff37640
--- /dev/null
+++ b/samples/client/petstore/perl/docs/ObjectReturn.md
@@ -0,0 +1,13 @@
+# WWW::SwaggerClient::Object::ObjectReturn
+
+## Import the module
+```perl
+use WWW::SwaggerClient::Object::ObjectReturn;
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**return** | **int** |  | [optional] 
+
+
diff --git a/samples/client/petstore/perl/docs/Order.md b/samples/client/petstore/perl/docs/Order.md
new file mode 100644
index 00000000000..542a3a91240
--- /dev/null
+++ b/samples/client/petstore/perl/docs/Order.md
@@ -0,0 +1,20 @@
+# WWW::SwaggerClient::Object::Order
+
+## Load the model package
+```perl
+use WWW::SwaggerClient::Object::Order;
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **int** |  | [optional] 
+**pet_id** | **int** |  | [optional] 
+**quantity** | **int** |  | [optional] 
+**ship_date** | **DateTime** |  | [optional] 
+**status** | **string** | Order Status | [optional] 
+**complete** | **boolean** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/perl/docs/Pet.md b/samples/client/petstore/perl/docs/Pet.md
new file mode 100644
index 00000000000..5931f6bd5f3
--- /dev/null
+++ b/samples/client/petstore/perl/docs/Pet.md
@@ -0,0 +1,20 @@
+# WWW::SwaggerClient::Object::Pet
+
+## Load the model package
+```perl
+use WWW::SwaggerClient::Object::Pet;
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **int** |  | [optional] 
+**category** | [**Category**](Category.md) |  | [optional] 
+**name** | **string** |  | 
+**photo_urls** | **ARRAY[string]** |  | 
+**tags** | [**ARRAY[Tag]**](Tag.md) |  | [optional] 
+**status** | **string** | pet status in the store | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/perl/docs/PetApi.md b/samples/client/petstore/perl/docs/PetApi.md
new file mode 100644
index 00000000000..971dc0772c8
--- /dev/null
+++ b/samples/client/petstore/perl/docs/PetApi.md
@@ -0,0 +1,557 @@
+# WWW::SwaggerClient::PetApi
+
+## Load the API package
+```perl
+use WWW::SwaggerClient::Object::PetApi;
+```
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**add_pet**](PetApi.md#add_pet) | **POST** /pet | Add a new pet to the store
+[**add_pet_using_byte_array**](PetApi.md#add_pet_using_byte_array) | **POST** /pet?testing_byte_array=true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
+[**delete_pet**](PetApi.md#delete_pet) | **DELETE** /pet/{petId} | Deletes a pet
+[**find_pets_by_status**](PetApi.md#find_pets_by_status) | **GET** /pet/findByStatus | Finds Pets by status
+[**find_pets_by_tags**](PetApi.md#find_pets_by_tags) | **GET** /pet/findByTags | Finds Pets by tags
+[**get_pet_by_id**](PetApi.md#get_pet_by_id) | **GET** /pet/{petId} | Find pet by ID
+[**get_pet_by_id_in_object**](PetApi.md#get_pet_by_id_in_object) | **GET** /pet/{petId}?response=inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+[**pet_pet_idtesting_byte_arraytrue_get**](PetApi.md#pet_pet_idtesting_byte_arraytrue_get) | **GET** /pet/{petId}?testing_byte_array=true | Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+[**update_pet**](PetApi.md#update_pet) | **PUT** /pet | Update an existing pet
+[**update_pet_with_form**](PetApi.md#update_pet_with_form) | **POST** /pet/{petId} | Updates a pet in the store with form data
+[**upload_file**](PetApi.md#upload_file) | **POST** /pet/{petId}/uploadImage | uploads an image
+
+
+# **add_pet**
+> add_pet(body => $body)
+
+Add a new pet to the store
+
+
+
+### Example 
+```perl
+use Data::Dumper;
+
+# Configure OAuth2 access token for authorization: petstore_auth
+$WWW::SwaggerClient::Configuration::access_token = 'YOUR_ACCESS_TOKEN';
+
+my $api_instance = WWW::SwaggerClient::PetApi->new();
+my $body = WWW::SwaggerClient::Object::Pet->new(); # Pet | Pet object that needs to be added to the store
+
+eval { 
+    $api_instance->add_pet(body => $body);
+};
+if ($@) {
+    warn "Exception when calling PetApi->add_pet: $@\n";
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **add_pet_using_byte_array**
+> add_pet_using_byte_array(body => $body)
+
+Fake endpoint to test byte array in body parameter for adding a new pet to the store
+
+
+
+### Example 
+```perl
+use Data::Dumper;
+
+# Configure OAuth2 access token for authorization: petstore_auth
+$WWW::SwaggerClient::Configuration::access_token = 'YOUR_ACCESS_TOKEN';
+
+my $api_instance = WWW::SwaggerClient::PetApi->new();
+my $body = WWW::SwaggerClient::Object::string->new(); # string | Pet object in the form of byte array
+
+eval { 
+    $api_instance->add_pet_using_byte_array(body => $body);
+};
+if ($@) {
+    warn "Exception when calling PetApi->add_pet_using_byte_array: $@\n";
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | **string**| Pet object in the form of byte array | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **delete_pet**
+> delete_pet(pet_id => $pet_id, api_key => $api_key)
+
+Deletes a pet
+
+
+
+### Example 
+```perl
+use Data::Dumper;
+
+# Configure OAuth2 access token for authorization: petstore_auth
+$WWW::SwaggerClient::Configuration::access_token = 'YOUR_ACCESS_TOKEN';
+
+my $api_instance = WWW::SwaggerClient::PetApi->new();
+my $pet_id = 789; # int | Pet id to delete
+my $api_key = 'api_key_example'; # string | 
+
+eval { 
+    $api_instance->delete_pet(pet_id => $pet_id, api_key => $api_key);
+};
+if ($@) {
+    warn "Exception when calling PetApi->delete_pet: $@\n";
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **pet_id** | **int**| Pet id to delete | 
+ **api_key** | **string**|  | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **find_pets_by_status**
+> ARRAY[Pet] find_pets_by_status(status => $status)
+
+Finds Pets by status
+
+Multiple status values can be provided with comma separated strings
+
+### Example 
+```perl
+use Data::Dumper;
+
+# Configure OAuth2 access token for authorization: petstore_auth
+$WWW::SwaggerClient::Configuration::access_token = 'YOUR_ACCESS_TOKEN';
+
+my $api_instance = WWW::SwaggerClient::PetApi->new();
+my $status = (); # ARRAY[string] | Status values that need to be considered for query
+
+eval { 
+    my $result = $api_instance->find_pets_by_status(status => $status);
+    print Dumper($result);
+};
+if ($@) {
+    warn "Exception when calling PetApi->find_pets_by_status: $@\n";
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **status** | [**ARRAY[string]**](string.md)| Status values that need to be considered for query | [optional] [default to available]
+
+### Return type
+
+[**ARRAY[Pet]**](Pet.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **find_pets_by_tags**
+> ARRAY[Pet] find_pets_by_tags(tags => $tags)
+
+Finds Pets by tags
+
+Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+
+### Example 
+```perl
+use Data::Dumper;
+
+# Configure OAuth2 access token for authorization: petstore_auth
+$WWW::SwaggerClient::Configuration::access_token = 'YOUR_ACCESS_TOKEN';
+
+my $api_instance = WWW::SwaggerClient::PetApi->new();
+my $tags = (); # ARRAY[string] | Tags to filter by
+
+eval { 
+    my $result = $api_instance->find_pets_by_tags(tags => $tags);
+    print Dumper($result);
+};
+if ($@) {
+    warn "Exception when calling PetApi->find_pets_by_tags: $@\n";
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **tags** | [**ARRAY[string]**](string.md)| Tags to filter by | [optional] 
+
+### Return type
+
+[**ARRAY[Pet]**](Pet.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_pet_by_id**
+> Pet get_pet_by_id(pet_id => $pet_id)
+
+Find pet by ID
+
+Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
+
+### Example 
+```perl
+use Data::Dumper;
+
+# Configure API key authorization: api_key
+$WWW::SwaggerClient::Configuration::api_key->{'api_key'} = 'YOUR_API_KEY';
+# uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+#$WWW::SwaggerClient::Configuration::api_key_prefix->{'api_key'} = "BEARER";
+# Configure OAuth2 access token for authorization: petstore_auth
+$WWW::SwaggerClient::Configuration::access_token = 'YOUR_ACCESS_TOKEN';
+
+my $api_instance = WWW::SwaggerClient::PetApi->new();
+my $pet_id = 789; # int | ID of pet that needs to be fetched
+
+eval { 
+    my $result = $api_instance->get_pet_by_id(pet_id => $pet_id);
+    print Dumper($result);
+};
+if ($@) {
+    warn "Exception when calling PetApi->get_pet_by_id: $@\n";
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **pet_id** | **int**| ID of pet that needs to be fetched | 
+
+### Return type
+
+[**Pet**](Pet.md)
+
+### Authorization
+
+[api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_pet_by_id_in_object**
+> InlineResponse200 get_pet_by_id_in_object(pet_id => $pet_id)
+
+Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
+
+Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
+
+### Example 
+```perl
+use Data::Dumper;
+
+# Configure API key authorization: api_key
+$WWW::SwaggerClient::Configuration::api_key->{'api_key'} = 'YOUR_API_KEY';
+# uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+#$WWW::SwaggerClient::Configuration::api_key_prefix->{'api_key'} = "BEARER";
+# Configure OAuth2 access token for authorization: petstore_auth
+$WWW::SwaggerClient::Configuration::access_token = 'YOUR_ACCESS_TOKEN';
+
+my $api_instance = WWW::SwaggerClient::PetApi->new();
+my $pet_id = 789; # int | ID of pet that needs to be fetched
+
+eval { 
+    my $result = $api_instance->get_pet_by_id_in_object(pet_id => $pet_id);
+    print Dumper($result);
+};
+if ($@) {
+    warn "Exception when calling PetApi->get_pet_by_id_in_object: $@\n";
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **pet_id** | **int**| ID of pet that needs to be fetched | 
+
+### Return type
+
+[**InlineResponse200**](InlineResponse200.md)
+
+### Authorization
+
+[api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **pet_pet_idtesting_byte_arraytrue_get**
+> string pet_pet_idtesting_byte_arraytrue_get(pet_id => $pet_id)
+
+Fake endpoint to test byte array return by 'Find pet by ID'
+
+Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
+
+### Example 
+```perl
+use Data::Dumper;
+
+# Configure API key authorization: api_key
+$WWW::SwaggerClient::Configuration::api_key->{'api_key'} = 'YOUR_API_KEY';
+# uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+#$WWW::SwaggerClient::Configuration::api_key_prefix->{'api_key'} = "BEARER";
+# Configure OAuth2 access token for authorization: petstore_auth
+$WWW::SwaggerClient::Configuration::access_token = 'YOUR_ACCESS_TOKEN';
+
+my $api_instance = WWW::SwaggerClient::PetApi->new();
+my $pet_id = 789; # int | ID of pet that needs to be fetched
+
+eval { 
+    my $result = $api_instance->pet_pet_idtesting_byte_arraytrue_get(pet_id => $pet_id);
+    print Dumper($result);
+};
+if ($@) {
+    warn "Exception when calling PetApi->pet_pet_idtesting_byte_arraytrue_get: $@\n";
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **pet_id** | **int**| ID of pet that needs to be fetched | 
+
+### Return type
+
+**string**
+
+### Authorization
+
+[api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **update_pet**
+> update_pet(body => $body)
+
+Update an existing pet
+
+
+
+### Example 
+```perl
+use Data::Dumper;
+
+# Configure OAuth2 access token for authorization: petstore_auth
+$WWW::SwaggerClient::Configuration::access_token = 'YOUR_ACCESS_TOKEN';
+
+my $api_instance = WWW::SwaggerClient::PetApi->new();
+my $body = WWW::SwaggerClient::Object::Pet->new(); # Pet | Pet object that needs to be added to the store
+
+eval { 
+    $api_instance->update_pet(body => $body);
+};
+if ($@) {
+    warn "Exception when calling PetApi->update_pet: $@\n";
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **update_pet_with_form**
+> update_pet_with_form(pet_id => $pet_id, name => $name, status => $status)
+
+Updates a pet in the store with form data
+
+
+
+### Example 
+```perl
+use Data::Dumper;
+
+# Configure OAuth2 access token for authorization: petstore_auth
+$WWW::SwaggerClient::Configuration::access_token = 'YOUR_ACCESS_TOKEN';
+
+my $api_instance = WWW::SwaggerClient::PetApi->new();
+my $pet_id = 'pet_id_example'; # string | ID of pet that needs to be updated
+my $name = 'name_example'; # string | Updated name of the pet
+my $status = 'status_example'; # string | Updated status of the pet
+
+eval { 
+    $api_instance->update_pet_with_form(pet_id => $pet_id, name => $name, status => $status);
+};
+if ($@) {
+    warn "Exception when calling PetApi->update_pet_with_form: $@\n";
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **pet_id** | **string**| ID of pet that needs to be updated | 
+ **name** | **string**| Updated name of the pet | [optional] 
+ **status** | **string**| Updated status of the pet | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: application/x-www-form-urlencoded
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **upload_file**
+> upload_file(pet_id => $pet_id, additional_metadata => $additional_metadata, file => $file)
+
+uploads an image
+
+
+
+### Example 
+```perl
+use Data::Dumper;
+
+# Configure OAuth2 access token for authorization: petstore_auth
+$WWW::SwaggerClient::Configuration::access_token = 'YOUR_ACCESS_TOKEN';
+
+my $api_instance = WWW::SwaggerClient::PetApi->new();
+my $pet_id = 789; # int | ID of pet to update
+my $additional_metadata = 'additional_metadata_example'; # string | Additional data to pass to server
+my $file = '/path/to/file.txt'; # File | file to upload
+
+eval { 
+    $api_instance->upload_file(pet_id => $pet_id, additional_metadata => $additional_metadata, file => $file);
+};
+if ($@) {
+    warn "Exception when calling PetApi->upload_file: $@\n";
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **pet_id** | **int**| ID of pet to update | 
+ **additional_metadata** | **string**| Additional data to pass to server | [optional] 
+ **file** | **File**| file to upload | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: multipart/form-data
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/samples/client/petstore/perl/docs/SpecialModelName.md b/samples/client/petstore/perl/docs/SpecialModelName.md
new file mode 100644
index 00000000000..cab9c8ccef6
--- /dev/null
+++ b/samples/client/petstore/perl/docs/SpecialModelName.md
@@ -0,0 +1,15 @@
+# WWW::SwaggerClient::Object::SpecialModelName
+
+## Load the model package
+```perl
+use WWW::SwaggerClient::Object::SpecialModelName;
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**__special[property/name]** | **int** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/perl/docs/StoreApi.md b/samples/client/petstore/perl/docs/StoreApi.md
new file mode 100644
index 00000000000..7b9e35c977d
--- /dev/null
+++ b/samples/client/petstore/perl/docs/StoreApi.md
@@ -0,0 +1,311 @@
+# WWW::SwaggerClient::StoreApi
+
+## Load the API package
+```perl
+use WWW::SwaggerClient::Object::StoreApi;
+```
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**delete_order**](StoreApi.md#delete_order) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
+[**find_orders_by_status**](StoreApi.md#find_orders_by_status) | **GET** /store/findByStatus | Finds orders by status
+[**get_inventory**](StoreApi.md#get_inventory) | **GET** /store/inventory | Returns pet inventories by status
+[**get_inventory_in_object**](StoreApi.md#get_inventory_in_object) | **GET** /store/inventory?response=arbitrary_object | Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+[**get_order_by_id**](StoreApi.md#get_order_by_id) | **GET** /store/order/{orderId} | Find purchase order by ID
+[**place_order**](StoreApi.md#place_order) | **POST** /store/order | Place an order for a pet
+
+
+# **delete_order**
+> delete_order(order_id => $order_id)
+
+Delete purchase order by ID
+
+For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+
+### Example 
+```perl
+use Data::Dumper;
+
+my $api_instance = WWW::SwaggerClient::StoreApi->new();
+my $order_id = 'order_id_example'; # string | ID of the order that needs to be deleted
+
+eval { 
+    $api_instance->delete_order(order_id => $order_id);
+};
+if ($@) {
+    warn "Exception when calling StoreApi->delete_order: $@\n";
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **order_id** | **string**| ID of the order that needs to be deleted | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **find_orders_by_status**
+> ARRAY[Order] find_orders_by_status(status => $status)
+
+Finds orders by status
+
+A single status value can be provided as a string
+
+### Example 
+```perl
+use Data::Dumper;
+
+# Configure API key authorization: test_api_client_id
+$WWW::SwaggerClient::Configuration::api_key->{'x-test_api_client_id'} = 'YOUR_API_KEY';
+# uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+#$WWW::SwaggerClient::Configuration::api_key_prefix->{'x-test_api_client_id'} = "BEARER";
+# Configure API key authorization: test_api_client_secret
+$WWW::SwaggerClient::Configuration::api_key->{'x-test_api_client_secret'} = 'YOUR_API_KEY';
+# uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+#$WWW::SwaggerClient::Configuration::api_key_prefix->{'x-test_api_client_secret'} = "BEARER";
+
+my $api_instance = WWW::SwaggerClient::StoreApi->new();
+my $status = 'status_example'; # string | Status value that needs to be considered for query
+
+eval { 
+    my $result = $api_instance->find_orders_by_status(status => $status);
+    print Dumper($result);
+};
+if ($@) {
+    warn "Exception when calling StoreApi->find_orders_by_status: $@\n";
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **status** | **string**| Status value that needs to be considered for query | [optional] [default to placed]
+
+### Return type
+
+[**ARRAY[Order]**](Order.md)
+
+### Authorization
+
+[test_api_client_id](../README.md#test_api_client_id), [test_api_client_secret](../README.md#test_api_client_secret)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_inventory**
+> HASH[string,int] get_inventory()
+
+Returns pet inventories by status
+
+Returns a map of status codes to quantities
+
+### Example 
+```perl
+use Data::Dumper;
+
+# Configure API key authorization: api_key
+$WWW::SwaggerClient::Configuration::api_key->{'api_key'} = 'YOUR_API_KEY';
+# uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+#$WWW::SwaggerClient::Configuration::api_key_prefix->{'api_key'} = "BEARER";
+
+my $api_instance = WWW::SwaggerClient::StoreApi->new();
+
+eval { 
+    my $result = $api_instance->get_inventory();
+    print Dumper($result);
+};
+if ($@) {
+    warn "Exception when calling StoreApi->get_inventory: $@\n";
+}
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+**HASH[string,int]**
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_inventory_in_object**
+> object get_inventory_in_object()
+
+Fake endpoint to test arbitrary object return by 'Get inventory'
+
+Returns an arbitrary object which is actually a map of status codes to quantities
+
+### Example 
+```perl
+use Data::Dumper;
+
+# Configure API key authorization: api_key
+$WWW::SwaggerClient::Configuration::api_key->{'api_key'} = 'YOUR_API_KEY';
+# uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+#$WWW::SwaggerClient::Configuration::api_key_prefix->{'api_key'} = "BEARER";
+
+my $api_instance = WWW::SwaggerClient::StoreApi->new();
+
+eval { 
+    my $result = $api_instance->get_inventory_in_object();
+    print Dumper($result);
+};
+if ($@) {
+    warn "Exception when calling StoreApi->get_inventory_in_object: $@\n";
+}
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+**object**
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_order_by_id**
+> Order get_order_by_id(order_id => $order_id)
+
+Find purchase order by ID
+
+For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+
+### Example 
+```perl
+use Data::Dumper;
+
+# Configure API key authorization: test_api_key_header
+$WWW::SwaggerClient::Configuration::api_key->{'test_api_key_header'} = 'YOUR_API_KEY';
+# uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+#$WWW::SwaggerClient::Configuration::api_key_prefix->{'test_api_key_header'} = "BEARER";
+# Configure API key authorization: test_api_key_query
+$WWW::SwaggerClient::Configuration::api_key->{'test_api_key_query'} = 'YOUR_API_KEY';
+# uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+#$WWW::SwaggerClient::Configuration::api_key_prefix->{'test_api_key_query'} = "BEARER";
+
+my $api_instance = WWW::SwaggerClient::StoreApi->new();
+my $order_id = 'order_id_example'; # string | ID of pet that needs to be fetched
+
+eval { 
+    my $result = $api_instance->get_order_by_id(order_id => $order_id);
+    print Dumper($result);
+};
+if ($@) {
+    warn "Exception when calling StoreApi->get_order_by_id: $@\n";
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **order_id** | **string**| ID of pet that needs to be fetched | 
+
+### Return type
+
+[**Order**](Order.md)
+
+### Authorization
+
+[test_api_key_header](../README.md#test_api_key_header), [test_api_key_query](../README.md#test_api_key_query)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **place_order**
+> Order place_order(body => $body)
+
+Place an order for a pet
+
+
+
+### Example 
+```perl
+use Data::Dumper;
+
+# Configure API key authorization: test_api_client_id
+$WWW::SwaggerClient::Configuration::api_key->{'x-test_api_client_id'} = 'YOUR_API_KEY';
+# uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+#$WWW::SwaggerClient::Configuration::api_key_prefix->{'x-test_api_client_id'} = "BEARER";
+# Configure API key authorization: test_api_client_secret
+$WWW::SwaggerClient::Configuration::api_key->{'x-test_api_client_secret'} = 'YOUR_API_KEY';
+# uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+#$WWW::SwaggerClient::Configuration::api_key_prefix->{'x-test_api_client_secret'} = "BEARER";
+
+my $api_instance = WWW::SwaggerClient::StoreApi->new();
+my $body = WWW::SwaggerClient::Object::Order->new(); # Order | order placed for purchasing the pet
+
+eval { 
+    my $result = $api_instance->place_order(body => $body);
+    print Dumper($result);
+};
+if ($@) {
+    warn "Exception when calling StoreApi->place_order: $@\n";
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Order**](Order.md)| order placed for purchasing the pet | [optional] 
+
+### Return type
+
+[**Order**](Order.md)
+
+### Authorization
+
+[test_api_client_id](../README.md#test_api_client_id), [test_api_client_secret](../README.md#test_api_client_secret)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/samples/client/petstore/perl/docs/Tag.md b/samples/client/petstore/perl/docs/Tag.md
new file mode 100644
index 00000000000..961035e41a4
--- /dev/null
+++ b/samples/client/petstore/perl/docs/Tag.md
@@ -0,0 +1,16 @@
+# WWW::SwaggerClient::Object::Tag
+
+## Load the model package
+```perl
+use WWW::SwaggerClient::Object::Tag;
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **int** |  | [optional] 
+**name** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/perl/docs/User.md b/samples/client/petstore/perl/docs/User.md
new file mode 100644
index 00000000000..b0335312e6a
--- /dev/null
+++ b/samples/client/petstore/perl/docs/User.md
@@ -0,0 +1,22 @@
+# WWW::SwaggerClient::Object::User
+
+## Load the model package
+```perl
+use WWW::SwaggerClient::Object::User;
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **int** |  | [optional] 
+**username** | **string** |  | [optional] 
+**first_name** | **string** |  | [optional] 
+**last_name** | **string** |  | [optional] 
+**email** | **string** |  | [optional] 
+**password** | **string** |  | [optional] 
+**phone** | **string** |  | [optional] 
+**user_status** | **int** | User Status | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/perl/docs/UserApi.md b/samples/client/petstore/perl/docs/UserApi.md
new file mode 100644
index 00000000000..7330c1b3980
--- /dev/null
+++ b/samples/client/petstore/perl/docs/UserApi.md
@@ -0,0 +1,371 @@
+# WWW::SwaggerClient::UserApi
+
+## Load the API package
+```perl
+use WWW::SwaggerClient::Object::UserApi;
+```
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**create_user**](UserApi.md#create_user) | **POST** /user | Create user
+[**create_users_with_array_input**](UserApi.md#create_users_with_array_input) | **POST** /user/createWithArray | Creates list of users with given input array
+[**create_users_with_list_input**](UserApi.md#create_users_with_list_input) | **POST** /user/createWithList | Creates list of users with given input array
+[**delete_user**](UserApi.md#delete_user) | **DELETE** /user/{username} | Delete user
+[**get_user_by_name**](UserApi.md#get_user_by_name) | **GET** /user/{username} | Get user by user name
+[**login_user**](UserApi.md#login_user) | **GET** /user/login | Logs user into the system
+[**logout_user**](UserApi.md#logout_user) | **GET** /user/logout | Logs out current logged in user session
+[**update_user**](UserApi.md#update_user) | **PUT** /user/{username} | Updated user
+
+
+# **create_user**
+> create_user(body => $body)
+
+Create user
+
+This can only be done by the logged in user.
+
+### Example 
+```perl
+use Data::Dumper;
+
+my $api_instance = WWW::SwaggerClient::UserApi->new();
+my $body = WWW::SwaggerClient::Object::User->new(); # User | Created user object
+
+eval { 
+    $api_instance->create_user(body => $body);
+};
+if ($@) {
+    warn "Exception when calling UserApi->create_user: $@\n";
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**User**](User.md)| Created user object | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **create_users_with_array_input**
+> create_users_with_array_input(body => $body)
+
+Creates list of users with given input array
+
+
+
+### Example 
+```perl
+use Data::Dumper;
+
+my $api_instance = WWW::SwaggerClient::UserApi->new();
+my $body = (WWW::SwaggerClient::Object::ARRAY[User]->new()); # ARRAY[User] | List of user object
+
+eval { 
+    $api_instance->create_users_with_array_input(body => $body);
+};
+if ($@) {
+    warn "Exception when calling UserApi->create_users_with_array_input: $@\n";
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**ARRAY[User]**](User.md)| List of user object | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **create_users_with_list_input**
+> create_users_with_list_input(body => $body)
+
+Creates list of users with given input array
+
+
+
+### Example 
+```perl
+use Data::Dumper;
+
+my $api_instance = WWW::SwaggerClient::UserApi->new();
+my $body = (WWW::SwaggerClient::Object::ARRAY[User]->new()); # ARRAY[User] | List of user object
+
+eval { 
+    $api_instance->create_users_with_list_input(body => $body);
+};
+if ($@) {
+    warn "Exception when calling UserApi->create_users_with_list_input: $@\n";
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**ARRAY[User]**](User.md)| List of user object | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **delete_user**
+> delete_user(username => $username)
+
+Delete user
+
+This can only be done by the logged in user.
+
+### Example 
+```perl
+use Data::Dumper;
+
+# Configure HTTP basic authorization: test_http_basic
+$WWW::SwaggerClient::Configuration::username = 'YOUR_USERNAME';
+$WWW::SwaggerClient::Configuration::password = 'YOUR_PASSWORD';
+
+my $api_instance = WWW::SwaggerClient::UserApi->new();
+my $username = 'username_example'; # string | The name that needs to be deleted
+
+eval { 
+    $api_instance->delete_user(username => $username);
+};
+if ($@) {
+    warn "Exception when calling UserApi->delete_user: $@\n";
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **string**| The name that needs to be deleted | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[test_http_basic](../README.md#test_http_basic)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_user_by_name**
+> User get_user_by_name(username => $username)
+
+Get user by user name
+
+
+
+### Example 
+```perl
+use Data::Dumper;
+
+my $api_instance = WWW::SwaggerClient::UserApi->new();
+my $username = 'username_example'; # string | The name that needs to be fetched. Use user1 for testing.
+
+eval { 
+    my $result = $api_instance->get_user_by_name(username => $username);
+    print Dumper($result);
+};
+if ($@) {
+    warn "Exception when calling UserApi->get_user_by_name: $@\n";
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **string**| The name that needs to be fetched. Use user1 for testing. | 
+
+### Return type
+
+[**User**](User.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **login_user**
+> string login_user(username => $username, password => $password)
+
+Logs user into the system
+
+
+
+### Example 
+```perl
+use Data::Dumper;
+
+my $api_instance = WWW::SwaggerClient::UserApi->new();
+my $username = 'username_example'; # string | The user name for login
+my $password = 'password_example'; # string | The password for login in clear text
+
+eval { 
+    my $result = $api_instance->login_user(username => $username, password => $password);
+    print Dumper($result);
+};
+if ($@) {
+    warn "Exception when calling UserApi->login_user: $@\n";
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **string**| The user name for login | [optional] 
+ **password** | **string**| The password for login in clear text | [optional] 
+
+### Return type
+
+**string**
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **logout_user**
+> logout_user()
+
+Logs out current logged in user session
+
+
+
+### Example 
+```perl
+use Data::Dumper;
+
+my $api_instance = WWW::SwaggerClient::UserApi->new();
+
+eval { 
+    $api_instance->logout_user();
+};
+if ($@) {
+    warn "Exception when calling UserApi->logout_user: $@\n";
+}
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **update_user**
+> update_user(username => $username, body => $body)
+
+Updated user
+
+This can only be done by the logged in user.
+
+### Example 
+```perl
+use Data::Dumper;
+
+my $api_instance = WWW::SwaggerClient::UserApi->new();
+my $username = 'username_example'; # string | name that need to be deleted
+my $body = WWW::SwaggerClient::Object::User->new(); # User | Updated user object
+
+eval { 
+    $api_instance->update_user(username => $username, body => $body);
+};
+if ($@) {
+    warn "Exception when calling UserApi->update_user: $@\n";
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **string**| name that need to be deleted | 
+ **body** | [**User**](User.md)| Updated user object | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/samples/client/petstore/perl/git_push.sh b/samples/client/petstore/perl/git_push.sh
new file mode 100644
index 00000000000..1a36388db02
--- /dev/null
+++ b/samples/client/petstore/perl/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="YOUR_GIT_USR_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="YOUR_GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm
index 11f2ab3f236..86dba7e1bcd 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm
@@ -319,6 +319,13 @@ sub update_params_for_auth {
         if (!defined($auth)) {
             # TODO show warning about auth setting not defined
         }
+        elsif ($auth eq 'test_api_key_header') {
+            
+            my $api_key = $self->get_api_key_with_prefix('test_api_key_header');
+            if ($api_key) {
+                $header_params->{'test_api_key_header'} = $api_key;
+            }
+        }
         elsif ($auth eq 'api_key') {
             
             my $api_key = $self->get_api_key_with_prefix('api_key');
@@ -326,6 +333,33 @@ sub update_params_for_auth {
                 $header_params->{'api_key'} = $api_key;
             }
         }
+        elsif ($auth eq 'test_http_basic') {
+            
+            if ($WWW::SwaggerClient::Configuration::username || $WWW::SwaggerClient::Configuration::password) {
+                $header_params->{'Authorization'} = 'Basic ' . encode_base64($WWW::SwaggerClient::Configuration::username . ":" . $WWW::SwaggerClient::Configuration::password);
+            }
+        }
+        elsif ($auth eq 'test_api_client_secret') {
+            
+            my $api_key = $self->get_api_key_with_prefix('x-test_api_client_secret');
+            if ($api_key) {
+                $header_params->{'x-test_api_client_secret'} = $api_key;
+            }
+        }
+        elsif ($auth eq 'test_api_client_id') {
+            
+            my $api_key = $self->get_api_key_with_prefix('x-test_api_client_id');
+            if ($api_key) {
+                $header_params->{'x-test_api_client_id'} = $api_key;
+            }
+        }
+        elsif ($auth eq 'test_api_key_query') {
+            
+            my $api_key = $self->get_api_key_with_prefix('test_api_key_query');
+            if ($api_key) {
+                $query_params->{'test_api_key_query'} = $api_key;
+            }
+        }
         elsif ($auth eq 'petstore_auth') {
             
             if ($WWW::SwaggerClient::Configuration::access_token) {
@@ -341,7 +375,7 @@ sub update_params_for_auth {
 
 # The endpoint API class has not found any settings for auth. This may be deliberate, 
 # in which case update_params_for_auth() will be a no-op. But it may also be that the 
-# swagger spec does not describe the intended authorization. So we check in the config for any 
+# OpenAPI Spec does not describe the intended authorization. So we check in the config for any 
 # auth tokens and if we find any, we use them for all endpoints; 
 sub _global_auth_setup {
 	my ($self, $header_params, $query_params) = @_; 
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm
index f0846a9b594..0ffd5498420 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm
@@ -13,7 +13,7 @@ use WWW::SwaggerClient::ApiClient;
 
 =head1 Name
 
-	WWW::SwaggerClient::ApiFactory - constructs APIs to retrieve SwaggerClient objects
+	WWW::SwaggerClient::ApiFactory - constructs APIs to retrieve WWW::SwaggerClient objects
 
 =head1 Synopsis
 
@@ -64,7 +64,7 @@ sub new {
 	
 	$which is a nickname for the class: 
 	
-		WWW::FooBarClient::BazApi has nickname 'Baz'
+		FooBarClient::BazApi has nickname 'Baz'
 		
 =cut
 
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Animal.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Animal.pm
new file mode 100644
index 00000000000..c2e124ad8b4
--- /dev/null
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Animal.pm
@@ -0,0 +1,127 @@
+package WWW::SwaggerClient::Object::Animal;
+
+require 5.6.0;
+use strict;
+use warnings;
+use utf8;
+use JSON qw(decode_json);
+use Data::Dumper;
+use Module::Runtime qw(use_module);
+use Log::Any qw($log);
+use Date::Parse;
+use DateTime;
+
+use base ("Class::Accessor", "Class::Data::Inheritable");
+
+
+#
+#
+#
+#NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+#
+
+__PACKAGE__->mk_classdata('attribute_map' => {});
+__PACKAGE__->mk_classdata('swagger_types' => {});
+__PACKAGE__->mk_classdata('method_documentation' => {}); 
+__PACKAGE__->mk_classdata('class_documentation' => {});
+
+# new object
+sub new { 
+    my ($class, %args) = @_; 
+
+	my $self = bless {}, $class;
+	
+	foreach my $attribute (keys %{$class->attribute_map}) {
+		my $args_key = $class->attribute_map->{$attribute};
+		$self->$attribute( $args{ $args_key } );
+	}
+	
+	return $self;
+}  
+
+# return perl hash
+sub to_hash {
+    return decode_json(JSON->new->convert_blessed->encode( shift ));
+}
+
+# used by JSON for serialization
+sub TO_JSON { 
+    my $self = shift;
+    my $_data = {};
+    foreach my $_key (keys %{$self->attribute_map}) {
+        if (defined $self->{$_key}) {
+            $_data->{$self->attribute_map->{$_key}} = $self->{$_key};
+        }
+    }
+    return $_data;
+}
+
+# from Perl hashref
+sub from_hash {
+    my ($self, $hash) = @_;
+
+    # loop through attributes and use swagger_types to deserialize the data
+    while ( my ($_key, $_type) = each %{$self->swagger_types} ) {
+    	my $_json_attribute = $self->attribute_map->{$_key}; 
+        if ($_type =~ /^array\[/i) { # array
+            my $_subclass = substr($_type, 6, -1);
+            my @_array = ();
+            foreach my $_element (@{$hash->{$_json_attribute}}) {
+                push @_array, $self->_deserialize($_subclass, $_element);
+            }
+            $self->{$_key} = \@_array;
+        } elsif (exists $hash->{$_json_attribute}) { #hash(model), primitive, datetime
+            $self->{$_key} = $self->_deserialize($_type, $hash->{$_json_attribute});
+        } else {
+        	$log->debugf("Warning: %s (%s) does not exist in input hash\n", $_key, $_json_attribute);
+        }
+    }
+  
+    return $self;
+}
+
+# deserialize non-array data
+sub _deserialize {
+    my ($self, $type, $data) = @_;
+    $log->debugf("deserializing %s with %s",Dumper($data), $type);
+        
+    if ($type eq 'DateTime') {
+        return DateTime->from_epoch(epoch => str2time($data));
+    } elsif ( grep( /^$type$/, ('int', 'double', 'string', 'boolean'))) {
+        return $data;
+    } else { # hash(model)
+        my $_instance = eval "WWW::SwaggerClient::Object::$type->new()";
+        return $_instance->from_hash($data);
+    }
+}
+
+
+
+__PACKAGE__->class_documentation({description => '',
+                                  class => 'Animal',
+                                  required => [], # TODO
+}                                 );
+
+__PACKAGE__->method_documentation({
+    'class_name' => {
+    	datatype => 'string',
+    	base_name => 'className',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    
+});
+
+__PACKAGE__->swagger_types( {
+    'class_name' => 'string'
+} );
+
+__PACKAGE__->attribute_map( {
+    'class_name' => 'className'
+} );
+
+__PACKAGE__->mk_accessors(keys %{__PACKAGE__->attribute_map});
+
+
+1;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Cat.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Cat.pm
new file mode 100644
index 00000000000..05500d61ad0
--- /dev/null
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Cat.pm
@@ -0,0 +1,136 @@
+package WWW::SwaggerClient::Object::Cat;
+
+require 5.6.0;
+use strict;
+use warnings;
+use utf8;
+use JSON qw(decode_json);
+use Data::Dumper;
+use Module::Runtime qw(use_module);
+use Log::Any qw($log);
+use Date::Parse;
+use DateTime;
+
+use base ("Class::Accessor", "Class::Data::Inheritable");
+
+
+#
+#
+#
+#NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+#
+
+__PACKAGE__->mk_classdata('attribute_map' => {});
+__PACKAGE__->mk_classdata('swagger_types' => {});
+__PACKAGE__->mk_classdata('method_documentation' => {}); 
+__PACKAGE__->mk_classdata('class_documentation' => {});
+
+# new object
+sub new { 
+    my ($class, %args) = @_; 
+
+	my $self = bless {}, $class;
+	
+	foreach my $attribute (keys %{$class->attribute_map}) {
+		my $args_key = $class->attribute_map->{$attribute};
+		$self->$attribute( $args{ $args_key } );
+	}
+	
+	return $self;
+}  
+
+# return perl hash
+sub to_hash {
+    return decode_json(JSON->new->convert_blessed->encode( shift ));
+}
+
+# used by JSON for serialization
+sub TO_JSON { 
+    my $self = shift;
+    my $_data = {};
+    foreach my $_key (keys %{$self->attribute_map}) {
+        if (defined $self->{$_key}) {
+            $_data->{$self->attribute_map->{$_key}} = $self->{$_key};
+        }
+    }
+    return $_data;
+}
+
+# from Perl hashref
+sub from_hash {
+    my ($self, $hash) = @_;
+
+    # loop through attributes and use swagger_types to deserialize the data
+    while ( my ($_key, $_type) = each %{$self->swagger_types} ) {
+    	my $_json_attribute = $self->attribute_map->{$_key}; 
+        if ($_type =~ /^array\[/i) { # array
+            my $_subclass = substr($_type, 6, -1);
+            my @_array = ();
+            foreach my $_element (@{$hash->{$_json_attribute}}) {
+                push @_array, $self->_deserialize($_subclass, $_element);
+            }
+            $self->{$_key} = \@_array;
+        } elsif (exists $hash->{$_json_attribute}) { #hash(model), primitive, datetime
+            $self->{$_key} = $self->_deserialize($_type, $hash->{$_json_attribute});
+        } else {
+        	$log->debugf("Warning: %s (%s) does not exist in input hash\n", $_key, $_json_attribute);
+        }
+    }
+  
+    return $self;
+}
+
+# deserialize non-array data
+sub _deserialize {
+    my ($self, $type, $data) = @_;
+    $log->debugf("deserializing %s with %s",Dumper($data), $type);
+        
+    if ($type eq 'DateTime') {
+        return DateTime->from_epoch(epoch => str2time($data));
+    } elsif ( grep( /^$type$/, ('int', 'double', 'string', 'boolean'))) {
+        return $data;
+    } else { # hash(model)
+        my $_instance = eval "WWW::SwaggerClient::Object::$type->new()";
+        return $_instance->from_hash($data);
+    }
+}
+
+
+
+__PACKAGE__->class_documentation({description => '',
+                                  class => 'Cat',
+                                  required => [], # TODO
+}                                 );
+
+__PACKAGE__->method_documentation({
+    'class_name' => {
+    	datatype => 'string',
+    	base_name => 'className',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    'declawed' => {
+    	datatype => 'boolean',
+    	base_name => 'declawed',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    
+});
+
+__PACKAGE__->swagger_types( {
+    'class_name' => 'string',
+    'declawed' => 'boolean'
+} );
+
+__PACKAGE__->attribute_map( {
+    'class_name' => 'className',
+    'declawed' => 'declawed'
+} );
+
+__PACKAGE__->mk_accessors(keys %{__PACKAGE__->attribute_map});
+
+
+1;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Dog.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Dog.pm
new file mode 100644
index 00000000000..b4192ec71cd
--- /dev/null
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Dog.pm
@@ -0,0 +1,136 @@
+package WWW::SwaggerClient::Object::Dog;
+
+require 5.6.0;
+use strict;
+use warnings;
+use utf8;
+use JSON qw(decode_json);
+use Data::Dumper;
+use Module::Runtime qw(use_module);
+use Log::Any qw($log);
+use Date::Parse;
+use DateTime;
+
+use base ("Class::Accessor", "Class::Data::Inheritable");
+
+
+#
+#
+#
+#NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+#
+
+__PACKAGE__->mk_classdata('attribute_map' => {});
+__PACKAGE__->mk_classdata('swagger_types' => {});
+__PACKAGE__->mk_classdata('method_documentation' => {}); 
+__PACKAGE__->mk_classdata('class_documentation' => {});
+
+# new object
+sub new { 
+    my ($class, %args) = @_; 
+
+	my $self = bless {}, $class;
+	
+	foreach my $attribute (keys %{$class->attribute_map}) {
+		my $args_key = $class->attribute_map->{$attribute};
+		$self->$attribute( $args{ $args_key } );
+	}
+	
+	return $self;
+}  
+
+# return perl hash
+sub to_hash {
+    return decode_json(JSON->new->convert_blessed->encode( shift ));
+}
+
+# used by JSON for serialization
+sub TO_JSON { 
+    my $self = shift;
+    my $_data = {};
+    foreach my $_key (keys %{$self->attribute_map}) {
+        if (defined $self->{$_key}) {
+            $_data->{$self->attribute_map->{$_key}} = $self->{$_key};
+        }
+    }
+    return $_data;
+}
+
+# from Perl hashref
+sub from_hash {
+    my ($self, $hash) = @_;
+
+    # loop through attributes and use swagger_types to deserialize the data
+    while ( my ($_key, $_type) = each %{$self->swagger_types} ) {
+    	my $_json_attribute = $self->attribute_map->{$_key}; 
+        if ($_type =~ /^array\[/i) { # array
+            my $_subclass = substr($_type, 6, -1);
+            my @_array = ();
+            foreach my $_element (@{$hash->{$_json_attribute}}) {
+                push @_array, $self->_deserialize($_subclass, $_element);
+            }
+            $self->{$_key} = \@_array;
+        } elsif (exists $hash->{$_json_attribute}) { #hash(model), primitive, datetime
+            $self->{$_key} = $self->_deserialize($_type, $hash->{$_json_attribute});
+        } else {
+        	$log->debugf("Warning: %s (%s) does not exist in input hash\n", $_key, $_json_attribute);
+        }
+    }
+  
+    return $self;
+}
+
+# deserialize non-array data
+sub _deserialize {
+    my ($self, $type, $data) = @_;
+    $log->debugf("deserializing %s with %s",Dumper($data), $type);
+        
+    if ($type eq 'DateTime') {
+        return DateTime->from_epoch(epoch => str2time($data));
+    } elsif ( grep( /^$type$/, ('int', 'double', 'string', 'boolean'))) {
+        return $data;
+    } else { # hash(model)
+        my $_instance = eval "WWW::SwaggerClient::Object::$type->new()";
+        return $_instance->from_hash($data);
+    }
+}
+
+
+
+__PACKAGE__->class_documentation({description => '',
+                                  class => 'Dog',
+                                  required => [], # TODO
+}                                 );
+
+__PACKAGE__->method_documentation({
+    'class_name' => {
+    	datatype => 'string',
+    	base_name => 'className',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    'breed' => {
+    	datatype => 'string',
+    	base_name => 'breed',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    
+});
+
+__PACKAGE__->swagger_types( {
+    'class_name' => 'string',
+    'breed' => 'string'
+} );
+
+__PACKAGE__->attribute_map( {
+    'class_name' => 'className',
+    'breed' => 'breed'
+} );
+
+__PACKAGE__->mk_accessors(keys %{__PACKAGE__->attribute_map});
+
+
+1;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/InlineResponse200.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/InlineResponse200.pm
new file mode 100644
index 00000000000..90f7bad236e
--- /dev/null
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/InlineResponse200.pm
@@ -0,0 +1,172 @@
+package WWW::SwaggerClient::Object::InlineResponse200;
+
+require 5.6.0;
+use strict;
+use warnings;
+use utf8;
+use JSON qw(decode_json);
+use Data::Dumper;
+use Module::Runtime qw(use_module);
+use Log::Any qw($log);
+use Date::Parse;
+use DateTime;
+
+use base ("Class::Accessor", "Class::Data::Inheritable");
+
+
+#
+#
+#
+#NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+#
+
+__PACKAGE__->mk_classdata('attribute_map' => {});
+__PACKAGE__->mk_classdata('swagger_types' => {});
+__PACKAGE__->mk_classdata('method_documentation' => {}); 
+__PACKAGE__->mk_classdata('class_documentation' => {});
+
+# new object
+sub new { 
+    my ($class, %args) = @_; 
+
+	my $self = bless {}, $class;
+	
+	foreach my $attribute (keys %{$class->attribute_map}) {
+		my $args_key = $class->attribute_map->{$attribute};
+		$self->$attribute( $args{ $args_key } );
+	}
+	
+	return $self;
+}  
+
+# return perl hash
+sub to_hash {
+    return decode_json(JSON->new->convert_blessed->encode( shift ));
+}
+
+# used by JSON for serialization
+sub TO_JSON { 
+    my $self = shift;
+    my $_data = {};
+    foreach my $_key (keys %{$self->attribute_map}) {
+        if (defined $self->{$_key}) {
+            $_data->{$self->attribute_map->{$_key}} = $self->{$_key};
+        }
+    }
+    return $_data;
+}
+
+# from Perl hashref
+sub from_hash {
+    my ($self, $hash) = @_;
+
+    # loop through attributes and use swagger_types to deserialize the data
+    while ( my ($_key, $_type) = each %{$self->swagger_types} ) {
+    	my $_json_attribute = $self->attribute_map->{$_key}; 
+        if ($_type =~ /^array\[/i) { # array
+            my $_subclass = substr($_type, 6, -1);
+            my @_array = ();
+            foreach my $_element (@{$hash->{$_json_attribute}}) {
+                push @_array, $self->_deserialize($_subclass, $_element);
+            }
+            $self->{$_key} = \@_array;
+        } elsif (exists $hash->{$_json_attribute}) { #hash(model), primitive, datetime
+            $self->{$_key} = $self->_deserialize($_type, $hash->{$_json_attribute});
+        } else {
+        	$log->debugf("Warning: %s (%s) does not exist in input hash\n", $_key, $_json_attribute);
+        }
+    }
+  
+    return $self;
+}
+
+# deserialize non-array data
+sub _deserialize {
+    my ($self, $type, $data) = @_;
+    $log->debugf("deserializing %s with %s",Dumper($data), $type);
+        
+    if ($type eq 'DateTime') {
+        return DateTime->from_epoch(epoch => str2time($data));
+    } elsif ( grep( /^$type$/, ('int', 'double', 'string', 'boolean'))) {
+        return $data;
+    } else { # hash(model)
+        my $_instance = eval "WWW::SwaggerClient::Object::$type->new()";
+        return $_instance->from_hash($data);
+    }
+}
+
+
+
+__PACKAGE__->class_documentation({description => '',
+                                  class => 'InlineResponse200',
+                                  required => [], # TODO
+}                                 );
+
+__PACKAGE__->method_documentation({
+    'tags' => {
+    	datatype => 'ARRAY[Tag]',
+    	base_name => 'tags',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    'id' => {
+    	datatype => 'int',
+    	base_name => 'id',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    'category' => {
+    	datatype => 'object',
+    	base_name => 'category',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    'status' => {
+    	datatype => 'string',
+    	base_name => 'status',
+    	description => 'pet status in the store',
+    	format => '',
+    	read_only => '',
+    		},
+    'name' => {
+    	datatype => 'string',
+    	base_name => 'name',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    'photo_urls' => {
+    	datatype => 'ARRAY[string]',
+    	base_name => 'photoUrls',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    
+});
+
+__PACKAGE__->swagger_types( {
+    'tags' => 'ARRAY[Tag]',
+    'id' => 'int',
+    'category' => 'object',
+    'status' => 'string',
+    'name' => 'string',
+    'photo_urls' => 'ARRAY[string]'
+} );
+
+__PACKAGE__->attribute_map( {
+    'tags' => 'tags',
+    'id' => 'id',
+    'category' => 'category',
+    'status' => 'status',
+    'name' => 'name',
+    'photo_urls' => 'photoUrls'
+} );
+
+__PACKAGE__->mk_accessors(keys %{__PACKAGE__->attribute_map});
+
+
+1;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Model200Response.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Model200Response.pm
new file mode 100644
index 00000000000..8ec16d4b97a
--- /dev/null
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Model200Response.pm
@@ -0,0 +1,127 @@
+package WWW::SwaggerClient::Object::Model200Response;
+
+require 5.6.0;
+use strict;
+use warnings;
+use utf8;
+use JSON qw(decode_json);
+use Data::Dumper;
+use Module::Runtime qw(use_module);
+use Log::Any qw($log);
+use Date::Parse;
+use DateTime;
+
+use base ("Class::Accessor", "Class::Data::Inheritable");
+
+
+#
+#
+#
+#NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+#
+
+__PACKAGE__->mk_classdata('attribute_map' => {});
+__PACKAGE__->mk_classdata('swagger_types' => {});
+__PACKAGE__->mk_classdata('method_documentation' => {}); 
+__PACKAGE__->mk_classdata('class_documentation' => {});
+
+# new object
+sub new { 
+    my ($class, %args) = @_; 
+
+	my $self = bless {}, $class;
+	
+	foreach my $attribute (keys %{$class->attribute_map}) {
+		my $args_key = $class->attribute_map->{$attribute};
+		$self->$attribute( $args{ $args_key } );
+	}
+	
+	return $self;
+}  
+
+# return perl hash
+sub to_hash {
+    return decode_json(JSON->new->convert_blessed->encode( shift ));
+}
+
+# used by JSON for serialization
+sub TO_JSON { 
+    my $self = shift;
+    my $_data = {};
+    foreach my $_key (keys %{$self->attribute_map}) {
+        if (defined $self->{$_key}) {
+            $_data->{$self->attribute_map->{$_key}} = $self->{$_key};
+        }
+    }
+    return $_data;
+}
+
+# from Perl hashref
+sub from_hash {
+    my ($self, $hash) = @_;
+
+    # loop through attributes and use swagger_types to deserialize the data
+    while ( my ($_key, $_type) = each %{$self->swagger_types} ) {
+    	my $_json_attribute = $self->attribute_map->{$_key}; 
+        if ($_type =~ /^array\[/i) { # array
+            my $_subclass = substr($_type, 6, -1);
+            my @_array = ();
+            foreach my $_element (@{$hash->{$_json_attribute}}) {
+                push @_array, $self->_deserialize($_subclass, $_element);
+            }
+            $self->{$_key} = \@_array;
+        } elsif (exists $hash->{$_json_attribute}) { #hash(model), primitive, datetime
+            $self->{$_key} = $self->_deserialize($_type, $hash->{$_json_attribute});
+        } else {
+        	$log->debugf("Warning: %s (%s) does not exist in input hash\n", $_key, $_json_attribute);
+        }
+    }
+  
+    return $self;
+}
+
+# deserialize non-array data
+sub _deserialize {
+    my ($self, $type, $data) = @_;
+    $log->debugf("deserializing %s with %s",Dumper($data), $type);
+        
+    if ($type eq 'DateTime') {
+        return DateTime->from_epoch(epoch => str2time($data));
+    } elsif ( grep( /^$type$/, ('int', 'double', 'string', 'boolean'))) {
+        return $data;
+    } else { # hash(model)
+        my $_instance = eval "WWW::SwaggerClient::Object::$type->new()";
+        return $_instance->from_hash($data);
+    }
+}
+
+
+
+__PACKAGE__->class_documentation({description => '',
+                                  class => 'Model200Response',
+                                  required => [], # TODO
+}                                 );
+
+__PACKAGE__->method_documentation({
+    'name' => {
+    	datatype => 'int',
+    	base_name => 'name',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    
+});
+
+__PACKAGE__->swagger_types( {
+    'name' => 'int'
+} );
+
+__PACKAGE__->attribute_map( {
+    'name' => 'name'
+} );
+
+__PACKAGE__->mk_accessors(keys %{__PACKAGE__->attribute_map});
+
+
+1;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ModelReturn.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ModelReturn.pm
new file mode 100644
index 00000000000..5436aae64bc
--- /dev/null
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ModelReturn.pm
@@ -0,0 +1,127 @@
+package WWW::SwaggerClient::Object::ModelReturn;
+
+require 5.6.0;
+use strict;
+use warnings;
+use utf8;
+use JSON qw(decode_json);
+use Data::Dumper;
+use Module::Runtime qw(use_module);
+use Log::Any qw($log);
+use Date::Parse;
+use DateTime;
+
+use base ("Class::Accessor", "Class::Data::Inheritable");
+
+
+#
+#
+#
+#NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+#
+
+__PACKAGE__->mk_classdata('attribute_map' => {});
+__PACKAGE__->mk_classdata('swagger_types' => {});
+__PACKAGE__->mk_classdata('method_documentation' => {}); 
+__PACKAGE__->mk_classdata('class_documentation' => {});
+
+# new object
+sub new { 
+    my ($class, %args) = @_; 
+
+	my $self = bless {}, $class;
+	
+	foreach my $attribute (keys %{$class->attribute_map}) {
+		my $args_key = $class->attribute_map->{$attribute};
+		$self->$attribute( $args{ $args_key } );
+	}
+	
+	return $self;
+}  
+
+# return perl hash
+sub to_hash {
+    return decode_json(JSON->new->convert_blessed->encode( shift ));
+}
+
+# used by JSON for serialization
+sub TO_JSON { 
+    my $self = shift;
+    my $_data = {};
+    foreach my $_key (keys %{$self->attribute_map}) {
+        if (defined $self->{$_key}) {
+            $_data->{$self->attribute_map->{$_key}} = $self->{$_key};
+        }
+    }
+    return $_data;
+}
+
+# from Perl hashref
+sub from_hash {
+    my ($self, $hash) = @_;
+
+    # loop through attributes and use swagger_types to deserialize the data
+    while ( my ($_key, $_type) = each %{$self->swagger_types} ) {
+    	my $_json_attribute = $self->attribute_map->{$_key}; 
+        if ($_type =~ /^array\[/i) { # array
+            my $_subclass = substr($_type, 6, -1);
+            my @_array = ();
+            foreach my $_element (@{$hash->{$_json_attribute}}) {
+                push @_array, $self->_deserialize($_subclass, $_element);
+            }
+            $self->{$_key} = \@_array;
+        } elsif (exists $hash->{$_json_attribute}) { #hash(model), primitive, datetime
+            $self->{$_key} = $self->_deserialize($_type, $hash->{$_json_attribute});
+        } else {
+        	$log->debugf("Warning: %s (%s) does not exist in input hash\n", $_key, $_json_attribute);
+        }
+    }
+  
+    return $self;
+}
+
+# deserialize non-array data
+sub _deserialize {
+    my ($self, $type, $data) = @_;
+    $log->debugf("deserializing %s with %s",Dumper($data), $type);
+        
+    if ($type eq 'DateTime') {
+        return DateTime->from_epoch(epoch => str2time($data));
+    } elsif ( grep( /^$type$/, ('int', 'double', 'string', 'boolean'))) {
+        return $data;
+    } else { # hash(model)
+        my $_instance = eval "WWW::SwaggerClient::Object::$type->new()";
+        return $_instance->from_hash($data);
+    }
+}
+
+
+
+__PACKAGE__->class_documentation({description => '',
+                                  class => 'ModelReturn',
+                                  required => [], # TODO
+}                                 );
+
+__PACKAGE__->method_documentation({
+    'return' => {
+    	datatype => 'int',
+    	base_name => 'return',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    
+});
+
+__PACKAGE__->swagger_types( {
+    'return' => 'int'
+} );
+
+__PACKAGE__->attribute_map( {
+    'return' => 'return'
+} );
+
+__PACKAGE__->mk_accessors(keys %{__PACKAGE__->attribute_map});
+
+
+1;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Name.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Name.pm
new file mode 100644
index 00000000000..f136a7f031e
--- /dev/null
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Name.pm
@@ -0,0 +1,136 @@
+package WWW::SwaggerClient::Object::Name;
+
+require 5.6.0;
+use strict;
+use warnings;
+use utf8;
+use JSON qw(decode_json);
+use Data::Dumper;
+use Module::Runtime qw(use_module);
+use Log::Any qw($log);
+use Date::Parse;
+use DateTime;
+
+use base ("Class::Accessor", "Class::Data::Inheritable");
+
+
+#
+#
+#
+#NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+#
+
+__PACKAGE__->mk_classdata('attribute_map' => {});
+__PACKAGE__->mk_classdata('swagger_types' => {});
+__PACKAGE__->mk_classdata('method_documentation' => {}); 
+__PACKAGE__->mk_classdata('class_documentation' => {});
+
+# new object
+sub new { 
+    my ($class, %args) = @_; 
+
+	my $self = bless {}, $class;
+	
+	foreach my $attribute (keys %{$class->attribute_map}) {
+		my $args_key = $class->attribute_map->{$attribute};
+		$self->$attribute( $args{ $args_key } );
+	}
+	
+	return $self;
+}  
+
+# return perl hash
+sub to_hash {
+    return decode_json(JSON->new->convert_blessed->encode( shift ));
+}
+
+# used by JSON for serialization
+sub TO_JSON { 
+    my $self = shift;
+    my $_data = {};
+    foreach my $_key (keys %{$self->attribute_map}) {
+        if (defined $self->{$_key}) {
+            $_data->{$self->attribute_map->{$_key}} = $self->{$_key};
+        }
+    }
+    return $_data;
+}
+
+# from Perl hashref
+sub from_hash {
+    my ($self, $hash) = @_;
+
+    # loop through attributes and use swagger_types to deserialize the data
+    while ( my ($_key, $_type) = each %{$self->swagger_types} ) {
+    	my $_json_attribute = $self->attribute_map->{$_key}; 
+        if ($_type =~ /^array\[/i) { # array
+            my $_subclass = substr($_type, 6, -1);
+            my @_array = ();
+            foreach my $_element (@{$hash->{$_json_attribute}}) {
+                push @_array, $self->_deserialize($_subclass, $_element);
+            }
+            $self->{$_key} = \@_array;
+        } elsif (exists $hash->{$_json_attribute}) { #hash(model), primitive, datetime
+            $self->{$_key} = $self->_deserialize($_type, $hash->{$_json_attribute});
+        } else {
+        	$log->debugf("Warning: %s (%s) does not exist in input hash\n", $_key, $_json_attribute);
+        }
+    }
+  
+    return $self;
+}
+
+# deserialize non-array data
+sub _deserialize {
+    my ($self, $type, $data) = @_;
+    $log->debugf("deserializing %s with %s",Dumper($data), $type);
+        
+    if ($type eq 'DateTime') {
+        return DateTime->from_epoch(epoch => str2time($data));
+    } elsif ( grep( /^$type$/, ('int', 'double', 'string', 'boolean'))) {
+        return $data;
+    } else { # hash(model)
+        my $_instance = eval "WWW::SwaggerClient::Object::$type->new()";
+        return $_instance->from_hash($data);
+    }
+}
+
+
+
+__PACKAGE__->class_documentation({description => '',
+                                  class => 'Name',
+                                  required => [], # TODO
+}                                 );
+
+__PACKAGE__->method_documentation({
+    'name' => {
+    	datatype => 'int',
+    	base_name => 'name',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    'snake_case' => {
+    	datatype => 'int',
+    	base_name => 'snake_case',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    
+});
+
+__PACKAGE__->swagger_types( {
+    'name' => 'int',
+    'snake_case' => 'int'
+} );
+
+__PACKAGE__->attribute_map( {
+    'name' => 'name',
+    'snake_case' => 'snake_case'
+} );
+
+__PACKAGE__->mk_accessors(keys %{__PACKAGE__->attribute_map});
+
+
+1;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ObjectReturn.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ObjectReturn.pm
new file mode 100644
index 00000000000..6dec8a34c54
--- /dev/null
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ObjectReturn.pm
@@ -0,0 +1,127 @@
+package WWW::SwaggerClient::Object::ObjectReturn;
+
+require 5.6.0;
+use strict;
+use warnings;
+use utf8;
+use JSON qw(decode_json);
+use Data::Dumper;
+use Module::Runtime qw(use_module);
+use Log::Any qw($log);
+use Date::Parse;
+use DateTime;
+
+use base ("Class::Accessor", "Class::Data::Inheritable");
+
+
+#
+#
+#
+#NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+#
+
+__PACKAGE__->mk_classdata('attribute_map' => {});
+__PACKAGE__->mk_classdata('swagger_types' => {});
+__PACKAGE__->mk_classdata('method_documentation' => {}); 
+__PACKAGE__->mk_classdata('class_documentation' => {});
+
+# new object
+sub new { 
+    my ($class, %args) = @_; 
+
+	my $self = bless {}, $class;
+	
+	foreach my $attribute (keys %{$class->attribute_map}) {
+		my $args_key = $class->attribute_map->{$attribute};
+		$self->$attribute( $args{ $args_key } );
+	}
+	
+	return $self;
+}  
+
+# return perl hash
+sub to_hash {
+    return decode_json(JSON->new->convert_blessed->encode( shift ));
+}
+
+# used by JSON for serialization
+sub TO_JSON { 
+    my $self = shift;
+    my $_data = {};
+    foreach my $_key (keys %{$self->attribute_map}) {
+        if (defined $self->{$_key}) {
+            $_data->{$self->attribute_map->{$_key}} = $self->{$_key};
+        }
+    }
+    return $_data;
+}
+
+# from Perl hashref
+sub from_hash {
+    my ($self, $hash) = @_;
+
+    # loop through attributes and use swagger_types to deserialize the data
+    while ( my ($_key, $_type) = each %{$self->swagger_types} ) {
+    	my $_json_attribute = $self->attribute_map->{$_key}; 
+        if ($_type =~ /^array\[/i) { # array
+            my $_subclass = substr($_type, 6, -1);
+            my @_array = ();
+            foreach my $_element (@{$hash->{$_json_attribute}}) {
+                push @_array, $self->_deserialize($_subclass, $_element);
+            }
+            $self->{$_key} = \@_array;
+        } elsif (exists $hash->{$_json_attribute}) { #hash(model), primitive, datetime
+            $self->{$_key} = $self->_deserialize($_type, $hash->{$_json_attribute});
+        } else {
+        	$log->debugf("Warning: %s (%s) does not exist in input hash\n", $_key, $_json_attribute);
+        }
+    }
+  
+    return $self;
+}
+
+# deserialize non-array data
+sub _deserialize {
+    my ($self, $type, $data) = @_;
+    $log->debugf("deserializing %s with %s",Dumper($data), $type);
+        
+    if ($type eq 'DateTime') {
+        return DateTime->from_epoch(epoch => str2time($data));
+    } elsif ( grep( /^$type$/, ('int', 'double', 'string', 'boolean'))) {
+        return $data;
+    } else { # hash(model)
+        my $_instance = eval "WWW::SwaggerClient::Object::$type->new()";
+        return $_instance->from_hash($data);
+    }
+}
+
+
+
+__PACKAGE__->class_documentation({description => '',
+                                  class => 'ObjectReturn',
+                                  required => [], # TODO
+}                                 );
+
+__PACKAGE__->method_documentation({
+    'return' => {
+    	datatype => 'int',
+    	base_name => 'return',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    
+});
+
+__PACKAGE__->swagger_types( {
+    'return' => 'int'
+} );
+
+__PACKAGE__->attribute_map( {
+    'return' => 'return'
+} );
+
+__PACKAGE__->mk_accessors(keys %{__PACKAGE__->attribute_map});
+
+
+1;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/SpecialModelName.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/SpecialModelName.pm
new file mode 100644
index 00000000000..b720c10b1a6
--- /dev/null
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/SpecialModelName.pm
@@ -0,0 +1,127 @@
+package WWW::SwaggerClient::Object::SpecialModelName;
+
+require 5.6.0;
+use strict;
+use warnings;
+use utf8;
+use JSON qw(decode_json);
+use Data::Dumper;
+use Module::Runtime qw(use_module);
+use Log::Any qw($log);
+use Date::Parse;
+use DateTime;
+
+use base ("Class::Accessor", "Class::Data::Inheritable");
+
+
+#
+#
+#
+#NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+#
+
+__PACKAGE__->mk_classdata('attribute_map' => {});
+__PACKAGE__->mk_classdata('swagger_types' => {});
+__PACKAGE__->mk_classdata('method_documentation' => {}); 
+__PACKAGE__->mk_classdata('class_documentation' => {});
+
+# new object
+sub new { 
+    my ($class, %args) = @_; 
+
+	my $self = bless {}, $class;
+	
+	foreach my $attribute (keys %{$class->attribute_map}) {
+		my $args_key = $class->attribute_map->{$attribute};
+		$self->$attribute( $args{ $args_key } );
+	}
+	
+	return $self;
+}  
+
+# return perl hash
+sub to_hash {
+    return decode_json(JSON->new->convert_blessed->encode( shift ));
+}
+
+# used by JSON for serialization
+sub TO_JSON { 
+    my $self = shift;
+    my $_data = {};
+    foreach my $_key (keys %{$self->attribute_map}) {
+        if (defined $self->{$_key}) {
+            $_data->{$self->attribute_map->{$_key}} = $self->{$_key};
+        }
+    }
+    return $_data;
+}
+
+# from Perl hashref
+sub from_hash {
+    my ($self, $hash) = @_;
+
+    # loop through attributes and use swagger_types to deserialize the data
+    while ( my ($_key, $_type) = each %{$self->swagger_types} ) {
+    	my $_json_attribute = $self->attribute_map->{$_key}; 
+        if ($_type =~ /^array\[/i) { # array
+            my $_subclass = substr($_type, 6, -1);
+            my @_array = ();
+            foreach my $_element (@{$hash->{$_json_attribute}}) {
+                push @_array, $self->_deserialize($_subclass, $_element);
+            }
+            $self->{$_key} = \@_array;
+        } elsif (exists $hash->{$_json_attribute}) { #hash(model), primitive, datetime
+            $self->{$_key} = $self->_deserialize($_type, $hash->{$_json_attribute});
+        } else {
+        	$log->debugf("Warning: %s (%s) does not exist in input hash\n", $_key, $_json_attribute);
+        }
+    }
+  
+    return $self;
+}
+
+# deserialize non-array data
+sub _deserialize {
+    my ($self, $type, $data) = @_;
+    $log->debugf("deserializing %s with %s",Dumper($data), $type);
+        
+    if ($type eq 'DateTime') {
+        return DateTime->from_epoch(epoch => str2time($data));
+    } elsif ( grep( /^$type$/, ('int', 'double', 'string', 'boolean'))) {
+        return $data;
+    } else { # hash(model)
+        my $_instance = eval "WWW::SwaggerClient::Object::$type->new()";
+        return $_instance->from_hash($data);
+    }
+}
+
+
+
+__PACKAGE__->class_documentation({description => '',
+                                  class => 'SpecialModelName',
+                                  required => [], # TODO
+}                                 );
+
+__PACKAGE__->method_documentation({
+    '__special[property/name]' => {
+    	datatype => 'int',
+    	base_name => '$special[property.name]',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    
+});
+
+__PACKAGE__->swagger_types( {
+    '__special[property/name]' => 'int'
+} );
+
+__PACKAGE__->attribute_map( {
+    '__special[property/name]' => '$special[property.name]'
+} );
+
+__PACKAGE__->mk_accessors(keys %{__PACKAGE__->attribute_map});
+
+
+1;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm
index 06ccfca98e8..c55c9a5fecf 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm
@@ -1,5 +1,5 @@
 #
-# Copyright 2015 SmartBear Software
+# Copyright 2016 SmartBear Software
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -51,71 +51,6 @@ sub new {
 }
 
 
-#
-# update_pet
-#
-# Update an existing pet
-# 
-# @param Pet $body Pet object that needs to be added to the store (optional)
-{
-    my $params = {
-    'body' => {
-        data_type => 'Pet',
-        description => 'Pet object that needs to be added to the store',
-        required => '0',
-    },
-    };
-    __PACKAGE__->method_documentation->{ update_pet } = { 
-    	summary => 'Update an existing pet',
-        params => $params,
-        returns => undef,
-        };
-}
-# @return void
-#
-sub update_pet {
-    my ($self, %args) = @_;
-
-    
-
-    # parse inputs
-    my $_resource_path = '/pet';
-    $_resource_path =~ s/{format}/json/; # default format to json
-
-    my $_method = 'PUT';
-    my $query_params = {};
-    my $header_params = {};
-    my $form_params = {};
-
-    # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
-    if ($_header_accept) {
-        $header_params->{'Accept'} = $_header_accept;
-    }
-    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type('application/json', 'application/xml');
-
-    
-    
-    
-    
-    my $_body_data;
-    # body params
-    if ( exists $args{'body'}) {
-        $_body_data = $args{'body'};
-    }
-
-    # authentication setting, if any
-    my $auth_settings = [qw(petstore_auth )];
-
-    # make the API Call
-    
-    $self->{api_client}->call_api($_resource_path, $_method,
-                                           $query_params, $form_params,
-                                           $header_params, $_body_data, $auth_settings);
-    return;
-    
-}
-
 #
 # add_pet
 #
@@ -181,17 +116,163 @@ sub add_pet {
     
 }
 
+#
+# add_pet_using_byte_array
+#
+# Fake endpoint to test byte array in body parameter for adding a new pet to the store
+# 
+# @param string $body Pet object in the form of byte array (optional)
+{
+    my $params = {
+    'body' => {
+        data_type => 'string',
+        description => 'Pet object in the form of byte array',
+        required => '0',
+    },
+    };
+    __PACKAGE__->method_documentation->{ add_pet_using_byte_array } = { 
+    	summary => 'Fake endpoint to test byte array in body parameter for adding a new pet to the store',
+        params => $params,
+        returns => undef,
+        };
+}
+# @return void
+#
+sub add_pet_using_byte_array {
+    my ($self, %args) = @_;
+
+    
+
+    # parse inputs
+    my $_resource_path = '/pet?testing_byte_array=true';
+    $_resource_path =~ s/{format}/json/; # default format to json
+
+    my $_method = 'POST';
+    my $query_params = {};
+    my $header_params = {};
+    my $form_params = {};
+
+    # 'Accept' and 'Content-Type' header
+    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    if ($_header_accept) {
+        $header_params->{'Accept'} = $_header_accept;
+    }
+    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type('application/json', 'application/xml');
+
+    
+    
+    
+    
+    my $_body_data;
+    # body params
+    if ( exists $args{'body'}) {
+        $_body_data = $args{'body'};
+    }
+
+    # authentication setting, if any
+    my $auth_settings = [qw(petstore_auth )];
+
+    # make the API Call
+    
+    $self->{api_client}->call_api($_resource_path, $_method,
+                                           $query_params, $form_params,
+                                           $header_params, $_body_data, $auth_settings);
+    return;
+    
+}
+
+#
+# delete_pet
+#
+# Deletes a pet
+# 
+# @param int $pet_id Pet id to delete (required)
+# @param string $api_key  (optional)
+{
+    my $params = {
+    'pet_id' => {
+        data_type => 'int',
+        description => 'Pet id to delete',
+        required => '1',
+    },
+    'api_key' => {
+        data_type => 'string',
+        description => '',
+        required => '0',
+    },
+    };
+    __PACKAGE__->method_documentation->{ delete_pet } = { 
+    	summary => 'Deletes a pet',
+        params => $params,
+        returns => undef,
+        };
+}
+# @return void
+#
+sub delete_pet {
+    my ($self, %args) = @_;
+
+    
+    # verify the required parameter 'pet_id' is set
+    unless (exists $args{'pet_id'}) {
+      croak("Missing the required parameter 'pet_id' when calling delete_pet");
+    }
+    
+
+    # parse inputs
+    my $_resource_path = '/pet/{petId}';
+    $_resource_path =~ s/{format}/json/; # default format to json
+
+    my $_method = 'DELETE';
+    my $query_params = {};
+    my $header_params = {};
+    my $form_params = {};
+
+    # 'Accept' and 'Content-Type' header
+    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    if ($_header_accept) {
+        $header_params->{'Accept'} = $_header_accept;
+    }
+    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
+
+    
+    # header params
+    if ( exists $args{'api_key'}) {
+        $header_params->{'api_key'} = $self->{api_client}->to_header_value($args{'api_key'});
+    }
+    # path params
+    if ( exists $args{'pet_id'}) {
+        my $_base_variable = "{" . "petId" . "}";
+        my $_base_value = $self->{api_client}->to_path_value($args{'pet_id'});
+        $_resource_path =~ s/$_base_variable/$_base_value/g;
+    }
+    
+    my $_body_data;
+    
+
+    # authentication setting, if any
+    my $auth_settings = [qw(petstore_auth )];
+
+    # make the API Call
+    
+    $self->{api_client}->call_api($_resource_path, $_method,
+                                           $query_params, $form_params,
+                                           $header_params, $_body_data, $auth_settings);
+    return;
+    
+}
+
 #
 # find_pets_by_status
 #
 # Finds Pets by status
 # 
-# @param ARRAY[string] $status Status values that need to be considered for filter (optional)
+# @param ARRAY[string] $status Status values that need to be considered for query (optional, default to available)
 {
     my $params = {
     'status' => {
         data_type => 'ARRAY[string]',
-        description => 'Status values that need to be considered for filter',
+        description => 'Status values that need to be considered for query',
         required => '0',
     },
     };
@@ -378,7 +459,7 @@ sub get_pet_by_id {
     
 
     # authentication setting, if any
-    my $auth_settings = [qw(api_key )];
+    my $auth_settings = [qw(api_key petstore_auth )];
 
     # make the API Call
     my $response = $self->{api_client}->call_api($_resource_path, $_method,
@@ -392,6 +473,221 @@ sub get_pet_by_id {
     
 }
 
+#
+# get_pet_by_id_in_object
+#
+# Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
+# 
+# @param int $pet_id ID of pet that needs to be fetched (required)
+{
+    my $params = {
+    'pet_id' => {
+        data_type => 'int',
+        description => 'ID of pet that needs to be fetched',
+        required => '1',
+    },
+    };
+    __PACKAGE__->method_documentation->{ get_pet_by_id_in_object } = { 
+    	summary => 'Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;',
+        params => $params,
+        returns => 'InlineResponse200',
+        };
+}
+# @return InlineResponse200
+#
+sub get_pet_by_id_in_object {
+    my ($self, %args) = @_;
+
+    
+    # verify the required parameter 'pet_id' is set
+    unless (exists $args{'pet_id'}) {
+      croak("Missing the required parameter 'pet_id' when calling get_pet_by_id_in_object");
+    }
+    
+
+    # parse inputs
+    my $_resource_path = '/pet/{petId}?response=inline_arbitrary_object';
+    $_resource_path =~ s/{format}/json/; # default format to json
+
+    my $_method = 'GET';
+    my $query_params = {};
+    my $header_params = {};
+    my $form_params = {};
+
+    # 'Accept' and 'Content-Type' header
+    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    if ($_header_accept) {
+        $header_params->{'Accept'} = $_header_accept;
+    }
+    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
+
+    
+    
+    # path params
+    if ( exists $args{'pet_id'}) {
+        my $_base_variable = "{" . "petId" . "}";
+        my $_base_value = $self->{api_client}->to_path_value($args{'pet_id'});
+        $_resource_path =~ s/$_base_variable/$_base_value/g;
+    }
+    
+    my $_body_data;
+    
+
+    # authentication setting, if any
+    my $auth_settings = [qw(api_key petstore_auth )];
+
+    # make the API Call
+    my $response = $self->{api_client}->call_api($_resource_path, $_method,
+                                           $query_params, $form_params,
+                                           $header_params, $_body_data, $auth_settings);
+    if (!$response) {
+        return;
+    }
+    my $_response_object = $self->{api_client}->deserialize('InlineResponse200', $response);
+    return $_response_object;
+    
+}
+
+#
+# pet_pet_idtesting_byte_arraytrue_get
+#
+# Fake endpoint to test byte array return by 'Find pet by ID'
+# 
+# @param int $pet_id ID of pet that needs to be fetched (required)
+{
+    my $params = {
+    'pet_id' => {
+        data_type => 'int',
+        description => 'ID of pet that needs to be fetched',
+        required => '1',
+    },
+    };
+    __PACKAGE__->method_documentation->{ pet_pet_idtesting_byte_arraytrue_get } = { 
+    	summary => 'Fake endpoint to test byte array return by &#39;Find pet by ID&#39;',
+        params => $params,
+        returns => 'string',
+        };
+}
+# @return string
+#
+sub pet_pet_idtesting_byte_arraytrue_get {
+    my ($self, %args) = @_;
+
+    
+    # verify the required parameter 'pet_id' is set
+    unless (exists $args{'pet_id'}) {
+      croak("Missing the required parameter 'pet_id' when calling pet_pet_idtesting_byte_arraytrue_get");
+    }
+    
+
+    # parse inputs
+    my $_resource_path = '/pet/{petId}?testing_byte_array=true';
+    $_resource_path =~ s/{format}/json/; # default format to json
+
+    my $_method = 'GET';
+    my $query_params = {};
+    my $header_params = {};
+    my $form_params = {};
+
+    # 'Accept' and 'Content-Type' header
+    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    if ($_header_accept) {
+        $header_params->{'Accept'} = $_header_accept;
+    }
+    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
+
+    
+    
+    # path params
+    if ( exists $args{'pet_id'}) {
+        my $_base_variable = "{" . "petId" . "}";
+        my $_base_value = $self->{api_client}->to_path_value($args{'pet_id'});
+        $_resource_path =~ s/$_base_variable/$_base_value/g;
+    }
+    
+    my $_body_data;
+    
+
+    # authentication setting, if any
+    my $auth_settings = [qw(api_key petstore_auth )];
+
+    # make the API Call
+    my $response = $self->{api_client}->call_api($_resource_path, $_method,
+                                           $query_params, $form_params,
+                                           $header_params, $_body_data, $auth_settings);
+    if (!$response) {
+        return;
+    }
+    my $_response_object = $self->{api_client}->deserialize('string', $response);
+    return $_response_object;
+    
+}
+
+#
+# update_pet
+#
+# Update an existing pet
+# 
+# @param Pet $body Pet object that needs to be added to the store (optional)
+{
+    my $params = {
+    'body' => {
+        data_type => 'Pet',
+        description => 'Pet object that needs to be added to the store',
+        required => '0',
+    },
+    };
+    __PACKAGE__->method_documentation->{ update_pet } = { 
+    	summary => 'Update an existing pet',
+        params => $params,
+        returns => undef,
+        };
+}
+# @return void
+#
+sub update_pet {
+    my ($self, %args) = @_;
+
+    
+
+    # parse inputs
+    my $_resource_path = '/pet';
+    $_resource_path =~ s/{format}/json/; # default format to json
+
+    my $_method = 'PUT';
+    my $query_params = {};
+    my $header_params = {};
+    my $form_params = {};
+
+    # 'Accept' and 'Content-Type' header
+    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    if ($_header_accept) {
+        $header_params->{'Accept'} = $_header_accept;
+    }
+    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type('application/json', 'application/xml');
+
+    
+    
+    
+    
+    my $_body_data;
+    # body params
+    if ( exists $args{'body'}) {
+        $_body_data = $args{'body'};
+    }
+
+    # authentication setting, if any
+    my $auth_settings = [qw(petstore_auth )];
+
+    # make the API Call
+    
+    $self->{api_client}->call_api($_resource_path, $_method,
+                                           $query_params, $form_params,
+                                           $header_params, $_body_data, $auth_settings);
+    return;
+    
+}
+
 #
 # update_pet_with_form
 #
@@ -486,87 +782,6 @@ sub update_pet_with_form {
     
 }
 
-#
-# delete_pet
-#
-# Deletes a pet
-# 
-# @param int $pet_id Pet id to delete (required)
-# @param string $api_key  (optional)
-{
-    my $params = {
-    'pet_id' => {
-        data_type => 'int',
-        description => 'Pet id to delete',
-        required => '1',
-    },
-    'api_key' => {
-        data_type => 'string',
-        description => '',
-        required => '0',
-    },
-    };
-    __PACKAGE__->method_documentation->{ delete_pet } = { 
-    	summary => 'Deletes a pet',
-        params => $params,
-        returns => undef,
-        };
-}
-# @return void
-#
-sub delete_pet {
-    my ($self, %args) = @_;
-
-    
-    # verify the required parameter 'pet_id' is set
-    unless (exists $args{'pet_id'}) {
-      croak("Missing the required parameter 'pet_id' when calling delete_pet");
-    }
-    
-
-    # parse inputs
-    my $_resource_path = '/pet/{petId}';
-    $_resource_path =~ s/{format}/json/; # default format to json
-
-    my $_method = 'DELETE';
-    my $query_params = {};
-    my $header_params = {};
-    my $form_params = {};
-
-    # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
-    if ($_header_accept) {
-        $header_params->{'Accept'} = $_header_accept;
-    }
-    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
-
-    
-    # header params
-    if ( exists $args{'api_key'}) {
-        $header_params->{'api_key'} = $self->{api_client}->to_header_value($args{'api_key'});
-    }
-    # path params
-    if ( exists $args{'pet_id'}) {
-        my $_base_variable = "{" . "petId" . "}";
-        my $_base_value = $self->{api_client}->to_path_value($args{'pet_id'});
-        $_resource_path =~ s/$_base_variable/$_base_value/g;
-    }
-    
-    my $_body_data;
-    
-
-    # authentication setting, if any
-    my $auth_settings = [qw(petstore_auth )];
-
-    # make the API Call
-    
-    $self->{api_client}->call_api($_resource_path, $_method,
-                                           $query_params, $form_params,
-                                           $header_params, $_body_data, $auth_settings);
-    return;
-    
-}
-
 #
 # upload_file
 #
@@ -574,7 +789,7 @@ sub delete_pet {
 # 
 # @param int $pet_id ID of pet to update (required)
 # @param string $additional_metadata Additional data to pass to server (optional)
-# @param file $file file to upload (optional)
+# @param File $file file to upload (optional)
 {
     my $params = {
     'pet_id' => {
@@ -588,7 +803,7 @@ sub delete_pet {
         required => '0',
     },
     'file' => {
-        data_type => 'file',
+        data_type => 'File',
         description => 'file to upload',
         required => '0',
     },
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm
index 8c9e85ed506..4b1f63cbb2e 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm
@@ -37,7 +37,7 @@ has version_info => ( is => 'ro',
                       default => sub { {
                           app_name => 'Swagger Petstore',
                           app_version => '1.0.0',
-                          generated_date => '2015-12-29T16:27:28.775+08:00',
+                          generated_date => '2016-03-30T20:57:51.908+08:00',
                           generator_class => 'class io.swagger.codegen.languages.PerlClientCodegen',
                       } },
                       documentation => 'Information about the application version and the codegen codebase version'
@@ -103,7 +103,7 @@ Automatically generated by the Perl Swagger Codegen project:
 
 =over 4 
 
-=item Build date: 2015-12-29T16:27:28.775+08:00
+=item Build date: 2016-03-30T20:57:51.908+08:00
 
 =item Build package: class io.swagger.codegen.languages.PerlClientCodegen
 
@@ -119,7 +119,7 @@ WWW::SwaggerClient::ApiFactory for non-Moosey usage.
 =head1 SYNOPSIS
 
 The Perl Swagger Codegen project builds a library of Perl modules to interact with 
-a web service defined by a Swagger specification. See below for how to build the 
+a web service defined by a OpenAPI Specification. See below for how to build the 
 library.
 
 This module provides an interface to the generated library. All the classes, 
@@ -154,7 +154,7 @@ For documentation of all these methods, see AUTOMATIC DOCUMENTATION below.
 
 =head2 Configuring authentication
 
-In the normal case, the Swagger spec will describe what parameters are
+In the normal case, the OpenAPI Spec will describe what parameters are
 required and where to put them. You just need to supply the tokens.
 
     my $tokens = {
@@ -264,12 +264,12 @@ you could also call them on class names.
 
 See the homepage C<https://github.com/swagger-api/swagger-codegen> for full details. 
 But briefly, clone the git repository, build the codegen codebase, set up your build 
-config file, then run the API build script. You will need git, Java 7 and Apache 
+config file, then run the API build script. You will need git, Java 7 or 8 and Apache
 maven 3.0.3 or better already installed.
 
 The config file should specify the project name for the generated library: 
 
-	{"moduleName":"MyProjectName"}
+	{"moduleName":"WWW::MyProjectName"}
 
 Your library files will be built under C<WWW::MyProjectName>.
 
@@ -304,7 +304,7 @@ output formats are supported:
 The C<-c> option allows you to load and inspect your own application. A dummy
 namespace is used if you don't supply your own class.
 
-=head1 DOCUMENTATION FROM THE SWAGGER SPEC
+=head1 DOCUMENTATION FROM THE OpenAPI Spec
 
 Additional documentation for each class and method may be provided by the Swagger 
 spec. If so, this is available via the C<class_documentation()> and 
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm
index 0dc30dbfb90..d57c96c1798 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm
@@ -424,4 +424,4 @@ $attrname
 
 
 
-1;
\ No newline at end of file
+1;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm
index abe936573e7..f9af88c0ac9 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm
@@ -1,5 +1,5 @@
 #
-# Copyright 2015 SmartBear Software
+# Copyright 2016 SmartBear Software
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -51,208 +51,6 @@ sub new {
 }
 
 
-#
-# get_inventory
-#
-# Returns pet inventories by status
-# 
-{
-    my $params = {
-    };
-    __PACKAGE__->method_documentation->{ get_inventory } = { 
-    	summary => 'Returns pet inventories by status',
-        params => $params,
-        returns => 'HASH[string,int]',
-        };
-}
-# @return HASH[string,int]
-#
-sub get_inventory {
-    my ($self, %args) = @_;
-
-    
-
-    # parse inputs
-    my $_resource_path = '/store/inventory';
-    $_resource_path =~ s/{format}/json/; # default format to json
-
-    my $_method = 'GET';
-    my $query_params = {};
-    my $header_params = {};
-    my $form_params = {};
-
-    # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
-    if ($_header_accept) {
-        $header_params->{'Accept'} = $_header_accept;
-    }
-    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
-
-    
-    
-    
-    
-    my $_body_data;
-    
-
-    # authentication setting, if any
-    my $auth_settings = [qw(api_key )];
-
-    # make the API Call
-    my $response = $self->{api_client}->call_api($_resource_path, $_method,
-                                           $query_params, $form_params,
-                                           $header_params, $_body_data, $auth_settings);
-    if (!$response) {
-        return;
-    }
-    my $_response_object = $self->{api_client}->deserialize('HASH[string,int]', $response);
-    return $_response_object;
-    
-}
-
-#
-# place_order
-#
-# Place an order for a pet
-# 
-# @param Order $body order placed for purchasing the pet (optional)
-{
-    my $params = {
-    'body' => {
-        data_type => 'Order',
-        description => 'order placed for purchasing the pet',
-        required => '0',
-    },
-    };
-    __PACKAGE__->method_documentation->{ place_order } = { 
-    	summary => 'Place an order for a pet',
-        params => $params,
-        returns => 'Order',
-        };
-}
-# @return Order
-#
-sub place_order {
-    my ($self, %args) = @_;
-
-    
-
-    # parse inputs
-    my $_resource_path = '/store/order';
-    $_resource_path =~ s/{format}/json/; # default format to json
-
-    my $_method = 'POST';
-    my $query_params = {};
-    my $header_params = {};
-    my $form_params = {};
-
-    # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
-    if ($_header_accept) {
-        $header_params->{'Accept'} = $_header_accept;
-    }
-    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
-
-    
-    
-    
-    
-    my $_body_data;
-    # body params
-    if ( exists $args{'body'}) {
-        $_body_data = $args{'body'};
-    }
-
-    # authentication setting, if any
-    my $auth_settings = [qw()];
-
-    # make the API Call
-    my $response = $self->{api_client}->call_api($_resource_path, $_method,
-                                           $query_params, $form_params,
-                                           $header_params, $_body_data, $auth_settings);
-    if (!$response) {
-        return;
-    }
-    my $_response_object = $self->{api_client}->deserialize('Order', $response);
-    return $_response_object;
-    
-}
-
-#
-# get_order_by_id
-#
-# Find purchase order by ID
-# 
-# @param string $order_id ID of pet that needs to be fetched (required)
-{
-    my $params = {
-    'order_id' => {
-        data_type => 'string',
-        description => 'ID of pet that needs to be fetched',
-        required => '1',
-    },
-    };
-    __PACKAGE__->method_documentation->{ get_order_by_id } = { 
-    	summary => 'Find purchase order by ID',
-        params => $params,
-        returns => 'Order',
-        };
-}
-# @return Order
-#
-sub get_order_by_id {
-    my ($self, %args) = @_;
-
-    
-    # verify the required parameter 'order_id' is set
-    unless (exists $args{'order_id'}) {
-      croak("Missing the required parameter 'order_id' when calling get_order_by_id");
-    }
-    
-
-    # parse inputs
-    my $_resource_path = '/store/order/{orderId}';
-    $_resource_path =~ s/{format}/json/; # default format to json
-
-    my $_method = 'GET';
-    my $query_params = {};
-    my $header_params = {};
-    my $form_params = {};
-
-    # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
-    if ($_header_accept) {
-        $header_params->{'Accept'} = $_header_accept;
-    }
-    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
-
-    
-    
-    # path params
-    if ( exists $args{'order_id'}) {
-        my $_base_variable = "{" . "orderId" . "}";
-        my $_base_value = $self->{api_client}->to_path_value($args{'order_id'});
-        $_resource_path =~ s/$_base_variable/$_base_value/g;
-    }
-    
-    my $_body_data;
-    
-
-    # authentication setting, if any
-    my $auth_settings = [qw()];
-
-    # make the API Call
-    my $response = $self->{api_client}->call_api($_resource_path, $_method,
-                                           $query_params, $form_params,
-                                           $header_params, $_body_data, $auth_settings);
-    if (!$response) {
-        return;
-    }
-    my $_response_object = $self->{api_client}->deserialize('Order', $response);
-    return $_response_object;
-    
-}
-
 #
 # delete_order
 #
@@ -325,5 +123,334 @@ sub delete_order {
     
 }
 
+#
+# find_orders_by_status
+#
+# Finds orders by status
+# 
+# @param string $status Status value that needs to be considered for query (optional, default to placed)
+{
+    my $params = {
+    'status' => {
+        data_type => 'string',
+        description => 'Status value that needs to be considered for query',
+        required => '0',
+    },
+    };
+    __PACKAGE__->method_documentation->{ find_orders_by_status } = { 
+    	summary => 'Finds orders by status',
+        params => $params,
+        returns => 'ARRAY[Order]',
+        };
+}
+# @return ARRAY[Order]
+#
+sub find_orders_by_status {
+    my ($self, %args) = @_;
+
+    
+
+    # parse inputs
+    my $_resource_path = '/store/findByStatus';
+    $_resource_path =~ s/{format}/json/; # default format to json
+
+    my $_method = 'GET';
+    my $query_params = {};
+    my $header_params = {};
+    my $form_params = {};
+
+    # 'Accept' and 'Content-Type' header
+    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    if ($_header_accept) {
+        $header_params->{'Accept'} = $_header_accept;
+    }
+    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
+
+    # query params
+    if ( exists $args{'status'}) {
+        $query_params->{'status'} = $self->{api_client}->to_query_value($args{'status'});
+    }
+    
+    
+    
+    my $_body_data;
+    
+
+    # authentication setting, if any
+    my $auth_settings = [qw(test_api_client_id test_api_client_secret )];
+
+    # make the API Call
+    my $response = $self->{api_client}->call_api($_resource_path, $_method,
+                                           $query_params, $form_params,
+                                           $header_params, $_body_data, $auth_settings);
+    if (!$response) {
+        return;
+    }
+    my $_response_object = $self->{api_client}->deserialize('ARRAY[Order]', $response);
+    return $_response_object;
+    
+}
+
+#
+# get_inventory
+#
+# Returns pet inventories by status
+# 
+{
+    my $params = {
+    };
+    __PACKAGE__->method_documentation->{ get_inventory } = { 
+    	summary => 'Returns pet inventories by status',
+        params => $params,
+        returns => 'HASH[string,int]',
+        };
+}
+# @return HASH[string,int]
+#
+sub get_inventory {
+    my ($self, %args) = @_;
+
+    
+
+    # parse inputs
+    my $_resource_path = '/store/inventory';
+    $_resource_path =~ s/{format}/json/; # default format to json
+
+    my $_method = 'GET';
+    my $query_params = {};
+    my $header_params = {};
+    my $form_params = {};
+
+    # 'Accept' and 'Content-Type' header
+    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    if ($_header_accept) {
+        $header_params->{'Accept'} = $_header_accept;
+    }
+    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
+
+    
+    
+    
+    
+    my $_body_data;
+    
+
+    # authentication setting, if any
+    my $auth_settings = [qw(api_key )];
+
+    # make the API Call
+    my $response = $self->{api_client}->call_api($_resource_path, $_method,
+                                           $query_params, $form_params,
+                                           $header_params, $_body_data, $auth_settings);
+    if (!$response) {
+        return;
+    }
+    my $_response_object = $self->{api_client}->deserialize('HASH[string,int]', $response);
+    return $_response_object;
+    
+}
+
+#
+# get_inventory_in_object
+#
+# Fake endpoint to test arbitrary object return by 'Get inventory'
+# 
+{
+    my $params = {
+    };
+    __PACKAGE__->method_documentation->{ get_inventory_in_object } = { 
+    	summary => 'Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;',
+        params => $params,
+        returns => 'object',
+        };
+}
+# @return object
+#
+sub get_inventory_in_object {
+    my ($self, %args) = @_;
+
+    
+
+    # parse inputs
+    my $_resource_path = '/store/inventory?response=arbitrary_object';
+    $_resource_path =~ s/{format}/json/; # default format to json
+
+    my $_method = 'GET';
+    my $query_params = {};
+    my $header_params = {};
+    my $form_params = {};
+
+    # 'Accept' and 'Content-Type' header
+    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    if ($_header_accept) {
+        $header_params->{'Accept'} = $_header_accept;
+    }
+    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
+
+    
+    
+    
+    
+    my $_body_data;
+    
+
+    # authentication setting, if any
+    my $auth_settings = [qw(api_key )];
+
+    # make the API Call
+    my $response = $self->{api_client}->call_api($_resource_path, $_method,
+                                           $query_params, $form_params,
+                                           $header_params, $_body_data, $auth_settings);
+    if (!$response) {
+        return;
+    }
+    my $_response_object = $self->{api_client}->deserialize('object', $response);
+    return $_response_object;
+    
+}
+
+#
+# get_order_by_id
+#
+# Find purchase order by ID
+# 
+# @param string $order_id ID of pet that needs to be fetched (required)
+{
+    my $params = {
+    'order_id' => {
+        data_type => 'string',
+        description => 'ID of pet that needs to be fetched',
+        required => '1',
+    },
+    };
+    __PACKAGE__->method_documentation->{ get_order_by_id } = { 
+    	summary => 'Find purchase order by ID',
+        params => $params,
+        returns => 'Order',
+        };
+}
+# @return Order
+#
+sub get_order_by_id {
+    my ($self, %args) = @_;
+
+    
+    # verify the required parameter 'order_id' is set
+    unless (exists $args{'order_id'}) {
+      croak("Missing the required parameter 'order_id' when calling get_order_by_id");
+    }
+    
+
+    # parse inputs
+    my $_resource_path = '/store/order/{orderId}';
+    $_resource_path =~ s/{format}/json/; # default format to json
+
+    my $_method = 'GET';
+    my $query_params = {};
+    my $header_params = {};
+    my $form_params = {};
+
+    # 'Accept' and 'Content-Type' header
+    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    if ($_header_accept) {
+        $header_params->{'Accept'} = $_header_accept;
+    }
+    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
+
+    
+    
+    # path params
+    if ( exists $args{'order_id'}) {
+        my $_base_variable = "{" . "orderId" . "}";
+        my $_base_value = $self->{api_client}->to_path_value($args{'order_id'});
+        $_resource_path =~ s/$_base_variable/$_base_value/g;
+    }
+    
+    my $_body_data;
+    
+
+    # authentication setting, if any
+    my $auth_settings = [qw(test_api_key_header test_api_key_query )];
+
+    # make the API Call
+    my $response = $self->{api_client}->call_api($_resource_path, $_method,
+                                           $query_params, $form_params,
+                                           $header_params, $_body_data, $auth_settings);
+    if (!$response) {
+        return;
+    }
+    my $_response_object = $self->{api_client}->deserialize('Order', $response);
+    return $_response_object;
+    
+}
+
+#
+# place_order
+#
+# Place an order for a pet
+# 
+# @param Order $body order placed for purchasing the pet (optional)
+{
+    my $params = {
+    'body' => {
+        data_type => 'Order',
+        description => 'order placed for purchasing the pet',
+        required => '0',
+    },
+    };
+    __PACKAGE__->method_documentation->{ place_order } = { 
+    	summary => 'Place an order for a pet',
+        params => $params,
+        returns => 'Order',
+        };
+}
+# @return Order
+#
+sub place_order {
+    my ($self, %args) = @_;
+
+    
+
+    # parse inputs
+    my $_resource_path = '/store/order';
+    $_resource_path =~ s/{format}/json/; # default format to json
+
+    my $_method = 'POST';
+    my $query_params = {};
+    my $header_params = {};
+    my $form_params = {};
+
+    # 'Accept' and 'Content-Type' header
+    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    if ($_header_accept) {
+        $header_params->{'Accept'} = $_header_accept;
+    }
+    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
+
+    
+    
+    
+    
+    my $_body_data;
+    # body params
+    if ( exists $args{'body'}) {
+        $_body_data = $args{'body'};
+    }
+
+    # authentication setting, if any
+    my $auth_settings = [qw(test_api_client_id test_api_client_secret )];
+
+    # make the API Call
+    my $response = $self->{api_client}->call_api($_resource_path, $_method,
+                                           $query_params, $form_params,
+                                           $header_params, $_body_data, $auth_settings);
+    if (!$response) {
+        return;
+    }
+    my $_response_object = $self->{api_client}->deserialize('Order', $response);
+    return $_response_object;
+    
+}
+
 
 1;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm
index 9ba45815c8c..e86cc571a70 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm
@@ -1,5 +1,5 @@
 #
-# Copyright 2015 SmartBear Software
+# Copyright 2016 SmartBear Software
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -246,6 +246,153 @@ sub create_users_with_list_input {
     
 }
 
+#
+# delete_user
+#
+# Delete user
+# 
+# @param string $username The name that needs to be deleted (required)
+{
+    my $params = {
+    'username' => {
+        data_type => 'string',
+        description => 'The name that needs to be deleted',
+        required => '1',
+    },
+    };
+    __PACKAGE__->method_documentation->{ delete_user } = { 
+    	summary => 'Delete user',
+        params => $params,
+        returns => undef,
+        };
+}
+# @return void
+#
+sub delete_user {
+    my ($self, %args) = @_;
+
+    
+    # verify the required parameter 'username' is set
+    unless (exists $args{'username'}) {
+      croak("Missing the required parameter 'username' when calling delete_user");
+    }
+    
+
+    # parse inputs
+    my $_resource_path = '/user/{username}';
+    $_resource_path =~ s/{format}/json/; # default format to json
+
+    my $_method = 'DELETE';
+    my $query_params = {};
+    my $header_params = {};
+    my $form_params = {};
+
+    # 'Accept' and 'Content-Type' header
+    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    if ($_header_accept) {
+        $header_params->{'Accept'} = $_header_accept;
+    }
+    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
+
+    
+    
+    # path params
+    if ( exists $args{'username'}) {
+        my $_base_variable = "{" . "username" . "}";
+        my $_base_value = $self->{api_client}->to_path_value($args{'username'});
+        $_resource_path =~ s/$_base_variable/$_base_value/g;
+    }
+    
+    my $_body_data;
+    
+
+    # authentication setting, if any
+    my $auth_settings = [qw(test_http_basic )];
+
+    # make the API Call
+    
+    $self->{api_client}->call_api($_resource_path, $_method,
+                                           $query_params, $form_params,
+                                           $header_params, $_body_data, $auth_settings);
+    return;
+    
+}
+
+#
+# get_user_by_name
+#
+# Get user by user name
+# 
+# @param string $username The name that needs to be fetched. Use user1 for testing. (required)
+{
+    my $params = {
+    'username' => {
+        data_type => 'string',
+        description => 'The name that needs to be fetched. Use user1 for testing.',
+        required => '1',
+    },
+    };
+    __PACKAGE__->method_documentation->{ get_user_by_name } = { 
+    	summary => 'Get user by user name',
+        params => $params,
+        returns => 'User',
+        };
+}
+# @return User
+#
+sub get_user_by_name {
+    my ($self, %args) = @_;
+
+    
+    # verify the required parameter 'username' is set
+    unless (exists $args{'username'}) {
+      croak("Missing the required parameter 'username' when calling get_user_by_name");
+    }
+    
+
+    # parse inputs
+    my $_resource_path = '/user/{username}';
+    $_resource_path =~ s/{format}/json/; # default format to json
+
+    my $_method = 'GET';
+    my $query_params = {};
+    my $header_params = {};
+    my $form_params = {};
+
+    # 'Accept' and 'Content-Type' header
+    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    if ($_header_accept) {
+        $header_params->{'Accept'} = $_header_accept;
+    }
+    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
+
+    
+    
+    # path params
+    if ( exists $args{'username'}) {
+        my $_base_variable = "{" . "username" . "}";
+        my $_base_value = $self->{api_client}->to_path_value($args{'username'});
+        $_resource_path =~ s/$_base_variable/$_base_value/g;
+    }
+    
+    my $_body_data;
+    
+
+    # authentication setting, if any
+    my $auth_settings = [qw()];
+
+    # make the API Call
+    my $response = $self->{api_client}->call_api($_resource_path, $_method,
+                                           $query_params, $form_params,
+                                           $header_params, $_body_data, $auth_settings);
+    if (!$response) {
+        return;
+    }
+    my $_response_object = $self->{api_client}->deserialize('User', $response);
+    return $_response_object;
+    
+}
+
 #
 # login_user
 #
@@ -379,81 +526,6 @@ sub logout_user {
     
 }
 
-#
-# get_user_by_name
-#
-# Get user by user name
-# 
-# @param string $username The name that needs to be fetched. Use user1 for testing. (required)
-{
-    my $params = {
-    'username' => {
-        data_type => 'string',
-        description => 'The name that needs to be fetched. Use user1 for testing.',
-        required => '1',
-    },
-    };
-    __PACKAGE__->method_documentation->{ get_user_by_name } = { 
-    	summary => 'Get user by user name',
-        params => $params,
-        returns => 'User',
-        };
-}
-# @return User
-#
-sub get_user_by_name {
-    my ($self, %args) = @_;
-
-    
-    # verify the required parameter 'username' is set
-    unless (exists $args{'username'}) {
-      croak("Missing the required parameter 'username' when calling get_user_by_name");
-    }
-    
-
-    # parse inputs
-    my $_resource_path = '/user/{username}';
-    $_resource_path =~ s/{format}/json/; # default format to json
-
-    my $_method = 'GET';
-    my $query_params = {};
-    my $header_params = {};
-    my $form_params = {};
-
-    # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
-    if ($_header_accept) {
-        $header_params->{'Accept'} = $_header_accept;
-    }
-    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
-
-    
-    
-    # path params
-    if ( exists $args{'username'}) {
-        my $_base_variable = "{" . "username" . "}";
-        my $_base_value = $self->{api_client}->to_path_value($args{'username'});
-        $_resource_path =~ s/$_base_variable/$_base_value/g;
-    }
-    
-    my $_body_data;
-    
-
-    # authentication setting, if any
-    my $auth_settings = [qw()];
-
-    # make the API Call
-    my $response = $self->{api_client}->call_api($_resource_path, $_method,
-                                           $query_params, $form_params,
-                                           $header_params, $_body_data, $auth_settings);
-    if (!$response) {
-        return;
-    }
-    my $_response_object = $self->{api_client}->deserialize('User', $response);
-    return $_response_object;
-    
-}
-
 #
 # update_user
 #
@@ -535,77 +607,5 @@ sub update_user {
     
 }
 
-#
-# delete_user
-#
-# Delete user
-# 
-# @param string $username The name that needs to be deleted (required)
-{
-    my $params = {
-    'username' => {
-        data_type => 'string',
-        description => 'The name that needs to be deleted',
-        required => '1',
-    },
-    };
-    __PACKAGE__->method_documentation->{ delete_user } = { 
-    	summary => 'Delete user',
-        params => $params,
-        returns => undef,
-        };
-}
-# @return void
-#
-sub delete_user {
-    my ($self, %args) = @_;
-
-    
-    # verify the required parameter 'username' is set
-    unless (exists $args{'username'}) {
-      croak("Missing the required parameter 'username' when calling delete_user");
-    }
-    
-
-    # parse inputs
-    my $_resource_path = '/user/{username}';
-    $_resource_path =~ s/{format}/json/; # default format to json
-
-    my $_method = 'DELETE';
-    my $query_params = {};
-    my $header_params = {};
-    my $form_params = {};
-
-    # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
-    if ($_header_accept) {
-        $header_params->{'Accept'} = $_header_accept;
-    }
-    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
-
-    
-    
-    # path params
-    if ( exists $args{'username'}) {
-        my $_base_variable = "{" . "username" . "}";
-        my $_base_value = $self->{api_client}->to_path_value($args{'username'});
-        $_resource_path =~ s/$_base_variable/$_base_value/g;
-    }
-    
-    my $_body_data;
-    
-
-    # authentication setting, if any
-    my $auth_settings = [qw()];
-
-    # make the API Call
-    
-    $self->{api_client}->call_api($_resource_path, $_method,
-                                           $query_params, $form_params,
-                                           $header_params, $_body_data, $auth_settings);
-    return;
-    
-}
-
 
 1;
diff --git a/samples/client/petstore/perl/pom.xml b/samples/client/petstore/perl/pom.xml
index 4aa0040f82e..d761d022cd6 100644
--- a/samples/client/petstore/perl/pom.xml
+++ b/samples/client/petstore/perl/pom.xml
@@ -35,7 +35,7 @@
                         <configuration>
                             <executable>perl</executable>
                             <arguments>
-                                <argument>t/01_pet_api.t</argument>
+                                <argument>tests/01_pet_api.t</argument>
                             </arguments>
                         </configuration>
                     </execution>
@@ -48,7 +48,7 @@
                         <configuration>
                             <executable>perl</executable>
                             <arguments>
-                                <argument>t/02_store_api.t</argument>
+                                <argument>tests/02_store_api.t</argument>
                             </arguments>
                         </configuration>
                     </execution>
@@ -61,7 +61,7 @@
                         <configuration>
                             <executable>perl</executable>
                             <arguments>
-                                <argument>t/03_api_factory.t</argument>
+                                <argument>tests/03_api_factory.t</argument>
                             </arguments>
                         </configuration>
                     </execution>
@@ -74,7 +74,7 @@
                         <configuration>
                             <executable>perl</executable>
                             <arguments>
-                                <argument>t/04_role.t</argument>
+                                <argument>tests/04_role.t</argument>
                             </arguments>
                         </configuration>
                     </execution>
diff --git a/samples/client/petstore/perl/t/AnimalTest.t b/samples/client/petstore/perl/t/AnimalTest.t
new file mode 100644
index 00000000000..7d608e30803
--- /dev/null
+++ b/samples/client/petstore/perl/t/AnimalTest.t
@@ -0,0 +1,17 @@
+# NOTE: This class is auto generated by the Swagger Codegen
+# Please update the test case below to test the model.
+
+use Test::More tests => 2;
+use Test::Exception;
+
+use lib 'lib';
+use strict;
+use warnings;
+
+
+use_ok('WWW::SwaggerClient::Object::Animal');
+
+my $instance = WWW::SwaggerClient::Object::Animal->new();
+
+isa_ok($instance, 'WWW::SwaggerClient::Object::Animal');
+
diff --git a/samples/client/petstore/perl/t/CatTest.t b/samples/client/petstore/perl/t/CatTest.t
new file mode 100644
index 00000000000..cc1569cab40
--- /dev/null
+++ b/samples/client/petstore/perl/t/CatTest.t
@@ -0,0 +1,17 @@
+# NOTE: This class is auto generated by the Swagger Codegen
+# Please update the test case below to test the model.
+
+use Test::More tests => 2;
+use Test::Exception;
+
+use lib 'lib';
+use strict;
+use warnings;
+
+
+use_ok('WWW::SwaggerClient::Object::Cat');
+
+my $instance = WWW::SwaggerClient::Object::Cat->new();
+
+isa_ok($instance, 'WWW::SwaggerClient::Object::Cat');
+
diff --git a/samples/client/petstore/perl/t/CategoryTest.t b/samples/client/petstore/perl/t/CategoryTest.t
new file mode 100644
index 00000000000..495d4202ec5
--- /dev/null
+++ b/samples/client/petstore/perl/t/CategoryTest.t
@@ -0,0 +1,17 @@
+# NOTE: This class is auto generated by the Swagger Codegen
+# Please update the test case below to test the model.
+
+use Test::More tests => 2;
+use Test::Exception;
+
+use lib 'lib';
+use strict;
+use warnings;
+
+
+use_ok('WWW::SwaggerClient::Object::Category');
+
+my $instance = WWW::SwaggerClient::Object::Category->new();
+
+isa_ok($instance, 'WWW::SwaggerClient::Object::Category');
+
diff --git a/samples/client/petstore/perl/t/DogTest.t b/samples/client/petstore/perl/t/DogTest.t
new file mode 100644
index 00000000000..d99225a0592
--- /dev/null
+++ b/samples/client/petstore/perl/t/DogTest.t
@@ -0,0 +1,17 @@
+# NOTE: This class is auto generated by the Swagger Codegen
+# Please update the test case below to test the model.
+
+use Test::More tests => 2;
+use Test::Exception;
+
+use lib 'lib';
+use strict;
+use warnings;
+
+
+use_ok('WWW::SwaggerClient::Object::Dog');
+
+my $instance = WWW::SwaggerClient::Object::Dog->new();
+
+isa_ok($instance, 'WWW::SwaggerClient::Object::Dog');
+
diff --git a/samples/client/petstore/perl/t/InlineResponse200Test.t b/samples/client/petstore/perl/t/InlineResponse200Test.t
new file mode 100644
index 00000000000..404dc64b7e3
--- /dev/null
+++ b/samples/client/petstore/perl/t/InlineResponse200Test.t
@@ -0,0 +1,17 @@
+# NOTE: This class is auto generated by the Swagger Codegen
+# Please update the test case below to test the model.
+
+use Test::More tests => 2;
+use Test::Exception;
+
+use lib 'lib';
+use strict;
+use warnings;
+
+
+use_ok('WWW::SwaggerClient::Object::InlineResponse200');
+
+my $instance = WWW::SwaggerClient::Object::InlineResponse200->new();
+
+isa_ok($instance, 'WWW::SwaggerClient::Object::InlineResponse200');
+
diff --git a/samples/client/petstore/perl/t/Model200ResponseTest.t b/samples/client/petstore/perl/t/Model200ResponseTest.t
new file mode 100644
index 00000000000..d6c0785519e
--- /dev/null
+++ b/samples/client/petstore/perl/t/Model200ResponseTest.t
@@ -0,0 +1,17 @@
+# NOTE: This class is auto generated by the Swagger Codegen
+# Please update the test case below to test the model.
+
+use Test::More tests => 2;
+use Test::Exception;
+
+use lib 'lib';
+use strict;
+use warnings;
+
+
+use_ok('WWW::SwaggerClient::Object::Model200Response');
+
+my $instance = WWW::SwaggerClient::Object::Model200Response->new();
+
+isa_ok($instance, 'WWW::SwaggerClient::Object::Model200Response');
+
diff --git a/samples/client/petstore/perl/t/ModelReturnTest.t b/samples/client/petstore/perl/t/ModelReturnTest.t
new file mode 100644
index 00000000000..29753c78e5b
--- /dev/null
+++ b/samples/client/petstore/perl/t/ModelReturnTest.t
@@ -0,0 +1,17 @@
+# NOTE: This class is auto generated by the Swagger Codegen
+# Please update the test case below to test the model.
+
+use Test::More tests => 2;
+use Test::Exception;
+
+use lib 'lib';
+use strict;
+use warnings;
+
+
+use_ok('WWW::SwaggerClient::Object::ModelReturn');
+
+my $instance = WWW::SwaggerClient::Object::ModelReturn->new();
+
+isa_ok($instance, 'WWW::SwaggerClient::Object::ModelReturn');
+
diff --git a/samples/client/petstore/perl/t/NameTest.t b/samples/client/petstore/perl/t/NameTest.t
new file mode 100644
index 00000000000..3714cb140e6
--- /dev/null
+++ b/samples/client/petstore/perl/t/NameTest.t
@@ -0,0 +1,17 @@
+# NOTE: This class is auto generated by the Swagger Codegen
+# Please update the test case below to test the model.
+
+use Test::More tests => 2;
+use Test::Exception;
+
+use lib 'lib';
+use strict;
+use warnings;
+
+
+use_ok('WWW::SwaggerClient::Object::Name');
+
+my $instance = WWW::SwaggerClient::Object::Name->new();
+
+isa_ok($instance, 'WWW::SwaggerClient::Object::Name');
+
diff --git a/samples/client/petstore/perl/t/ObjectReturnTest.t b/samples/client/petstore/perl/t/ObjectReturnTest.t
new file mode 100644
index 00000000000..a703141bb4e
--- /dev/null
+++ b/samples/client/petstore/perl/t/ObjectReturnTest.t
@@ -0,0 +1,17 @@
+# NOTE: This class is auto generated by the Swagger Codegen
+# Please update the test case below to test the model.
+
+use Test::More tests => 2;
+use Test::Exception;
+
+use lib 'lib';
+use strict;
+use warnings;
+
+
+use_ok('WWW::SwaggerClient::Object::ObjectReturn');
+
+my $instance = WWW::SwaggerClient::Object::ObjectReturn->new();
+
+isa_ok($instance, 'WWW::SwaggerClient::Object::ObjectReturn');
+
diff --git a/samples/client/petstore/perl/t/OrderTest.t b/samples/client/petstore/perl/t/OrderTest.t
new file mode 100644
index 00000000000..36871c896c6
--- /dev/null
+++ b/samples/client/petstore/perl/t/OrderTest.t
@@ -0,0 +1,17 @@
+# NOTE: This class is auto generated by the Swagger Codegen
+# Please update the test case below to test the model.
+
+use Test::More tests => 2;
+use Test::Exception;
+
+use lib 'lib';
+use strict;
+use warnings;
+
+
+use_ok('WWW::SwaggerClient::Object::Order');
+
+my $instance = WWW::SwaggerClient::Object::Order->new();
+
+isa_ok($instance, 'WWW::SwaggerClient::Object::Order');
+
diff --git a/samples/client/petstore/perl/t/PetApiTest.t b/samples/client/petstore/perl/t/PetApiTest.t
new file mode 100644
index 00000000000..91f87e56f24
--- /dev/null
+++ b/samples/client/petstore/perl/t/PetApiTest.t
@@ -0,0 +1,126 @@
+#
+# Copyright 2016 SmartBear Software
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+# NOTE: This class is auto generated by Swagger Codegen
+# Please update the test case below to test the API endpoints.
+#
+use Test::More tests => 1; #TODO update number of test cases
+use Test::Exception;
+
+use lib 'lib';
+use strict;
+use warnings;
+
+use_ok('WWW::SwaggerClient::PetApi');
+
+my $api = WWW::SwaggerClient::PetApi->new();
+isa_ok($api, 'WWW::SwaggerClient::PetApi');
+
+#
+# add_pet test
+#
+{
+    my $body = undef; # replace NULL with a proper value
+    my $result = $api->add_pet(body => $body);
+}
+
+#
+# add_pet_using_byte_array test
+#
+{
+    my $body = undef; # replace NULL with a proper value
+    my $result = $api->add_pet_using_byte_array(body => $body);
+}
+
+#
+# delete_pet test
+#
+{
+    my $pet_id = undef; # replace NULL with a proper value
+    my $api_key = undef; # replace NULL with a proper value
+    my $result = $api->delete_pet(pet_id => $pet_id, api_key => $api_key);
+}
+
+#
+# find_pets_by_status test
+#
+{
+    my $status = undef; # replace NULL with a proper value
+    my $result = $api->find_pets_by_status(status => $status);
+}
+
+#
+# find_pets_by_tags test
+#
+{
+    my $tags = undef; # replace NULL with a proper value
+    my $result = $api->find_pets_by_tags(tags => $tags);
+}
+
+#
+# get_pet_by_id test
+#
+{
+    my $pet_id = undef; # replace NULL with a proper value
+    my $result = $api->get_pet_by_id(pet_id => $pet_id);
+}
+
+#
+# get_pet_by_id_in_object test
+#
+{
+    my $pet_id = undef; # replace NULL with a proper value
+    my $result = $api->get_pet_by_id_in_object(pet_id => $pet_id);
+}
+
+#
+# pet_pet_idtesting_byte_arraytrue_get test
+#
+{
+    my $pet_id = undef; # replace NULL with a proper value
+    my $result = $api->pet_pet_idtesting_byte_arraytrue_get(pet_id => $pet_id);
+}
+
+#
+# update_pet test
+#
+{
+    my $body = undef; # replace NULL with a proper value
+    my $result = $api->update_pet(body => $body);
+}
+
+#
+# update_pet_with_form test
+#
+{
+    my $pet_id = undef; # replace NULL with a proper value
+    my $name = undef; # replace NULL with a proper value
+    my $status = undef; # replace NULL with a proper value
+    my $result = $api->update_pet_with_form(pet_id => $pet_id, name => $name, status => $status);
+}
+
+#
+# upload_file test
+#
+{
+    my $pet_id = undef; # replace NULL with a proper value
+    my $additional_metadata = undef; # replace NULL with a proper value
+    my $file = undef; # replace NULL with a proper value
+    my $result = $api->upload_file(pet_id => $pet_id, additional_metadata => $additional_metadata, file => $file);
+}
+
+
+1;
diff --git a/samples/client/petstore/perl/t/PetTest.t b/samples/client/petstore/perl/t/PetTest.t
new file mode 100644
index 00000000000..54a2888dbe8
--- /dev/null
+++ b/samples/client/petstore/perl/t/PetTest.t
@@ -0,0 +1,17 @@
+# NOTE: This class is auto generated by the Swagger Codegen
+# Please update the test case below to test the model.
+
+use Test::More tests => 2;
+use Test::Exception;
+
+use lib 'lib';
+use strict;
+use warnings;
+
+
+use_ok('WWW::SwaggerClient::Object::Pet');
+
+my $instance = WWW::SwaggerClient::Object::Pet->new();
+
+isa_ok($instance, 'WWW::SwaggerClient::Object::Pet');
+
diff --git a/samples/client/petstore/perl/t/SpecialModelNameTest.t b/samples/client/petstore/perl/t/SpecialModelNameTest.t
new file mode 100644
index 00000000000..230db33bab8
--- /dev/null
+++ b/samples/client/petstore/perl/t/SpecialModelNameTest.t
@@ -0,0 +1,17 @@
+# NOTE: This class is auto generated by the Swagger Codegen
+# Please update the test case below to test the model.
+
+use Test::More tests => 2;
+use Test::Exception;
+
+use lib 'lib';
+use strict;
+use warnings;
+
+
+use_ok('WWW::SwaggerClient::Object::SpecialModelName');
+
+my $instance = WWW::SwaggerClient::Object::SpecialModelName->new();
+
+isa_ok($instance, 'WWW::SwaggerClient::Object::SpecialModelName');
+
diff --git a/samples/client/petstore/perl/t/StoreApiTest.t b/samples/client/petstore/perl/t/StoreApiTest.t
new file mode 100644
index 00000000000..a9bc3b3a4f3
--- /dev/null
+++ b/samples/client/petstore/perl/t/StoreApiTest.t
@@ -0,0 +1,79 @@
+#
+# Copyright 2016 SmartBear Software
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+# NOTE: This class is auto generated by Swagger Codegen
+# Please update the test case below to test the API endpoints.
+#
+use Test::More tests => 1; #TODO update number of test cases
+use Test::Exception;
+
+use lib 'lib';
+use strict;
+use warnings;
+
+use_ok('WWW::SwaggerClient::StoreApi');
+
+my $api = WWW::SwaggerClient::StoreApi->new();
+isa_ok($api, 'WWW::SwaggerClient::StoreApi');
+
+#
+# delete_order test
+#
+{
+    my $order_id = undef; # replace NULL with a proper value
+    my $result = $api->delete_order(order_id => $order_id);
+}
+
+#
+# find_orders_by_status test
+#
+{
+    my $status = undef; # replace NULL with a proper value
+    my $result = $api->find_orders_by_status(status => $status);
+}
+
+#
+# get_inventory test
+#
+{
+    my $result = $api->get_inventory();
+}
+
+#
+# get_inventory_in_object test
+#
+{
+    my $result = $api->get_inventory_in_object();
+}
+
+#
+# get_order_by_id test
+#
+{
+    my $order_id = undef; # replace NULL with a proper value
+    my $result = $api->get_order_by_id(order_id => $order_id);
+}
+
+#
+# place_order test
+#
+{
+    my $body = undef; # replace NULL with a proper value
+    my $result = $api->place_order(body => $body);
+}
+
+
+1;
diff --git a/samples/client/petstore/perl/t/TagTest.t b/samples/client/petstore/perl/t/TagTest.t
new file mode 100644
index 00000000000..bde9da8c69e
--- /dev/null
+++ b/samples/client/petstore/perl/t/TagTest.t
@@ -0,0 +1,17 @@
+# NOTE: This class is auto generated by the Swagger Codegen
+# Please update the test case below to test the model.
+
+use Test::More tests => 2;
+use Test::Exception;
+
+use lib 'lib';
+use strict;
+use warnings;
+
+
+use_ok('WWW::SwaggerClient::Object::Tag');
+
+my $instance = WWW::SwaggerClient::Object::Tag->new();
+
+isa_ok($instance, 'WWW::SwaggerClient::Object::Tag');
+
diff --git a/samples/client/petstore/perl/t/UserApiTest.t b/samples/client/petstore/perl/t/UserApiTest.t
new file mode 100644
index 00000000000..108484ed120
--- /dev/null
+++ b/samples/client/petstore/perl/t/UserApiTest.t
@@ -0,0 +1,98 @@
+#
+# Copyright 2016 SmartBear Software
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+# NOTE: This class is auto generated by Swagger Codegen
+# Please update the test case below to test the API endpoints.
+#
+use Test::More tests => 1; #TODO update number of test cases
+use Test::Exception;
+
+use lib 'lib';
+use strict;
+use warnings;
+
+use_ok('WWW::SwaggerClient::UserApi');
+
+my $api = WWW::SwaggerClient::UserApi->new();
+isa_ok($api, 'WWW::SwaggerClient::UserApi');
+
+#
+# create_user test
+#
+{
+    my $body = undef; # replace NULL with a proper value
+    my $result = $api->create_user(body => $body);
+}
+
+#
+# create_users_with_array_input test
+#
+{
+    my $body = undef; # replace NULL with a proper value
+    my $result = $api->create_users_with_array_input(body => $body);
+}
+
+#
+# create_users_with_list_input test
+#
+{
+    my $body = undef; # replace NULL with a proper value
+    my $result = $api->create_users_with_list_input(body => $body);
+}
+
+#
+# delete_user test
+#
+{
+    my $username = undef; # replace NULL with a proper value
+    my $result = $api->delete_user(username => $username);
+}
+
+#
+# get_user_by_name test
+#
+{
+    my $username = undef; # replace NULL with a proper value
+    my $result = $api->get_user_by_name(username => $username);
+}
+
+#
+# login_user test
+#
+{
+    my $username = undef; # replace NULL with a proper value
+    my $password = undef; # replace NULL with a proper value
+    my $result = $api->login_user(username => $username, password => $password);
+}
+
+#
+# logout_user test
+#
+{
+    my $result = $api->logout_user();
+}
+
+#
+# update_user test
+#
+{
+    my $username = undef; # replace NULL with a proper value
+    my $body = undef; # replace NULL with a proper value
+    my $result = $api->update_user(username => $username, body => $body);
+}
+
+
+1;
diff --git a/samples/client/petstore/perl/t/UserTest.t b/samples/client/petstore/perl/t/UserTest.t
new file mode 100644
index 00000000000..260595540be
--- /dev/null
+++ b/samples/client/petstore/perl/t/UserTest.t
@@ -0,0 +1,17 @@
+# NOTE: This class is auto generated by the Swagger Codegen
+# Please update the test case below to test the model.
+
+use Test::More tests => 2;
+use Test::Exception;
+
+use lib 'lib';
+use strict;
+use warnings;
+
+
+use_ok('WWW::SwaggerClient::Object::User');
+
+my $instance = WWW::SwaggerClient::Object::User->new();
+
+isa_ok($instance, 'WWW::SwaggerClient::Object::User');
+
diff --git a/samples/client/petstore/perl/test.pl b/samples/client/petstore/perl/test.pl
index b12105c9054..626d25357fc 100755
--- a/samples/client/petstore/perl/test.pl
+++ b/samples/client/petstore/perl/test.pl
@@ -25,6 +25,14 @@ $WWW::SwaggerClient::Configuration::password = 'password';
 
 my $api = WWW::SwaggerClient::PetApi->new();
 
+# exception handling
+#eval {
+#    print "\nget_pet_by_id:".Dumper $api->get_pet_by_id(pet_id => 9999);
+#};
+#if ($@) {
+#    print "Exception when calling: $@\n";
+#}
+
 my $pet_id = 10008;
 
 my $category =  WWW::SwaggerClient::Object::Category->new('id' => '2', 'name' => 'perl');
diff --git a/samples/client/petstore/perl/t/01_pet_api.t b/samples/client/petstore/perl/tests/01_pet_api.t
similarity index 100%
rename from samples/client/petstore/perl/t/01_pet_api.t
rename to samples/client/petstore/perl/tests/01_pet_api.t
diff --git a/samples/client/petstore/perl/t/02_store_api.t b/samples/client/petstore/perl/tests/02_store_api.t
similarity index 100%
rename from samples/client/petstore/perl/t/02_store_api.t
rename to samples/client/petstore/perl/tests/02_store_api.t
diff --git a/samples/client/petstore/perl/t/03_api_factory.t b/samples/client/petstore/perl/tests/03_api_factory.t
similarity index 100%
rename from samples/client/petstore/perl/t/03_api_factory.t
rename to samples/client/petstore/perl/tests/03_api_factory.t
diff --git a/samples/client/petstore/perl/t/04_role.t b/samples/client/petstore/perl/tests/04_role.t
similarity index 96%
rename from samples/client/petstore/perl/t/04_role.t
rename to samples/client/petstore/perl/tests/04_role.t
index 73328fa6e62..8836c35546c 100644
--- a/samples/client/petstore/perl/t/04_role.t
+++ b/samples/client/petstore/perl/tests/04_role.t
@@ -50,7 +50,7 @@ is $get_pet->tags->[0]->id, '11', 'stored and retrieved: got the proper tag id';
 
 # API method docs 
 is_deeply(	[sort keys %{$api->pet_api->method_documentation}], 
-			[ 'add_pet', 'delete_pet', 'find_pets_by_status', 'find_pets_by_tags', 'get_pet_by_id', 'update_pet', 'update_pet_with_form', 'upload_file'], 
+			[ 'add_pet', 'add_pet_using_byte_array', 'delete_pet', 'find_pets_by_status', 'find_pets_by_tags', 'get_pet_by_id', 'get_pet_by_id_in_object', 'pet_pet_idtesting_byte_arraytrue_get', 'update_pet', 'update_pet_with_form', 'upload_file'], 
 			"Pet API method_documentation has the correct keys");
 is $api->pet_api->method_documentation->{get_pet_by_id}->{params}->{pet_id}->{description}, 
 	'ID of pet that needs to be fetched', 'get_pet_by_id parameter pet_id description is correct';
diff --git a/samples/client/petstore/perl/tests/05_long_module_name.t b/samples/client/petstore/perl/tests/05_long_module_name.t
new file mode 100644
index 00000000000..5663e15e5ff
--- /dev/null
+++ b/samples/client/petstore/perl/tests/05_long_module_name.t
@@ -0,0 +1,96 @@
+use Test::More;
+use Test::Exception;
+
+use lib 'deep_module_test/lib';
+use strict;
+use warnings;
+
+if (! -d 'deep_module_test/lib' ) {
+    plan skip_all => 'bin/perl-petstore.sh needs to be run first';
+}
+else {
+    plan tests => 38;
+}
+
+use_ok('Something::Deep::PetApi');
+use_ok('Something::Deep::ApiClient');
+use_ok('Something::Deep::Object::Pet');
+use_ok('Something::Deep::Object::Tag');
+use_ok('Something::Deep::Object::Category');
+
+my $api_client = Something::Deep::ApiClient->instance('base_url' => 'http://testing');
+my $pet_api = Something::Deep::PetApi->new('api_client' => $api_client);
+is $pet_api->{api_client}->{base_url}, 'http://testing', 'get the proper base URL from api client';
+
+my $api = Something::Deep::PetApi->new();
+
+is $api->{api_client}->{base_url}, 'http://testing', 'we still get the original base URL from api client, because it\'s a singleton';
+
+# reset the base_url - no direct access because an application shouldn't be changing 
+# its base URL halfway through
+$api->{api_client}->{base_url} = 'http://petstore.swagger.io/v2';
+
+is $api->{api_client}->{base_url}, 'http://petstore.swagger.io/v2', 'get the default base URL from api client';
+
+# test select_header_content_type
+is $api->{api_client}->select_header_content_type('application/xml', 'Application/JSON'), 'application/json', 'get the proper content type application/json but not application/xml';
+is $api->{api_client}->select_header_content_type('application/xml'), 'application/xml', 'get the proper content type application/json'; 
+is $api->{api_client}->select_header_content_type(''), 'application/json', 'get the proper content type application/json (default)'; 
+
+# test select_header_accept
+is $api->{api_client}->select_header_accept('application/xml', 'Application/JSON'), 'application/json', 'get the proper accept application/json but not application/xml';
+is $api->{api_client}->select_header_content_type('application/xml'), 'application/xml', 'get the proper accept application/json'; 
+is $api->{api_client}->select_header_accept(''), undef, 'get the proper accept "undef" (default)';
+
+my $pet_id = 10008;
+
+my $category =  Something::Deep::Object::Category->new('id' => '22', 'name' => 'perl');
+my $tag =  Something::Deep::Object::Tag->new('id' => '11', 'name' => 'just kidding');
+my $pet =  Something::Deep::Object::Pet->new('id' => $pet_id, 'name' => 'perl test',
+      "photoUrls" => ['123', 'oop'], 'tags' => [$tag], 'status' => 'pending', 'category' => $category);
+
+isa_ok($api, 'Something::Deep::PetApi');
+isa_ok($category, 'Something::Deep::Object::Category');
+isa_ok($tag, 'Something::Deep::Object::Tag');
+isa_ok($pet, 'Something::Deep::Object::Pet');
+
+my $pet_hash = $pet->to_hash;
+
+is $pet_hash->{category}->{id}, '22', 'get the proper category id';
+is $pet_hash->{category}->{name}, 'perl', 'get the proper category name';
+is $pet_hash->{tags}[0]->{name}, 'just kidding', 'get the proper tag name';
+is $pet_hash->{tags}[0]->{id}, '11', 'get the proper tag id';
+
+my $add_pet = $api->add_pet(body => $pet);
+
+my $get_pet = $api->get_pet_by_id(pet_id => $pet_id);
+my $get_pet_hash = $get_pet->to_hash;
+is $get_pet_hash->{name}, 'perl test', 'get the proper pet name from get_pet_by_id';
+is $get_pet_hash->{id}, '10008', 'get the proper pet id from get_pet_by_id';
+is $get_pet_hash->{category}->{name}, 'perl', 'get the proper category name from get_pet_by_id';
+is $get_pet_hash->{category}->{id}, '22', 'get the proper category id from get_pet_by_id';
+is $get_pet_hash->{category}->{name}, 'perl', 'get the proper category from get_pet_by_id';
+is $get_pet_hash->{tags}[0]->{name}, 'just kidding', 'get the proper tag from get_pet_by_id';
+is $get_pet_hash->{tags}[0]->{id}, '11', 'get the proper tag id from get_pet_by_id';
+is $get_pet_hash->{photoUrls}->[0], '123', 'get the proper photoUrl from get_pet_by_id';
+is $get_pet_hash->{photoUrls}->[1], 'oop', 'get the proper photoUrl from get_pet_by_id';
+
+
+my $update_pet_with_form = $api->update_pet_with_form(pet_id => $pet_id, name => 'test_name', status => 'sold');
+is $update_pet_with_form, undef, 'get the null response from update_pet_wth_form';
+
+my $get_pet_after_update = $api->get_pet_by_id(pet_id => $pet_id);
+is $get_pet_after_update->{status}, 'sold', 'get the updated status after update_pet_with_form';
+
+my $upload_pet = $api->upload_file(pet_id => $pet_id, additional_metadata => 'testabc', file => 'test.pl');
+is $upload_pet, undef, 'get the null response from upload_pet';
+
+my $delete_pet = $api->delete_pet(pet_id => $pet_id);
+is $delete_pet, undef, 'get the null response from delete_pet';
+throws_ok{$api->get_pet_by_id(pet_id => $pet_id)} qr/API Exception\(404\): Not Found/, "throw 404 error about pet not found after delete";
+#is $get_pet_after_delete->{status}, undef, 'get the updated status after update_pet_with_form';
+
+my $pets;
+lives_ok {$pets = $api->find_pets_by_status(status => [qw(sold available)])} 'array query param processed correctly';
+isa_ok($pets->[0], 'Something::Deep::Object::Pet');
+
diff --git a/samples/client/petstore/php/SwaggerClient-php/.travis.yml b/samples/client/petstore/php/SwaggerClient-php/.travis.yml
new file mode 100644
index 00000000000..3c97d942552
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/.travis.yml
@@ -0,0 +1,10 @@
+language: php
+sudo: false
+php:
+    - 5.4
+    - 5.5
+    - 5.6
+    - 7.0
+    - hhvm
+before_install: "composer install"
+script: "phpunit lib/Tests"
diff --git a/samples/client/petstore/php/SwaggerClient-php/README.md b/samples/client/petstore/php/SwaggerClient-php/README.md
index 6dfd19a292a..79dbf6ee5bf 100644
--- a/samples/client/petstore/php/SwaggerClient-php/README.md
+++ b/samples/client/petstore/php/SwaggerClient-php/README.md
@@ -1,52 +1,177 @@
+# SwaggerClient-php
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+This PHP package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
+
+- API version: 1.0.0
+- Package version: 1.0.0
+- Build date: 2016-03-30T20:57:56.803+08:00
+- Build package: class io.swagger.codegen.languages.PhpClientCodegen
+
 ## Requirements
 
-PHP 5.3.3 and later.
+PHP 5.4.0 and later
 
-## Composer
+## Installation & Usage
+### Composer
 
-You can install the bindings via [Composer](http://getcomposer.org/). Add this to your `composer.json`:
+To install the bindings via [Composer](http://getcomposer.org/), add the following to `composer.json`:
 
+```
+{
+  "repositories": [
     {
-        "repositories": [
-        {
-            "type": "git",
-            "url": "https://github.com/wing328/SwaggerPetstore-php.git"
-        }
-        ],
-        "require": {
-            "SwaggerPetstore/SwaggerPetstore-php": "*@dev"
-        }
+      "type": "git",
+      "url": "https://github.com/YOUR_GIT_USR_ID/YOUR_GIT_REPO_ID.git"
     }
+  ],
+  "require": {
+    "YOUR_GIT_USR_ID/YOUR_GIT_REPO_ID": "*@dev"
+  }
+}
+```
 
-Then install via:
+Then run `composer install`
 
-    composer install
+### Manual Installation
 
-To use the bindings, use Composer's [autoload](https://getcomposer.org/doc/00-intro.md#autoloading):
+Download the files and include `autoload.php`:
 
-    require_once('vendor/autoload.php');
+```php
+    require_once('/path/to/SwaggerClient-php/autoload.php');
+```
 
-## Manual Installation
+## Tests 
 
-If you do not wish to use Composer, you can download the latest release. Then, to use the bindings, include the `SwaggerPetstore.php` file.
+To run the unit tests:
 
-    require_once('/path/to/SwaggerPetstore-php/SwaggerPetstore.php');
+```
+composer install
+./vendor/bin/phpunit lib/Tests
+```
 
 ## Getting Started
 
-php test.php
+Please follow the [installation procedure](#installation--usage) and then run the following:
 
-## Documentation
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
 
-TODO
+// Configure OAuth2 access token for authorization: petstore_auth
+Swagger\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
 
-## Tests
+$api_instance = new Swagger\Client\Api\PetApi();
+$body = new \Swagger\Client\Model\Pet(); // \Swagger\Client\Model\Pet | Pet object that needs to be added to the store
 
-In order to run tests first install [PHPUnit](http://packagist.org/packages/phpunit/phpunit) via [Composer](http://getcomposer.org/):
+try {
+    $api_instance->addPet($body);
+} catch (Exception $e) {
+    echo 'Exception when calling PetApi->addPet: ', $e->getMessage(), "\n";
+}
 
-    composer update
+?>
+```
 
-To run the test suite:
+## Documentation for API Endpoints
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*PetApi* | [**addPet**](docs/PetApi.md#addpet) | **POST** /pet | Add a new pet to the store
+*PetApi* | [**addPetUsingByteArray**](docs/PetApi.md#addpetusingbytearray) | **POST** /pet?testing_byte_array=true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
+*PetApi* | [**deletePet**](docs/PetApi.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet
+*PetApi* | [**findPetsByStatus**](docs/PetApi.md#findpetsbystatus) | **GET** /pet/findByStatus | Finds Pets by status
+*PetApi* | [**findPetsByTags**](docs/PetApi.md#findpetsbytags) | **GET** /pet/findByTags | Finds Pets by tags
+*PetApi* | [**getPetById**](docs/PetApi.md#getpetbyid) | **GET** /pet/{petId} | Find pet by ID
+*PetApi* | [**getPetByIdInObject**](docs/PetApi.md#getpetbyidinobject) | **GET** /pet/{petId}?response=inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+*PetApi* | [**petPetIdtestingByteArraytrueGet**](docs/PetApi.md#petpetidtestingbytearraytrueget) | **GET** /pet/{petId}?testing_byte_array=true | Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+*PetApi* | [**updatePet**](docs/PetApi.md#updatepet) | **PUT** /pet | Update an existing pet
+*PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatepetwithform) | **POST** /pet/{petId} | Updates a pet in the store with form data
+*PetApi* | [**uploadFile**](docs/PetApi.md#uploadfile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteorder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
+*StoreApi* | [**findOrdersByStatus**](docs/StoreApi.md#findordersbystatus) | **GET** /store/findByStatus | Finds orders by status
+*StoreApi* | [**getInventory**](docs/StoreApi.md#getinventory) | **GET** /store/inventory | Returns pet inventories by status
+*StoreApi* | [**getInventoryInObject**](docs/StoreApi.md#getinventoryinobject) | **GET** /store/inventory?response=arbitrary_object | Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+*StoreApi* | [**getOrderById**](docs/StoreApi.md#getorderbyid) | **GET** /store/order/{orderId} | Find purchase order by ID
+*StoreApi* | [**placeOrder**](docs/StoreApi.md#placeorder) | **POST** /store/order | Place an order for a pet
+*UserApi* | [**createUser**](docs/UserApi.md#createuser) | **POST** /user | Create user
+*UserApi* | [**createUsersWithArrayInput**](docs/UserApi.md#createuserswitharrayinput) | **POST** /user/createWithArray | Creates list of users with given input array
+*UserApi* | [**createUsersWithListInput**](docs/UserApi.md#createuserswithlistinput) | **POST** /user/createWithList | Creates list of users with given input array
+*UserApi* | [**deleteUser**](docs/UserApi.md#deleteuser) | **DELETE** /user/{username} | Delete user
+*UserApi* | [**getUserByName**](docs/UserApi.md#getuserbyname) | **GET** /user/{username} | Get user by user name
+*UserApi* | [**loginUser**](docs/UserApi.md#loginuser) | **GET** /user/login | Logs user into the system
+*UserApi* | [**logoutUser**](docs/UserApi.md#logoutuser) | **GET** /user/logout | Logs out current logged in user session
+*UserApi* | [**updateUser**](docs/UserApi.md#updateuser) | **PUT** /user/{username} | Updated user
+
+
+## Documentation For Models
+
+ - [Animal](docs/Animal.md)
+ - [Cat](docs/Cat.md)
+ - [Category](docs/Category.md)
+ - [Dog](docs/Dog.md)
+ - [InlineResponse200](docs/InlineResponse200.md)
+ - [Model200Response](docs/Model200Response.md)
+ - [ModelReturn](docs/ModelReturn.md)
+ - [Name](docs/Name.md)
+ - [Order](docs/Order.md)
+ - [Pet](docs/Pet.md)
+ - [SpecialModelName](docs/SpecialModelName.md)
+ - [Tag](docs/Tag.md)
+ - [User](docs/User.md)
+
+
+## Documentation For Authorization
+
+
+## test_api_key_header
+
+- **Type**: API key 
+- **API key parameter name**: test_api_key_header
+- **Location**: HTTP header
+
+## api_key
+
+- **Type**: API key 
+- **API key parameter name**: api_key
+- **Location**: HTTP header
+
+## test_http_basic
+
+- **Type**: HTTP basic authentication
+
+## test_api_client_secret
+
+- **Type**: API key 
+- **API key parameter name**: x-test_api_client_secret
+- **Location**: HTTP header
+
+## test_api_client_id
+
+- **Type**: API key 
+- **API key parameter name**: x-test_api_client_id
+- **Location**: HTTP header
+
+## test_api_key_query
+
+- **Type**: API key 
+- **API key parameter name**: test_api_key_query
+- **Location**: URL query string
+
+## petstore_auth
+
+- **Type**: OAuth
+- **Flow**: implicit
+- **Authorizatoin URL**: http://petstore.swagger.io/api/oauth/dialog
+- **Scopes**: 
+ - **write:pets**: modify pets in your account
+ - **read:pets**: read your pets
+
+
+## Author
+
+apiteam@swagger.io
 
-    ./vendor/bin/phpunit tests
 
diff --git a/samples/client/petstore/php/SwaggerClient-php/composer.json b/samples/client/petstore/php/SwaggerClient-php/composer.json
index 3b432d83b92..3889aee8a36 100644
--- a/samples/client/petstore/php/SwaggerClient-php/composer.json
+++ b/samples/client/petstore/php/SwaggerClient-php/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "swagger/swagger-client",
+    "name": "YOUR_GIT_USR_ID/YOUR_GIT_REPO_ID",
     "version": "1.0.0",
     "description": "",
     "keywords": [
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/200Response.md b/samples/client/petstore/php/SwaggerClient-php/docs/200Response.md
new file mode 100644
index 00000000000..284a8795c61
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/200Response.md
@@ -0,0 +1,10 @@
+# 200Response
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **int** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/Animal.md b/samples/client/petstore/php/SwaggerClient-php/docs/Animal.md
new file mode 100644
index 00000000000..948a992f502
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/Animal.md
@@ -0,0 +1,10 @@
+# Animal
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**class_name** | **string** |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/Cat.md b/samples/client/petstore/php/SwaggerClient-php/docs/Cat.md
new file mode 100644
index 00000000000..8d30565d014
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/Cat.md
@@ -0,0 +1,10 @@
+# Cat
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**declawed** | **bool** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/Category.md b/samples/client/petstore/php/SwaggerClient-php/docs/Category.md
new file mode 100644
index 00000000000..80aef312e5e
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/Category.md
@@ -0,0 +1,11 @@
+# Category
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **int** |  | [optional] 
+**name** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/Dog.md b/samples/client/petstore/php/SwaggerClient-php/docs/Dog.md
new file mode 100644
index 00000000000..3c04bdf4cf7
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/Dog.md
@@ -0,0 +1,10 @@
+# Dog
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**breed** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/InlineResponse200.md b/samples/client/petstore/php/SwaggerClient-php/docs/InlineResponse200.md
new file mode 100644
index 00000000000..1c0b9237453
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/InlineResponse200.md
@@ -0,0 +1,15 @@
+# InlineResponse200
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**tags** | [**\Swagger\Client\Model\Tag[]**](Tag.md) |  | [optional] 
+**id** | **int** |  | 
+**category** | **object** |  | [optional] 
+**status** | **string** | pet status in the store | [optional] 
+**name** | **string** |  | [optional] 
+**photo_urls** | **string[]** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/Model200Response.md b/samples/client/petstore/php/SwaggerClient-php/docs/Model200Response.md
new file mode 100644
index 00000000000..e29747a87e7
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/Model200Response.md
@@ -0,0 +1,10 @@
+# Model200Response
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **int** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/ModelReturn.md b/samples/client/petstore/php/SwaggerClient-php/docs/ModelReturn.md
new file mode 100644
index 00000000000..9adb62e1e12
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/ModelReturn.md
@@ -0,0 +1,10 @@
+# ModelReturn
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**return** | **int** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/Name.md b/samples/client/petstore/php/SwaggerClient-php/docs/Name.md
new file mode 100644
index 00000000000..26473221c32
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/Name.md
@@ -0,0 +1,11 @@
+# Name
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **int** |  | [optional] 
+**snake_case** | **int** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/Order.md b/samples/client/petstore/php/SwaggerClient-php/docs/Order.md
new file mode 100644
index 00000000000..8932478b022
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/Order.md
@@ -0,0 +1,15 @@
+# Order
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **int** |  | [optional] 
+**pet_id** | **int** |  | [optional] 
+**quantity** | **int** |  | [optional] 
+**ship_date** | [**\DateTime**](\DateTime.md) |  | [optional] 
+**status** | **string** | Order Status | [optional] 
+**complete** | **bool** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/Pet.md b/samples/client/petstore/php/SwaggerClient-php/docs/Pet.md
new file mode 100644
index 00000000000..4525fe7d776
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/Pet.md
@@ -0,0 +1,15 @@
+# Pet
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **int** |  | [optional] 
+**category** | [**\Swagger\Client\Model\Category**](Category.md) |  | [optional] 
+**name** | **string** |  | 
+**photo_urls** | **string[]** |  | 
+**tags** | [**\Swagger\Client\Model\Tag[]**](Tag.md) |  | [optional] 
+**status** | **string** | pet status in the store | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/PetApi.md b/samples/client/petstore/php/SwaggerClient-php/docs/PetApi.md
new file mode 100644
index 00000000000..b21d4b595b1
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/PetApi.md
@@ -0,0 +1,563 @@
+# Swagger\Client\PetApi
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**addPet**](PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
+[**addPetUsingByteArray**](PetApi.md#addPetUsingByteArray) | **POST** /pet?testing_byte_array=true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
+[**deletePet**](PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
+[**findPetsByStatus**](PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
+[**findPetsByTags**](PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags
+[**getPetById**](PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID
+[**getPetByIdInObject**](PetApi.md#getPetByIdInObject) | **GET** /pet/{petId}?response=inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+[**petPetIdtestingByteArraytrueGet**](PetApi.md#petPetIdtestingByteArraytrueGet) | **GET** /pet/{petId}?testing_byte_array=true | Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+[**updatePet**](PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
+[**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
+[**uploadFile**](PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+
+
+# **addPet**
+> addPet($body)
+
+Add a new pet to the store
+
+
+
+### Example 
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+// Configure OAuth2 access token for authorization: petstore_auth
+Swagger\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
+
+$api_instance = new Swagger\Client\Api\PetApi();
+$body = new \Swagger\Client\Model\Pet(); // \Swagger\Client\Model\Pet | Pet object that needs to be added to the store
+
+try { 
+    $api_instance->addPet($body);
+} catch (Exception $e) {
+    echo 'Exception when calling PetApi->addPet: ', $e->getMessage(), "\n";
+}
+?>
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**\Swagger\Client\Model\Pet**](\Swagger\Client\Model\Pet.md)| Pet object that needs to be added to the store | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **addPetUsingByteArray**
+> addPetUsingByteArray($body)
+
+Fake endpoint to test byte array in body parameter for adding a new pet to the store
+
+
+
+### Example 
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+// Configure OAuth2 access token for authorization: petstore_auth
+Swagger\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
+
+$api_instance = new Swagger\Client\Api\PetApi();
+$body = "B"; // string | Pet object in the form of byte array
+
+try { 
+    $api_instance->addPetUsingByteArray($body);
+} catch (Exception $e) {
+    echo 'Exception when calling PetApi->addPetUsingByteArray: ', $e->getMessage(), "\n";
+}
+?>
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | **string**| Pet object in the form of byte array | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **deletePet**
+> deletePet($pet_id, $api_key)
+
+Deletes a pet
+
+
+
+### Example 
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+// Configure OAuth2 access token for authorization: petstore_auth
+Swagger\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
+
+$api_instance = new Swagger\Client\Api\PetApi();
+$pet_id = 789; // int | Pet id to delete
+$api_key = "api_key_example"; // string | 
+
+try { 
+    $api_instance->deletePet($pet_id, $api_key);
+} catch (Exception $e) {
+    echo 'Exception when calling PetApi->deletePet: ', $e->getMessage(), "\n";
+}
+?>
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **pet_id** | **int**| Pet id to delete | 
+ **api_key** | **string**|  | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **findPetsByStatus**
+> \Swagger\Client\Model\Pet[] findPetsByStatus($status)
+
+Finds Pets by status
+
+Multiple status values can be provided with comma separated strings
+
+### Example 
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+// Configure OAuth2 access token for authorization: petstore_auth
+Swagger\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
+
+$api_instance = new Swagger\Client\Api\PetApi();
+$status = array("available"); // string[] | Status values that need to be considered for query
+
+try { 
+    $result = $api_instance->findPetsByStatus($status);
+    print_r($result);
+} catch (Exception $e) {
+    echo 'Exception when calling PetApi->findPetsByStatus: ', $e->getMessage(), "\n";
+}
+?>
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **status** | [**string[]**](string.md)| Status values that need to be considered for query | [optional] [default to available]
+
+### Return type
+
+[**\Swagger\Client\Model\Pet[]**](Pet.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **findPetsByTags**
+> \Swagger\Client\Model\Pet[] findPetsByTags($tags)
+
+Finds Pets by tags
+
+Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+
+### Example 
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+// Configure OAuth2 access token for authorization: petstore_auth
+Swagger\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
+
+$api_instance = new Swagger\Client\Api\PetApi();
+$tags = array("tags_example"); // string[] | Tags to filter by
+
+try { 
+    $result = $api_instance->findPetsByTags($tags);
+    print_r($result);
+} catch (Exception $e) {
+    echo 'Exception when calling PetApi->findPetsByTags: ', $e->getMessage(), "\n";
+}
+?>
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **tags** | [**string[]**](string.md)| Tags to filter by | [optional] 
+
+### Return type
+
+[**\Swagger\Client\Model\Pet[]**](Pet.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **getPetById**
+> \Swagger\Client\Model\Pet getPetById($pet_id)
+
+Find pet by ID
+
+Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
+
+### Example 
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+// Configure API key authorization: api_key
+Swagger\Client\Configuration::getDefaultConfiguration()->setApiKey('api_key', 'YOUR_API_KEY');
+// Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+// Swagger\Client\Configuration::getDefaultConfiguration()->setApiKeyPrefix('api_key', 'BEARER');
+// Configure OAuth2 access token for authorization: petstore_auth
+Swagger\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
+
+$api_instance = new Swagger\Client\Api\PetApi();
+$pet_id = 789; // int | ID of pet that needs to be fetched
+
+try { 
+    $result = $api_instance->getPetById($pet_id);
+    print_r($result);
+} catch (Exception $e) {
+    echo 'Exception when calling PetApi->getPetById: ', $e->getMessage(), "\n";
+}
+?>
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **pet_id** | **int**| ID of pet that needs to be fetched | 
+
+### Return type
+
+[**\Swagger\Client\Model\Pet**](Pet.md)
+
+### Authorization
+
+[api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **getPetByIdInObject**
+> \Swagger\Client\Model\InlineResponse200 getPetByIdInObject($pet_id)
+
+Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
+
+Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
+
+### Example 
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+// Configure API key authorization: api_key
+Swagger\Client\Configuration::getDefaultConfiguration()->setApiKey('api_key', 'YOUR_API_KEY');
+// Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+// Swagger\Client\Configuration::getDefaultConfiguration()->setApiKeyPrefix('api_key', 'BEARER');
+// Configure OAuth2 access token for authorization: petstore_auth
+Swagger\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
+
+$api_instance = new Swagger\Client\Api\PetApi();
+$pet_id = 789; // int | ID of pet that needs to be fetched
+
+try { 
+    $result = $api_instance->getPetByIdInObject($pet_id);
+    print_r($result);
+} catch (Exception $e) {
+    echo 'Exception when calling PetApi->getPetByIdInObject: ', $e->getMessage(), "\n";
+}
+?>
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **pet_id** | **int**| ID of pet that needs to be fetched | 
+
+### Return type
+
+[**\Swagger\Client\Model\InlineResponse200**](InlineResponse200.md)
+
+### Authorization
+
+[api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **petPetIdtestingByteArraytrueGet**
+> string petPetIdtestingByteArraytrueGet($pet_id)
+
+Fake endpoint to test byte array return by 'Find pet by ID'
+
+Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
+
+### Example 
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+// Configure API key authorization: api_key
+Swagger\Client\Configuration::getDefaultConfiguration()->setApiKey('api_key', 'YOUR_API_KEY');
+// Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+// Swagger\Client\Configuration::getDefaultConfiguration()->setApiKeyPrefix('api_key', 'BEARER');
+// Configure OAuth2 access token for authorization: petstore_auth
+Swagger\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
+
+$api_instance = new Swagger\Client\Api\PetApi();
+$pet_id = 789; // int | ID of pet that needs to be fetched
+
+try { 
+    $result = $api_instance->petPetIdtestingByteArraytrueGet($pet_id);
+    print_r($result);
+} catch (Exception $e) {
+    echo 'Exception when calling PetApi->petPetIdtestingByteArraytrueGet: ', $e->getMessage(), "\n";
+}
+?>
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **pet_id** | **int**| ID of pet that needs to be fetched | 
+
+### Return type
+
+**string**
+
+### Authorization
+
+[api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **updatePet**
+> updatePet($body)
+
+Update an existing pet
+
+
+
+### Example 
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+// Configure OAuth2 access token for authorization: petstore_auth
+Swagger\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
+
+$api_instance = new Swagger\Client\Api\PetApi();
+$body = new \Swagger\Client\Model\Pet(); // \Swagger\Client\Model\Pet | Pet object that needs to be added to the store
+
+try { 
+    $api_instance->updatePet($body);
+} catch (Exception $e) {
+    echo 'Exception when calling PetApi->updatePet: ', $e->getMessage(), "\n";
+}
+?>
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**\Swagger\Client\Model\Pet**](\Swagger\Client\Model\Pet.md)| Pet object that needs to be added to the store | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **updatePetWithForm**
+> updatePetWithForm($pet_id, $name, $status)
+
+Updates a pet in the store with form data
+
+
+
+### Example 
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+// Configure OAuth2 access token for authorization: petstore_auth
+Swagger\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
+
+$api_instance = new Swagger\Client\Api\PetApi();
+$pet_id = "pet_id_example"; // string | ID of pet that needs to be updated
+$name = "name_example"; // string | Updated name of the pet
+$status = "status_example"; // string | Updated status of the pet
+
+try { 
+    $api_instance->updatePetWithForm($pet_id, $name, $status);
+} catch (Exception $e) {
+    echo 'Exception when calling PetApi->updatePetWithForm: ', $e->getMessage(), "\n";
+}
+?>
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **pet_id** | **string**| ID of pet that needs to be updated | 
+ **name** | **string**| Updated name of the pet | [optional] 
+ **status** | **string**| Updated status of the pet | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: application/x-www-form-urlencoded
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **uploadFile**
+> uploadFile($pet_id, $additional_metadata, $file)
+
+uploads an image
+
+
+
+### Example 
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+// Configure OAuth2 access token for authorization: petstore_auth
+Swagger\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
+
+$api_instance = new Swagger\Client\Api\PetApi();
+$pet_id = 789; // int | ID of pet to update
+$additional_metadata = "additional_metadata_example"; // string | Additional data to pass to server
+$file = "/path/to/file.txt"; // \SplFileObject | file to upload
+
+try { 
+    $api_instance->uploadFile($pet_id, $additional_metadata, $file);
+} catch (Exception $e) {
+    echo 'Exception when calling PetApi->uploadFile: ', $e->getMessage(), "\n";
+}
+?>
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **pet_id** | **int**| ID of pet to update | 
+ **additional_metadata** | **string**| Additional data to pass to server | [optional] 
+ **file** | **\SplFileObject**| file to upload | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: multipart/form-data
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/SpecialModelName.md b/samples/client/petstore/php/SwaggerClient-php/docs/SpecialModelName.md
new file mode 100644
index 00000000000..022ee19169c
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/SpecialModelName.md
@@ -0,0 +1,10 @@
+# SpecialModelName
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**special_property_name** | **int** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/StoreApi.md b/samples/client/petstore/php/SwaggerClient-php/docs/StoreApi.md
new file mode 100644
index 00000000000..a414755a82d
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/StoreApi.md
@@ -0,0 +1,312 @@
+# Swagger\Client\StoreApi
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**deleteOrder**](StoreApi.md#deleteOrder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
+[**findOrdersByStatus**](StoreApi.md#findOrdersByStatus) | **GET** /store/findByStatus | Finds orders by status
+[**getInventory**](StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
+[**getInventoryInObject**](StoreApi.md#getInventoryInObject) | **GET** /store/inventory?response=arbitrary_object | Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+[**getOrderById**](StoreApi.md#getOrderById) | **GET** /store/order/{orderId} | Find purchase order by ID
+[**placeOrder**](StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet
+
+
+# **deleteOrder**
+> deleteOrder($order_id)
+
+Delete purchase order by ID
+
+For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+
+### Example 
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+$api_instance = new Swagger\Client\Api\StoreApi();
+$order_id = "order_id_example"; // string | ID of the order that needs to be deleted
+
+try { 
+    $api_instance->deleteOrder($order_id);
+} catch (Exception $e) {
+    echo 'Exception when calling StoreApi->deleteOrder: ', $e->getMessage(), "\n";
+}
+?>
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **order_id** | **string**| ID of the order that needs to be deleted | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **findOrdersByStatus**
+> \Swagger\Client\Model\Order[] findOrdersByStatus($status)
+
+Finds orders by status
+
+A single status value can be provided as a string
+
+### Example 
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+// Configure API key authorization: test_api_client_id
+Swagger\Client\Configuration::getDefaultConfiguration()->setApiKey('x-test_api_client_id', 'YOUR_API_KEY');
+// Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+// Swagger\Client\Configuration::getDefaultConfiguration()->setApiKeyPrefix('x-test_api_client_id', 'BEARER');
+// Configure API key authorization: test_api_client_secret
+Swagger\Client\Configuration::getDefaultConfiguration()->setApiKey('x-test_api_client_secret', 'YOUR_API_KEY');
+// Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+// Swagger\Client\Configuration::getDefaultConfiguration()->setApiKeyPrefix('x-test_api_client_secret', 'BEARER');
+
+$api_instance = new Swagger\Client\Api\StoreApi();
+$status = "placed"; // string | Status value that needs to be considered for query
+
+try { 
+    $result = $api_instance->findOrdersByStatus($status);
+    print_r($result);
+} catch (Exception $e) {
+    echo 'Exception when calling StoreApi->findOrdersByStatus: ', $e->getMessage(), "\n";
+}
+?>
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **status** | **string**| Status value that needs to be considered for query | [optional] [default to placed]
+
+### Return type
+
+[**\Swagger\Client\Model\Order[]**](Order.md)
+
+### Authorization
+
+[test_api_client_id](../README.md#test_api_client_id), [test_api_client_secret](../README.md#test_api_client_secret)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **getInventory**
+> map[string,int] getInventory()
+
+Returns pet inventories by status
+
+Returns a map of status codes to quantities
+
+### Example 
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+// Configure API key authorization: api_key
+Swagger\Client\Configuration::getDefaultConfiguration()->setApiKey('api_key', 'YOUR_API_KEY');
+// Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+// Swagger\Client\Configuration::getDefaultConfiguration()->setApiKeyPrefix('api_key', 'BEARER');
+
+$api_instance = new Swagger\Client\Api\StoreApi();
+
+try { 
+    $result = $api_instance->getInventory();
+    print_r($result);
+} catch (Exception $e) {
+    echo 'Exception when calling StoreApi->getInventory: ', $e->getMessage(), "\n";
+}
+?>
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**map[string,int]**](map.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **getInventoryInObject**
+> object getInventoryInObject()
+
+Fake endpoint to test arbitrary object return by 'Get inventory'
+
+Returns an arbitrary object which is actually a map of status codes to quantities
+
+### Example 
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+// Configure API key authorization: api_key
+Swagger\Client\Configuration::getDefaultConfiguration()->setApiKey('api_key', 'YOUR_API_KEY');
+// Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+// Swagger\Client\Configuration::getDefaultConfiguration()->setApiKeyPrefix('api_key', 'BEARER');
+
+$api_instance = new Swagger\Client\Api\StoreApi();
+
+try { 
+    $result = $api_instance->getInventoryInObject();
+    print_r($result);
+} catch (Exception $e) {
+    echo 'Exception when calling StoreApi->getInventoryInObject: ', $e->getMessage(), "\n";
+}
+?>
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+**object**
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **getOrderById**
+> \Swagger\Client\Model\Order getOrderById($order_id)
+
+Find purchase order by ID
+
+For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+
+### Example 
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+// Configure API key authorization: test_api_key_header
+Swagger\Client\Configuration::getDefaultConfiguration()->setApiKey('test_api_key_header', 'YOUR_API_KEY');
+// Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+// Swagger\Client\Configuration::getDefaultConfiguration()->setApiKeyPrefix('test_api_key_header', 'BEARER');
+// Configure API key authorization: test_api_key_query
+Swagger\Client\Configuration::getDefaultConfiguration()->setApiKey('test_api_key_query', 'YOUR_API_KEY');
+// Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+// Swagger\Client\Configuration::getDefaultConfiguration()->setApiKeyPrefix('test_api_key_query', 'BEARER');
+
+$api_instance = new Swagger\Client\Api\StoreApi();
+$order_id = "order_id_example"; // string | ID of pet that needs to be fetched
+
+try { 
+    $result = $api_instance->getOrderById($order_id);
+    print_r($result);
+} catch (Exception $e) {
+    echo 'Exception when calling StoreApi->getOrderById: ', $e->getMessage(), "\n";
+}
+?>
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **order_id** | **string**| ID of pet that needs to be fetched | 
+
+### Return type
+
+[**\Swagger\Client\Model\Order**](Order.md)
+
+### Authorization
+
+[test_api_key_header](../README.md#test_api_key_header), [test_api_key_query](../README.md#test_api_key_query)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **placeOrder**
+> \Swagger\Client\Model\Order placeOrder($body)
+
+Place an order for a pet
+
+
+
+### Example 
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+// Configure API key authorization: test_api_client_id
+Swagger\Client\Configuration::getDefaultConfiguration()->setApiKey('x-test_api_client_id', 'YOUR_API_KEY');
+// Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+// Swagger\Client\Configuration::getDefaultConfiguration()->setApiKeyPrefix('x-test_api_client_id', 'BEARER');
+// Configure API key authorization: test_api_client_secret
+Swagger\Client\Configuration::getDefaultConfiguration()->setApiKey('x-test_api_client_secret', 'YOUR_API_KEY');
+// Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+// Swagger\Client\Configuration::getDefaultConfiguration()->setApiKeyPrefix('x-test_api_client_secret', 'BEARER');
+
+$api_instance = new Swagger\Client\Api\StoreApi();
+$body = new \Swagger\Client\Model\Order(); // \Swagger\Client\Model\Order | order placed for purchasing the pet
+
+try { 
+    $result = $api_instance->placeOrder($body);
+    print_r($result);
+} catch (Exception $e) {
+    echo 'Exception when calling StoreApi->placeOrder: ', $e->getMessage(), "\n";
+}
+?>
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**\Swagger\Client\Model\Order**](\Swagger\Client\Model\Order.md)| order placed for purchasing the pet | [optional] 
+
+### Return type
+
+[**\Swagger\Client\Model\Order**](Order.md)
+
+### Authorization
+
+[test_api_client_id](../README.md#test_api_client_id), [test_api_client_secret](../README.md#test_api_client_secret)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/Tag.md b/samples/client/petstore/php/SwaggerClient-php/docs/Tag.md
new file mode 100644
index 00000000000..15ec3e0a91d
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/Tag.md
@@ -0,0 +1,11 @@
+# Tag
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **int** |  | [optional] 
+**name** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/User.md b/samples/client/petstore/php/SwaggerClient-php/docs/User.md
new file mode 100644
index 00000000000..ff278fd4889
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/User.md
@@ -0,0 +1,17 @@
+# User
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **int** |  | [optional] 
+**username** | **string** |  | [optional] 
+**first_name** | **string** |  | [optional] 
+**last_name** | **string** |  | [optional] 
+**email** | **string** |  | [optional] 
+**password** | **string** |  | [optional] 
+**phone** | **string** |  | [optional] 
+**user_status** | **int** | User Status | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/UserApi.md b/samples/client/petstore/php/SwaggerClient-php/docs/UserApi.md
new file mode 100644
index 00000000000..46f508fe293
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/UserApi.md
@@ -0,0 +1,374 @@
+# Swagger\Client\UserApi
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**createUser**](UserApi.md#createUser) | **POST** /user | Create user
+[**createUsersWithArrayInput**](UserApi.md#createUsersWithArrayInput) | **POST** /user/createWithArray | Creates list of users with given input array
+[**createUsersWithListInput**](UserApi.md#createUsersWithListInput) | **POST** /user/createWithList | Creates list of users with given input array
+[**deleteUser**](UserApi.md#deleteUser) | **DELETE** /user/{username} | Delete user
+[**getUserByName**](UserApi.md#getUserByName) | **GET** /user/{username} | Get user by user name
+[**loginUser**](UserApi.md#loginUser) | **GET** /user/login | Logs user into the system
+[**logoutUser**](UserApi.md#logoutUser) | **GET** /user/logout | Logs out current logged in user session
+[**updateUser**](UserApi.md#updateUser) | **PUT** /user/{username} | Updated user
+
+
+# **createUser**
+> createUser($body)
+
+Create user
+
+This can only be done by the logged in user.
+
+### Example 
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+$api_instance = new Swagger\Client\Api\UserApi();
+$body = new \Swagger\Client\Model\User(); // \Swagger\Client\Model\User | Created user object
+
+try { 
+    $api_instance->createUser($body);
+} catch (Exception $e) {
+    echo 'Exception when calling UserApi->createUser: ', $e->getMessage(), "\n";
+}
+?>
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**\Swagger\Client\Model\User**](\Swagger\Client\Model\User.md)| Created user object | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **createUsersWithArrayInput**
+> createUsersWithArrayInput($body)
+
+Creates list of users with given input array
+
+
+
+### Example 
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+$api_instance = new Swagger\Client\Api\UserApi();
+$body = array(new User()); // \Swagger\Client\Model\User[] | List of user object
+
+try { 
+    $api_instance->createUsersWithArrayInput($body);
+} catch (Exception $e) {
+    echo 'Exception when calling UserApi->createUsersWithArrayInput: ', $e->getMessage(), "\n";
+}
+?>
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**\Swagger\Client\Model\User[]**](User.md)| List of user object | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **createUsersWithListInput**
+> createUsersWithListInput($body)
+
+Creates list of users with given input array
+
+
+
+### Example 
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+$api_instance = new Swagger\Client\Api\UserApi();
+$body = array(new User()); // \Swagger\Client\Model\User[] | List of user object
+
+try { 
+    $api_instance->createUsersWithListInput($body);
+} catch (Exception $e) {
+    echo 'Exception when calling UserApi->createUsersWithListInput: ', $e->getMessage(), "\n";
+}
+?>
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**\Swagger\Client\Model\User[]**](User.md)| List of user object | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **deleteUser**
+> deleteUser($username)
+
+Delete user
+
+This can only be done by the logged in user.
+
+### Example 
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+// Configure HTTP basic authorization: test_http_basic
+Swagger\Client\Configuration::getDefaultConfiguration()->setUsername('YOUR_USERNAME');
+Swagger\Client\Configuration::getDefaultConfiguration()->setPassword('YOUR_PASSWORD');
+
+$api_instance = new Swagger\Client\Api\UserApi();
+$username = "username_example"; // string | The name that needs to be deleted
+
+try { 
+    $api_instance->deleteUser($username);
+} catch (Exception $e) {
+    echo 'Exception when calling UserApi->deleteUser: ', $e->getMessage(), "\n";
+}
+?>
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **string**| The name that needs to be deleted | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[test_http_basic](../README.md#test_http_basic)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **getUserByName**
+> \Swagger\Client\Model\User getUserByName($username)
+
+Get user by user name
+
+
+
+### Example 
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+$api_instance = new Swagger\Client\Api\UserApi();
+$username = "username_example"; // string | The name that needs to be fetched. Use user1 for testing.
+
+try { 
+    $result = $api_instance->getUserByName($username);
+    print_r($result);
+} catch (Exception $e) {
+    echo 'Exception when calling UserApi->getUserByName: ', $e->getMessage(), "\n";
+}
+?>
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **string**| The name that needs to be fetched. Use user1 for testing. | 
+
+### Return type
+
+[**\Swagger\Client\Model\User**](User.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **loginUser**
+> string loginUser($username, $password)
+
+Logs user into the system
+
+
+
+### Example 
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+$api_instance = new Swagger\Client\Api\UserApi();
+$username = "username_example"; // string | The user name for login
+$password = "password_example"; // string | The password for login in clear text
+
+try { 
+    $result = $api_instance->loginUser($username, $password);
+    print_r($result);
+} catch (Exception $e) {
+    echo 'Exception when calling UserApi->loginUser: ', $e->getMessage(), "\n";
+}
+?>
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **string**| The user name for login | [optional] 
+ **password** | **string**| The password for login in clear text | [optional] 
+
+### Return type
+
+**string**
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **logoutUser**
+> logoutUser()
+
+Logs out current logged in user session
+
+
+
+### Example 
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+$api_instance = new Swagger\Client\Api\UserApi();
+
+try { 
+    $api_instance->logoutUser();
+} catch (Exception $e) {
+    echo 'Exception when calling UserApi->logoutUser: ', $e->getMessage(), "\n";
+}
+?>
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **updateUser**
+> updateUser($username, $body)
+
+Updated user
+
+This can only be done by the logged in user.
+
+### Example 
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+$api_instance = new Swagger\Client\Api\UserApi();
+$username = "username_example"; // string | name that need to be deleted
+$body = new \Swagger\Client\Model\User(); // \Swagger\Client\Model\User | Updated user object
+
+try { 
+    $api_instance->updateUser($username, $body);
+} catch (Exception $e) {
+    echo 'Exception when calling UserApi->updateUser: ', $e->getMessage(), "\n";
+}
+?>
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **string**| name that need to be deleted | 
+ **body** | [**\Swagger\Client\Model\User**](\Swagger\Client\Model\User.md)| Updated user object | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/samples/client/petstore/php/SwaggerClient-php/git_push.sh b/samples/client/petstore/php/SwaggerClient-php/git_push.sh
new file mode 100644
index 00000000000..1a36388db02
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="YOUR_GIT_USR_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="YOUR_GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php
index a2ce3cac04b..5c2c0564c70 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php
@@ -10,7 +10,7 @@
  * @link     https://github.com/swagger-api/swagger-codegen
  */
 /**
- *  Copyright 2015 SmartBear Software
+ *  Copyright 2016 SmartBear Software
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -91,89 +91,6 @@ class PetApi
     }
   
     
-    /**
-     * updatePet
-     *
-     * Update an existing pet
-     *
-     * @param \Swagger\Client\Model\Pet $body Pet object that needs to be added to the store (optional)
-     * @return void
-     * @throws \Swagger\Client\ApiException on non-2xx response
-     */
-    public function updatePet($body = null)
-    {
-        list($response, $statusCode, $httpHeader) = $this->updatePetWithHttpInfo ($body);
-        return $response; 
-    }
-
-
-    /**
-     * updatePetWithHttpInfo
-     *
-     * Update an existing pet
-     *
-     * @param \Swagger\Client\Model\Pet $body Pet object that needs to be added to the store (optional)
-     * @return Array of null, HTTP status code, HTTP response headers (array of strings)
-     * @throws \Swagger\Client\ApiException on non-2xx response
-     */
-    public function updatePetWithHttpInfo($body = null)
-    {
-        
-  
-        // parse inputs
-        $resourcePath = "/pet";
-        $resourcePath = str_replace("{format}", "json", $resourcePath);
-        $method = "PUT";
-        $httpBody = '';
-        $queryParams = array();
-        $headerParams = array();
-        $formParams = array();
-        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
-        if (!is_null($_header_accept)) {
-            $headerParams['Accept'] = $_header_accept;
-        }
-        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array('application/json','application/xml'));
-  
-        
-        
-        
-        
-        // body params
-        $_tempBody = null;
-        if (isset($body)) {
-            $_tempBody = $body;
-        }
-  
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-        } elseif (count($formParams) > 0) {
-            $httpBody = $formParams; // for HTTP post (form)
-        }
-        
-        // this endpoint requires OAuth (access token)
-        if (strlen($this->apiClient->getConfig()->getAccessToken()) !== 0) {
-            $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAccessToken();
-        }
-        
-        // make the API Call
-        try {
-            list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
-                $resourcePath, $method,
-                $queryParams, $httpBody,
-                $headerParams
-            );
-            
-            return array(null, $statusCode, $httpHeader);
-            
-        } catch (ApiException $e) {
-            switch ($e->getCode()) { 
-            }
-  
-            throw $e;
-        }
-    }
-    
     /**
      * addPet
      *
@@ -205,8 +122,6 @@ class PetApi
   
         // parse inputs
         $resourcePath = "/pet";
-        $resourcePath = str_replace("{format}", "json", $resourcePath);
-        $method = "POST";
         $httpBody = '';
         $queryParams = array();
         $headerParams = array();
@@ -220,6 +135,9 @@ class PetApi
         
         
         
+        // default format to json
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+
         
         // body params
         $_tempBody = null;
@@ -242,7 +160,7 @@ class PetApi
         // make the API Call
         try {
             list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
-                $resourcePath, $method,
+                $resourcePath, 'POST',
                 $queryParams, $httpBody,
                 $headerParams
             );
@@ -258,337 +176,36 @@ class PetApi
     }
     
     /**
-     * findPetsByStatus
+     * addPetUsingByteArray
      *
-     * Finds Pets by status
+     * Fake endpoint to test byte array in body parameter for adding a new pet to the store
      *
-     * @param string[] $status Status values that need to be considered for filter (optional)
-     * @return \Swagger\Client\Model\Pet[]
-     * @throws \Swagger\Client\ApiException on non-2xx response
-     */
-    public function findPetsByStatus($status = null)
-    {
-        list($response, $statusCode, $httpHeader) = $this->findPetsByStatusWithHttpInfo ($status);
-        return $response; 
-    }
-
-
-    /**
-     * findPetsByStatusWithHttpInfo
-     *
-     * Finds Pets by status
-     *
-     * @param string[] $status Status values that need to be considered for filter (optional)
-     * @return Array of \Swagger\Client\Model\Pet[], HTTP status code, HTTP response headers (array of strings)
-     * @throws \Swagger\Client\ApiException on non-2xx response
-     */
-    public function findPetsByStatusWithHttpInfo($status = null)
-    {
-        
-  
-        // parse inputs
-        $resourcePath = "/pet/findByStatus";
-        $resourcePath = str_replace("{format}", "json", $resourcePath);
-        $method = "GET";
-        $httpBody = '';
-        $queryParams = array();
-        $headerParams = array();
-        $formParams = array();
-        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
-        if (!is_null($_header_accept)) {
-            $headerParams['Accept'] = $_header_accept;
-        }
-        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
-  
-        // query params
-        
-        if (is_array($status)) {
-            $status = $this->apiClient->getSerializer()->serializeCollection($status, 'multi', true);
-        }
-        
-        if ($status !== null) {
-            $queryParams['status'] = $this->apiClient->getSerializer()->toQueryValue($status);
-        }
-        
-        
-        
-        
-  
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-        } elseif (count($formParams) > 0) {
-            $httpBody = $formParams; // for HTTP post (form)
-        }
-        
-        // this endpoint requires OAuth (access token)
-        if (strlen($this->apiClient->getConfig()->getAccessToken()) !== 0) {
-            $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAccessToken();
-        }
-        
-        // make the API Call
-        try {
-            list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
-                $resourcePath, $method,
-                $queryParams, $httpBody,
-                $headerParams, '\Swagger\Client\Model\Pet[]'
-            );
-            
-            if (!$response) {
-                return array(null, $statusCode, $httpHeader);
-            }
-
-            return array($this->apiClient->getSerializer()->deserialize($response, '\Swagger\Client\Model\Pet[]', $httpHeader), $statusCode, $httpHeader);
-            
-        } catch (ApiException $e) {
-            switch ($e->getCode()) { 
-            case 200:
-                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Pet[]', $e->getResponseHeaders());
-                $e->setResponseObject($data);
-                break;
-            }
-  
-            throw $e;
-        }
-    }
-    
-    /**
-     * findPetsByTags
-     *
-     * Finds Pets by tags
-     *
-     * @param string[] $tags Tags to filter by (optional)
-     * @return \Swagger\Client\Model\Pet[]
-     * @throws \Swagger\Client\ApiException on non-2xx response
-     */
-    public function findPetsByTags($tags = null)
-    {
-        list($response, $statusCode, $httpHeader) = $this->findPetsByTagsWithHttpInfo ($tags);
-        return $response; 
-    }
-
-
-    /**
-     * findPetsByTagsWithHttpInfo
-     *
-     * Finds Pets by tags
-     *
-     * @param string[] $tags Tags to filter by (optional)
-     * @return Array of \Swagger\Client\Model\Pet[], HTTP status code, HTTP response headers (array of strings)
-     * @throws \Swagger\Client\ApiException on non-2xx response
-     */
-    public function findPetsByTagsWithHttpInfo($tags = null)
-    {
-        
-  
-        // parse inputs
-        $resourcePath = "/pet/findByTags";
-        $resourcePath = str_replace("{format}", "json", $resourcePath);
-        $method = "GET";
-        $httpBody = '';
-        $queryParams = array();
-        $headerParams = array();
-        $formParams = array();
-        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
-        if (!is_null($_header_accept)) {
-            $headerParams['Accept'] = $_header_accept;
-        }
-        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
-  
-        // query params
-        
-        if (is_array($tags)) {
-            $tags = $this->apiClient->getSerializer()->serializeCollection($tags, 'multi', true);
-        }
-        
-        if ($tags !== null) {
-            $queryParams['tags'] = $this->apiClient->getSerializer()->toQueryValue($tags);
-        }
-        
-        
-        
-        
-  
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-        } elseif (count($formParams) > 0) {
-            $httpBody = $formParams; // for HTTP post (form)
-        }
-        
-        // this endpoint requires OAuth (access token)
-        if (strlen($this->apiClient->getConfig()->getAccessToken()) !== 0) {
-            $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAccessToken();
-        }
-        
-        // make the API Call
-        try {
-            list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
-                $resourcePath, $method,
-                $queryParams, $httpBody,
-                $headerParams, '\Swagger\Client\Model\Pet[]'
-            );
-            
-            if (!$response) {
-                return array(null, $statusCode, $httpHeader);
-            }
-
-            return array($this->apiClient->getSerializer()->deserialize($response, '\Swagger\Client\Model\Pet[]', $httpHeader), $statusCode, $httpHeader);
-            
-        } catch (ApiException $e) {
-            switch ($e->getCode()) { 
-            case 200:
-                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Pet[]', $e->getResponseHeaders());
-                $e->setResponseObject($data);
-                break;
-            }
-  
-            throw $e;
-        }
-    }
-    
-    /**
-     * getPetById
-     *
-     * Find pet by ID
-     *
-     * @param int $pet_id ID of pet that needs to be fetched (required)
-     * @return \Swagger\Client\Model\Pet
-     * @throws \Swagger\Client\ApiException on non-2xx response
-     */
-    public function getPetById($pet_id)
-    {
-        list($response, $statusCode, $httpHeader) = $this->getPetByIdWithHttpInfo ($pet_id);
-        return $response; 
-    }
-
-
-    /**
-     * getPetByIdWithHttpInfo
-     *
-     * Find pet by ID
-     *
-     * @param int $pet_id ID of pet that needs to be fetched (required)
-     * @return Array of \Swagger\Client\Model\Pet, HTTP status code, HTTP response headers (array of strings)
-     * @throws \Swagger\Client\ApiException on non-2xx response
-     */
-    public function getPetByIdWithHttpInfo($pet_id)
-    {
-        
-        // verify the required parameter 'pet_id' is set
-        if ($pet_id === null) {
-            throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling getPetById');
-        }
-  
-        // parse inputs
-        $resourcePath = "/pet/{petId}";
-        $resourcePath = str_replace("{format}", "json", $resourcePath);
-        $method = "GET";
-        $httpBody = '';
-        $queryParams = array();
-        $headerParams = array();
-        $formParams = array();
-        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
-        if (!is_null($_header_accept)) {
-            $headerParams['Accept'] = $_header_accept;
-        }
-        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
-  
-        
-        
-        // path params
-        
-        if ($pet_id !== null) {
-            $resourcePath = str_replace(
-                "{" . "petId" . "}",
-                $this->apiClient->getSerializer()->toPathValue($pet_id),
-                $resourcePath
-            );
-        }
-        
-        
-  
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-        } elseif (count($formParams) > 0) {
-            $httpBody = $formParams; // for HTTP post (form)
-        }
-        
-        // this endpoint requires API key authentication
-        $apiKey = $this->apiClient->getApiKeyWithPrefix('api_key');
-        if (strlen($apiKey) !== 0) {
-            $headerParams['api_key'] = $apiKey;
-        }
-        
-        
-        // make the API Call
-        try {
-            list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
-                $resourcePath, $method,
-                $queryParams, $httpBody,
-                $headerParams, '\Swagger\Client\Model\Pet'
-            );
-            
-            if (!$response) {
-                return array(null, $statusCode, $httpHeader);
-            }
-
-            return array($this->apiClient->getSerializer()->deserialize($response, '\Swagger\Client\Model\Pet', $httpHeader), $statusCode, $httpHeader);
-            
-        } catch (ApiException $e) {
-            switch ($e->getCode()) { 
-            case 200:
-                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Pet', $e->getResponseHeaders());
-                $e->setResponseObject($data);
-                break;
-            }
-  
-            throw $e;
-        }
-    }
-    
-    /**
-     * updatePetWithForm
-     *
-     * Updates a pet in the store with form data
-     *
-     * @param string $pet_id ID of pet that needs to be updated (required)
-     * @param string $name Updated name of the pet (optional)
-     * @param string $status Updated status of the pet (optional)
+     * @param string $body Pet object in the form of byte array (optional)
      * @return void
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
-    public function updatePetWithForm($pet_id, $name = null, $status = null)
+    public function addPetUsingByteArray($body = null)
     {
-        list($response, $statusCode, $httpHeader) = $this->updatePetWithFormWithHttpInfo ($pet_id, $name, $status);
+        list($response, $statusCode, $httpHeader) = $this->addPetUsingByteArrayWithHttpInfo ($body);
         return $response; 
     }
 
 
     /**
-     * updatePetWithFormWithHttpInfo
+     * addPetUsingByteArrayWithHttpInfo
      *
-     * Updates a pet in the store with form data
+     * Fake endpoint to test byte array in body parameter for adding a new pet to the store
      *
-     * @param string $pet_id ID of pet that needs to be updated (required)
-     * @param string $name Updated name of the pet (optional)
-     * @param string $status Updated status of the pet (optional)
+     * @param string $body Pet object in the form of byte array (optional)
      * @return Array of null, HTTP status code, HTTP response headers (array of strings)
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
-    public function updatePetWithFormWithHttpInfo($pet_id, $name = null, $status = null)
+    public function addPetUsingByteArrayWithHttpInfo($body = null)
     {
         
-        // verify the required parameter 'pet_id' is set
-        if ($pet_id === null) {
-            throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling updatePetWithForm');
-        }
   
         // parse inputs
-        $resourcePath = "/pet/{petId}";
-        $resourcePath = str_replace("{format}", "json", $resourcePath);
-        $method = "POST";
+        $resourcePath = "/pet?testing_byte_array=true";
         $httpBody = '';
         $queryParams = array();
         $headerParams = array();
@@ -597,33 +214,20 @@ class PetApi
         if (!is_null($_header_accept)) {
             $headerParams['Accept'] = $_header_accept;
         }
-        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array('application/x-www-form-urlencoded'));
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array('application/json','application/xml'));
   
         
         
-        // path params
         
-        if ($pet_id !== null) {
-            $resourcePath = str_replace(
-                "{" . "petId" . "}",
-                $this->apiClient->getSerializer()->toPathValue($pet_id),
-                $resourcePath
-            );
-        }
-        // form params
-        if ($name !== null) {
-            
-            
-            $formParams['name'] = $this->apiClient->getSerializer()->toFormValue($name);
-            
-        }// form params
-        if ($status !== null) {
-            
-            
-            $formParams['status'] = $this->apiClient->getSerializer()->toFormValue($status);
-            
-        }
+        // default format to json
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+
         
+        // body params
+        $_tempBody = null;
+        if (isset($body)) {
+            $_tempBody = $body;
+        }
   
         // for model (json/xml)
         if (isset($_tempBody)) {
@@ -640,7 +244,7 @@ class PetApi
         // make the API Call
         try {
             list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
-                $resourcePath, $method,
+                $resourcePath, 'POST',
                 $queryParams, $httpBody,
                 $headerParams
             );
@@ -692,8 +296,6 @@ class PetApi
   
         // parse inputs
         $resourcePath = "/pet/{petId}";
-        $resourcePath = str_replace("{format}", "json", $resourcePath);
-        $method = "DELETE";
         $httpBody = '';
         $queryParams = array();
         $headerParams = array();
@@ -719,6 +321,9 @@ class PetApi
                 $resourcePath
             );
         }
+        // default format to json
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+
         
         
   
@@ -737,7 +342,712 @@ class PetApi
         // make the API Call
         try {
             list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
-                $resourcePath, $method,
+                $resourcePath, 'DELETE',
+                $queryParams, $httpBody,
+                $headerParams
+            );
+            
+            return array(null, $statusCode, $httpHeader);
+            
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            }
+  
+            throw $e;
+        }
+    }
+    
+    /**
+     * findPetsByStatus
+     *
+     * Finds Pets by status
+     *
+     * @param string[] $status Status values that need to be considered for query (optional, default to available)
+     * @return \Swagger\Client\Model\Pet[]
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function findPetsByStatus($status = null)
+    {
+        list($response, $statusCode, $httpHeader) = $this->findPetsByStatusWithHttpInfo ($status);
+        return $response; 
+    }
+
+
+    /**
+     * findPetsByStatusWithHttpInfo
+     *
+     * Finds Pets by status
+     *
+     * @param string[] $status Status values that need to be considered for query (optional, default to available)
+     * @return Array of \Swagger\Client\Model\Pet[], HTTP status code, HTTP response headers (array of strings)
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function findPetsByStatusWithHttpInfo($status = null)
+    {
+        
+  
+        // parse inputs
+        $resourcePath = "/pet/findByStatus";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
+  
+        // query params
+        
+        if (is_array($status)) {
+            $status = $this->apiClient->getSerializer()->serializeCollection($status, 'multi', true);
+        }
+        
+        if ($status !== null) {
+            $queryParams['status'] = $this->apiClient->getSerializer()->toQueryValue($status);
+        }
+        
+        
+        // default format to json
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+
+        
+        
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } elseif (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // this endpoint requires OAuth (access token)
+        if (strlen($this->apiClient->getConfig()->getAccessToken()) !== 0) {
+            $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAccessToken();
+        }
+        
+        // make the API Call
+        try {
+            list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, 'GET',
+                $queryParams, $httpBody,
+                $headerParams, '\Swagger\Client\Model\Pet[]'
+            );
+            
+            if (!$response) {
+                return array(null, $statusCode, $httpHeader);
+            }
+
+            return array(\Swagger\Client\ObjectSerializer::deserialize($response, '\Swagger\Client\Model\Pet[]', $httpHeader), $statusCode, $httpHeader);
+            
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            case 200:
+                $data = \Swagger\Client\ObjectSerializer::deserialize($e->getResponseBody(), '\Swagger\Client\Model\Pet[]', $e->getResponseHeaders());
+                $e->setResponseObject($data);
+                break;
+            }
+  
+            throw $e;
+        }
+    }
+    
+    /**
+     * findPetsByTags
+     *
+     * Finds Pets by tags
+     *
+     * @param string[] $tags Tags to filter by (optional)
+     * @return \Swagger\Client\Model\Pet[]
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function findPetsByTags($tags = null)
+    {
+        list($response, $statusCode, $httpHeader) = $this->findPetsByTagsWithHttpInfo ($tags);
+        return $response; 
+    }
+
+
+    /**
+     * findPetsByTagsWithHttpInfo
+     *
+     * Finds Pets by tags
+     *
+     * @param string[] $tags Tags to filter by (optional)
+     * @return Array of \Swagger\Client\Model\Pet[], HTTP status code, HTTP response headers (array of strings)
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function findPetsByTagsWithHttpInfo($tags = null)
+    {
+        
+  
+        // parse inputs
+        $resourcePath = "/pet/findByTags";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
+  
+        // query params
+        
+        if (is_array($tags)) {
+            $tags = $this->apiClient->getSerializer()->serializeCollection($tags, 'multi', true);
+        }
+        
+        if ($tags !== null) {
+            $queryParams['tags'] = $this->apiClient->getSerializer()->toQueryValue($tags);
+        }
+        
+        
+        // default format to json
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+
+        
+        
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } elseif (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // this endpoint requires OAuth (access token)
+        if (strlen($this->apiClient->getConfig()->getAccessToken()) !== 0) {
+            $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAccessToken();
+        }
+        
+        // make the API Call
+        try {
+            list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, 'GET',
+                $queryParams, $httpBody,
+                $headerParams, '\Swagger\Client\Model\Pet[]'
+            );
+            
+            if (!$response) {
+                return array(null, $statusCode, $httpHeader);
+            }
+
+            return array(\Swagger\Client\ObjectSerializer::deserialize($response, '\Swagger\Client\Model\Pet[]', $httpHeader), $statusCode, $httpHeader);
+            
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            case 200:
+                $data = \Swagger\Client\ObjectSerializer::deserialize($e->getResponseBody(), '\Swagger\Client\Model\Pet[]', $e->getResponseHeaders());
+                $e->setResponseObject($data);
+                break;
+            }
+  
+            throw $e;
+        }
+    }
+    
+    /**
+     * getPetById
+     *
+     * Find pet by ID
+     *
+     * @param int $pet_id ID of pet that needs to be fetched (required)
+     * @return \Swagger\Client\Model\Pet
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function getPetById($pet_id)
+    {
+        list($response, $statusCode, $httpHeader) = $this->getPetByIdWithHttpInfo ($pet_id);
+        return $response; 
+    }
+
+
+    /**
+     * getPetByIdWithHttpInfo
+     *
+     * Find pet by ID
+     *
+     * @param int $pet_id ID of pet that needs to be fetched (required)
+     * @return Array of \Swagger\Client\Model\Pet, HTTP status code, HTTP response headers (array of strings)
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function getPetByIdWithHttpInfo($pet_id)
+    {
+        
+        // verify the required parameter 'pet_id' is set
+        if ($pet_id === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling getPetById');
+        }
+  
+        // parse inputs
+        $resourcePath = "/pet/{petId}";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
+  
+        
+        
+        // path params
+        
+        if ($pet_id !== null) {
+            $resourcePath = str_replace(
+                "{" . "petId" . "}",
+                $this->apiClient->getSerializer()->toPathValue($pet_id),
+                $resourcePath
+            );
+        }
+        // default format to json
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+
+        
+        
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } elseif (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // this endpoint requires API key authentication
+        $apiKey = $this->apiClient->getApiKeyWithPrefix('api_key');
+        if (strlen($apiKey) !== 0) {
+            $headerParams['api_key'] = $apiKey;
+        }
+        
+        
+        // this endpoint requires OAuth (access token)
+        if (strlen($this->apiClient->getConfig()->getAccessToken()) !== 0) {
+            $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAccessToken();
+        }
+        
+        // make the API Call
+        try {
+            list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, 'GET',
+                $queryParams, $httpBody,
+                $headerParams, '\Swagger\Client\Model\Pet'
+            );
+            
+            if (!$response) {
+                return array(null, $statusCode, $httpHeader);
+            }
+
+            return array(\Swagger\Client\ObjectSerializer::deserialize($response, '\Swagger\Client\Model\Pet', $httpHeader), $statusCode, $httpHeader);
+            
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            case 200:
+                $data = \Swagger\Client\ObjectSerializer::deserialize($e->getResponseBody(), '\Swagger\Client\Model\Pet', $e->getResponseHeaders());
+                $e->setResponseObject($data);
+                break;
+            }
+  
+            throw $e;
+        }
+    }
+    
+    /**
+     * getPetByIdInObject
+     *
+     * Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
+     *
+     * @param int $pet_id ID of pet that needs to be fetched (required)
+     * @return \Swagger\Client\Model\InlineResponse200
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function getPetByIdInObject($pet_id)
+    {
+        list($response, $statusCode, $httpHeader) = $this->getPetByIdInObjectWithHttpInfo ($pet_id);
+        return $response; 
+    }
+
+
+    /**
+     * getPetByIdInObjectWithHttpInfo
+     *
+     * Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
+     *
+     * @param int $pet_id ID of pet that needs to be fetched (required)
+     * @return Array of \Swagger\Client\Model\InlineResponse200, HTTP status code, HTTP response headers (array of strings)
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function getPetByIdInObjectWithHttpInfo($pet_id)
+    {
+        
+        // verify the required parameter 'pet_id' is set
+        if ($pet_id === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling getPetByIdInObject');
+        }
+  
+        // parse inputs
+        $resourcePath = "/pet/{petId}?response=inline_arbitrary_object";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
+  
+        
+        
+        // path params
+        
+        if ($pet_id !== null) {
+            $resourcePath = str_replace(
+                "{" . "petId" . "}",
+                $this->apiClient->getSerializer()->toPathValue($pet_id),
+                $resourcePath
+            );
+        }
+        // default format to json
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+
+        
+        
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } elseif (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // this endpoint requires API key authentication
+        $apiKey = $this->apiClient->getApiKeyWithPrefix('api_key');
+        if (strlen($apiKey) !== 0) {
+            $headerParams['api_key'] = $apiKey;
+        }
+        
+        
+        // this endpoint requires OAuth (access token)
+        if (strlen($this->apiClient->getConfig()->getAccessToken()) !== 0) {
+            $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAccessToken();
+        }
+        
+        // make the API Call
+        try {
+            list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, 'GET',
+                $queryParams, $httpBody,
+                $headerParams, '\Swagger\Client\Model\InlineResponse200'
+            );
+            
+            if (!$response) {
+                return array(null, $statusCode, $httpHeader);
+            }
+
+            return array(\Swagger\Client\ObjectSerializer::deserialize($response, '\Swagger\Client\Model\InlineResponse200', $httpHeader), $statusCode, $httpHeader);
+            
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            case 200:
+                $data = \Swagger\Client\ObjectSerializer::deserialize($e->getResponseBody(), '\Swagger\Client\Model\InlineResponse200', $e->getResponseHeaders());
+                $e->setResponseObject($data);
+                break;
+            }
+  
+            throw $e;
+        }
+    }
+    
+    /**
+     * petPetIdtestingByteArraytrueGet
+     *
+     * Fake endpoint to test byte array return by 'Find pet by ID'
+     *
+     * @param int $pet_id ID of pet that needs to be fetched (required)
+     * @return string
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function petPetIdtestingByteArraytrueGet($pet_id)
+    {
+        list($response, $statusCode, $httpHeader) = $this->petPetIdtestingByteArraytrueGetWithHttpInfo ($pet_id);
+        return $response; 
+    }
+
+
+    /**
+     * petPetIdtestingByteArraytrueGetWithHttpInfo
+     *
+     * Fake endpoint to test byte array return by 'Find pet by ID'
+     *
+     * @param int $pet_id ID of pet that needs to be fetched (required)
+     * @return Array of string, HTTP status code, HTTP response headers (array of strings)
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function petPetIdtestingByteArraytrueGetWithHttpInfo($pet_id)
+    {
+        
+        // verify the required parameter 'pet_id' is set
+        if ($pet_id === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling petPetIdtestingByteArraytrueGet');
+        }
+  
+        // parse inputs
+        $resourcePath = "/pet/{petId}?testing_byte_array=true";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
+  
+        
+        
+        // path params
+        
+        if ($pet_id !== null) {
+            $resourcePath = str_replace(
+                "{" . "petId" . "}",
+                $this->apiClient->getSerializer()->toPathValue($pet_id),
+                $resourcePath
+            );
+        }
+        // default format to json
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+
+        
+        
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } elseif (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // this endpoint requires API key authentication
+        $apiKey = $this->apiClient->getApiKeyWithPrefix('api_key');
+        if (strlen($apiKey) !== 0) {
+            $headerParams['api_key'] = $apiKey;
+        }
+        
+        
+        // this endpoint requires OAuth (access token)
+        if (strlen($this->apiClient->getConfig()->getAccessToken()) !== 0) {
+            $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAccessToken();
+        }
+        
+        // make the API Call
+        try {
+            list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, 'GET',
+                $queryParams, $httpBody,
+                $headerParams, 'string'
+            );
+            
+            if (!$response) {
+                return array(null, $statusCode, $httpHeader);
+            }
+
+            return array(\Swagger\Client\ObjectSerializer::deserialize($response, 'string', $httpHeader), $statusCode, $httpHeader);
+            
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            case 200:
+                $data = \Swagger\Client\ObjectSerializer::deserialize($e->getResponseBody(), 'string', $e->getResponseHeaders());
+                $e->setResponseObject($data);
+                break;
+            }
+  
+            throw $e;
+        }
+    }
+    
+    /**
+     * updatePet
+     *
+     * Update an existing pet
+     *
+     * @param \Swagger\Client\Model\Pet $body Pet object that needs to be added to the store (optional)
+     * @return void
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function updatePet($body = null)
+    {
+        list($response, $statusCode, $httpHeader) = $this->updatePetWithHttpInfo ($body);
+        return $response; 
+    }
+
+
+    /**
+     * updatePetWithHttpInfo
+     *
+     * Update an existing pet
+     *
+     * @param \Swagger\Client\Model\Pet $body Pet object that needs to be added to the store (optional)
+     * @return Array of null, HTTP status code, HTTP response headers (array of strings)
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function updatePetWithHttpInfo($body = null)
+    {
+        
+  
+        // parse inputs
+        $resourcePath = "/pet";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array('application/json','application/xml'));
+  
+        
+        
+        
+        // default format to json
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+
+        
+        // body params
+        $_tempBody = null;
+        if (isset($body)) {
+            $_tempBody = $body;
+        }
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } elseif (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // this endpoint requires OAuth (access token)
+        if (strlen($this->apiClient->getConfig()->getAccessToken()) !== 0) {
+            $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAccessToken();
+        }
+        
+        // make the API Call
+        try {
+            list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, 'PUT',
+                $queryParams, $httpBody,
+                $headerParams
+            );
+            
+            return array(null, $statusCode, $httpHeader);
+            
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            }
+  
+            throw $e;
+        }
+    }
+    
+    /**
+     * updatePetWithForm
+     *
+     * Updates a pet in the store with form data
+     *
+     * @param string $pet_id ID of pet that needs to be updated (required)
+     * @param string $name Updated name of the pet (optional)
+     * @param string $status Updated status of the pet (optional)
+     * @return void
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function updatePetWithForm($pet_id, $name = null, $status = null)
+    {
+        list($response, $statusCode, $httpHeader) = $this->updatePetWithFormWithHttpInfo ($pet_id, $name, $status);
+        return $response; 
+    }
+
+
+    /**
+     * updatePetWithFormWithHttpInfo
+     *
+     * Updates a pet in the store with form data
+     *
+     * @param string $pet_id ID of pet that needs to be updated (required)
+     * @param string $name Updated name of the pet (optional)
+     * @param string $status Updated status of the pet (optional)
+     * @return Array of null, HTTP status code, HTTP response headers (array of strings)
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function updatePetWithFormWithHttpInfo($pet_id, $name = null, $status = null)
+    {
+        
+        // verify the required parameter 'pet_id' is set
+        if ($pet_id === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling updatePetWithForm');
+        }
+  
+        // parse inputs
+        $resourcePath = "/pet/{petId}";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array('application/x-www-form-urlencoded'));
+  
+        
+        
+        // path params
+        
+        if ($pet_id !== null) {
+            $resourcePath = str_replace(
+                "{" . "petId" . "}",
+                $this->apiClient->getSerializer()->toPathValue($pet_id),
+                $resourcePath
+            );
+        }
+        // default format to json
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+
+        // form params
+        if ($name !== null) {
+            
+            
+            $formParams['name'] = $this->apiClient->getSerializer()->toFormValue($name);
+            
+        }// form params
+        if ($status !== null) {
+            
+            
+            $formParams['status'] = $this->apiClient->getSerializer()->toFormValue($status);
+            
+        }
+        
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } elseif (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // this endpoint requires OAuth (access token)
+        if (strlen($this->apiClient->getConfig()->getAccessToken()) !== 0) {
+            $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAccessToken();
+        }
+        
+        // make the API Call
+        try {
+            list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, 'POST',
                 $queryParams, $httpBody,
                 $headerParams
             );
@@ -791,8 +1101,6 @@ class PetApi
   
         // parse inputs
         $resourcePath = "/pet/{petId}/uploadImage";
-        $resourcePath = str_replace("{format}", "json", $resourcePath);
-        $method = "POST";
         $httpBody = '';
         $queryParams = array();
         $headerParams = array();
@@ -814,6 +1122,9 @@ class PetApi
                 $resourcePath
             );
         }
+        // default format to json
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+
         // form params
         if ($additional_metadata !== null) {
             
@@ -850,7 +1161,7 @@ class PetApi
         // make the API Call
         try {
             list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
-                $resourcePath, $method,
+                $resourcePath, 'POST',
                 $queryParams, $httpBody,
                 $headerParams
             );
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php
index 6a03542dfb0..b510b4a3b6e 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php
@@ -10,7 +10,7 @@
  * @link     https://github.com/swagger-api/swagger-codegen
  */
 /**
- *  Copyright 2015 SmartBear Software
+ *  Copyright 2016 SmartBear Software
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -91,6 +91,194 @@ class StoreApi
     }
   
     
+    /**
+     * deleteOrder
+     *
+     * Delete purchase order by ID
+     *
+     * @param string $order_id ID of the order that needs to be deleted (required)
+     * @return void
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function deleteOrder($order_id)
+    {
+        list($response, $statusCode, $httpHeader) = $this->deleteOrderWithHttpInfo ($order_id);
+        return $response; 
+    }
+
+
+    /**
+     * deleteOrderWithHttpInfo
+     *
+     * Delete purchase order by ID
+     *
+     * @param string $order_id ID of the order that needs to be deleted (required)
+     * @return Array of null, HTTP status code, HTTP response headers (array of strings)
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function deleteOrderWithHttpInfo($order_id)
+    {
+        
+        // verify the required parameter 'order_id' is set
+        if ($order_id === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $order_id when calling deleteOrder');
+        }
+  
+        // parse inputs
+        $resourcePath = "/store/order/{orderId}";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
+  
+        
+        
+        // path params
+        
+        if ($order_id !== null) {
+            $resourcePath = str_replace(
+                "{" . "orderId" . "}",
+                $this->apiClient->getSerializer()->toPathValue($order_id),
+                $resourcePath
+            );
+        }
+        // default format to json
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+
+        
+        
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } elseif (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // make the API Call
+        try {
+            list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, 'DELETE',
+                $queryParams, $httpBody,
+                $headerParams
+            );
+            
+            return array(null, $statusCode, $httpHeader);
+            
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            }
+  
+            throw $e;
+        }
+    }
+    
+    /**
+     * findOrdersByStatus
+     *
+     * Finds orders by status
+     *
+     * @param string $status Status value that needs to be considered for query (optional, default to placed)
+     * @return \Swagger\Client\Model\Order[]
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function findOrdersByStatus($status = null)
+    {
+        list($response, $statusCode, $httpHeader) = $this->findOrdersByStatusWithHttpInfo ($status);
+        return $response; 
+    }
+
+
+    /**
+     * findOrdersByStatusWithHttpInfo
+     *
+     * Finds orders by status
+     *
+     * @param string $status Status value that needs to be considered for query (optional, default to placed)
+     * @return Array of \Swagger\Client\Model\Order[], HTTP status code, HTTP response headers (array of strings)
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function findOrdersByStatusWithHttpInfo($status = null)
+    {
+        
+  
+        // parse inputs
+        $resourcePath = "/store/findByStatus";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
+  
+        // query params
+        
+        if ($status !== null) {
+            $queryParams['status'] = $this->apiClient->getSerializer()->toQueryValue($status);
+        }
+        
+        
+        // default format to json
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+
+        
+        
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } elseif (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // this endpoint requires API key authentication
+        $apiKey = $this->apiClient->getApiKeyWithPrefix('x-test_api_client_id');
+        if (strlen($apiKey) !== 0) {
+            $headerParams['x-test_api_client_id'] = $apiKey;
+        }
+        
+        
+        // this endpoint requires API key authentication
+        $apiKey = $this->apiClient->getApiKeyWithPrefix('x-test_api_client_secret');
+        if (strlen($apiKey) !== 0) {
+            $headerParams['x-test_api_client_secret'] = $apiKey;
+        }
+        
+        
+        // make the API Call
+        try {
+            list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, 'GET',
+                $queryParams, $httpBody,
+                $headerParams, '\Swagger\Client\Model\Order[]'
+            );
+            
+            if (!$response) {
+                return array(null, $statusCode, $httpHeader);
+            }
+
+            return array(\Swagger\Client\ObjectSerializer::deserialize($response, '\Swagger\Client\Model\Order[]', $httpHeader), $statusCode, $httpHeader);
+            
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            case 200:
+                $data = \Swagger\Client\ObjectSerializer::deserialize($e->getResponseBody(), '\Swagger\Client\Model\Order[]', $e->getResponseHeaders());
+                $e->setResponseObject($data);
+                break;
+            }
+  
+            throw $e;
+        }
+    }
+    
     /**
      * getInventory
      *
@@ -120,8 +308,6 @@ class StoreApi
   
         // parse inputs
         $resourcePath = "/store/inventory";
-        $resourcePath = str_replace("{format}", "json", $resourcePath);
-        $method = "GET";
         $httpBody = '';
         $queryParams = array();
         $headerParams = array();
@@ -135,6 +321,9 @@ class StoreApi
         
         
         
+        // default format to json
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+
         
         
   
@@ -155,7 +344,7 @@ class StoreApi
         // make the API Call
         try {
             list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
-                $resourcePath, $method,
+                $resourcePath, 'GET',
                 $queryParams, $httpBody,
                 $headerParams, 'map[string,int]'
             );
@@ -164,12 +353,12 @@ class StoreApi
                 return array(null, $statusCode, $httpHeader);
             }
 
-            return array($this->apiClient->getSerializer()->deserialize($response, 'map[string,int]', $httpHeader), $statusCode, $httpHeader);
+            return array(\Swagger\Client\ObjectSerializer::deserialize($response, 'map[string,int]', $httpHeader), $statusCode, $httpHeader);
             
         } catch (ApiException $e) {
             switch ($e->getCode()) { 
             case 200:
-                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), 'map[string,int]', $e->getResponseHeaders());
+                $data = \Swagger\Client\ObjectSerializer::deserialize($e->getResponseBody(), 'map[string,int]', $e->getResponseHeaders());
                 $e->setResponseObject($data);
                 break;
             }
@@ -179,38 +368,34 @@ class StoreApi
     }
     
     /**
-     * placeOrder
+     * getInventoryInObject
      *
-     * Place an order for a pet
+     * Fake endpoint to test arbitrary object return by 'Get inventory'
      *
-     * @param \Swagger\Client\Model\Order $body order placed for purchasing the pet (optional)
-     * @return \Swagger\Client\Model\Order
+     * @return object
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
-    public function placeOrder($body = null)
+    public function getInventoryInObject()
     {
-        list($response, $statusCode, $httpHeader) = $this->placeOrderWithHttpInfo ($body);
+        list($response, $statusCode, $httpHeader) = $this->getInventoryInObjectWithHttpInfo ();
         return $response; 
     }
 
 
     /**
-     * placeOrderWithHttpInfo
+     * getInventoryInObjectWithHttpInfo
      *
-     * Place an order for a pet
+     * Fake endpoint to test arbitrary object return by 'Get inventory'
      *
-     * @param \Swagger\Client\Model\Order $body order placed for purchasing the pet (optional)
-     * @return Array of \Swagger\Client\Model\Order, HTTP status code, HTTP response headers (array of strings)
+     * @return Array of object, HTTP status code, HTTP response headers (array of strings)
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
-    public function placeOrderWithHttpInfo($body = null)
+    public function getInventoryInObjectWithHttpInfo()
     {
         
   
         // parse inputs
-        $resourcePath = "/store/order";
-        $resourcePath = str_replace("{format}", "json", $resourcePath);
-        $method = "POST";
+        $resourcePath = "/store/inventory?response=arbitrary_object";
         $httpBody = '';
         $queryParams = array();
         $headerParams = array();
@@ -224,12 +409,11 @@ class StoreApi
         
         
         
+        // default format to json
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+
+        
         
-        // body params
-        $_tempBody = null;
-        if (isset($body)) {
-            $_tempBody = $body;
-        }
   
         // for model (json/xml)
         if (isset($_tempBody)) {
@@ -238,24 +422,31 @@ class StoreApi
             $httpBody = $formParams; // for HTTP post (form)
         }
         
+        // this endpoint requires API key authentication
+        $apiKey = $this->apiClient->getApiKeyWithPrefix('api_key');
+        if (strlen($apiKey) !== 0) {
+            $headerParams['api_key'] = $apiKey;
+        }
+        
+        
         // make the API Call
         try {
             list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
-                $resourcePath, $method,
+                $resourcePath, 'GET',
                 $queryParams, $httpBody,
-                $headerParams, '\Swagger\Client\Model\Order'
+                $headerParams, 'object'
             );
             
             if (!$response) {
                 return array(null, $statusCode, $httpHeader);
             }
 
-            return array($this->apiClient->getSerializer()->deserialize($response, '\Swagger\Client\Model\Order', $httpHeader), $statusCode, $httpHeader);
+            return array(\Swagger\Client\ObjectSerializer::deserialize($response, 'object', $httpHeader), $statusCode, $httpHeader);
             
         } catch (ApiException $e) {
             switch ($e->getCode()) { 
             case 200:
-                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Order', $e->getResponseHeaders());
+                $data = \Swagger\Client\ObjectSerializer::deserialize($e->getResponseBody(), 'object', $e->getResponseHeaders());
                 $e->setResponseObject($data);
                 break;
             }
@@ -299,8 +490,6 @@ class StoreApi
   
         // parse inputs
         $resourcePath = "/store/order/{orderId}";
-        $resourcePath = str_replace("{format}", "json", $resourcePath);
-        $method = "GET";
         $httpBody = '';
         $queryParams = array();
         $headerParams = array();
@@ -322,6 +511,9 @@ class StoreApi
                 $resourcePath
             );
         }
+        // default format to json
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+
         
         
   
@@ -332,10 +524,24 @@ class StoreApi
             $httpBody = $formParams; // for HTTP post (form)
         }
         
+        // this endpoint requires API key authentication
+        $apiKey = $this->apiClient->getApiKeyWithPrefix('test_api_key_header');
+        if (strlen($apiKey) !== 0) {
+            $headerParams['test_api_key_header'] = $apiKey;
+        }
+        
+        
+        // this endpoint requires API key authentication
+        $apiKey = $this->apiClient->getApiKeyWithPrefix('test_api_key_query');
+        if (strlen($apiKey) !== 0) {
+            $queryParams['test_api_key_query'] = $apiKey;
+        }
+        
+        
         // make the API Call
         try {
             list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
-                $resourcePath, $method,
+                $resourcePath, 'GET',
                 $queryParams, $httpBody,
                 $headerParams, '\Swagger\Client\Model\Order'
             );
@@ -344,12 +550,12 @@ class StoreApi
                 return array(null, $statusCode, $httpHeader);
             }
 
-            return array($this->apiClient->getSerializer()->deserialize($response, '\Swagger\Client\Model\Order', $httpHeader), $statusCode, $httpHeader);
+            return array(\Swagger\Client\ObjectSerializer::deserialize($response, '\Swagger\Client\Model\Order', $httpHeader), $statusCode, $httpHeader);
             
         } catch (ApiException $e) {
             switch ($e->getCode()) { 
             case 200:
-                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Order', $e->getResponseHeaders());
+                $data = \Swagger\Client\ObjectSerializer::deserialize($e->getResponseBody(), '\Swagger\Client\Model\Order', $e->getResponseHeaders());
                 $e->setResponseObject($data);
                 break;
             }
@@ -359,42 +565,36 @@ class StoreApi
     }
     
     /**
-     * deleteOrder
+     * placeOrder
      *
-     * Delete purchase order by ID
+     * Place an order for a pet
      *
-     * @param string $order_id ID of the order that needs to be deleted (required)
-     * @return void
+     * @param \Swagger\Client\Model\Order $body order placed for purchasing the pet (optional)
+     * @return \Swagger\Client\Model\Order
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
-    public function deleteOrder($order_id)
+    public function placeOrder($body = null)
     {
-        list($response, $statusCode, $httpHeader) = $this->deleteOrderWithHttpInfo ($order_id);
+        list($response, $statusCode, $httpHeader) = $this->placeOrderWithHttpInfo ($body);
         return $response; 
     }
 
 
     /**
-     * deleteOrderWithHttpInfo
+     * placeOrderWithHttpInfo
      *
-     * Delete purchase order by ID
+     * Place an order for a pet
      *
-     * @param string $order_id ID of the order that needs to be deleted (required)
-     * @return Array of null, HTTP status code, HTTP response headers (array of strings)
+     * @param \Swagger\Client\Model\Order $body order placed for purchasing the pet (optional)
+     * @return Array of \Swagger\Client\Model\Order, HTTP status code, HTTP response headers (array of strings)
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
-    public function deleteOrderWithHttpInfo($order_id)
+    public function placeOrderWithHttpInfo($body = null)
     {
         
-        // verify the required parameter 'order_id' is set
-        if ($order_id === null) {
-            throw new \InvalidArgumentException('Missing the required parameter $order_id when calling deleteOrder');
-        }
   
         // parse inputs
-        $resourcePath = "/store/order/{orderId}";
-        $resourcePath = str_replace("{format}", "json", $resourcePath);
-        $method = "DELETE";
+        $resourcePath = "/store/order";
         $httpBody = '';
         $queryParams = array();
         $headerParams = array();
@@ -407,17 +607,16 @@ class StoreApi
   
         
         
-        // path params
         
-        if ($order_id !== null) {
-            $resourcePath = str_replace(
-                "{" . "orderId" . "}",
-                $this->apiClient->getSerializer()->toPathValue($order_id),
-                $resourcePath
-            );
+        // default format to json
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+
+        
+        // body params
+        $_tempBody = null;
+        if (isset($body)) {
+            $_tempBody = $body;
         }
-        
-        
   
         // for model (json/xml)
         if (isset($_tempBody)) {
@@ -426,18 +625,40 @@ class StoreApi
             $httpBody = $formParams; // for HTTP post (form)
         }
         
+        // this endpoint requires API key authentication
+        $apiKey = $this->apiClient->getApiKeyWithPrefix('x-test_api_client_id');
+        if (strlen($apiKey) !== 0) {
+            $headerParams['x-test_api_client_id'] = $apiKey;
+        }
+        
+        
+        // this endpoint requires API key authentication
+        $apiKey = $this->apiClient->getApiKeyWithPrefix('x-test_api_client_secret');
+        if (strlen($apiKey) !== 0) {
+            $headerParams['x-test_api_client_secret'] = $apiKey;
+        }
+        
+        
         // make the API Call
         try {
             list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
-                $resourcePath, $method,
+                $resourcePath, 'POST',
                 $queryParams, $httpBody,
-                $headerParams
+                $headerParams, '\Swagger\Client\Model\Order'
             );
             
-            return array(null, $statusCode, $httpHeader);
+            if (!$response) {
+                return array(null, $statusCode, $httpHeader);
+            }
+
+            return array(\Swagger\Client\ObjectSerializer::deserialize($response, '\Swagger\Client\Model\Order', $httpHeader), $statusCode, $httpHeader);
             
         } catch (ApiException $e) {
             switch ($e->getCode()) { 
+            case 200:
+                $data = \Swagger\Client\ObjectSerializer::deserialize($e->getResponseBody(), '\Swagger\Client\Model\Order', $e->getResponseHeaders());
+                $e->setResponseObject($data);
+                break;
             }
   
             throw $e;
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Api/UserApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/Api/UserApi.php
index 18d39efea28..259581ee2f5 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/UserApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/UserApi.php
@@ -10,7 +10,7 @@
  * @link     https://github.com/swagger-api/swagger-codegen
  */
 /**
- *  Copyright 2015 SmartBear Software
+ *  Copyright 2016 SmartBear Software
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -122,8 +122,6 @@ class UserApi
   
         // parse inputs
         $resourcePath = "/user";
-        $resourcePath = str_replace("{format}", "json", $resourcePath);
-        $method = "POST";
         $httpBody = '';
         $queryParams = array();
         $headerParams = array();
@@ -137,6 +135,9 @@ class UserApi
         
         
         
+        // default format to json
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+
         
         // body params
         $_tempBody = null;
@@ -154,7 +155,7 @@ class UserApi
         // make the API Call
         try {
             list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
-                $resourcePath, $method,
+                $resourcePath, 'POST',
                 $queryParams, $httpBody,
                 $headerParams
             );
@@ -200,8 +201,6 @@ class UserApi
   
         // parse inputs
         $resourcePath = "/user/createWithArray";
-        $resourcePath = str_replace("{format}", "json", $resourcePath);
-        $method = "POST";
         $httpBody = '';
         $queryParams = array();
         $headerParams = array();
@@ -215,6 +214,9 @@ class UserApi
         
         
         
+        // default format to json
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+
         
         // body params
         $_tempBody = null;
@@ -232,7 +234,7 @@ class UserApi
         // make the API Call
         try {
             list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
-                $resourcePath, $method,
+                $resourcePath, 'POST',
                 $queryParams, $httpBody,
                 $headerParams
             );
@@ -278,8 +280,6 @@ class UserApi
   
         // parse inputs
         $resourcePath = "/user/createWithList";
-        $resourcePath = str_replace("{format}", "json", $resourcePath);
-        $method = "POST";
         $httpBody = '';
         $queryParams = array();
         $headerParams = array();
@@ -293,6 +293,9 @@ class UserApi
         
         
         
+        // default format to json
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+
         
         // body params
         $_tempBody = null;
@@ -310,357 +313,7 @@ class UserApi
         // make the API Call
         try {
             list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
-                $resourcePath, $method,
-                $queryParams, $httpBody,
-                $headerParams
-            );
-            
-            return array(null, $statusCode, $httpHeader);
-            
-        } catch (ApiException $e) {
-            switch ($e->getCode()) { 
-            }
-  
-            throw $e;
-        }
-    }
-    
-    /**
-     * loginUser
-     *
-     * Logs user into the system
-     *
-     * @param string $username The user name for login (optional)
-     * @param string $password The password for login in clear text (optional)
-     * @return string
-     * @throws \Swagger\Client\ApiException on non-2xx response
-     */
-    public function loginUser($username = null, $password = null)
-    {
-        list($response, $statusCode, $httpHeader) = $this->loginUserWithHttpInfo ($username, $password);
-        return $response; 
-    }
-
-
-    /**
-     * loginUserWithHttpInfo
-     *
-     * Logs user into the system
-     *
-     * @param string $username The user name for login (optional)
-     * @param string $password The password for login in clear text (optional)
-     * @return Array of string, HTTP status code, HTTP response headers (array of strings)
-     * @throws \Swagger\Client\ApiException on non-2xx response
-     */
-    public function loginUserWithHttpInfo($username = null, $password = null)
-    {
-        
-  
-        // parse inputs
-        $resourcePath = "/user/login";
-        $resourcePath = str_replace("{format}", "json", $resourcePath);
-        $method = "GET";
-        $httpBody = '';
-        $queryParams = array();
-        $headerParams = array();
-        $formParams = array();
-        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
-        if (!is_null($_header_accept)) {
-            $headerParams['Accept'] = $_header_accept;
-        }
-        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
-  
-        // query params
-        
-        if ($username !== null) {
-            $queryParams['username'] = $this->apiClient->getSerializer()->toQueryValue($username);
-        }// query params
-        
-        if ($password !== null) {
-            $queryParams['password'] = $this->apiClient->getSerializer()->toQueryValue($password);
-        }
-        
-        
-        
-        
-  
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-        } elseif (count($formParams) > 0) {
-            $httpBody = $formParams; // for HTTP post (form)
-        }
-        
-        // make the API Call
-        try {
-            list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
-                $resourcePath, $method,
-                $queryParams, $httpBody,
-                $headerParams, 'string'
-            );
-            
-            if (!$response) {
-                return array(null, $statusCode, $httpHeader);
-            }
-
-            return array($this->apiClient->getSerializer()->deserialize($response, 'string', $httpHeader), $statusCode, $httpHeader);
-            
-        } catch (ApiException $e) {
-            switch ($e->getCode()) { 
-            case 200:
-                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), 'string', $e->getResponseHeaders());
-                $e->setResponseObject($data);
-                break;
-            }
-  
-            throw $e;
-        }
-    }
-    
-    /**
-     * logoutUser
-     *
-     * Logs out current logged in user session
-     *
-     * @return void
-     * @throws \Swagger\Client\ApiException on non-2xx response
-     */
-    public function logoutUser()
-    {
-        list($response, $statusCode, $httpHeader) = $this->logoutUserWithHttpInfo ();
-        return $response; 
-    }
-
-
-    /**
-     * logoutUserWithHttpInfo
-     *
-     * Logs out current logged in user session
-     *
-     * @return Array of null, HTTP status code, HTTP response headers (array of strings)
-     * @throws \Swagger\Client\ApiException on non-2xx response
-     */
-    public function logoutUserWithHttpInfo()
-    {
-        
-  
-        // parse inputs
-        $resourcePath = "/user/logout";
-        $resourcePath = str_replace("{format}", "json", $resourcePath);
-        $method = "GET";
-        $httpBody = '';
-        $queryParams = array();
-        $headerParams = array();
-        $formParams = array();
-        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
-        if (!is_null($_header_accept)) {
-            $headerParams['Accept'] = $_header_accept;
-        }
-        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
-  
-        
-        
-        
-        
-        
-  
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-        } elseif (count($formParams) > 0) {
-            $httpBody = $formParams; // for HTTP post (form)
-        }
-        
-        // make the API Call
-        try {
-            list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
-                $resourcePath, $method,
-                $queryParams, $httpBody,
-                $headerParams
-            );
-            
-            return array(null, $statusCode, $httpHeader);
-            
-        } catch (ApiException $e) {
-            switch ($e->getCode()) { 
-            }
-  
-            throw $e;
-        }
-    }
-    
-    /**
-     * getUserByName
-     *
-     * Get user by user name
-     *
-     * @param string $username The name that needs to be fetched. Use user1 for testing. (required)
-     * @return \Swagger\Client\Model\User
-     * @throws \Swagger\Client\ApiException on non-2xx response
-     */
-    public function getUserByName($username)
-    {
-        list($response, $statusCode, $httpHeader) = $this->getUserByNameWithHttpInfo ($username);
-        return $response; 
-    }
-
-
-    /**
-     * getUserByNameWithHttpInfo
-     *
-     * Get user by user name
-     *
-     * @param string $username The name that needs to be fetched. Use user1 for testing. (required)
-     * @return Array of \Swagger\Client\Model\User, HTTP status code, HTTP response headers (array of strings)
-     * @throws \Swagger\Client\ApiException on non-2xx response
-     */
-    public function getUserByNameWithHttpInfo($username)
-    {
-        
-        // verify the required parameter 'username' is set
-        if ($username === null) {
-            throw new \InvalidArgumentException('Missing the required parameter $username when calling getUserByName');
-        }
-  
-        // parse inputs
-        $resourcePath = "/user/{username}";
-        $resourcePath = str_replace("{format}", "json", $resourcePath);
-        $method = "GET";
-        $httpBody = '';
-        $queryParams = array();
-        $headerParams = array();
-        $formParams = array();
-        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
-        if (!is_null($_header_accept)) {
-            $headerParams['Accept'] = $_header_accept;
-        }
-        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
-  
-        
-        
-        // path params
-        
-        if ($username !== null) {
-            $resourcePath = str_replace(
-                "{" . "username" . "}",
-                $this->apiClient->getSerializer()->toPathValue($username),
-                $resourcePath
-            );
-        }
-        
-        
-  
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-        } elseif (count($formParams) > 0) {
-            $httpBody = $formParams; // for HTTP post (form)
-        }
-        
-        // make the API Call
-        try {
-            list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
-                $resourcePath, $method,
-                $queryParams, $httpBody,
-                $headerParams, '\Swagger\Client\Model\User'
-            );
-            
-            if (!$response) {
-                return array(null, $statusCode, $httpHeader);
-            }
-
-            return array($this->apiClient->getSerializer()->deserialize($response, '\Swagger\Client\Model\User', $httpHeader), $statusCode, $httpHeader);
-            
-        } catch (ApiException $e) {
-            switch ($e->getCode()) { 
-            case 200:
-                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\User', $e->getResponseHeaders());
-                $e->setResponseObject($data);
-                break;
-            }
-  
-            throw $e;
-        }
-    }
-    
-    /**
-     * updateUser
-     *
-     * Updated user
-     *
-     * @param string $username name that need to be deleted (required)
-     * @param \Swagger\Client\Model\User $body Updated user object (optional)
-     * @return void
-     * @throws \Swagger\Client\ApiException on non-2xx response
-     */
-    public function updateUser($username, $body = null)
-    {
-        list($response, $statusCode, $httpHeader) = $this->updateUserWithHttpInfo ($username, $body);
-        return $response; 
-    }
-
-
-    /**
-     * updateUserWithHttpInfo
-     *
-     * Updated user
-     *
-     * @param string $username name that need to be deleted (required)
-     * @param \Swagger\Client\Model\User $body Updated user object (optional)
-     * @return Array of null, HTTP status code, HTTP response headers (array of strings)
-     * @throws \Swagger\Client\ApiException on non-2xx response
-     */
-    public function updateUserWithHttpInfo($username, $body = null)
-    {
-        
-        // verify the required parameter 'username' is set
-        if ($username === null) {
-            throw new \InvalidArgumentException('Missing the required parameter $username when calling updateUser');
-        }
-  
-        // parse inputs
-        $resourcePath = "/user/{username}";
-        $resourcePath = str_replace("{format}", "json", $resourcePath);
-        $method = "PUT";
-        $httpBody = '';
-        $queryParams = array();
-        $headerParams = array();
-        $formParams = array();
-        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
-        if (!is_null($_header_accept)) {
-            $headerParams['Accept'] = $_header_accept;
-        }
-        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
-  
-        
-        
-        // path params
-        
-        if ($username !== null) {
-            $resourcePath = str_replace(
-                "{" . "username" . "}",
-                $this->apiClient->getSerializer()->toPathValue($username),
-                $resourcePath
-            );
-        }
-        
-        // body params
-        $_tempBody = null;
-        if (isset($body)) {
-            $_tempBody = $body;
-        }
-  
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-        } elseif (count($formParams) > 0) {
-            $httpBody = $formParams; // for HTTP post (form)
-        }
-        
-        // make the API Call
-        try {
-            list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
-                $resourcePath, $method,
+                $resourcePath, 'POST',
                 $queryParams, $httpBody,
                 $headerParams
             );
@@ -710,8 +363,6 @@ class UserApi
   
         // parse inputs
         $resourcePath = "/user/{username}";
-        $resourcePath = str_replace("{format}", "json", $resourcePath);
-        $method = "DELETE";
         $httpBody = '';
         $queryParams = array();
         $headerParams = array();
@@ -733,6 +384,101 @@ class UserApi
                 $resourcePath
             );
         }
+        // default format to json
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+
+        
+        
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } elseif (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // this endpoint requires HTTP basic authentication
+        if (strlen($this->apiClient->getConfig()->getUsername()) !== 0 or strlen($this->apiClient->getConfig()->getPassword()) !== 0) {
+            $headerParams['Authorization'] = 'Basic ' . base64_encode($this->apiClient->getConfig()->getUsername() . ":" . $this->apiClient->getConfig()->getPassword());
+        }
+        
+        // make the API Call
+        try {
+            list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, 'DELETE',
+                $queryParams, $httpBody,
+                $headerParams
+            );
+            
+            return array(null, $statusCode, $httpHeader);
+            
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            }
+  
+            throw $e;
+        }
+    }
+    
+    /**
+     * getUserByName
+     *
+     * Get user by user name
+     *
+     * @param string $username The name that needs to be fetched. Use user1 for testing. (required)
+     * @return \Swagger\Client\Model\User
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function getUserByName($username)
+    {
+        list($response, $statusCode, $httpHeader) = $this->getUserByNameWithHttpInfo ($username);
+        return $response; 
+    }
+
+
+    /**
+     * getUserByNameWithHttpInfo
+     *
+     * Get user by user name
+     *
+     * @param string $username The name that needs to be fetched. Use user1 for testing. (required)
+     * @return Array of \Swagger\Client\Model\User, HTTP status code, HTTP response headers (array of strings)
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function getUserByNameWithHttpInfo($username)
+    {
+        
+        // verify the required parameter 'username' is set
+        if ($username === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $username when calling getUserByName');
+        }
+  
+        // parse inputs
+        $resourcePath = "/user/{username}";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
+  
+        
+        
+        // path params
+        
+        if ($username !== null) {
+            $resourcePath = str_replace(
+                "{" . "username" . "}",
+                $this->apiClient->getSerializer()->toPathValue($username),
+                $resourcePath
+            );
+        }
+        // default format to json
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+
         
         
   
@@ -746,7 +492,274 @@ class UserApi
         // make the API Call
         try {
             list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
-                $resourcePath, $method,
+                $resourcePath, 'GET',
+                $queryParams, $httpBody,
+                $headerParams, '\Swagger\Client\Model\User'
+            );
+            
+            if (!$response) {
+                return array(null, $statusCode, $httpHeader);
+            }
+
+            return array(\Swagger\Client\ObjectSerializer::deserialize($response, '\Swagger\Client\Model\User', $httpHeader), $statusCode, $httpHeader);
+            
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            case 200:
+                $data = \Swagger\Client\ObjectSerializer::deserialize($e->getResponseBody(), '\Swagger\Client\Model\User', $e->getResponseHeaders());
+                $e->setResponseObject($data);
+                break;
+            }
+  
+            throw $e;
+        }
+    }
+    
+    /**
+     * loginUser
+     *
+     * Logs user into the system
+     *
+     * @param string $username The user name for login (optional)
+     * @param string $password The password for login in clear text (optional)
+     * @return string
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function loginUser($username = null, $password = null)
+    {
+        list($response, $statusCode, $httpHeader) = $this->loginUserWithHttpInfo ($username, $password);
+        return $response; 
+    }
+
+
+    /**
+     * loginUserWithHttpInfo
+     *
+     * Logs user into the system
+     *
+     * @param string $username The user name for login (optional)
+     * @param string $password The password for login in clear text (optional)
+     * @return Array of string, HTTP status code, HTTP response headers (array of strings)
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function loginUserWithHttpInfo($username = null, $password = null)
+    {
+        
+  
+        // parse inputs
+        $resourcePath = "/user/login";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
+  
+        // query params
+        
+        if ($username !== null) {
+            $queryParams['username'] = $this->apiClient->getSerializer()->toQueryValue($username);
+        }// query params
+        
+        if ($password !== null) {
+            $queryParams['password'] = $this->apiClient->getSerializer()->toQueryValue($password);
+        }
+        
+        
+        // default format to json
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+
+        
+        
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } elseif (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // make the API Call
+        try {
+            list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, 'GET',
+                $queryParams, $httpBody,
+                $headerParams, 'string'
+            );
+            
+            if (!$response) {
+                return array(null, $statusCode, $httpHeader);
+            }
+
+            return array(\Swagger\Client\ObjectSerializer::deserialize($response, 'string', $httpHeader), $statusCode, $httpHeader);
+            
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            case 200:
+                $data = \Swagger\Client\ObjectSerializer::deserialize($e->getResponseBody(), 'string', $e->getResponseHeaders());
+                $e->setResponseObject($data);
+                break;
+            }
+  
+            throw $e;
+        }
+    }
+    
+    /**
+     * logoutUser
+     *
+     * Logs out current logged in user session
+     *
+     * @return void
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function logoutUser()
+    {
+        list($response, $statusCode, $httpHeader) = $this->logoutUserWithHttpInfo ();
+        return $response; 
+    }
+
+
+    /**
+     * logoutUserWithHttpInfo
+     *
+     * Logs out current logged in user session
+     *
+     * @return Array of null, HTTP status code, HTTP response headers (array of strings)
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function logoutUserWithHttpInfo()
+    {
+        
+  
+        // parse inputs
+        $resourcePath = "/user/logout";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
+  
+        
+        
+        
+        // default format to json
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+
+        
+        
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } elseif (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // make the API Call
+        try {
+            list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, 'GET',
+                $queryParams, $httpBody,
+                $headerParams
+            );
+            
+            return array(null, $statusCode, $httpHeader);
+            
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            }
+  
+            throw $e;
+        }
+    }
+    
+    /**
+     * updateUser
+     *
+     * Updated user
+     *
+     * @param string $username name that need to be deleted (required)
+     * @param \Swagger\Client\Model\User $body Updated user object (optional)
+     * @return void
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function updateUser($username, $body = null)
+    {
+        list($response, $statusCode, $httpHeader) = $this->updateUserWithHttpInfo ($username, $body);
+        return $response; 
+    }
+
+
+    /**
+     * updateUserWithHttpInfo
+     *
+     * Updated user
+     *
+     * @param string $username name that need to be deleted (required)
+     * @param \Swagger\Client\Model\User $body Updated user object (optional)
+     * @return Array of null, HTTP status code, HTTP response headers (array of strings)
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function updateUserWithHttpInfo($username, $body = null)
+    {
+        
+        // verify the required parameter 'username' is set
+        if ($username === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $username when calling updateUser');
+        }
+  
+        // parse inputs
+        $resourcePath = "/user/{username}";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array('application/json', 'application/xml'));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array());
+  
+        
+        
+        // path params
+        
+        if ($username !== null) {
+            $resourcePath = str_replace(
+                "{" . "username" . "}",
+                $this->apiClient->getSerializer()->toPathValue($username),
+                $resourcePath
+            );
+        }
+        // default format to json
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+
+        
+        // body params
+        $_tempBody = null;
+        if (isset($body)) {
+            $_tempBody = $body;
+        }
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } elseif (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // make the API Call
+        try {
+            list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, 'PUT',
                 $queryParams, $httpBody,
                 $headerParams
             );
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/ApiClient.php b/samples/client/petstore/php/SwaggerClient-php/lib/ApiClient.php
index 8730a8c0601..df38b989f88 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/ApiClient.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/ApiClient.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/swagger-api/swagger-codegen
  */
 /**
- *  Copyright 2015 SmartBear Software
+ *  Copyright 2016 SmartBear Software
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -150,7 +150,7 @@ class ApiClient
         if ($postData and in_array('Content-Type: application/x-www-form-urlencoded', $headers)) {
             $postData = http_build_query($postData);
         } elseif ((is_object($postData) or is_array($postData)) and !in_array('Content-Type: multipart/form-data', $headers)) { // json model
-            $postData = json_encode($this->serializer->sanitizeForSerialization($postData));
+            $postData = json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($postData));
         }
 
         $url = $this->config->getHost() . $resourcePath;
@@ -230,7 +230,7 @@ class ApiClient
             throw new ApiException("API call to $url timed out: ".serialize($response_info), 0, null, null);
         } elseif ($response_info['http_code'] >= 200 && $response_info['http_code'] <= 299 ) {
             // return raw body if response is a file
-            if ($responseType == '\SplFileObject') {
+            if ($responseType == '\SplFileObject' || $responseType == 'string') {
                 return array($http_body, $response_info['http_code'], $http_header);
             }
 
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php b/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php
index 0b8f5892a35..d6040a0ff20 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php
@@ -10,7 +10,7 @@
  * @link     https://github.com/swagger-api/swagger-codegen
  */
 /**
- *  Copyright 2015 SmartBear Software
+ *  Copyright 2016 SmartBear Software
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php b/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php
index 7281f729985..9da9c7edac0 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php
@@ -11,7 +11,7 @@
  */
 
 /**
- *  Copyright 2015 SmartBear Software
+ *  Copyright 2016 SmartBear Software
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -110,7 +110,7 @@ class Configuration
      *
      * @var string
      */
-    protected $userAgent = "PHP-Swagger/1.0.0";
+    protected $userAgent = "Swagger-Codegen/1.0.0/php";
 
     /**
      * Debug switch (default set to false)
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Animal.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Animal.php
new file mode 100644
index 00000000000..eaaa566f3be
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Animal.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ * Animal
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+namespace Swagger\Client\Model;
+
+use \ArrayAccess;
+/**
+ * Animal Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class Animal implements ArrayAccess
+{
+    /**
+      * Array of property to type mappings. Used for (de)serialization 
+      * @var string[]
+      */
+    static $swaggerTypes = array(
+        'class_name' => 'string'
+    );
+  
+    static function swaggerTypes() {
+        return self::$swaggerTypes;
+    }
+
+    /** 
+      * Array of attributes where the key is the local name, and the value is the original name
+      * @var string[] 
+      */
+    static $attributeMap = array(
+        'class_name' => 'className'
+    );
+  
+    static function attributeMap() {
+        return self::$attributeMap;
+    }
+
+    /**
+      * Array of attributes to setter functions (for deserialization of responses)
+      * @var string[]
+      */
+    static $setters = array(
+        'class_name' => 'setClassName'
+    );
+  
+    static function setters() {
+        return self::$setters;
+    }
+
+    /**
+      * Array of attributes to getter functions (for serialization of requests)
+      * @var string[]
+      */
+    static $getters = array(
+        'class_name' => 'getClassName'
+    );
+  
+    static function getters() {
+        return self::$getters;
+    }
+
+    
+    /**
+      * $class_name 
+      * @var string
+      */
+    protected $class_name;
+    
+
+    /**
+     * Constructor
+     * @param mixed[] $data Associated array of property value initalizing the model
+     */
+    public function __construct(array $data = null)
+    {
+        
+        if ($data != null) {
+            $this->class_name = $data["class_name"];
+        }
+    }
+    
+    /**
+     * Gets class_name
+     * @return string
+     */
+    public function getClassName()
+    {
+        return $this->class_name;
+    }
+  
+    /**
+     * Sets class_name
+     * @param string $class_name 
+     * @return $this
+     */
+    public function setClassName($class_name)
+    {
+        
+        $this->class_name = $class_name;
+        return $this;
+    }
+    
+    /**
+     * Returns true if offset exists. False otherwise.
+     * @param  integer $offset Offset 
+     * @return boolean
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->$offset);
+    }
+  
+    /**
+     * Gets offset.
+     * @param  integer $offset Offset 
+     * @return mixed 
+     */
+    public function offsetGet($offset)
+    {
+        return $this->$offset;
+    }
+  
+    /**
+     * Sets value based on offset.
+     * @param  integer $offset Offset 
+     * @param  mixed   $value  Value to be set
+     * @return void
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->$offset = $value;
+    }
+  
+    /**
+     * Unsets offset.
+     * @param  integer $offset Offset 
+     * @return void
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->$offset);
+    }
+  
+    /**
+     * Gets the string presentation of the object
+     * @return string
+     */
+    public function __toString()
+    {
+        if (defined('JSON_PRETTY_PRINT')) {
+            return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this), JSON_PRETTY_PRINT);
+        } else {
+            return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this));
+        }
+    }
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Cat.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Cat.php
new file mode 100644
index 00000000000..962f8ec00b6
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Cat.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ * Cat
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+namespace Swagger\Client\Model;
+
+use \ArrayAccess;
+/**
+ * Cat Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class Cat extends Animal implements ArrayAccess
+{
+    /**
+      * Array of property to type mappings. Used for (de)serialization 
+      * @var string[]
+      */
+    static $swaggerTypes = array(
+        'declawed' => 'bool'
+    );
+  
+    static function swaggerTypes() {
+        return self::$swaggerTypes + parent::swaggerTypes();
+    }
+
+    /** 
+      * Array of attributes where the key is the local name, and the value is the original name
+      * @var string[] 
+      */
+    static $attributeMap = array(
+        'declawed' => 'declawed'
+    );
+  
+    static function attributeMap() {
+        return parent::attributeMap() + self::$attributeMap;
+    }
+
+    /**
+      * Array of attributes to setter functions (for deserialization of responses)
+      * @var string[]
+      */
+    static $setters = array(
+        'declawed' => 'setDeclawed'
+    );
+  
+    static function setters() {
+        return parent::setters() + self::$setters;
+    }
+
+    /**
+      * Array of attributes to getter functions (for serialization of requests)
+      * @var string[]
+      */
+    static $getters = array(
+        'declawed' => 'getDeclawed'
+    );
+  
+    static function getters() {
+        return parent::getters() + self::$getters;
+    }
+
+    
+    /**
+      * $declawed 
+      * @var bool
+      */
+    protected $declawed;
+    
+
+    /**
+     * Constructor
+     * @param mixed[] $data Associated array of property value initalizing the model
+     */
+    public function __construct(array $data = null)
+    {
+        parent::__construct($data);
+        if ($data != null) {
+            $this->declawed = $data["declawed"];
+        }
+    }
+    
+    /**
+     * Gets declawed
+     * @return bool
+     */
+    public function getDeclawed()
+    {
+        return $this->declawed;
+    }
+  
+    /**
+     * Sets declawed
+     * @param bool $declawed 
+     * @return $this
+     */
+    public function setDeclawed($declawed)
+    {
+        
+        $this->declawed = $declawed;
+        return $this;
+    }
+    
+    /**
+     * Returns true if offset exists. False otherwise.
+     * @param  integer $offset Offset 
+     * @return boolean
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->$offset);
+    }
+  
+    /**
+     * Gets offset.
+     * @param  integer $offset Offset 
+     * @return mixed 
+     */
+    public function offsetGet($offset)
+    {
+        return $this->$offset;
+    }
+  
+    /**
+     * Sets value based on offset.
+     * @param  integer $offset Offset 
+     * @param  mixed   $value  Value to be set
+     * @return void
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->$offset = $value;
+    }
+  
+    /**
+     * Unsets offset.
+     * @param  integer $offset Offset 
+     * @return void
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->$offset);
+    }
+  
+    /**
+     * Gets the string presentation of the object
+     * @return string
+     */
+    public function __toString()
+    {
+        if (defined('JSON_PRETTY_PRINT')) {
+            return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this), JSON_PRETTY_PRINT);
+        } else {
+            return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this));
+        }
+    }
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php
index 444c3c1ed7e..65d736ce9d9 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/swagger-api/swagger-codegen
  */
 /**
- *  Copyright 2015 SmartBear Software
+ *  Copyright 2016 SmartBear Software
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -55,6 +55,10 @@ class Category implements ArrayAccess
         'name' => 'string'
     );
   
+    static function swaggerTypes() {
+        return self::$swaggerTypes;
+    }
+
     /** 
       * Array of attributes where the key is the local name, and the value is the original name
       * @var string[] 
@@ -64,6 +68,10 @@ class Category implements ArrayAccess
         'name' => 'name'
     );
   
+    static function attributeMap() {
+        return self::$attributeMap;
+    }
+
     /**
       * Array of attributes to setter functions (for deserialization of responses)
       * @var string[]
@@ -73,6 +81,10 @@ class Category implements ArrayAccess
         'name' => 'setName'
     );
   
+    static function setters() {
+        return self::$setters;
+    }
+
     /**
       * Array of attributes to getter functions (for serialization of requests)
       * @var string[]
@@ -82,6 +94,10 @@ class Category implements ArrayAccess
         'name' => 'getName'
     );
   
+    static function getters() {
+        return self::$getters;
+    }
+
     
     /**
       * $id 
@@ -102,6 +118,7 @@ class Category implements ArrayAccess
      */
     public function __construct(array $data = null)
     {
+        
         if ($data != null) {
             $this->id = $data["id"];
             $this->name = $data["name"];
@@ -198,9 +215,9 @@ class Category implements ArrayAccess
     public function __toString()
     {
         if (defined('JSON_PRETTY_PRINT')) {
-            return json_encode(get_object_vars($this), JSON_PRETTY_PRINT);
+            return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this), JSON_PRETTY_PRINT);
         } else {
-            return json_encode(get_object_vars($this));
+            return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this));
         }
     }
 }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Dog.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Dog.php
new file mode 100644
index 00000000000..2aef5757fe3
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Dog.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ * Dog
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+namespace Swagger\Client\Model;
+
+use \ArrayAccess;
+/**
+ * Dog Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class Dog extends Animal implements ArrayAccess
+{
+    /**
+      * Array of property to type mappings. Used for (de)serialization 
+      * @var string[]
+      */
+    static $swaggerTypes = array(
+        'breed' => 'string'
+    );
+  
+    static function swaggerTypes() {
+        return self::$swaggerTypes + parent::swaggerTypes();
+    }
+
+    /** 
+      * Array of attributes where the key is the local name, and the value is the original name
+      * @var string[] 
+      */
+    static $attributeMap = array(
+        'breed' => 'breed'
+    );
+  
+    static function attributeMap() {
+        return parent::attributeMap() + self::$attributeMap;
+    }
+
+    /**
+      * Array of attributes to setter functions (for deserialization of responses)
+      * @var string[]
+      */
+    static $setters = array(
+        'breed' => 'setBreed'
+    );
+  
+    static function setters() {
+        return parent::setters() + self::$setters;
+    }
+
+    /**
+      * Array of attributes to getter functions (for serialization of requests)
+      * @var string[]
+      */
+    static $getters = array(
+        'breed' => 'getBreed'
+    );
+  
+    static function getters() {
+        return parent::getters() + self::$getters;
+    }
+
+    
+    /**
+      * $breed 
+      * @var string
+      */
+    protected $breed;
+    
+
+    /**
+     * Constructor
+     * @param mixed[] $data Associated array of property value initalizing the model
+     */
+    public function __construct(array $data = null)
+    {
+        parent::__construct($data);
+        if ($data != null) {
+            $this->breed = $data["breed"];
+        }
+    }
+    
+    /**
+     * Gets breed
+     * @return string
+     */
+    public function getBreed()
+    {
+        return $this->breed;
+    }
+  
+    /**
+     * Sets breed
+     * @param string $breed 
+     * @return $this
+     */
+    public function setBreed($breed)
+    {
+        
+        $this->breed = $breed;
+        return $this;
+    }
+    
+    /**
+     * Returns true if offset exists. False otherwise.
+     * @param  integer $offset Offset 
+     * @return boolean
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->$offset);
+    }
+  
+    /**
+     * Gets offset.
+     * @param  integer $offset Offset 
+     * @return mixed 
+     */
+    public function offsetGet($offset)
+    {
+        return $this->$offset;
+    }
+  
+    /**
+     * Sets value based on offset.
+     * @param  integer $offset Offset 
+     * @param  mixed   $value  Value to be set
+     * @return void
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->$offset = $value;
+    }
+  
+    /**
+     * Unsets offset.
+     * @param  integer $offset Offset 
+     * @return void
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->$offset);
+    }
+  
+    /**
+     * Gets the string presentation of the object
+     * @return string
+     */
+    public function __toString()
+    {
+        if (defined('JSON_PRETTY_PRINT')) {
+            return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this), JSON_PRETTY_PRINT);
+        } else {
+            return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this));
+        }
+    }
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/InlineResponse200.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/InlineResponse200.php
new file mode 100644
index 00000000000..8efea4018b1
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/InlineResponse200.php
@@ -0,0 +1,354 @@
+<?php
+/**
+ * InlineResponse200
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+namespace Swagger\Client\Model;
+
+use \ArrayAccess;
+/**
+ * InlineResponse200 Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class InlineResponse200 implements ArrayAccess
+{
+    /**
+      * Array of property to type mappings. Used for (de)serialization 
+      * @var string[]
+      */
+    static $swaggerTypes = array(
+        'tags' => '\Swagger\Client\Model\Tag[]',
+        'id' => 'int',
+        'category' => 'object',
+        'status' => 'string',
+        'name' => 'string',
+        'photo_urls' => 'string[]'
+    );
+  
+    static function swaggerTypes() {
+        return self::$swaggerTypes;
+    }
+
+    /** 
+      * Array of attributes where the key is the local name, and the value is the original name
+      * @var string[] 
+      */
+    static $attributeMap = array(
+        'tags' => 'tags',
+        'id' => 'id',
+        'category' => 'category',
+        'status' => 'status',
+        'name' => 'name',
+        'photo_urls' => 'photoUrls'
+    );
+  
+    static function attributeMap() {
+        return self::$attributeMap;
+    }
+
+    /**
+      * Array of attributes to setter functions (for deserialization of responses)
+      * @var string[]
+      */
+    static $setters = array(
+        'tags' => 'setTags',
+        'id' => 'setId',
+        'category' => 'setCategory',
+        'status' => 'setStatus',
+        'name' => 'setName',
+        'photo_urls' => 'setPhotoUrls'
+    );
+  
+    static function setters() {
+        return self::$setters;
+    }
+
+    /**
+      * Array of attributes to getter functions (for serialization of requests)
+      * @var string[]
+      */
+    static $getters = array(
+        'tags' => 'getTags',
+        'id' => 'getId',
+        'category' => 'getCategory',
+        'status' => 'getStatus',
+        'name' => 'getName',
+        'photo_urls' => 'getPhotoUrls'
+    );
+  
+    static function getters() {
+        return self::$getters;
+    }
+
+    
+    /**
+      * $tags 
+      * @var \Swagger\Client\Model\Tag[]
+      */
+    protected $tags;
+    
+    /**
+      * $id 
+      * @var int
+      */
+    protected $id;
+    
+    /**
+      * $category 
+      * @var object
+      */
+    protected $category;
+    
+    /**
+      * $status pet status in the store
+      * @var string
+      */
+    protected $status;
+    
+    /**
+      * $name 
+      * @var string
+      */
+    protected $name;
+    
+    /**
+      * $photo_urls 
+      * @var string[]
+      */
+    protected $photo_urls;
+    
+
+    /**
+     * Constructor
+     * @param mixed[] $data Associated array of property value initalizing the model
+     */
+    public function __construct(array $data = null)
+    {
+        
+        if ($data != null) {
+            $this->tags = $data["tags"];
+            $this->id = $data["id"];
+            $this->category = $data["category"];
+            $this->status = $data["status"];
+            $this->name = $data["name"];
+            $this->photo_urls = $data["photo_urls"];
+        }
+    }
+    
+    /**
+     * Gets tags
+     * @return \Swagger\Client\Model\Tag[]
+     */
+    public function getTags()
+    {
+        return $this->tags;
+    }
+  
+    /**
+     * Sets tags
+     * @param \Swagger\Client\Model\Tag[] $tags 
+     * @return $this
+     */
+    public function setTags($tags)
+    {
+        
+        $this->tags = $tags;
+        return $this;
+    }
+    
+    /**
+     * Gets id
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+  
+    /**
+     * Sets id
+     * @param int $id 
+     * @return $this
+     */
+    public function setId($id)
+    {
+        
+        $this->id = $id;
+        return $this;
+    }
+    
+    /**
+     * Gets category
+     * @return object
+     */
+    public function getCategory()
+    {
+        return $this->category;
+    }
+  
+    /**
+     * Sets category
+     * @param object $category 
+     * @return $this
+     */
+    public function setCategory($category)
+    {
+        
+        $this->category = $category;
+        return $this;
+    }
+    
+    /**
+     * Gets status
+     * @return string
+     */
+    public function getStatus()
+    {
+        return $this->status;
+    }
+  
+    /**
+     * Sets status
+     * @param string $status pet status in the store
+     * @return $this
+     */
+    public function setStatus($status)
+    {
+        $allowed_values = array("available", "pending", "sold");
+        if (!in_array($status, $allowed_values)) {
+            throw new \InvalidArgumentException("Invalid value for 'status', must be one of 'available', 'pending', 'sold'");
+        }
+        $this->status = $status;
+        return $this;
+    }
+    
+    /**
+     * Gets name
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+  
+    /**
+     * Sets name
+     * @param string $name 
+     * @return $this
+     */
+    public function setName($name)
+    {
+        
+        $this->name = $name;
+        return $this;
+    }
+    
+    /**
+     * Gets photo_urls
+     * @return string[]
+     */
+    public function getPhotoUrls()
+    {
+        return $this->photo_urls;
+    }
+  
+    /**
+     * Sets photo_urls
+     * @param string[] $photo_urls 
+     * @return $this
+     */
+    public function setPhotoUrls($photo_urls)
+    {
+        
+        $this->photo_urls = $photo_urls;
+        return $this;
+    }
+    
+    /**
+     * Returns true if offset exists. False otherwise.
+     * @param  integer $offset Offset 
+     * @return boolean
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->$offset);
+    }
+  
+    /**
+     * Gets offset.
+     * @param  integer $offset Offset 
+     * @return mixed 
+     */
+    public function offsetGet($offset)
+    {
+        return $this->$offset;
+    }
+  
+    /**
+     * Sets value based on offset.
+     * @param  integer $offset Offset 
+     * @param  mixed   $value  Value to be set
+     * @return void
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->$offset = $value;
+    }
+  
+    /**
+     * Unsets offset.
+     * @param  integer $offset Offset 
+     * @return void
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->$offset);
+    }
+  
+    /**
+     * Gets the string presentation of the object
+     * @return string
+     */
+    public function __toString()
+    {
+        if (defined('JSON_PRETTY_PRINT')) {
+            return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this), JSON_PRETTY_PRINT);
+        } else {
+            return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this));
+        }
+    }
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Model200Response.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Model200Response.php
new file mode 100644
index 00000000000..57cb31c084b
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Model200Response.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ * Model200Response
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+namespace Swagger\Client\Model;
+
+use \ArrayAccess;
+/**
+ * Model200Response Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class Model200Response implements ArrayAccess
+{
+    /**
+      * Array of property to type mappings. Used for (de)serialization 
+      * @var string[]
+      */
+    static $swaggerTypes = array(
+        'name' => 'int'
+    );
+  
+    static function swaggerTypes() {
+        return self::$swaggerTypes;
+    }
+
+    /** 
+      * Array of attributes where the key is the local name, and the value is the original name
+      * @var string[] 
+      */
+    static $attributeMap = array(
+        'name' => 'name'
+    );
+  
+    static function attributeMap() {
+        return self::$attributeMap;
+    }
+
+    /**
+      * Array of attributes to setter functions (for deserialization of responses)
+      * @var string[]
+      */
+    static $setters = array(
+        'name' => 'setName'
+    );
+  
+    static function setters() {
+        return self::$setters;
+    }
+
+    /**
+      * Array of attributes to getter functions (for serialization of requests)
+      * @var string[]
+      */
+    static $getters = array(
+        'name' => 'getName'
+    );
+  
+    static function getters() {
+        return self::$getters;
+    }
+
+    
+    /**
+      * $name 
+      * @var int
+      */
+    protected $name;
+    
+
+    /**
+     * Constructor
+     * @param mixed[] $data Associated array of property value initalizing the model
+     */
+    public function __construct(array $data = null)
+    {
+        
+        if ($data != null) {
+            $this->name = $data["name"];
+        }
+    }
+    
+    /**
+     * Gets name
+     * @return int
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+  
+    /**
+     * Sets name
+     * @param int $name 
+     * @return $this
+     */
+    public function setName($name)
+    {
+        
+        $this->name = $name;
+        return $this;
+    }
+    
+    /**
+     * Returns true if offset exists. False otherwise.
+     * @param  integer $offset Offset 
+     * @return boolean
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->$offset);
+    }
+  
+    /**
+     * Gets offset.
+     * @param  integer $offset Offset 
+     * @return mixed 
+     */
+    public function offsetGet($offset)
+    {
+        return $this->$offset;
+    }
+  
+    /**
+     * Sets value based on offset.
+     * @param  integer $offset Offset 
+     * @param  mixed   $value  Value to be set
+     * @return void
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->$offset = $value;
+    }
+  
+    /**
+     * Unsets offset.
+     * @param  integer $offset Offset 
+     * @return void
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->$offset);
+    }
+  
+    /**
+     * Gets the string presentation of the object
+     * @return string
+     */
+    public function __toString()
+    {
+        if (defined('JSON_PRETTY_PRINT')) {
+            return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this), JSON_PRETTY_PRINT);
+        } else {
+            return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this));
+        }
+    }
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelReturn.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelReturn.php
new file mode 100644
index 00000000000..fd8d1479ca0
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelReturn.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ * ModelReturn
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+namespace Swagger\Client\Model;
+
+use \ArrayAccess;
+/**
+ * ModelReturn Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class ModelReturn implements ArrayAccess
+{
+    /**
+      * Array of property to type mappings. Used for (de)serialization 
+      * @var string[]
+      */
+    static $swaggerTypes = array(
+        'return' => 'int'
+    );
+  
+    static function swaggerTypes() {
+        return self::$swaggerTypes;
+    }
+
+    /** 
+      * Array of attributes where the key is the local name, and the value is the original name
+      * @var string[] 
+      */
+    static $attributeMap = array(
+        'return' => 'return'
+    );
+  
+    static function attributeMap() {
+        return self::$attributeMap;
+    }
+
+    /**
+      * Array of attributes to setter functions (for deserialization of responses)
+      * @var string[]
+      */
+    static $setters = array(
+        'return' => 'setReturn'
+    );
+  
+    static function setters() {
+        return self::$setters;
+    }
+
+    /**
+      * Array of attributes to getter functions (for serialization of requests)
+      * @var string[]
+      */
+    static $getters = array(
+        'return' => 'getReturn'
+    );
+  
+    static function getters() {
+        return self::$getters;
+    }
+
+    
+    /**
+      * $return 
+      * @var int
+      */
+    protected $return;
+    
+
+    /**
+     * Constructor
+     * @param mixed[] $data Associated array of property value initalizing the model
+     */
+    public function __construct(array $data = null)
+    {
+        
+        if ($data != null) {
+            $this->return = $data["return"];
+        }
+    }
+    
+    /**
+     * Gets return
+     * @return int
+     */
+    public function getReturn()
+    {
+        return $this->return;
+    }
+  
+    /**
+     * Sets return
+     * @param int $return 
+     * @return $this
+     */
+    public function setReturn($return)
+    {
+        
+        $this->return = $return;
+        return $this;
+    }
+    
+    /**
+     * Returns true if offset exists. False otherwise.
+     * @param  integer $offset Offset 
+     * @return boolean
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->$offset);
+    }
+  
+    /**
+     * Gets offset.
+     * @param  integer $offset Offset 
+     * @return mixed 
+     */
+    public function offsetGet($offset)
+    {
+        return $this->$offset;
+    }
+  
+    /**
+     * Sets value based on offset.
+     * @param  integer $offset Offset 
+     * @param  mixed   $value  Value to be set
+     * @return void
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->$offset = $value;
+    }
+  
+    /**
+     * Unsets offset.
+     * @param  integer $offset Offset 
+     * @return void
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->$offset);
+    }
+  
+    /**
+     * Gets the string presentation of the object
+     * @return string
+     */
+    public function __toString()
+    {
+        if (defined('JSON_PRETTY_PRINT')) {
+            return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this), JSON_PRETTY_PRINT);
+        } else {
+            return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this));
+        }
+    }
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Name.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Name.php
new file mode 100644
index 00000000000..9b52f9a6c00
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Name.php
@@ -0,0 +1,223 @@
+<?php
+/**
+ * Name
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+namespace Swagger\Client\Model;
+
+use \ArrayAccess;
+/**
+ * Name Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class Name implements ArrayAccess
+{
+    /**
+      * Array of property to type mappings. Used for (de)serialization 
+      * @var string[]
+      */
+    static $swaggerTypes = array(
+        'name' => 'int',
+        'snake_case' => 'int'
+    );
+  
+    static function swaggerTypes() {
+        return self::$swaggerTypes;
+    }
+
+    /** 
+      * Array of attributes where the key is the local name, and the value is the original name
+      * @var string[] 
+      */
+    static $attributeMap = array(
+        'name' => 'name',
+        'snake_case' => 'snake_case'
+    );
+  
+    static function attributeMap() {
+        return self::$attributeMap;
+    }
+
+    /**
+      * Array of attributes to setter functions (for deserialization of responses)
+      * @var string[]
+      */
+    static $setters = array(
+        'name' => 'setName',
+        'snake_case' => 'setSnakeCase'
+    );
+  
+    static function setters() {
+        return self::$setters;
+    }
+
+    /**
+      * Array of attributes to getter functions (for serialization of requests)
+      * @var string[]
+      */
+    static $getters = array(
+        'name' => 'getName',
+        'snake_case' => 'getSnakeCase'
+    );
+  
+    static function getters() {
+        return self::$getters;
+    }
+
+    
+    /**
+      * $name 
+      * @var int
+      */
+    protected $name;
+    
+    /**
+      * $snake_case 
+      * @var int
+      */
+    protected $snake_case;
+    
+
+    /**
+     * Constructor
+     * @param mixed[] $data Associated array of property value initalizing the model
+     */
+    public function __construct(array $data = null)
+    {
+        
+        if ($data != null) {
+            $this->name = $data["name"];
+            $this->snake_case = $data["snake_case"];
+        }
+    }
+    
+    /**
+     * Gets name
+     * @return int
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+  
+    /**
+     * Sets name
+     * @param int $name 
+     * @return $this
+     */
+    public function setName($name)
+    {
+        
+        $this->name = $name;
+        return $this;
+    }
+    
+    /**
+     * Gets snake_case
+     * @return int
+     */
+    public function getSnakeCase()
+    {
+        return $this->snake_case;
+    }
+  
+    /**
+     * Sets snake_case
+     * @param int $snake_case 
+     * @return $this
+     */
+    public function setSnakeCase($snake_case)
+    {
+        
+        $this->snake_case = $snake_case;
+        return $this;
+    }
+    
+    /**
+     * Returns true if offset exists. False otherwise.
+     * @param  integer $offset Offset 
+     * @return boolean
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->$offset);
+    }
+  
+    /**
+     * Gets offset.
+     * @param  integer $offset Offset 
+     * @return mixed 
+     */
+    public function offsetGet($offset)
+    {
+        return $this->$offset;
+    }
+  
+    /**
+     * Sets value based on offset.
+     * @param  integer $offset Offset 
+     * @param  mixed   $value  Value to be set
+     * @return void
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->$offset = $value;
+    }
+  
+    /**
+     * Unsets offset.
+     * @param  integer $offset Offset 
+     * @return void
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->$offset);
+    }
+  
+    /**
+     * Gets the string presentation of the object
+     * @return string
+     */
+    public function __toString()
+    {
+        if (defined('JSON_PRETTY_PRINT')) {
+            return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this), JSON_PRETTY_PRINT);
+        } else {
+            return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this));
+        }
+    }
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php
index b803bd7325e..1c114a8392c 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/swagger-api/swagger-codegen
  */
 /**
- *  Copyright 2015 SmartBear Software
+ *  Copyright 2016 SmartBear Software
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -59,6 +59,10 @@ class Order implements ArrayAccess
         'complete' => 'bool'
     );
   
+    static function swaggerTypes() {
+        return self::$swaggerTypes;
+    }
+
     /** 
       * Array of attributes where the key is the local name, and the value is the original name
       * @var string[] 
@@ -72,6 +76,10 @@ class Order implements ArrayAccess
         'complete' => 'complete'
     );
   
+    static function attributeMap() {
+        return self::$attributeMap;
+    }
+
     /**
       * Array of attributes to setter functions (for deserialization of responses)
       * @var string[]
@@ -85,6 +93,10 @@ class Order implements ArrayAccess
         'complete' => 'setComplete'
     );
   
+    static function setters() {
+        return self::$setters;
+    }
+
     /**
       * Array of attributes to getter functions (for serialization of requests)
       * @var string[]
@@ -98,6 +110,10 @@ class Order implements ArrayAccess
         'complete' => 'getComplete'
     );
   
+    static function getters() {
+        return self::$getters;
+    }
+
     
     /**
       * $id 
@@ -142,6 +158,7 @@ class Order implements ArrayAccess
      */
     public function __construct(array $data = null)
     {
+        
         if ($data != null) {
             $this->id = $data["id"];
             $this->pet_id = $data["pet_id"];
@@ -329,9 +346,9 @@ class Order implements ArrayAccess
     public function __toString()
     {
         if (defined('JSON_PRETTY_PRINT')) {
-            return json_encode(get_object_vars($this), JSON_PRETTY_PRINT);
+            return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this), JSON_PRETTY_PRINT);
         } else {
-            return json_encode(get_object_vars($this));
+            return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this));
         }
     }
 }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php
index 6871ea9d9be..39735aaa428 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/swagger-api/swagger-codegen
  */
 /**
- *  Copyright 2015 SmartBear Software
+ *  Copyright 2016 SmartBear Software
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -59,6 +59,10 @@ class Pet implements ArrayAccess
         'status' => 'string'
     );
   
+    static function swaggerTypes() {
+        return self::$swaggerTypes;
+    }
+
     /** 
       * Array of attributes where the key is the local name, and the value is the original name
       * @var string[] 
@@ -72,6 +76,10 @@ class Pet implements ArrayAccess
         'status' => 'status'
     );
   
+    static function attributeMap() {
+        return self::$attributeMap;
+    }
+
     /**
       * Array of attributes to setter functions (for deserialization of responses)
       * @var string[]
@@ -85,6 +93,10 @@ class Pet implements ArrayAccess
         'status' => 'setStatus'
     );
   
+    static function setters() {
+        return self::$setters;
+    }
+
     /**
       * Array of attributes to getter functions (for serialization of requests)
       * @var string[]
@@ -98,6 +110,10 @@ class Pet implements ArrayAccess
         'status' => 'getStatus'
     );
   
+    static function getters() {
+        return self::$getters;
+    }
+
     
     /**
       * $id 
@@ -142,6 +158,7 @@ class Pet implements ArrayAccess
      */
     public function __construct(array $data = null)
     {
+        
         if ($data != null) {
             $this->id = $data["id"];
             $this->category = $data["category"];
@@ -329,9 +346,9 @@ class Pet implements ArrayAccess
     public function __toString()
     {
         if (defined('JSON_PRETTY_PRINT')) {
-            return json_encode(get_object_vars($this), JSON_PRETTY_PRINT);
+            return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this), JSON_PRETTY_PRINT);
         } else {
-            return json_encode(get_object_vars($this));
+            return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this));
         }
     }
 }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/SpecialModelName.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/SpecialModelName.php
new file mode 100644
index 00000000000..0ce073a43aa
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/SpecialModelName.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ * SpecialModelName
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+namespace Swagger\Client\Model;
+
+use \ArrayAccess;
+/**
+ * SpecialModelName Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class SpecialModelName implements ArrayAccess
+{
+    /**
+      * Array of property to type mappings. Used for (de)serialization 
+      * @var string[]
+      */
+    static $swaggerTypes = array(
+        'special_property_name' => 'int'
+    );
+  
+    static function swaggerTypes() {
+        return self::$swaggerTypes;
+    }
+
+    /** 
+      * Array of attributes where the key is the local name, and the value is the original name
+      * @var string[] 
+      */
+    static $attributeMap = array(
+        'special_property_name' => '$special[property.name]'
+    );
+  
+    static function attributeMap() {
+        return self::$attributeMap;
+    }
+
+    /**
+      * Array of attributes to setter functions (for deserialization of responses)
+      * @var string[]
+      */
+    static $setters = array(
+        'special_property_name' => 'setSpecialPropertyName'
+    );
+  
+    static function setters() {
+        return self::$setters;
+    }
+
+    /**
+      * Array of attributes to getter functions (for serialization of requests)
+      * @var string[]
+      */
+    static $getters = array(
+        'special_property_name' => 'getSpecialPropertyName'
+    );
+  
+    static function getters() {
+        return self::$getters;
+    }
+
+    
+    /**
+      * $special_property_name 
+      * @var int
+      */
+    protected $special_property_name;
+    
+
+    /**
+     * Constructor
+     * @param mixed[] $data Associated array of property value initalizing the model
+     */
+    public function __construct(array $data = null)
+    {
+        
+        if ($data != null) {
+            $this->special_property_name = $data["special_property_name"];
+        }
+    }
+    
+    /**
+     * Gets special_property_name
+     * @return int
+     */
+    public function getSpecialPropertyName()
+    {
+        return $this->special_property_name;
+    }
+  
+    /**
+     * Sets special_property_name
+     * @param int $special_property_name 
+     * @return $this
+     */
+    public function setSpecialPropertyName($special_property_name)
+    {
+        
+        $this->special_property_name = $special_property_name;
+        return $this;
+    }
+    
+    /**
+     * Returns true if offset exists. False otherwise.
+     * @param  integer $offset Offset 
+     * @return boolean
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->$offset);
+    }
+  
+    /**
+     * Gets offset.
+     * @param  integer $offset Offset 
+     * @return mixed 
+     */
+    public function offsetGet($offset)
+    {
+        return $this->$offset;
+    }
+  
+    /**
+     * Sets value based on offset.
+     * @param  integer $offset Offset 
+     * @param  mixed   $value  Value to be set
+     * @return void
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->$offset = $value;
+    }
+  
+    /**
+     * Unsets offset.
+     * @param  integer $offset Offset 
+     * @return void
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->$offset);
+    }
+  
+    /**
+     * Gets the string presentation of the object
+     * @return string
+     */
+    public function __toString()
+    {
+        if (defined('JSON_PRETTY_PRINT')) {
+            return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this), JSON_PRETTY_PRINT);
+        } else {
+            return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this));
+        }
+    }
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php
index bcecb32fa7e..129206e9650 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/swagger-api/swagger-codegen
  */
 /**
- *  Copyright 2015 SmartBear Software
+ *  Copyright 2016 SmartBear Software
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -55,6 +55,10 @@ class Tag implements ArrayAccess
         'name' => 'string'
     );
   
+    static function swaggerTypes() {
+        return self::$swaggerTypes;
+    }
+
     /** 
       * Array of attributes where the key is the local name, and the value is the original name
       * @var string[] 
@@ -64,6 +68,10 @@ class Tag implements ArrayAccess
         'name' => 'name'
     );
   
+    static function attributeMap() {
+        return self::$attributeMap;
+    }
+
     /**
       * Array of attributes to setter functions (for deserialization of responses)
       * @var string[]
@@ -73,6 +81,10 @@ class Tag implements ArrayAccess
         'name' => 'setName'
     );
   
+    static function setters() {
+        return self::$setters;
+    }
+
     /**
       * Array of attributes to getter functions (for serialization of requests)
       * @var string[]
@@ -82,6 +94,10 @@ class Tag implements ArrayAccess
         'name' => 'getName'
     );
   
+    static function getters() {
+        return self::$getters;
+    }
+
     
     /**
       * $id 
@@ -102,6 +118,7 @@ class Tag implements ArrayAccess
      */
     public function __construct(array $data = null)
     {
+        
         if ($data != null) {
             $this->id = $data["id"];
             $this->name = $data["name"];
@@ -198,9 +215,9 @@ class Tag implements ArrayAccess
     public function __toString()
     {
         if (defined('JSON_PRETTY_PRINT')) {
-            return json_encode(get_object_vars($this), JSON_PRETTY_PRINT);
+            return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this), JSON_PRETTY_PRINT);
         } else {
-            return json_encode(get_object_vars($this));
+            return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this));
         }
     }
 }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php
index 1650635d8ce..662983d61b9 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/swagger-api/swagger-codegen
  */
 /**
- *  Copyright 2015 SmartBear Software
+ *  Copyright 2016 SmartBear Software
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -61,6 +61,10 @@ class User implements ArrayAccess
         'user_status' => 'int'
     );
   
+    static function swaggerTypes() {
+        return self::$swaggerTypes;
+    }
+
     /** 
       * Array of attributes where the key is the local name, and the value is the original name
       * @var string[] 
@@ -76,6 +80,10 @@ class User implements ArrayAccess
         'user_status' => 'userStatus'
     );
   
+    static function attributeMap() {
+        return self::$attributeMap;
+    }
+
     /**
       * Array of attributes to setter functions (for deserialization of responses)
       * @var string[]
@@ -91,6 +99,10 @@ class User implements ArrayAccess
         'user_status' => 'setUserStatus'
     );
   
+    static function setters() {
+        return self::$setters;
+    }
+
     /**
       * Array of attributes to getter functions (for serialization of requests)
       * @var string[]
@@ -106,6 +118,10 @@ class User implements ArrayAccess
         'user_status' => 'getUserStatus'
     );
   
+    static function getters() {
+        return self::$getters;
+    }
+
     
     /**
       * $id 
@@ -162,6 +178,7 @@ class User implements ArrayAccess
      */
     public function __construct(array $data = null)
     {
+        
         if ($data != null) {
             $this->id = $data["id"];
             $this->username = $data["username"];
@@ -390,9 +407,9 @@ class User implements ArrayAccess
     public function __toString()
     {
         if (defined('JSON_PRETTY_PRINT')) {
-            return json_encode(get_object_vars($this), JSON_PRETTY_PRINT);
+            return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this), JSON_PRETTY_PRINT);
         } else {
-            return json_encode(get_object_vars($this));
+            return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this));
         }
     }
 }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php b/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php
index 04b5cd0861b..e0a0efc03ca 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/swagger-api/swagger-codegen
  */
 /**
- *  Copyright 2015 SmartBear Software
+ *  Copyright 2016 SmartBear Software
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -46,32 +46,32 @@ class ObjectSerializer
 {
 
     /**
-     * Build a JSON POST object
+     * Serialize data
      *
      * @param mixed $data the data to serialize
      *
      * @return string serialized form of $data
      */
-    public function sanitizeForSerialization($data)
+    public static function sanitizeForSerialization($data)
     {
         if (is_scalar($data) || null === $data) {
             $sanitized = $data;
         } elseif ($data instanceof \DateTime) {
-            $sanitized = $data->format(\DateTime::ISO8601);
+            $sanitized = $data->format(\DateTime::ATOM);
         } elseif (is_array($data)) {
             foreach ($data as $property => $value) {
-                $data[$property] = $this->sanitizeForSerialization($value);
+                $data[$property] = self::sanitizeForSerialization($value);
             }
             $sanitized = $data;
         } elseif (is_object($data)) {
             $values = array();
-            foreach (array_keys($data::$swaggerTypes) as $property) {
-                $getter = $data::$getters[$property];
+            foreach (array_keys($data::swaggerTypes()) as $property) {
+                $getter = $data::getters()[$property];
                 if ($data->$getter() !== null) {
-                    $values[$data::$attributeMap[$property]] = $this->sanitizeForSerialization($data->$getter());
+                    $values[$data::attributeMap()[$property]] = self::sanitizeForSerialization($data->$getter());
                 }
             }
-            $sanitized = $values;
+            $sanitized = (object)$values;
         } else {
             $sanitized = (string)$data;
         }
@@ -79,6 +79,23 @@ class ObjectSerializer
         return $sanitized;
     }
 
+    /**
+     * Sanitize filename by removing path.
+     * e.g. ../../sun.gif becomes sun.gif 
+     *
+     * @param string $filename filename to be sanitized
+     *
+     * @return string the sanitized filename
+     */
+    public function sanitizeFilename($filename)
+    {
+        if (preg_match("/.*[\/\\\\](.*)$/", $filename, $match)) {
+            return $match[1];
+        } else {
+            return $filename;
+        }
+    }
+
     /**
      * Take value and turn it into a string suitable for inclusion in
      * the path, by url-encoding.
@@ -136,7 +153,7 @@ class ObjectSerializer
      */
     public function toFormValue($value)
     {
-        if ($value instanceof SplFileObject) {
+        if ($value instanceof \SplFileObject) {
             return $value->getRealPath();
         } else {
             return $this->toString($value);
@@ -155,7 +172,7 @@ class ObjectSerializer
     public function toString($value)
     {
         if ($value instanceof \DateTime) { // datetime in ISO8601 format
-            return $value->format(\DateTime::ISO8601);
+            return $value->format(\DateTime::ATOM);
         } else {
             return $value;
         }
@@ -197,13 +214,14 @@ class ObjectSerializer
     /**
      * Deserialize a JSON string into an object
      *
-     * @param mixed  $data       object or primitive to be deserialized
-     * @param string $class      class name is passed as a string
-     * @param string $httpHeader HTTP headers
+     * @param mixed  $data          object or primitive to be deserialized
+     * @param string $class         class name is passed as a string
+     * @param string $httpHeaders   HTTP headers
+     * @param string $discriminator discriminator if polymorphism is used
      *
      * @return object an instance of $class
      */
-    public function deserialize($data, $class, $httpHeader=null)
+    public static function deserialize($data, $class, $httpHeaders=null, $discriminator=null)
     {
         if (null === $data) {
             $deserialized = null;
@@ -214,25 +232,38 @@ class ObjectSerializer
                 $subClass_array = explode(',', $inner, 2);
                 $subClass = $subClass_array[1];
                 foreach ($data as $key => $value) {
-                    $deserialized[$key] = $this->deserialize($value, $subClass);
+                    $deserialized[$key] = self::deserialize($value, $subClass, null, $discriminator);
                 }
             }
         } elseif (strcasecmp(substr($class, -2), '[]') == 0) {
             $subClass = substr($class, 0, -2);
             $values = array();
             foreach ($data as $key => $value) {
-                $values[] = $this->deserialize($value, $subClass);
+                $values[] = self::deserialize($value, $subClass, null, $discriminator);
             }
             $deserialized = $values;
+        } elseif ($class === 'object') {
+            settype($data, 'array');
+            $deserialized = $data;
         } elseif ($class === '\DateTime') {
-            $deserialized = new \DateTime($data);
+            // Some API's return an invalid, empty string as a
+            // date-time property. DateTime::__construct() will return
+            // the current time for empty input which is probably not
+            // what is meant. The invalid empty string is probably to
+            // be interpreted as a missing field/value. Let's handle
+            // this graceful.
+            if (!empty($data)) {
+                $deserialized = new \DateTime($data);
+            } else {
+                $deserialized = null;
+            }
         } elseif (in_array($class, array('integer', 'int', 'void', 'number', 'object', 'double', 'float', 'byte', 'DateTime', 'string', 'mixed', 'boolean', 'bool'))) {
             settype($data, $class);
             $deserialized = $data;
         } elseif ($class === '\SplFileObject') {
             // determine file name
-            if (array_key_exists('Content-Disposition', $httpHeaders) && preg_match('/inline; filename=[\'"]?([^\'"\s]+)[\'"]?$/i', $httpHeader['Content-Disposition'], $match)) {
-                $filename = Configuration::getDefaultConfiguration()->getTempFolderPath().$match[1];
+            if (array_key_exists('Content-Disposition', $httpHeaders) && preg_match('/inline; filename=[\'"]?([^\'"\s]+)[\'"]?$/i', $httpHeaders['Content-Disposition'], $match)) {
+                $filename = Configuration::getDefaultConfiguration()->getTempFolderPath() . sanitizeFilename($match[1]);
             } else {
                 $filename = tempnam(Configuration::getDefaultConfiguration()->getTempFolderPath(), '');
             }
@@ -241,17 +272,24 @@ class ObjectSerializer
             error_log("[INFO] Written $byte_written byte to $filename. Please move the file to a proper folder or delete the temp file after processing.\n", 3, Configuration::getDefaultConfiguration()->getDebugFile());
       
         } else {
+            // If a discriminator is defined and points to a valid subclass, use it.
+            if (!empty($discriminator) && isset($data->{$discriminator}) && is_string($data->{$discriminator})) {
+                $subclass = '\Swagger\Client\Model\\' . $data->{$discriminator};
+                if (is_subclass_of($subclass, $class)) {
+                    $class = $subclass;
+                }
+            }
             $instance = new $class();
-            foreach ($instance::$swaggerTypes as $property => $type) {
-                $propertySetter = $instance::$setters[$property];
+            foreach ($instance::swaggerTypes() as $property => $type) {
+                $propertySetter = $instance::setters()[$property];
      
-                if (!isset($propertySetter) || !isset($data->{$instance::$attributeMap[$property]})) {
+                if (!isset($propertySetter) || !isset($data->{$instance::attributeMap()[$property]})) {
                     continue;
                 }
      
-                $propertyValue = $data->{$instance::$attributeMap[$property]};
+                $propertyValue = $data->{$instance::attributeMap()[$property]};
                 if (isset($propertyValue)) {
-                    $instance->$propertySetter($this->deserialize($propertyValue, $type));
+                    $instance->$propertySetter(self::deserialize($propertyValue, $type, null, $discriminator));
                 }
             }
             $deserialized = $instance;
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/AnimalTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/AnimalTest.php
new file mode 100644
index 00000000000..f66fc54f211
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/AnimalTest.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * AnimalTest
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Please update the test case below to test the model.
+ */
+
+namespace Swagger\Client\Model;
+
+/**
+ * AnimalTest Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class AnimalTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    /**
+     * Test Animal
+     */
+    public function testAnimal() {
+
+    }
+
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/CatTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/CatTest.php
new file mode 100644
index 00000000000..c6fddff26eb
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/CatTest.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * CatTest
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Please update the test case below to test the model.
+ */
+
+namespace Swagger\Client\Model;
+
+/**
+ * CatTest Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class CatTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    /**
+     * Test Cat
+     */
+    public function testCat() {
+
+    }
+
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/CategoryTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/CategoryTest.php
new file mode 100644
index 00000000000..26214963d3f
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/CategoryTest.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * CategoryTest
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Please update the test case below to test the model.
+ */
+
+namespace Swagger\Client\Model;
+
+/**
+ * CategoryTest Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class CategoryTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    /**
+     * Test Category
+     */
+    public function testCategory() {
+
+    }
+
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/DogTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/DogTest.php
new file mode 100644
index 00000000000..7bd00617167
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/DogTest.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * DogTest
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Please update the test case below to test the model.
+ */
+
+namespace Swagger\Client\Model;
+
+/**
+ * DogTest Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class DogTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    /**
+     * Test Dog
+     */
+    public function testDog() {
+
+    }
+
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/InlineResponse200Test.php b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/InlineResponse200Test.php
new file mode 100644
index 00000000000..1bd1c822700
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/InlineResponse200Test.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * InlineResponse200Test
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Please update the test case below to test the model.
+ */
+
+namespace Swagger\Client\Model;
+
+/**
+ * InlineResponse200Test Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class InlineResponse200Test extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    /**
+     * Test InlineResponse200
+     */
+    public function testInlineResponse200() {
+
+    }
+
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/Model200ResponseTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/Model200ResponseTest.php
new file mode 100644
index 00000000000..b9c7b167d54
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/Model200ResponseTest.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Model200ResponseTest
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Please update the test case below to test the model.
+ */
+
+namespace Swagger\Client\Model;
+
+/**
+ * Model200ResponseTest Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class Model200ResponseTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    /**
+     * Test Model200Response
+     */
+    public function testModel200Response() {
+
+    }
+
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/ModelReturnTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/ModelReturnTest.php
new file mode 100644
index 00000000000..b42efd5ef57
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/ModelReturnTest.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * ModelReturnTest
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Please update the test case below to test the model.
+ */
+
+namespace Swagger\Client\Model;
+
+/**
+ * ModelReturnTest Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class ModelReturnTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    /**
+     * Test ModelReturn
+     */
+    public function testModelReturn() {
+
+    }
+
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/NameTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/NameTest.php
new file mode 100644
index 00000000000..17a22692df8
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/NameTest.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * NameTest
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Please update the test case below to test the model.
+ */
+
+namespace Swagger\Client\Model;
+
+/**
+ * NameTest Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class NameTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    /**
+     * Test Name
+     */
+    public function testName() {
+
+    }
+
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/OrderTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/OrderTest.php
new file mode 100644
index 00000000000..abfbe53d48f
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/OrderTest.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * OrderTest
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Please update the test case below to test the model.
+ */
+
+namespace Swagger\Client\Model;
+
+/**
+ * OrderTest Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class OrderTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    /**
+     * Test Order
+     */
+    public function testOrder() {
+
+    }
+
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/PetApiTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/PetApiTest.php
new file mode 100644
index 00000000000..6cc0a6e217f
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/PetApiTest.php
@@ -0,0 +1,178 @@
+<?php
+/**
+ * PetApiTest
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+ * NOTE: This class is auto generated by the swagger code generator program. 
+ * https://github.com/swagger-api/swagger-codegen 
+ * Please update the test case below to test the endpoint.
+ */
+
+namespace Swagger\Client\Api;
+
+use \Swagger\Client\Configuration;
+use \Swagger\Client\ApiClient;
+use \Swagger\Client\ApiException;
+use \Swagger\Client\ObjectSerializer;
+
+/**
+ * PetApiTest Class Doc Comment
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+class PetApiTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    
+    /**
+     * Test case for addPet
+     *
+     * Add a new pet to the store
+     *
+     */
+    public function test_addPet() {
+
+    }
+    
+    /**
+     * Test case for addPetUsingByteArray
+     *
+     * Fake endpoint to test byte array in body parameter for adding a new pet to the store
+     *
+     */
+    public function test_addPetUsingByteArray() {
+
+    }
+    
+    /**
+     * Test case for deletePet
+     *
+     * Deletes a pet
+     *
+     */
+    public function test_deletePet() {
+
+    }
+    
+    /**
+     * Test case for findPetsByStatus
+     *
+     * Finds Pets by status
+     *
+     */
+    public function test_findPetsByStatus() {
+
+    }
+    
+    /**
+     * Test case for findPetsByTags
+     *
+     * Finds Pets by tags
+     *
+     */
+    public function test_findPetsByTags() {
+
+    }
+    
+    /**
+     * Test case for getPetById
+     *
+     * Find pet by ID
+     *
+     */
+    public function test_getPetById() {
+
+    }
+    
+    /**
+     * Test case for getPetByIdInObject
+     *
+     * Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
+     *
+     */
+    public function test_getPetByIdInObject() {
+
+    }
+    
+    /**
+     * Test case for petPetIdtestingByteArraytrueGet
+     *
+     * Fake endpoint to test byte array return by 'Find pet by ID'
+     *
+     */
+    public function test_petPetIdtestingByteArraytrueGet() {
+
+    }
+    
+    /**
+     * Test case for updatePet
+     *
+     * Update an existing pet
+     *
+     */
+    public function test_updatePet() {
+
+    }
+    
+    /**
+     * Test case for updatePetWithForm
+     *
+     * Updates a pet in the store with form data
+     *
+     */
+    public function test_updatePetWithForm() {
+
+    }
+    
+    /**
+     * Test case for uploadFile
+     *
+     * uploads an image
+     *
+     */
+    public function test_uploadFile() {
+
+    }
+    
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/PetTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/PetTest.php
new file mode 100644
index 00000000000..571e17f56cb
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/PetTest.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * PetTest
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Please update the test case below to test the model.
+ */
+
+namespace Swagger\Client\Model;
+
+/**
+ * PetTest Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class PetTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    /**
+     * Test Pet
+     */
+    public function testPet() {
+
+    }
+
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/SpecialModelNameTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/SpecialModelNameTest.php
new file mode 100644
index 00000000000..542ffa68a13
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/SpecialModelNameTest.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * SpecialModelNameTest
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Please update the test case below to test the model.
+ */
+
+namespace Swagger\Client\Model;
+
+/**
+ * SpecialModelNameTest Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class SpecialModelNameTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    /**
+     * Test SpecialModelName
+     */
+    public function testSpecialModelName() {
+
+    }
+
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/StoreApiTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/StoreApiTest.php
new file mode 100644
index 00000000000..0d6fdfd9d8c
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/StoreApiTest.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * StoreApiTest
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+ * NOTE: This class is auto generated by the swagger code generator program. 
+ * https://github.com/swagger-api/swagger-codegen 
+ * Please update the test case below to test the endpoint.
+ */
+
+namespace Swagger\Client\Api;
+
+use \Swagger\Client\Configuration;
+use \Swagger\Client\ApiClient;
+use \Swagger\Client\ApiException;
+use \Swagger\Client\ObjectSerializer;
+
+/**
+ * StoreApiTest Class Doc Comment
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+class StoreApiTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    
+    /**
+     * Test case for deleteOrder
+     *
+     * Delete purchase order by ID
+     *
+     */
+    public function test_deleteOrder() {
+
+    }
+    
+    /**
+     * Test case for findOrdersByStatus
+     *
+     * Finds orders by status
+     *
+     */
+    public function test_findOrdersByStatus() {
+
+    }
+    
+    /**
+     * Test case for getInventory
+     *
+     * Returns pet inventories by status
+     *
+     */
+    public function test_getInventory() {
+
+    }
+    
+    /**
+     * Test case for getInventoryInObject
+     *
+     * Fake endpoint to test arbitrary object return by 'Get inventory'
+     *
+     */
+    public function test_getInventoryInObject() {
+
+    }
+    
+    /**
+     * Test case for getOrderById
+     *
+     * Find purchase order by ID
+     *
+     */
+    public function test_getOrderById() {
+
+    }
+    
+    /**
+     * Test case for placeOrder
+     *
+     * Place an order for a pet
+     *
+     */
+    public function test_placeOrder() {
+
+    }
+    
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/TagTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/TagTest.php
new file mode 100644
index 00000000000..34536dc0d4c
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/TagTest.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * TagTest
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Please update the test case below to test the model.
+ */
+
+namespace Swagger\Client\Model;
+
+/**
+ * TagTest Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class TagTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    /**
+     * Test Tag
+     */
+    public function testTag() {
+
+    }
+
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/UserApiTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/UserApiTest.php
new file mode 100644
index 00000000000..8eddc284528
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/UserApiTest.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * UserApiTest
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+ * NOTE: This class is auto generated by the swagger code generator program. 
+ * https://github.com/swagger-api/swagger-codegen 
+ * Please update the test case below to test the endpoint.
+ */
+
+namespace Swagger\Client\Api;
+
+use \Swagger\Client\Configuration;
+use \Swagger\Client\ApiClient;
+use \Swagger\Client\ApiException;
+use \Swagger\Client\ObjectSerializer;
+
+/**
+ * UserApiTest Class Doc Comment
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+class UserApiTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    
+    /**
+     * Test case for createUser
+     *
+     * Create user
+     *
+     */
+    public function test_createUser() {
+
+    }
+    
+    /**
+     * Test case for createUsersWithArrayInput
+     *
+     * Creates list of users with given input array
+     *
+     */
+    public function test_createUsersWithArrayInput() {
+
+    }
+    
+    /**
+     * Test case for createUsersWithListInput
+     *
+     * Creates list of users with given input array
+     *
+     */
+    public function test_createUsersWithListInput() {
+
+    }
+    
+    /**
+     * Test case for deleteUser
+     *
+     * Delete user
+     *
+     */
+    public function test_deleteUser() {
+
+    }
+    
+    /**
+     * Test case for getUserByName
+     *
+     * Get user by user name
+     *
+     */
+    public function test_getUserByName() {
+
+    }
+    
+    /**
+     * Test case for loginUser
+     *
+     * Logs user into the system
+     *
+     */
+    public function test_loginUser() {
+
+    }
+    
+    /**
+     * Test case for logoutUser
+     *
+     * Logs out current logged in user session
+     *
+     */
+    public function test_logoutUser() {
+
+    }
+    
+    /**
+     * Test case for updateUser
+     *
+     * Updated user
+     *
+     */
+    public function test_updateUser() {
+
+    }
+    
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/UserTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/UserTest.php
new file mode 100644
index 00000000000..ffde69ecf2f
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/UserTest.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * UserTest
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Please update the test case below to test the model.
+ */
+
+namespace Swagger\Client\Model;
+
+/**
+ * UserTest Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class UserTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    /**
+     * Test User
+     */
+    public function testUser() {
+
+    }
+
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/petstore b/samples/client/petstore/php/SwaggerClient-php/petstore
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/samples/client/petstore/php/SwaggerClient-php/tests/ObjectSerializerTest.php b/samples/client/petstore/php/SwaggerClient-php/tests/ObjectSerializerTest.php
new file mode 100644
index 00000000000..14bbc0de913
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/tests/ObjectSerializerTest.php
@@ -0,0 +1,29 @@
+<?php
+
+require_once('autoload.php');
+
+// test object serializer
+class ObjectSerializerTest extends \PHPUnit_Framework_TestCase
+{
+    // test sanitizeFilename
+    public function testSanitizeFilename()
+    {
+        // initialize the API client
+        $s = new Swagger\Client\ObjectSerializer();
+
+        $this->assertSame("sun.gif", $s->sanitizeFilename("sun.gif"));
+        $this->assertSame("sun.gif", $s->sanitizeFilename("../sun.gif"));
+        $this->assertSame("sun.gif", $s->sanitizeFilename("/var/tmp/sun.gif"));
+        $this->assertSame("sun.gif", $s->sanitizeFilename("./sun.gif"));
+        
+        $this->assertSame("sun", $s->sanitizeFilename("sun"));
+        $this->assertSame("sun.gif", $s->sanitizeFilename("..\sun.gif"));
+        $this->assertSame("sun.gif", $s->sanitizeFilename("\var\tmp\sun.gif"));
+        $this->assertSame("sun.gif", $s->sanitizeFilename("c:\var\tmp\sun.gif"));
+        $this->assertSame("sun.gif", $s->sanitizeFilename(".\sun.gif"));
+    }
+  
+}
+
+?>
+
diff --git a/samples/client/petstore/php/SwaggerClient-php/tests/OrderApiTest.php b/samples/client/petstore/php/SwaggerClient-php/tests/OrderApiTest.php
index 3eb0d11a9b2..51b82a695d6 100644
--- a/samples/client/petstore/php/SwaggerClient-php/tests/OrderApiTest.php
+++ b/samples/client/petstore/php/SwaggerClient-php/tests/OrderApiTest.php
@@ -45,8 +45,7 @@ class OrderApiTest extends \PHPUnit_Framework_TestCase
   "complete": false
 }
 ORDER;
-        $serializer = new Swagger\Client\ObjectSerializer;
-        $order = $serializer->deserialize(json_decode($order_json), 'Swagger\Client\Model\Order');
+        $order = \Swagger\Client\ObjectSerializer::deserialize(json_decode($order_json), 'Swagger\Client\Model\Order');
         
         $this->assertInstanceOf('Swagger\Client\Model\Order', $order);
         $this->assertSame(10, $order->getId());
@@ -57,6 +56,64 @@ ORDER;
         $this->assertSame(false, $order->getComplete());
     }
   
+    // test deseralization of array of array of order
+    public function testDeserializationOfArrayOfArrayOfOrder()
+    {
+        $order_json = <<<ORDER
+[[{
+  "id": 10,
+  "petId": 20,
+  "quantity": 30,
+  "shipDate": "2015-08-22T07:13:36.613Z",
+  "status": "placed",
+  "complete": false
+}]]
+ORDER;
+        $order = \Swagger\Client\ObjectSerializer::deserialize(json_decode($order_json), 'Swagger\Client\Model\Order[][]');
+
+        $this->assertArrayHasKey(0, $order); 
+        $this->assertArrayHasKey(0, $order[0]);
+        $_order = $order[0][0];
+        $this->assertInstanceOf('Swagger\Client\Model\Order', $_order);
+        $this->assertSame(10, $_order->getId());
+        $this->assertSame(20, $_order->getPetId());
+        $this->assertSame(30, $_order->getQuantity());
+        $this->assertTrue(new DateTime("2015-08-22T07:13:36.613Z") == $_order->getShipDate());
+        $this->assertSame("placed", $_order->getStatus());
+        $this->assertSame(false, $_order->getComplete());
+    }
+
+    // test deseralization of map of map of order
+    public function testDeserializationOfMapOfMapOfOrder()
+    {
+        $order_json = <<<ORDER
+{
+  "test": {
+    "test2": {
+      "id": 10,
+      "petId": 20,
+      "quantity": 30,
+      "shipDate": "2015-08-22T07:13:36.613Z",
+      "status": "placed",
+      "complete": false
+    }
+  }
+}
+ORDER;
+        $order = \Swagger\Client\ObjectSerializer::deserialize(json_decode($order_json), 'map[string,map[string,\Swagger\Client\Model\Order]]');
+
+        $this->assertArrayHasKey('test', $order); 
+        $this->assertArrayHasKey('test2', $order['test']);
+        $_order = $order['test']['test2'];
+        $this->assertInstanceOf('Swagger\Client\Model\Order', $_order);
+        $this->assertSame(10, $_order->getId());
+        $this->assertSame(20, $_order->getPetId());
+        $this->assertSame(30, $_order->getQuantity());
+        $this->assertTrue(new DateTime("2015-08-22T07:13:36.613Z") == $_order->getShipDate());
+        $this->assertSame("placed", $_order->getStatus());
+        $this->assertSame(false, $_order->getComplete());
+    }
+
 }
 
 ?>
diff --git a/samples/client/petstore/php/SwaggerClient-php/tests/PetApiTest.php b/samples/client/petstore/php/SwaggerClient-php/tests/PetApiTest.php
index c81b07b38fd..3af1064f711 100644
--- a/samples/client/petstore/php/SwaggerClient-php/tests/PetApiTest.php
+++ b/samples/client/petstore/php/SwaggerClient-php/tests/PetApiTest.php
@@ -2,259 +2,405 @@
 
 require_once('autoload.php');
 
+// increase memory limit to avoid fatal error due to findPetByStatus
+// returning a lot of data
+ini_set('memory_limit', '256M');
+
 class PetApiTest extends \PHPUnit_Framework_TestCase
 {
 
-  // add a new pet (id 10005) to ensure the pet object is available for all the tests
-  public static function setUpBeforeClass() {
-    // for error reporting (need to run with php5.3 to get no warning)
-    //ini_set('display_errors', 1);
-    //error_reporting(~0);
-    // when running with php5.5, comment out below to skip the warning about
-    // using @ to handle file upload
-    //ini_set('display_startup_errors',1);
-    //ini_set('display_errors',1);
-    //error_reporting(-1);
-
-    // enable debugging 
-    //Swagger\Client\Configuration::$debug = true;
-
-    // skip initializing the API client as it should be automatic
-    //$api_client = new Swagger\Client\ApiClient('http://petstore.swagger.io/v2');
-    // new pet
-    $new_pet_id = 10005;
-    $new_pet = new Swagger\Client\Model\Pet;
-    $new_pet->setId($new_pet_id);
-    $new_pet->setName("PHP Unit Test");
-    // new tag
-    $tag= new Swagger\Client\Model\Tag;
-    $tag->setId($new_pet_id); // use the same id as pet
-    $tag->setName("test php tag");
-    // new category
-    $category = new Swagger\Client\Model\Category;
-    $category->setId($new_pet_id); // use the same id as pet
-    $category->setName("test php category");
-
-    $new_pet->setTags(array($tag));
-    $new_pet->setCategory($category);
-
-    $pet_api = new Swagger\Client\Api\PetAPI();
-    // add a new pet (model)
-    $add_response = $pet_api->addPet($new_pet);
-  }
-
-  // test static functions defined in ApiClient
-  public function testApiClient()
-  { 
-    // test selectHeaderAccept
-    $api_client = new Swagger\Client\ApiClient();
-    $this->assertSame('application/json', $api_client->selectHeaderAccept(array('application/xml','application/json')));
-    $this->assertSame(NULL, $api_client->selectHeaderAccept(array()));
-    $this->assertSame('application/yaml,application/xml', $api_client->selectHeaderAccept(array('application/yaml','application/xml')));
-   
-    // test selectHeaderContentType
-    $this->assertSame('application/json', $api_client->selectHeaderContentType(array('application/xml','application/json')));
-    $this->assertSame('application/json', $api_client->selectHeaderContentType(array()));
-    $this->assertSame('application/yaml,application/xml', $api_client->selectHeaderContentType(array('application/yaml','application/xml')));
-
-    // test addDefaultHeader and getDefaultHeader
-    $api_client->getConfig()->addDefaultHeader('test1', 'value1');
-    $api_client->getConfig()->addDefaultHeader('test2', 200);
-    $defaultHeader = $api_client->getConfig()->getDefaultHeaders();
-    $this->assertSame('value1', $defaultHeader['test1']);
-    $this->assertSame(200, $defaultHeader['test2']);
-
-    // test deleteDefaultHeader
-    $api_client->getConfig()->deleteDefaultHeader('test2');
-    $defaultHeader = $api_client->getConfig()->getDefaultHeaders();
-    $this->assertFalse(isset($defaultHeader['test2']));
-
-    $pet_api2 = new Swagger\Client\Api\PetAPI();
-    $config3 = new Swagger\Client\Configuration();
-    $apiClient3 = new Swagger\Client\ApiClient($config3);
-    $apiClient3->getConfig()->setUserAgent('api client 3');
-    $config4 = new Swagger\Client\Configuration();
-    $apiClient4 = new Swagger\Client\ApiClient($config4);
-    $apiClient4->getConfig()->setUserAgent('api client 4');
-    $pet_api3 = new Swagger\Client\Api\PetAPI($apiClient3);
-
-    // 2 different api clients are not the same 
-    $this->assertNotEquals($apiClient3, $apiClient4);
-    // customied pet api not using the old pet api's api client
-    $this->assertNotEquals($pet_api2->getApiClient(), $pet_api3->getApiClient());
-
-    // test access token
-    $api_client->getConfig()->setAccessToken("testing_only");
-    $this->assertSame('testing_only', $api_client->getConfig()->getAccessToken());
-  }
-
-  // test getPetById with a Pet object (id 10005)
-  public function testGetPetById()
-  {
-    // initialize the API client without host
-    $pet_id = 10005;  // ID of pet that needs to be fetched
-    $pet_api = new Swagger\Client\Api\PetAPI();
-    $pet_api->getApiClient()->getConfig()->setApiKey('api_key', '111222333444555');
-    // return Pet (model)
-    $response = $pet_api->getPetById($pet_id);
-    $this->assertSame($response->getId(), $pet_id);
-    $this->assertSame($response->getName(), 'PHP Unit Test');
-    $this->assertSame($response->getCategory()->getId(), $pet_id);
-    $this->assertSame($response->getCategory()->getName(), 'test php category');
-    $this->assertSame($response->getTags()[0]->getId(), $pet_id);
-    $this->assertSame($response->getTags()[0]->getName(), 'test php tag');
-  }
-
-  // test getPetById with a Pet object (id 10005)
-  public function testGetPetByIdWithHttpInfo()
-  {
-    // initialize the API client without host
-    $pet_id = 10005;  // ID of pet that needs to be fetched
-    $pet_api = new Swagger\Client\Api\PetAPI();
-    $pet_api->getApiClient()->getConfig()->setApiKey('api_key', '111222333444555');
-    // return Pet (model)
-    list($response, $status_code, $response_headers) = $pet_api->getPetByIdWithHttpInfo($pet_id);
-    $this->assertSame($response->getId(), $pet_id);
-    $this->assertSame($response->getName(), 'PHP Unit Test');
-    $this->assertSame($response->getCategory()->getId(), $pet_id);
-    $this->assertSame($response->getCategory()->getName(), 'test php category');
-    $this->assertSame($response->getTags()[0]->getId(), $pet_id);
-    $this->assertSame($response->getTags()[0]->getName(), 'test php tag');
-    $this->assertSame($status_code, 200);
-    $this->assertSame($response_headers['Content-Type'], 'application/json');
-  }
-
-  // test getPetByStatus and verify by the "id" of the response
-  public function testFindPetByStatus()
-  {
-    // initialize the API client
-    $config = (new Swagger\Client\Configuration())->setHost('http://petstore.swagger.io/v2');
-    $api_client = new Swagger\Client\ApiClient($config);
-    $pet_api = new Swagger\Client\Api\PetAPI($api_client);
-    // return Pet (model)
-    $response = $pet_api->findPetsByStatus("available");
-    $this->assertGreaterThan(0, count($response)); // at least one object returned
-    $this->assertSame(get_class($response[0]), "Swagger\\Client\\Model\\Pet"); // verify the object is Pet
-    // loop through result to ensure status is "available" 
-    foreach ($response as $_pet) {
-      $this->assertSame($_pet['status'], "available");
+    // add a new pet (id 10005) to ensure the pet object is available for all the tests
+    public static function setUpBeforeClass() {
+        // for error reporting (need to run with php5.3 to get no warning)
+        //ini_set('display_errors', 1);
+        //error_reporting(~0);
+        // when running with php5.5, comment out below to skip the warning about
+        // using @ to handle file upload
+        //ini_set('display_startup_errors',1);
+        //ini_set('display_errors',1);
+        //error_reporting(-1);
+  
+        // enable debugging 
+        //Swagger\Client\Configuration::$debug = true;
+  
+        // skip initializing the API client as it should be automatic
+        //$api_client = new Swagger\Client\ApiClient('http://petstore.swagger.io/v2');
+        // new pet
+        $new_pet_id = 10005;
+        $new_pet = new Swagger\Client\Model\Pet;
+        $new_pet->setId($new_pet_id);
+        $new_pet->setName("PHP Unit Test");
+        $new_pet->setPhotoUrls(array("http://test_php_unit_test.com"));
+        // new tag
+        $tag= new Swagger\Client\Model\Tag;
+        $tag->setId($new_pet_id); // use the same id as pet
+        $tag->setName("test php tag");
+        // new category
+        $category = new Swagger\Client\Model\Category;
+        $category->setId($new_pet_id); // use the same id as pet
+        $category->setName("test php category");
+  
+        $new_pet->setTags(array($tag));
+        $new_pet->setCategory($category);
+  
+        $pet_api = new Swagger\Client\Api\PetApi();
+        // add a new pet (model)
+        $add_response = $pet_api->addPet($new_pet);
+    }
+  
+    // test static functions defined in ApiClient
+    public function testApiClient()
+    { 
+        // test selectHeaderAccept
+        $api_client = new Swagger\Client\ApiClient();
+        $this->assertSame('application/json', $api_client->selectHeaderAccept(array('application/xml','application/json')));
+        $this->assertSame(NULL, $api_client->selectHeaderAccept(array()));
+        $this->assertSame('application/yaml,application/xml', $api_client->selectHeaderAccept(array('application/yaml','application/xml')));
+       
+        // test selectHeaderContentType
+        $this->assertSame('application/json', $api_client->selectHeaderContentType(array('application/xml','application/json')));
+        $this->assertSame('application/json', $api_client->selectHeaderContentType(array()));
+        $this->assertSame('application/yaml,application/xml', $api_client->selectHeaderContentType(array('application/yaml','application/xml')));
+  
+        // test addDefaultHeader and getDefaultHeader
+        $api_client->getConfig()->addDefaultHeader('test1', 'value1');
+        $api_client->getConfig()->addDefaultHeader('test2', 200);
+        $defaultHeader = $api_client->getConfig()->getDefaultHeaders();
+        $this->assertSame('value1', $defaultHeader['test1']);
+        $this->assertSame(200, $defaultHeader['test2']);
+  
+        // test deleteDefaultHeader
+        $api_client->getConfig()->deleteDefaultHeader('test2');
+        $defaultHeader = $api_client->getConfig()->getDefaultHeaders();
+        $this->assertFalse(isset($defaultHeader['test2']));
+  
+        $pet_api2 = new Swagger\Client\Api\PetApi();
+        $config3 = new Swagger\Client\Configuration();
+        $apiClient3 = new Swagger\Client\ApiClient($config3);
+        $apiClient3->getConfig()->setUserAgent('api client 3');
+        $config4 = new Swagger\Client\Configuration();
+        $apiClient4 = new Swagger\Client\ApiClient($config4);
+        $apiClient4->getConfig()->setUserAgent('api client 4');
+        $pet_api3 = new Swagger\Client\Api\PetApi($apiClient3);
+  
+        // 2 different api clients are not the same 
+        $this->assertNotEquals($apiClient3, $apiClient4);
+        // customied pet api not using the old pet api's api client
+        $this->assertNotEquals($pet_api2->getApiClient(), $pet_api3->getApiClient());
+  
+        // test access token
+        $api_client->getConfig()->setAccessToken("testing_only");
+        $this->assertSame('testing_only', $api_client->getConfig()->getAccessToken());
+    }
+  
+    // test getPetById with a Pet object (id 10005)
+    public function testGetPetById()
+    {
+        // initialize the API client without host
+        $pet_id = 10005;  // ID of pet that needs to be fetched
+        $pet_api = new Swagger\Client\Api\PetApi();
+        $pet_api->getApiClient()->getConfig()->setApiKey('api_key', '111222333444555');
+        // return Pet (model)
+        $response = $pet_api->getPetById($pet_id);
+        $this->assertSame($response->getId(), $pet_id);
+        $this->assertSame($response->getName(), 'PHP Unit Test');
+        $this->assertSame($response->getPhotoUrls()[0], 'http://test_php_unit_test.com');
+        $this->assertSame($response->getCategory()->getId(), $pet_id);
+        $this->assertSame($response->getCategory()->getName(), 'test php category');
+        $this->assertSame($response->getTags()[0]->getId(), $pet_id);
+        $this->assertSame($response->getTags()[0]->getName(), 'test php tag');
     }
-    // test invalid status 
-    $response = $pet_api->findPetsByStatus("unknown_and_incorrect_status");
-    $this->assertSame(count($response), 0); // confirm no object returned
-  }
 
-  // test updatePet (model/json)and verify by the "id" of the response
-  public function testUpdatePet()
-  {
-    // initialize the API client
-    $config = (new Swagger\Client\Configuration())->setHost('http://petstore.swagger.io/v2');
-    $api_client = new Swagger\Client\ApiClient($config);
-    $pet_id = 10001;  // ID of pet that needs to be fetched
-    $pet_api = new Swagger\Client\Api\PetAPI($api_client);
-    // create updated pet object
-    $updated_pet = new Swagger\Client\Model\Pet;
-    $updated_pet->setId($pet_id);
-    $updated_pet->setName('updatePet'); // new name
-    $updated_pet->setStatus('pending'); // new status
-    // update Pet (model/json)
-    $update_response = $pet_api->updatePet($updated_pet);
-    // return nothing (void)
-    $this->assertSame($update_response, NULL);
-    // verify updated Pet
-    $response = $pet_api->getPetById($pet_id);
-    $this->assertSame($response->getId(), $pet_id);
-    $this->assertSame($response->getStatus(), 'pending');
-    $this->assertSame($response->getName(), 'updatePet');
-  }
+    // test getPetById with a Pet object (id 10005)
+    public function testGetPetByIdInObject()
+    {
+        // initialize the API client without host
+        $pet_id = 10005;  // ID of pet that needs to be fetched
+        $pet_api = new Swagger\Client\Api\PetApi();
+        $pet_api->getApiClient()->getConfig()->setApiKey('api_key', '111222333444555');
+        // return Pet (inline model)
+        $response = $pet_api->getPetByIdInObject($pet_id);
+        $this->assertInstanceOf('Swagger\Client\Model\InlineResponse200', $response);
+        $this->assertSame($response->getId(), $pet_id);
+        $this->assertSame($response->getName(), 'PHP Unit Test');
+        $this->assertSame($response->getPhotoUrls()[0], 'http://test_php_unit_test.com');
 
-  // test updatePetWithFormWithHttpInfo and verify by the "name" of the response
-  public function testUpdatePetWithFormWithHttpInfo()
-  {
-    // initialize the API client
-    $config = (new Swagger\Client\Configuration())->setHost('http://petstore.swagger.io/v2');
-    $api_client = new Swagger\Client\ApiClient($config);
-    $pet_id = 10001;  // ID of pet that needs to be fetched
-    $pet_api = new Swagger\Client\Api\PetAPI($api_client);
-    // update Pet (form)
-    list($update_response, $status_code, $http_headers) = $pet_api->updatePetWithFormWithHttpInfo($pet_id, 'update pet with form with http info');
-    // return nothing (void)
-    $this->assertNull($update_response);
-    $this->assertSame($status_code, 200);
-    $this->assertSame($http_headers['Content-Type'], 'application/json');
-    $response = $pet_api->getPetById($pet_id);
-    $this->assertSame($response->getId(), $pet_id);
-    $this->assertSame($response->getName(), 'update pet with form with http info');
-  }
+        // category is type "object"
+        $this->assertInternalType('array', $response->getCategory());
+        $this->assertSame($response->getCategory()['id'], $pet_id);
+        $this->assertSame($response->getCategory()['name'], 'test php category');
 
-  // test updatePetWithForm and verify by the "name" and "status" of the response
-  public function testUpdatePetWithForm()
-  {
-    // initialize the API client
-    $config = (new Swagger\Client\Configuration())->setHost('http://petstore.swagger.io/v2');
-    $api_client = new Swagger\Client\ApiClient($config);
-    $pet_id = 10001;  // ID of pet that needs to be fetched
-    $pet_api = new Swagger\Client\Api\PetAPI($api_client);
-    // update Pet (form)
-    $update_response = $pet_api->updatePetWithForm($pet_id, 'update pet with form', 'sold');
-    // return nothing (void)
-    $this->assertSame($update_response, NULL);
-    $response = $pet_api->getPetById($pet_id);
-    $this->assertSame($response->getId(), $pet_id);
-    $this->assertSame($response->getName(), 'update pet with form');
-    $this->assertSame($response->getStatus(), 'sold');
-  }
+        $this->assertSame($response->getTags()[0]->getId(), $pet_id);
+        $this->assertSame($response->getTags()[0]->getName(), 'test php tag');
+    }
+  
+    // test getPetByIdWithHttpInfo with a Pet object (id 10005)
+    public function testGetPetByIdWithHttpInfo()
+    {
+        // initialize the API client without host
+        $pet_id = 10005;  // ID of pet that needs to be fetched
+        $pet_api = new Swagger\Client\Api\PetApi();
+        $pet_api->getApiClient()->getConfig()->setApiKey('api_key', '111222333444555');
+        // return Pet (model)
+        list($response, $status_code, $response_headers) = $pet_api->getPetByIdWithHttpInfo($pet_id);
+        $this->assertSame($response->getId(), $pet_id);
+        $this->assertSame($response->getName(), 'PHP Unit Test');
+        $this->assertSame($response->getCategory()->getId(), $pet_id);
+        $this->assertSame($response->getCategory()->getName(), 'test php category');
+        $this->assertSame($response->getTags()[0]->getId(), $pet_id);
+        $this->assertSame($response->getTags()[0]->getName(), 'test php tag');
+        $this->assertSame($status_code, 200);
+        $this->assertSame($response_headers['Content-Type'], 'application/json');
+    }
+  
+    // test getPetByStatus and verify by the "id" of the response
+    public function testFindPetByStatus()
+    {
+        // initialize the API client
+        $config = (new Swagger\Client\Configuration())->setHost('http://petstore.swagger.io/v2');
+        $api_client = new Swagger\Client\ApiClient($config);
+        $pet_api = new Swagger\Client\Api\PetApi($api_client);
+        // return Pet (model)
+        $response = $pet_api->findPetsByStatus("available");
+        $this->assertGreaterThan(0, count($response)); // at least one object returned
+        $this->assertSame(get_class($response[0]), "Swagger\\Client\\Model\\Pet"); // verify the object is Pet
+        // loop through result to ensure status is "available" 
+        foreach ($response as $_pet) {
+            $this->assertSame($_pet['status'], "available");
+        }
+        // test invalid status 
+        $response = $pet_api->findPetsByStatus("unknown_and_incorrect_status");
+        $this->assertSame(count($response), 0); // confirm no object returned
+    }
+  
+    // test getPetsByTags and verify by the "id" of the response
+    public function testFindPetsByTags()
+    {
+        // initialize the API client
+        $config = (new Swagger\Client\Configuration())->setHost('http://petstore.swagger.io/v2');
+        $api_client = new Swagger\Client\ApiClient($config);
+        $pet_api = new Swagger\Client\Api\PetApi($api_client);
+        // return Pet (model)
+        $response = $pet_api->findPetsByTags("test php tag");
+        $this->assertGreaterThan(0, count($response)); // at least one object returned
+        $this->assertSame(get_class($response[0]), "Swagger\\Client\\Model\\Pet"); // verify the object is Pet
+        // loop through result to ensure status is "available" 
+        foreach ($response as $_pet) {
+            $this->assertSame($_pet['tags'][0]['name'], "test php tag");
+        }
+        // test invalid status 
+        $response = $pet_api->findPetsByTags("unknown_and_incorrect_tag");
+        $this->assertSame(count($response), 0); // confirm no object returned
+    }
 
-  // test addPet and verify by the "id" and "name" of the response
-  public function testAddPet()
-  {
-    // initialize the API client
-    $config = (new Swagger\Client\Configuration())->setHost('http://petstore.swagger.io/v2');
-    $api_client = new Swagger\Client\ApiClient($config);
-    $new_pet_id = 10001;
-    $new_pet = new Swagger\Client\Model\Pet;
-    $new_pet->setId($new_pet_id);
-    $new_pet->setName("PHP Unit Test");
-    $pet_api = new Swagger\Client\Api\PetAPI($api_client);
-    // add a new pet (model)
-    $add_response = $pet_api->addPet($new_pet);
-    // return nothing (void)
-    $this->assertSame($add_response, NULL);
-    // verify added Pet
-    $response = $pet_api->getPetById($new_pet_id);
-    $this->assertSame($response->getId(), $new_pet_id);
-    $this->assertSame($response->getName(), 'PHP Unit Test');
-  }
+    // test updatePet (model/json)and verify by the "id" of the response
+    public function testUpdatePet()
+    {
+        // initialize the API client
+        $config = (new Swagger\Client\Configuration())->setHost('http://petstore.swagger.io/v2');
+        $api_client = new Swagger\Client\ApiClient($config);
+        $pet_id = 10001;  // ID of pet that needs to be fetched
+        $pet_api = new Swagger\Client\Api\PetApi($api_client);
+        // create updated pet object
+        $updated_pet = new Swagger\Client\Model\Pet;
+        $updated_pet->setId($pet_id);
+        $updated_pet->setName('updatePet'); // new name
+        $updated_pet->setStatus('pending'); // new status
+        // update Pet (model/json)
+        $update_response = $pet_api->updatePet($updated_pet);
+        // return nothing (void)
+        $this->assertSame($update_response, NULL);
+        // verify updated Pet
+        $response = $pet_api->getPetById($pet_id);
+        $this->assertSame($response->getId(), $pet_id);
+        $this->assertSame($response->getStatus(), 'pending');
+        $this->assertSame($response->getName(), 'updatePet');
+    }
+  
+    // test updatePetWithFormWithHttpInfo and verify by the "name" of the response
+    public function testUpdatePetWithFormWithHttpInfo()
+    {
+        // initialize the API client
+        $config = (new Swagger\Client\Configuration())->setHost('http://petstore.swagger.io/v2');
+        $api_client = new Swagger\Client\ApiClient($config);
+        $pet_id = 10001;  // ID of pet that needs to be fetched
+        $pet_api = new Swagger\Client\Api\PetApi($api_client);
+        // update Pet (form)
+        list($update_response, $status_code, $http_headers) = $pet_api->updatePetWithFormWithHttpInfo($pet_id, 'update pet with form with http info');
+        // return nothing (void)
+        $this->assertNull($update_response);
+        $this->assertSame($status_code, 200);
+        $this->assertSame($http_headers['Content-Type'], 'application/json');
+        $response = $pet_api->getPetById($pet_id);
+        $this->assertSame($response->getId(), $pet_id);
+        $this->assertSame($response->getName(), 'update pet with form with http info');
+    }
+  
+    // test updatePetWithForm and verify by the "name" and "status" of the response
+    public function testUpdatePetWithForm()
+    {
+        // initialize the API client
+        $config = (new Swagger\Client\Configuration())->setHost('http://petstore.swagger.io/v2');
+        $api_client = new Swagger\Client\ApiClient($config);
+        $pet_id = 10001;  // ID of pet that needs to be fetched
+        $pet_api = new Swagger\Client\Api\PetApi($api_client);
+        // update Pet (form)
+        $update_response = $pet_api->updatePetWithForm($pet_id, 'update pet with form', 'sold');
+        // return nothing (void)
+        $this->assertSame($update_response, NULL);
+        $response = $pet_api->getPetById($pet_id);
+        $this->assertSame($response->getId(), $pet_id);
+        $this->assertSame($response->getName(), 'update pet with form');
+        $this->assertSame($response->getStatus(), 'sold');
+    }
 
-  // test upload file
-  public function testUploadFile()
-  {
-    // initialize the API client
-    $config = (new Swagger\Client\Configuration())->setHost('http://petstore.swagger.io/v2');
-    $api_client = new Swagger\Client\ApiClient($config);
-    $pet_api = new Swagger\Client\Api\PetAPI($api_client);
-    // upload file
-    $pet_id = 10001;
-    $add_response = $pet_api->uploadFile($pet_id, "test meta", "./composer.json");
-    // return nothing (void)
-    $this->assertSame($add_response, NULL);
-  }
+    // test addPet and verify by the "id" and "name" of the response
+    public function testAddPet()
+    {
+        // initialize the API client
+        $config = (new Swagger\Client\Configuration())->setHost('http://petstore.swagger.io/v2');
+        $api_client = new Swagger\Client\ApiClient($config);
+        $new_pet_id = 10005;
+        $new_pet = new Swagger\Client\Model\Pet;
+        $new_pet->setId($new_pet_id);
+        $new_pet->setName("PHP Unit Test 2");
+        $pet_api = new Swagger\Client\Api\PetApi($api_client);
+        // add a new pet (model)
+        $add_response = $pet_api->addPet($new_pet);
+        // return nothing (void)
+        $this->assertSame($add_response, NULL);
+        // verify added Pet
+        $response = $pet_api->getPetById($new_pet_id);
+        $this->assertSame($response->getId(), $new_pet_id);
+        $this->assertSame($response->getName(), 'PHP Unit Test 2');
+    }
+  
+    // test addPetUsingByteArray and verify by the "id" and "name" of the response
+    public function testAddPetUsingByteArray()
+    {
+        // initialize the API client
+        $config = (new Swagger\Client\Configuration())->setHost('http://petstore.swagger.io/v2');
+        $api_client = new Swagger\Client\ApiClient($config);
 
-  // test get inventory
-  public function testGetInventory()
-  {
-    // initialize the API client
-    $config = new Swagger\Client\Configuration();
-    $config->setHost('http://petstore.swagger.io/v2');
-    $api_client = new Swagger\Client\APIClient($config);
-    $store_api = new Swagger\Client\Api\StoreAPI($api_client);
-    // get inventory
-    $get_response = $store_api->getInventory();
+        $new_pet_id = 10005;
+        $new_pet = new Swagger\Client\Model\Pet;
+        $new_pet->setId($new_pet_id);
+        $new_pet->setName("PHP Unit Test 3");
+        // new tag
+        $tag= new Swagger\Client\Model\Tag;
+        $tag->setId($new_pet_id); // use the same id as pet
+        $tag->setName("test php tag");
+        // new category
+        $category = new Swagger\Client\Model\Category;
+        $category->setId($new_pet_id); // use the same id as pet
+        $category->setName("test php category");
+  
+        $new_pet->setTags(array($tag));
+        $new_pet->setCategory($category);
 
-    $this->assertInternalType("int", $get_response['sold']);
-    $this->assertInternalType("int", $get_response['pending']);
+        $pet_api = new Swagger\Client\Api\PetApi($api_client);
+        // add a new pet (model)
+        $object_serializer = new Swagger\Client\ObjectSerializer();
+        $pet_json_string = json_encode($object_serializer->sanitizeForSerialization($new_pet));
+        $add_response = $pet_api->addPetUsingByteArray($pet_json_string);
+        // return nothing (void)
+        $this->assertSame($add_response, NULL);
+        // verify added Pet
+        $response = $pet_api->getPetById($new_pet_id);
+        $this->assertSame($response->getId(), $new_pet_id);
+        $this->assertSame($response->getName(), 'PHP Unit Test 3');
+    }
 
-  }
+
+  
+    // test upload file
+    public function testUploadFile()
+    {
+        // initialize the API client
+        $config = (new Swagger\Client\Configuration())->setHost('http://petstore.swagger.io/v2');
+        $api_client = new Swagger\Client\ApiClient($config);
+        $pet_api = new Swagger\Client\Api\PetApi($api_client);
+        // upload file
+        $pet_id = 10001;
+        $add_response = $pet_api->uploadFile($pet_id, "test meta", "./composer.json");
+        // return nothing (void)
+        $this->assertSame($add_response, NULL);
+    }
+  
+    // test get inventory
+    public function testGetInventory()
+    {
+        // initialize the API client
+        $config = new Swagger\Client\Configuration();
+        $config->setHost('http://petstore.swagger.io/v2');
+        $api_client = new Swagger\Client\APIClient($config);
+        $store_api = new Swagger\Client\Api\StoreAPI($api_client);
+        // get inventory
+        $get_response = $store_api->getInventory();
+  
+        $this->assertInternalType("int", $get_response['sold']);
+        $this->assertInternalType("int", $get_response['pending']);
+    }
+  
+    // test byte array response
+    public function testGetPetByIdWithByteArray()
+    {
+        // initialize the API client
+        $config = new Swagger\Client\Configuration();
+        $config->setHost('http://petstore.swagger.io/v2');
+        $api_client = new Swagger\Client\APIClient($config);
+        $pet_api = new Swagger\Client\Api\PetApi($api_client);
+        // test getPetByIdWithByteArray 
+        $pet_id = 10005;
+        $bytes = $pet_api->petPetIdtestingByteArraytrueGet($pet_id);
+        $json = json_decode($bytes, true);
+
+        $this->assertInternalType("string", $bytes);
+
+        $this->assertSame($json['id'], $pet_id);
+        // not testing name as it's tested by addPetUsingByteArray
+        //$this->assertSame($json['name'], 'PHP Unit Test');
+        $this->assertSame($json['category']['id'], $pet_id);
+        $this->assertSame($json['category']['name'], 'test php category');
+        $this->assertSame($json['tags'][0]['id'], $pet_id);
+        $this->assertSame($json['tags'][0]['name'], 'test php tag');
+    }
+
+    // test empty object serialization
+    public function testEmptyPetSerialization()
+    {
+        $new_pet = new Swagger\Client\Model\Pet;
+        // the empty object should be serialised to {}
+        $this->assertSame("{}", "$new_pet");
+
+    }
+
+    // test inheritance in the model
+    public function testInheritance()
+    {
+        $new_dog = new Swagger\Client\Model\Dog;
+        // the object should be an instance of the derived class
+        $this->assertInstanceOf('Swagger\Client\Model\Dog', $new_dog);
+        // the object should also be an instance of the parent class
+        $this->assertInstanceOf('Swagger\Client\Model\Animal', $new_dog);
+    }
+
+    // test inheritance constructor is working with data
+    // initialization
+    public function testInheritanceConstructorDataInitialization()
+    {
+        // initialize the object with data in the constructor
+        $data = array(
+            'class_name' => 'Dog',
+            'breed' => 'Great Dane'
+        );
+        $new_dog = new Swagger\Client\Model\Dog($data);
+
+        // the property on the derived class should be set
+        $this->assertSame('Great Dane', $new_dog->getBreed());
+        // the property on the parent class should be set
+        $this->assertSame('Dog', $new_dog->getClassName());
+    }
 
 }
 
diff --git a/samples/client/petstore/php/SwaggerClient-php/tests/StoreApiTest.php b/samples/client/petstore/php/SwaggerClient-php/tests/StoreApiTest.php
index fcba8adf20a..b54416f28a9 100644
--- a/samples/client/petstore/php/SwaggerClient-php/tests/StoreApiTest.php
+++ b/samples/client/petstore/php/SwaggerClient-php/tests/StoreApiTest.php
@@ -5,47 +5,61 @@ require_once('autoload.php');
 class StoreApiTest extends \PHPUnit_Framework_TestCase
 {
 
-  // add a new pet (id 10005) to ensure the pet object is available for all the tests
-  public static function setUpBeforeClass() {
-    // for error reporting (need to run with php5.3 to get no warning)
-    //ini_set('display_errors', 1);
-    //error_reporting(~0);
-    // new pet
-    $new_pet_id = 10005;
-    $new_pet = new Swagger\Client\Model\Pet;
-    $new_pet->setId($new_pet_id);
-    $new_pet->setName("PHP Unit Test");
-    $new_pet->setStatus("available");
-    // new tag
-    $tag= new Swagger\Client\Model\Tag;
-    $tag->setId($new_pet_id); // use the same id as pet
-    $tag->setName("test php tag");
-    // new category
-    $category = new Swagger\Client\Model\Category;
-    $category->setId($new_pet_id); // use the same id as pet
-    $category->setName("test php category");
+    // add a new pet (id 10005) to ensure the pet object is available for all the tests
+    public static function setUpBeforeClass() {
+        // for error reporting (need to run with php5.3 to get no warning)
+        //ini_set('display_errors', 1);
+        //error_reporting(~0);
+        // new pet
+        $new_pet_id = 10005;
+        $new_pet = new Swagger\Client\Model\Pet;
+        $new_pet->setId($new_pet_id);
+        $new_pet->setName("PHP Unit Test");
+        $new_pet->setStatus("available");
+        // new tag
+        $tag= new Swagger\Client\Model\Tag;
+        $tag->setId($new_pet_id); // use the same id as pet
+        $tag->setName("test php tag");
+        // new category
+        $category = new Swagger\Client\Model\Category;
+        $category->setId($new_pet_id); // use the same id as pet
+        $category->setName("test php category");
 
-    $new_pet->setTags(array($tag));
-    $new_pet->setCategory($category);
+        $new_pet->setTags(array($tag));
+        $new_pet->setCategory($category);
 
-    $pet_api = new Swagger\Client\Api\PetAPI();
-    // add a new pet (model)
-    $add_response = $pet_api->addPet($new_pet);
-  }
+        $pet_api = new Swagger\Client\Api\PetAPI();
+        // add a new pet (model)
+        $add_response = $pet_api->addPet($new_pet);
+    }
 
-  // test get inventory
-  public function testGetInventory()
-  {
-    // initialize the API client
-    $config = (new Swagger\Client\Configuration())->setHost('http://petstore.swagger.io/v2');
-    $api_client = new Swagger\Client\ApiClient($config);
-    $store_api = new Swagger\Client\Api\StoreAPI($api_client);
-    // get inventory
-    $get_response = $store_api->getInventory();
+    // test get inventory
+    public function testGetInventory()
+    {
+        // initialize the API client
+        $config = (new Swagger\Client\Configuration())->setHost('http://petstore.swagger.io/v2');
+        $api_client = new Swagger\Client\ApiClient($config);
+        $store_api = new Swagger\Client\Api\StoreAPI($api_client);
+        // get inventory
+        $get_response = $store_api->getInventory();
 
-    $this->assertInternalType("int", $get_response['available']);
+        $this->assertInternalType("array", $get_response);
+        $this->assertInternalType("int", $get_response['available']);
+    }
 
-  }
+    // test get inventory
+    public function testGetInventoryInObject()
+    {
+        // initialize the API client
+        //$config = (new Swagger\Client\Configuration())->setHost('http://petstore.swagger.io/v2');
+        $api_client = new Swagger\Client\ApiClient();
+        $store_api = new Swagger\Client\Api\StoreAPI($api_client);
+        // get inventory
+        $get_response = $store_api->getInventoryInObject();
+
+        $this->assertInternalType("array", $get_response);
+        $this->assertInternalType("int", $get_response['available']);
+    }
 
 }
 
diff --git a/samples/client/petstore/php/test.php b/samples/client/petstore/php/test.php
index 099e2975a4a..6f571a1c176 100644
--- a/samples/client/petstore/php/test.php
+++ b/samples/client/petstore/php/test.php
@@ -5,15 +5,14 @@ require_once(__DIR__ . '/SwaggerClient-php/autoload.php');
 //ini_set('display_errors', 1);
 //error_reporting(~0);
 
-// to enable logging
-//Swagger\Client\Configuration::$debug = true;
-//Swagger\Client\Configuration::$debug_file = '/var/tmp/php_debug.log';
-
 // to debug report
 print Swagger\Client\Configuration::toDebugReport();
 
 // to change temp folder path
 Swagger\Client\Configuration::getDefaultConfiguration()->setTempFolderPath('/var/tmp/php/');
+// to enable logging
+Swagger\Client\Configuration::getDefaultConfiguration()->setDebug(true);
+Swagger\Client\Configuration::getDefaultConfiguration()->setDebugFile('/var/tmp/php_debug.log');
 
 $petId = 10005; // ID of pet that needs to be fetched
 try {
diff --git a/samples/client/petstore/python/.coverage b/samples/client/petstore/python/.coverage
deleted file mode 100644
index 9921d07556e..00000000000
--- a/samples/client/petstore/python/.coverage
+++ /dev/null
@@ -1 +0,0 @@
-!coverage.py: This is a private format, don't read it directly!{"lines": {"/Users/williamcheng/Code/tmp/swagger-codegen/samples/client/petstore/python/swagger_client/models/user.py": [278, 70, 136, 202, 272, 81, 147, 213, 22, 25, 92, 29, 158, 224, 103, 169, 235, 284, 114, 19, 180, 30, 246, 266, 191, 125, 21], "/Users/williamcheng/Code/tmp/swagger-codegen/samples/client/petstore/python/swagger_client/models/category.py": [128, 134, 72, 74, 109, 19, 21, 22, 104, 25, 29, 30, 96, 100, 114, 102, 39, 40, 41, 103, 44, 45, 46, 112, 49, 50, 83, 116, 94, 52, 122, 61, 85, 63], "/Users/williamcheng/Code/tmp/swagger-codegen/samples/client/petstore/python/swagger_client/models/order.py": [130, 172, 141, 173, 19, 21, 22, 152, 25, 29, 30, 52, 161, 163, 39, 40, 41, 42, 43, 44, 45, 174, 175, 48, 49, 50, 51, 180, 53, 54, 57, 58, 59, 60, 61, 62, 191, 64, 202, 75, 86, 176, 222, 97, 228, 178, 234, 108, 240, 119], "/Users/williamcheng/Code/tmp/swagger-codegen/samples/client/petstore/python/swagger_client/apis/__init__.py": [1, 4, 5, 6], "/Users/williamcheng/Code/tmp/swagger-codegen/samples/client/petstore/python/swagger_client/apis/pet_api.py": [512, 513, 514, 516, 598, 18, 20, 22, 23, 26, 539, 28, 29, 542, 543, 32, 548, 37, 39, 40, 41, 42, 555, 556, 45, 558, 559, 560, 562, 564, 565, 566, 265, 568, 569, 345, 571, 574, 575, 576, 580, 581, 70, 584, 73, 586, 587, 588, 589, 590, 591, 592, 593, 594, 595, 596, 86, 88, 90, 92, 93, 95, 96, 97, 100, 101, 102, 106, 107, 621, 622, 624, 625, 626, 115, 116, 117, 118, 631, 632, 121, 122, 635, 124, 638, 639, 669, 641, 642, 643, 645, 647, 649, 650, 651, 652, 653, 654, 656, 145, 146, 659, 148, 661, 150, 665, 666, 155, 156, 538, 159, 160, 673, 162, 675, 676, 677, 166, 679, 168, 169, 171, 172, 173, 541, 176, 177, 178, 182, 183, 186, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 200, 119, 120, 377, 221, 222, 549, 224, 225, 226, 231, 232, 235, 236, 110, 238, 240, 552, 242, 244, 246, 247, 249, 383, 252, 253, 254, 258, 259, 262, 264, 44, 266, 267, 268, 269, 270, 271, 272, 273, 274, 276, 46, 48, 475, 112, 298, 300, 301, 302, 307, 308, 311, 312, 314, 316, 317, 318, 320, 322, 505, 325, 113, 328, 329, 330, 334, 335, 338, 340, 341, 342, 343, 344, 241, 346, 347, 348, 349, 350, 485, 352, 114, 373, 374, 376, 660, 378, 149, 384, 387, 390, 391, 393, 394, 395, 397, 399, 401, 402, 323, 404, 407, 408, 409, 297, 413, 414, 69, 417, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 431, 72, 499, 671, 74, 672, 454, 455, 457, 458, 459, 674, 464, 465, 468, 471, 472, 164, 474, 79, 476, 478, 480, 80, 482, 483, 484, 678, 486, 487, 489, 492, 493, 494, 680, 498, 83, 502, 681, 504, 84, 506, 507, 508, 509, 510, 511], "/Users/williamcheng/Code/tmp/swagger-codegen/samples/client/petstore/python/swagger_client/configuration.py": [135, 136, 137, 138, 139, 142, 19, 149, 22, 23, 25, 26, 27, 29, 158, 31, 32, 34, 36, 37, 39, 40, 41, 170, 43, 172, 46, 47, 189, 179, 52, 54, 59, 61, 190, 63, 192, 224, 67, 69, 71, 200, 73, 204, 80, 81, 82, 84, 213, 86, 199, 88, 90, 219, 92, 221, 222, 223, 96, 225, 98, 100, 102, 230, 104, 167, 111, 76, 168, 157, 122, 123, 42, 21], "/Users/williamcheng/Code/tmp/swagger-codegen/samples/client/petstore/python/swagger_client/apis/user_api.py": [32, 355, 37, 39, 200, 124, 428, 589, 48, 18, 20, 22, 23, 276, 26, 507, 28, 29], "/Users/williamcheng/Code/tmp/swagger-codegen/samples/client/petstore/python/swagger_client/rest.py": [20, 21, 23, 24, 25, 26, 27, 28, 31, 33, 35, 36, 40, 42, 48, 51, 53, 54, 55, 56, 57, 59, 63, 65, 72, 74, 82, 83, 88, 92, 95, 98, 101, 102, 103, 104, 105, 106, 109, 110, 121, 122, 124, 129, 130, 132, 135, 137, 138, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 152, 153, 154, 155, 156, 159, 160, 161, 166, 170, 171, 174, 176, 177, 179, 181, 182, 183, 184, 186, 191, 198, 199, 200, 201, 203, 204, 205, 206, 207, 208, 210, 211, 212, 213, 214, 215, 217, 225, 227, 228, 229, 230, 231, 232, 239, 243, 244, 245, 246, 248, 249, 251], "/Users/williamcheng/Code/tmp/swagger-codegen/samples/client/petstore/python/swagger_client/apis/store_api.py": [18, 276, 22, 23, 26, 28, 29, 197, 32, 37, 39, 40, 41, 44, 46, 48, 20, 68, 69, 71, 72, 79, 82, 83, 85, 87, 89, 91, 92, 94, 97, 98, 99, 103, 104, 107, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 121], "/Users/williamcheng/Code/tmp/swagger-codegen/samples/client/petstore/python/swagger_client/models/pet.py": [128, 130, 150, 172, 139, 141, 19, 215, 21, 22, 152, 25, 29, 30, 161, 163, 39, 40, 41, 42, 43, 44, 45, 174, 48, 49, 50, 51, 52, 53, 54, 183, 57, 58, 59, 60, 61, 62, 64, 194, 195, 200, 73, 202, 75, 206, 208, 209, 210, 211, 84, 213, 86, 185, 216, 218, 220, 222, 95, 97, 226, 228, 234, 108, 238, 240, 117, 119, 212, 106], "/Users/williamcheng/Code/tmp/swagger-codegen/samples/client/petstore/python/swagger_client/api_client.py": [512, 520, 527, 528, 529, 19, 21, 22, 23, 24, 26, 27, 28, 29, 30, 31, 32, 33, 34, 36, 37, 550, 40, 42, 44, 560, 49, 52, 568, 570, 571, 572, 573, 574, 575, 577, 68, 69, 74, 75, 76, 78, 79, 81, 82, 84, 86, 93, 98, 100, 104, 105, 106, 109, 110, 111, 113, 114, 117, 118, 119, 120, 121, 122, 125, 126, 127, 128, 131, 132, 133, 136, 139, 140, 143, 146, 147, 148, 149, 151, 154, 155, 157, 159, 160, 162, 539, 164, 173, 174, 176, 178, 193, 194, 196, 197, 198, 199, 200, 201, 202, 203, 204, 206, 207, 214, 215, 216, 548, 218, 219, 221, 549, 233, 237, 238, 242, 244, 253, 254, 256, 257, 258, 259, 260, 262, 263, 264, 265, 269, 270, 271, 274, 276, 277, 278, 280, 281, 282, 283, 285, 288, 289, 290, 318, 319, 320, 321, 322, 324, 325, 326, 327, 328, 329, 330, 331, 332, 334, 335, 339, 340, 341, 342, 343, 347, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 371, 372, 373, 374, 381, 389, 391, 392, 394, 395, 396, 397, 399, 400, 401, 402, 403, 404, 406, 408, 415, 416, 418, 420, 421, 423, 425, 432, 433, 435, 437, 438, 440, 442, 450, 452, 455, 456, 457, 458, 460, 461, 469, 495, 504, 505, 510], "/Users/williamcheng/Code/tmp/swagger-codegen/samples/client/petstore/python/swagger_client/models/tag.py": [128, 132, 134, 72, 74, 109, 19, 21, 22, 104, 25, 29, 30, 96, 100, 114, 102, 39, 40, 41, 103, 44, 45, 46, 112, 49, 50, 83, 116, 94, 52, 122, 61, 85, 63], "/Users/williamcheng/Code/tmp/swagger-codegen/samples/client/petstore/python/swagger_client/__init__.py": [1, 4, 5, 6, 7, 8, 11, 12, 13, 16, 18, 20], "/Users/williamcheng/Code/tmp/swagger-codegen/samples/client/petstore/python/swagger_client/models/__init__.py": [1, 4, 5, 6, 7, 8]}}
\ No newline at end of file
diff --git a/samples/client/petstore/python/.gitignore b/samples/client/petstore/python/.gitignore
new file mode 100644
index 00000000000..1dbc687de01
--- /dev/null
+++ b/samples/client/petstore/python/.gitignore
@@ -0,0 +1,62 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+#Ipython Notebook
+.ipynb_checkpoints
diff --git a/samples/client/petstore/python/dev-requirements.txt.log b/samples/client/petstore/python/dev-requirements.txt.log
deleted file mode 100644
index 28a3909b9e4..00000000000
--- a/samples/client/petstore/python/dev-requirements.txt.log
+++ /dev/null
@@ -1,148 +0,0 @@
-Collecting nose (from -r dev-requirements.txt (line 1))
-  Using cached nose-1.3.7-py2-none-any.whl
-Collecting tox (from -r dev-requirements.txt (line 2))
-  Using cached tox-2.1.1-py2.py3-none-any.whl
-Collecting coverage (from -r dev-requirements.txt (line 3))
-Collecting randomize (from -r dev-requirements.txt (line 4))
-  Using cached randomize-0.13-py2.py3-none-any.whl
-Collecting virtualenv>=1.11.2 (from tox->-r dev-requirements.txt (line 2))
-  Using cached virtualenv-13.1.2-py2.py3-none-any.whl
-Collecting py>=1.4.17 (from tox->-r dev-requirements.txt (line 2))
-  Using cached py-1.4.30-py2.py3-none-any.whl
-Collecting pluggy<0.4.0,>=0.3.0 (from tox->-r dev-requirements.txt (line 2))
-  Using cached pluggy-0.3.0-py2.py3-none-any.whl
-Installing collected packages: nose, virtualenv, py, pluggy, tox, coverage, randomize
-Successfully installed coverage-3.7.1 nose-1.3.7 pluggy-0.3.0 py-1.4.30 randomize-0.13 tox-2.1.1 virtualenv-13.1.2
-Requirement already satisfied (use --upgrade to upgrade): nose in ./.venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 1))
-Requirement already satisfied (use --upgrade to upgrade): tox in ./.venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): coverage in ./.venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 3))
-Requirement already satisfied (use --upgrade to upgrade): randomize in ./.venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 4))
-Requirement already satisfied (use --upgrade to upgrade): virtualenv>=1.11.2 in ./.venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): py>=1.4.17 in ./.venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): pluggy<0.4.0,>=0.3.0 in ./.venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): nose in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 1))
-Requirement already satisfied (use --upgrade to upgrade): tox in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): coverage in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 3))
-Requirement already satisfied (use --upgrade to upgrade): randomize in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 4))
-Requirement already satisfied (use --upgrade to upgrade): virtualenv>=1.11.2 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): py>=1.4.17 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): pluggy<0.4.0,>=0.3.0 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): nose in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 1))
-Requirement already satisfied (use --upgrade to upgrade): tox in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): coverage in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 3))
-Requirement already satisfied (use --upgrade to upgrade): randomize in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 4))
-Requirement already satisfied (use --upgrade to upgrade): virtualenv>=1.11.2 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): py>=1.4.17 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): pluggy<0.4.0,>=0.3.0 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): nose in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 1))
-Requirement already satisfied (use --upgrade to upgrade): tox in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): coverage in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 3))
-Requirement already satisfied (use --upgrade to upgrade): randomize in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 4))
-Requirement already satisfied (use --upgrade to upgrade): virtualenv>=1.11.2 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): py>=1.4.17 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): pluggy<0.4.0,>=0.3.0 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): nose in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 1))
-Requirement already satisfied (use --upgrade to upgrade): tox in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): coverage in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 3))
-Requirement already satisfied (use --upgrade to upgrade): randomize in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 4))
-Requirement already satisfied (use --upgrade to upgrade): virtualenv>=1.11.2 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): py>=1.4.17 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): pluggy<0.4.0,>=0.3.0 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): nose in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 1))
-Requirement already satisfied (use --upgrade to upgrade): tox in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): coverage in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 3))
-Requirement already satisfied (use --upgrade to upgrade): randomize in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 4))
-Requirement already satisfied (use --upgrade to upgrade): virtualenv>=1.11.2 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): py>=1.4.17 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): pluggy<0.4.0,>=0.3.0 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): nose in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 1))
-Requirement already satisfied (use --upgrade to upgrade): tox in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): coverage in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 3))
-Requirement already satisfied (use --upgrade to upgrade): randomize in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 4))
-Requirement already satisfied (use --upgrade to upgrade): virtualenv>=1.11.2 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): py>=1.4.17 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): pluggy<0.4.0,>=0.3.0 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): nose in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 1))
-Requirement already satisfied (use --upgrade to upgrade): tox in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): coverage in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 3))
-Requirement already satisfied (use --upgrade to upgrade): randomize in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 4))
-Requirement already satisfied (use --upgrade to upgrade): virtualenv>=1.11.2 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): py>=1.4.17 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): pluggy<0.4.0,>=0.3.0 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Collecting nose (from -r dev-requirements.txt (line 1))
-  Using cached nose-1.3.7-py2-none-any.whl
-Collecting tox (from -r dev-requirements.txt (line 2))
-  Using cached tox-2.2.1-py2.py3-none-any.whl
-Collecting coverage (from -r dev-requirements.txt (line 3))
-  Downloading coverage-4.0.3.tar.gz (354kB)
-Collecting randomize (from -r dev-requirements.txt (line 4))
-  Using cached randomize-0.13-py2.py3-none-any.whl
-Requirement already satisfied (use --upgrade to upgrade): virtualenv>=1.11.2 in /Library/Python/2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Collecting py>=1.4.17 (from tox->-r dev-requirements.txt (line 2))
-  Downloading py-1.4.31-py2.py3-none-any.whl (81kB)
-Collecting pluggy<0.4.0,>=0.3.0 (from tox->-r dev-requirements.txt (line 2))
-  Using cached pluggy-0.3.1-py2.py3-none-any.whl
-Installing collected packages: nose, py, pluggy, tox, coverage, randomize
-Collecting nose (from -r dev-requirements.txt (line 1))
-  Using cached nose-1.3.7-py2-none-any.whl
-Collecting tox (from -r dev-requirements.txt (line 2))
-  Using cached tox-2.2.1-py2.py3-none-any.whl
-Collecting coverage (from -r dev-requirements.txt (line 3))
-  Using cached coverage-4.0.3.tar.gz
-Collecting randomize (from -r dev-requirements.txt (line 4))
-  Using cached randomize-0.13-py2.py3-none-any.whl
-Requirement already satisfied (use --upgrade to upgrade): virtualenv>=1.11.2 in /Library/Python/2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Collecting py>=1.4.17 (from tox->-r dev-requirements.txt (line 2))
-  Using cached py-1.4.31-py2.py3-none-any.whl
-Collecting pluggy<0.4.0,>=0.3.0 (from tox->-r dev-requirements.txt (line 2))
-  Using cached pluggy-0.3.1-py2.py3-none-any.whl
-Installing collected packages: nose, py, pluggy, tox, coverage, randomize
-Requirement already satisfied (use --upgrade to upgrade): nose in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 1))
-Requirement already satisfied (use --upgrade to upgrade): tox in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): coverage in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 3))
-Requirement already satisfied (use --upgrade to upgrade): randomize in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 4))
-Requirement already satisfied (use --upgrade to upgrade): virtualenv>=1.11.2 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): py>=1.4.17 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): pluggy<0.4.0,>=0.3.0 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): nose in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 1))
-Requirement already satisfied (use --upgrade to upgrade): tox in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): coverage in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 3))
-Requirement already satisfied (use --upgrade to upgrade): randomize in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 4))
-Requirement already satisfied (use --upgrade to upgrade): virtualenv>=1.11.2 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): py>=1.4.17 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): pluggy<0.4.0,>=0.3.0 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): nose in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 1))
-Requirement already satisfied (use --upgrade to upgrade): tox in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): coverage in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 3))
-Requirement already satisfied (use --upgrade to upgrade): randomize in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 4))
-Requirement already satisfied (use --upgrade to upgrade): virtualenv>=1.11.2 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): py>=1.4.17 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): pluggy<0.4.0,>=0.3.0 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): nose in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 1))
-Requirement already satisfied (use --upgrade to upgrade): tox in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): coverage in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 3))
-Requirement already satisfied (use --upgrade to upgrade): randomize in ./venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 4))
-Requirement already satisfied (use --upgrade to upgrade): virtualenv>=1.11.2 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): py>=1.4.17 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): pluggy<0.4.0,>=0.3.0 in ./venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): nose in /private/var/tmp/pr/Tengah/swagger-codegen/samples/client/petstore/python/venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 1))
-Requirement already satisfied (use --upgrade to upgrade): tox in /private/var/tmp/pr/Tengah/swagger-codegen/samples/client/petstore/python/venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): coverage in /private/var/tmp/pr/Tengah/swagger-codegen/samples/client/petstore/python/venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 3))
-Requirement already satisfied (use --upgrade to upgrade): randomize in /private/var/tmp/pr/Tengah/swagger-codegen/samples/client/petstore/python/venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 4))
-Requirement already satisfied (use --upgrade to upgrade): virtualenv>=1.11.2 in /private/var/tmp/pr/Tengah/swagger-codegen/samples/client/petstore/python/venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): py>=1.4.17 in /private/var/tmp/pr/Tengah/swagger-codegen/samples/client/petstore/python/venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): pluggy<0.4.0,>=0.3.0 in /private/var/tmp/pr/Tengah/swagger-codegen/samples/client/petstore/python/venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): nose in /private/var/tmp/pr/Tengah/swagger-codegen/samples/client/petstore/python/venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 1))
-Requirement already satisfied (use --upgrade to upgrade): tox in /private/var/tmp/pr/Tengah/swagger-codegen/samples/client/petstore/python/venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): coverage in /private/var/tmp/pr/Tengah/swagger-codegen/samples/client/petstore/python/venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 3))
-Requirement already satisfied (use --upgrade to upgrade): randomize in /private/var/tmp/pr/Tengah/swagger-codegen/samples/client/petstore/python/venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 4))
-Requirement already satisfied (use --upgrade to upgrade): virtualenv>=1.11.2 in /private/var/tmp/pr/Tengah/swagger-codegen/samples/client/petstore/python/venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): py>=1.4.17 in /private/var/tmp/pr/Tengah/swagger-codegen/samples/client/petstore/python/venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): pluggy<0.4.0,>=0.3.0 in /private/var/tmp/pr/Tengah/swagger-codegen/samples/client/petstore/python/venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): nose in /private/var/tmp/pr/Tengah/swagger-codegen/samples/client/petstore/python/venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 1))
-Requirement already satisfied (use --upgrade to upgrade): tox in /private/var/tmp/pr/Tengah/swagger-codegen/samples/client/petstore/python/venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): coverage in /private/var/tmp/pr/Tengah/swagger-codegen/samples/client/petstore/python/venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 3))
-Requirement already satisfied (use --upgrade to upgrade): randomize in /private/var/tmp/pr/Tengah/swagger-codegen/samples/client/petstore/python/venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 4))
-Requirement already satisfied (use --upgrade to upgrade): virtualenv>=1.11.2 in /private/var/tmp/pr/Tengah/swagger-codegen/samples/client/petstore/python/venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): py>=1.4.17 in /private/var/tmp/pr/Tengah/swagger-codegen/samples/client/petstore/python/venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
-Requirement already satisfied (use --upgrade to upgrade): pluggy<0.4.0,>=0.3.0 in /private/var/tmp/pr/Tengah/swagger-codegen/samples/client/petstore/python/venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2))
diff --git a/samples/client/petstore/python/git_push.sh b/samples/client/petstore/python/git_push.sh
new file mode 100644
index 00000000000..1a36388db02
--- /dev/null
+++ b/samples/client/petstore/python/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="YOUR_GIT_USR_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="YOUR_GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/client/petstore/python/swagger_client.egg-info/SOURCES.txt b/samples/client/petstore/python/swagger_client.egg-info/SOURCES.txt
deleted file mode 100644
index a7d91c0b8ce..00000000000
--- a/samples/client/petstore/python/swagger_client.egg-info/SOURCES.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-setup.cfg
-setup.py
-swagger_client/__init__.py
-swagger_client/api_client.py
-swagger_client/configuration.py
-swagger_client/rest.py
-swagger_client.egg-info/PKG-INFO
-swagger_client.egg-info/SOURCES.txt
-swagger_client.egg-info/dependency_links.txt
-swagger_client.egg-info/requires.txt
-swagger_client.egg-info/top_level.txt
-swagger_client/apis/__init__.py
-swagger_client/apis/pet_api.py
-swagger_client/apis/store_api.py
-swagger_client/apis/user_api.py
-swagger_client/models/__init__.py
-swagger_client/models/category.py
-swagger_client/models/order.py
-swagger_client/models/pet.py
-swagger_client/models/tag.py
-swagger_client/models/user.py
-tests/__init__.py
-tests/test_api_client.py
-tests/test_api_exception.py
-tests/test_deserialization.py
-tests/test_order_model.py
-tests/test_pet_api.py
-tests/test_pet_model.py
-tests/test_store_api.py
\ No newline at end of file
diff --git a/samples/client/petstore/python/swagger_client/__init__.py b/samples/client/petstore/python/swagger_client/__init__.py
index f61c5d55262..3b52f200834 100644
--- a/samples/client/petstore/python/swagger_client/__init__.py
+++ b/samples/client/petstore/python/swagger_client/__init__.py
@@ -1,16 +1,21 @@
 from __future__ import absolute_import
 
 # import models into sdk package
-from .models.user import User
 from .models.category import Category
-from .models.pet import Pet
-from .models.tag import Tag
+from .models.inline_response_200 import InlineResponse200
+from .models.model_200_response import Model200Response
+from .models.model_return import ModelReturn
+from .models.name import Name
 from .models.order import Order
+from .models.pet import Pet
+from .models.special_model_name import SpecialModelName
+from .models.tag import Tag
+from .models.user import User
 
 # 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.user_api import UserApi
 
 # import ApiClient
 from .api_client import ApiClient
diff --git a/samples/client/petstore/python/swagger_client/api_client.py b/samples/client/petstore/python/swagger_client/api_client.py
index 63740a08745..e598115e319 100644
--- a/samples/client/petstore/python/swagger_client/api_client.py
+++ b/samples/client/petstore/python/swagger_client/api_client.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-Copyright 2015 SmartBear Software
+Copyright 2016 SmartBear Software
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -81,7 +81,7 @@ class ApiClient(object):
             self.host = host
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Python-Swagger/1.0.0'
+        self.user_agent = 'Swagger-Codegen/1.0.0/python'
 
     @property
     def user_agent(self):
@@ -386,22 +386,23 @@ class ApiClient(object):
         :param files: File parameters.
         :return: Form parameters with files.
         """
-        params = {}
+        params = []
 
         if post_params:
-            params.update(post_params)
+            params = post_params
 
         if files:
             for k, v in iteritems(files):
                 if not v:
                     continue
-
-                with open(v, 'rb') as f:
-                    filename = os.path.basename(f.name)
-                    filedata = f.read()
-                    mimetype = mimetypes.\
-                        guess_type(filename)[0] or 'application/octet-stream'
-                    params[k] = tuple([filename, filedata, mimetype])
+                file_names = v if type(v) is list else [v]
+                for n in file_names:
+                    with open(n, 'rb') as f:
+                        filename = os.path.basename(f.name)
+                        filedata = f.read()
+                        mimetype = mimetypes.\
+                            guess_type(filename)[0] or 'application/octet-stream'
+                        params.append(tuple([k, tuple([filename, filedata, mimetype])]))
 
         return params
 
diff --git a/samples/client/petstore/python/swagger_client/apis/__init__.py b/samples/client/petstore/python/swagger_client/apis/__init__.py
index 592a56e282d..a3a12ea9ac1 100644
--- a/samples/client/petstore/python/swagger_client/apis/__init__.py
+++ b/samples/client/petstore/python/swagger_client/apis/__init__.py
@@ -1,6 +1,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 .user_api import UserApi
diff --git a/samples/client/petstore/python/swagger_client/apis/pet_api.py b/samples/client/petstore/python/swagger_client/apis/pet_api.py
index d7bc11daaaf..8b081e077dc 100644
--- a/samples/client/petstore/python/swagger_client/apis/pet_api.py
+++ b/samples/client/petstore/python/swagger_client/apis/pet_api.py
@@ -2,7 +2,7 @@
 
 """
 PetApi.py
-Copyright 2015 SmartBear Software
+Copyright 2016 SmartBear Software
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -45,82 +45,6 @@ class PetApi(object):
                 config.api_client = ApiClient()
             self.api_client = config.api_client
 
-    def update_pet(self, **kwargs):
-        """
-        Update an existing pet
-        
-
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please define a `callback` function
-        to be invoked when receiving the response.
-        >>> def callback_function(response):
-        >>>     pprint(response)
-        >>>
-        >>> thread = api.update_pet(callback=callback_function)
-
-        :param callback function: The callback function
-            for asynchronous request. (optional)
-        :param Pet body: Pet object that needs to be added to the store
-        :return: None
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['body']
-        all_params.append('callback')
-
-        params = locals()
-        for key, val in iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method update_pet" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-
-        resource_path = '/pet'.replace('{format}', 'json')
-        method = 'PUT'
-
-        path_params = {}
-
-        query_params = {}
-
-        header_params = {}
-
-        form_params = {}
-        files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
-        if not header_params['Accept']:
-            del header_params['Accept']
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.\
-            select_header_content_type(['application/json', 'application/xml'])
-
-        # Authentication setting
-        auth_settings = ['petstore_auth']
-
-        response = self.api_client.call_api(resource_path, method,
-                                            path_params,
-                                            query_params,
-                                            header_params,
-                                            body=body_params,
-                                            post_params=form_params,
-                                            files=files,
-                                            response_type=None,
-                                            auth_settings=auth_settings,
-                                            callback=params.get('callback'))
-        return response
-
     def add_pet(self, **kwargs):
         """
         Add a new pet to the store
@@ -157,16 +81,14 @@ class PetApi(object):
 
 
         resource_path = '/pet'.replace('{format}', 'json')
-        method = 'POST'
-
         path_params = {}
 
         query_params = {}
 
         header_params = {}
 
-        form_params = {}
-        files = {}
+        form_params = []
+        local_var_files = {}
 
         body_params = None
         if 'body' in params:
@@ -185,252 +107,21 @@ class PetApi(object):
         # Authentication setting
         auth_settings = ['petstore_auth']
 
-        response = self.api_client.call_api(resource_path, method,
+        response = self.api_client.call_api(resource_path, 'POST',
                                             path_params,
                                             query_params,
                                             header_params,
                                             body=body_params,
                                             post_params=form_params,
-                                            files=files,
+                                            files=local_var_files,
                                             response_type=None,
                                             auth_settings=auth_settings,
                                             callback=params.get('callback'))
         return response
 
-    def find_pets_by_status(self, **kwargs):
+    def add_pet_using_byte_array(self, **kwargs):
         """
-        Finds Pets by status
-        Multiple status values can be provided with comma seperated strings
-
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please define a `callback` function
-        to be invoked when receiving the response.
-        >>> def callback_function(response):
-        >>>     pprint(response)
-        >>>
-        >>> thread = api.find_pets_by_status(callback=callback_function)
-
-        :param callback function: The callback function
-            for asynchronous request. (optional)
-        :param list[str] status: Status values that need to be considered for filter
-        :return: list[Pet]
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['status']
-        all_params.append('callback')
-
-        params = locals()
-        for key, val in iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method find_pets_by_status" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-
-        resource_path = '/pet/findByStatus'.replace('{format}', 'json')
-        method = 'GET'
-
-        path_params = {}
-
-        query_params = {}
-        if 'status' in params:
-            query_params['status'] = params['status']
-
-        header_params = {}
-
-        form_params = {}
-        files = {}
-
-        body_params = None
-
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
-        if not header_params['Accept']:
-            del header_params['Accept']
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.\
-            select_header_content_type([])
-
-        # Authentication setting
-        auth_settings = ['petstore_auth']
-
-        response = self.api_client.call_api(resource_path, method,
-                                            path_params,
-                                            query_params,
-                                            header_params,
-                                            body=body_params,
-                                            post_params=form_params,
-                                            files=files,
-                                            response_type='list[Pet]',
-                                            auth_settings=auth_settings,
-                                            callback=params.get('callback'))
-        return response
-
-    def find_pets_by_tags(self, **kwargs):
-        """
-        Finds Pets by tags
-        Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please define a `callback` function
-        to be invoked when receiving the response.
-        >>> def callback_function(response):
-        >>>     pprint(response)
-        >>>
-        >>> thread = api.find_pets_by_tags(callback=callback_function)
-
-        :param callback function: The callback function
-            for asynchronous request. (optional)
-        :param list[str] tags: Tags to filter by
-        :return: list[Pet]
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['tags']
-        all_params.append('callback')
-
-        params = locals()
-        for key, val in iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method find_pets_by_tags" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-
-        resource_path = '/pet/findByTags'.replace('{format}', 'json')
-        method = 'GET'
-
-        path_params = {}
-
-        query_params = {}
-        if 'tags' in params:
-            query_params['tags'] = params['tags']
-
-        header_params = {}
-
-        form_params = {}
-        files = {}
-
-        body_params = None
-
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
-        if not header_params['Accept']:
-            del header_params['Accept']
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.\
-            select_header_content_type([])
-
-        # Authentication setting
-        auth_settings = ['petstore_auth']
-
-        response = self.api_client.call_api(resource_path, method,
-                                            path_params,
-                                            query_params,
-                                            header_params,
-                                            body=body_params,
-                                            post_params=form_params,
-                                            files=files,
-                                            response_type='list[Pet]',
-                                            auth_settings=auth_settings,
-                                            callback=params.get('callback'))
-        return response
-
-    def get_pet_by_id(self, pet_id, **kwargs):
-        """
-        Find pet by ID
-        Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
-
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please define a `callback` function
-        to be invoked when receiving the response.
-        >>> def callback_function(response):
-        >>>     pprint(response)
-        >>>
-        >>> thread = api.get_pet_by_id(pet_id, callback=callback_function)
-
-        :param callback function: The callback function
-            for asynchronous request. (optional)
-        :param int pet_id: ID of pet that needs to be fetched (required)
-        :return: Pet
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['pet_id']
-        all_params.append('callback')
-
-        params = locals()
-        for key, val in iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method get_pet_by_id" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        # verify the required parameter 'pet_id' is set
-        if ('pet_id' not in params) or (params['pet_id'] is None):
-            raise ValueError("Missing the required parameter `pet_id` when calling `get_pet_by_id`")
-
-        resource_path = '/pet/{petId}'.replace('{format}', 'json')
-        method = 'GET'
-
-        path_params = {}
-        if 'pet_id' in params:
-            path_params['petId'] = params['pet_id']
-
-        query_params = {}
-
-        header_params = {}
-
-        form_params = {}
-        files = {}
-
-        body_params = None
-
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
-        if not header_params['Accept']:
-            del header_params['Accept']
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.\
-            select_header_content_type([])
-
-        # Authentication setting
-        auth_settings = ['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,
-                                            response_type='Pet',
-                                            auth_settings=auth_settings,
-                                            callback=params.get('callback'))
-        return response
-
-    def update_pet_with_form(self, pet_id, **kwargs):
-        """
-        Updates a pet in the store with form data
+        Fake endpoint to test byte array in body parameter for adding a new pet to the store
         
 
         This method makes a synchronous HTTP request by default. To make an
@@ -439,19 +130,17 @@ class PetApi(object):
         >>> def callback_function(response):
         >>>     pprint(response)
         >>>
-        >>> thread = api.update_pet_with_form(pet_id, callback=callback_function)
+        >>> thread = api.add_pet_using_byte_array(callback=callback_function)
 
         :param callback function: The callback function
             for asynchronous request. (optional)
-        :param str pet_id: ID of pet that needs to be updated (required)
-        :param str name: Updated name of the pet
-        :param str status: Updated status of the pet
+        :param str body: Pet object in the form of byte array
         :return: None
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['pet_id', 'name', 'status']
+        all_params = ['body']
         all_params.append('callback')
 
         params = locals()
@@ -459,34 +148,25 @@ class PetApi(object):
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method update_pet_with_form" % key
+                    " to method add_pet_using_byte_array" % key
                 )
             params[key] = val
         del params['kwargs']
 
-        # verify the required parameter 'pet_id' is set
-        if ('pet_id' not in params) or (params['pet_id'] is None):
-            raise ValueError("Missing the required parameter `pet_id` when calling `update_pet_with_form`")
-
-        resource_path = '/pet/{petId}'.replace('{format}', 'json')
-        method = 'POST'
 
+        resource_path = '/pet?testing_byte_array=true'.replace('{format}', 'json')
         path_params = {}
-        if 'pet_id' in params:
-            path_params['petId'] = params['pet_id']
 
         query_params = {}
 
         header_params = {}
 
-        form_params = {}
-        files = {}
-        if 'name' in params:
-            form_params['name'] = params['name']
-        if 'status' in params:
-            form_params['status'] = params['status']
+        form_params = []
+        local_var_files = {}
 
         body_params = None
+        if 'body' in params:
+            body_params = params['body']
 
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
@@ -496,18 +176,18 @@ class PetApi(object):
 
         # HTTP header `Content-Type`
         header_params['Content-Type'] = self.api_client.\
-            select_header_content_type(['application/x-www-form-urlencoded'])
+            select_header_content_type(['application/json', 'application/xml'])
 
         # Authentication setting
         auth_settings = ['petstore_auth']
 
-        response = self.api_client.call_api(resource_path, method,
+        response = self.api_client.call_api(resource_path, 'POST',
                                             path_params,
                                             query_params,
                                             header_params,
                                             body=body_params,
                                             post_params=form_params,
-                                            files=files,
+                                            files=local_var_files,
                                             response_type=None,
                                             auth_settings=auth_settings,
                                             callback=params.get('callback'))
@@ -553,8 +233,6 @@ class PetApi(object):
             raise ValueError("Missing the required parameter `pet_id` when calling `delete_pet`")
 
         resource_path = '/pet/{petId}'.replace('{format}', 'json')
-        method = 'DELETE'
-
         path_params = {}
         if 'pet_id' in params:
             path_params['petId'] = params['pet_id']
@@ -565,8 +243,8 @@ class PetApi(object):
         if 'api_key' in params:
             header_params['api_key'] = params['api_key']
 
-        form_params = {}
-        files = {}
+        form_params = []
+        local_var_files = {}
 
         body_params = None
 
@@ -583,13 +261,549 @@ class PetApi(object):
         # Authentication setting
         auth_settings = ['petstore_auth']
 
-        response = self.api_client.call_api(resource_path, method,
+        response = self.api_client.call_api(resource_path, 'DELETE',
                                             path_params,
                                             query_params,
                                             header_params,
                                             body=body_params,
                                             post_params=form_params,
-                                            files=files,
+                                            files=local_var_files,
+                                            response_type=None,
+                                            auth_settings=auth_settings,
+                                            callback=params.get('callback'))
+        return response
+
+    def find_pets_by_status(self, **kwargs):
+        """
+        Finds Pets by status
+        Multiple status values can be provided with comma separated strings
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please define a `callback` function
+        to be invoked when receiving the response.
+        >>> def callback_function(response):
+        >>>     pprint(response)
+        >>>
+        >>> thread = api.find_pets_by_status(callback=callback_function)
+
+        :param callback function: The callback function
+            for asynchronous request. (optional)
+        :param list[str] status: Status values that need to be considered for query
+        :return: list[Pet]
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['status']
+        all_params.append('callback')
+
+        params = locals()
+        for key, val in iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method find_pets_by_status" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+
+        resource_path = '/pet/findByStatus'.replace('{format}', 'json')
+        path_params = {}
+
+        query_params = {}
+        if 'status' in params:
+            query_params['status'] = params['status']
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.\
+            select_header_accept(['application/json', 'application/xml'])
+        if not header_params['Accept']:
+            del header_params['Accept']
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.\
+            select_header_content_type([])
+
+        # Authentication setting
+        auth_settings = ['petstore_auth']
+
+        response = self.api_client.call_api(resource_path, 'GET',
+                                            path_params,
+                                            query_params,
+                                            header_params,
+                                            body=body_params,
+                                            post_params=form_params,
+                                            files=local_var_files,
+                                            response_type='list[Pet]',
+                                            auth_settings=auth_settings,
+                                            callback=params.get('callback'))
+        return response
+
+    def find_pets_by_tags(self, **kwargs):
+        """
+        Finds Pets by tags
+        Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please define a `callback` function
+        to be invoked when receiving the response.
+        >>> def callback_function(response):
+        >>>     pprint(response)
+        >>>
+        >>> thread = api.find_pets_by_tags(callback=callback_function)
+
+        :param callback function: The callback function
+            for asynchronous request. (optional)
+        :param list[str] tags: Tags to filter by
+        :return: list[Pet]
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['tags']
+        all_params.append('callback')
+
+        params = locals()
+        for key, val in iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method find_pets_by_tags" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+
+        resource_path = '/pet/findByTags'.replace('{format}', 'json')
+        path_params = {}
+
+        query_params = {}
+        if 'tags' in params:
+            query_params['tags'] = params['tags']
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.\
+            select_header_accept(['application/json', 'application/xml'])
+        if not header_params['Accept']:
+            del header_params['Accept']
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.\
+            select_header_content_type([])
+
+        # Authentication setting
+        auth_settings = ['petstore_auth']
+
+        response = self.api_client.call_api(resource_path, 'GET',
+                                            path_params,
+                                            query_params,
+                                            header_params,
+                                            body=body_params,
+                                            post_params=form_params,
+                                            files=local_var_files,
+                                            response_type='list[Pet]',
+                                            auth_settings=auth_settings,
+                                            callback=params.get('callback'))
+        return response
+
+    def get_pet_by_id(self, pet_id, **kwargs):
+        """
+        Find pet by ID
+        Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please define a `callback` function
+        to be invoked when receiving the response.
+        >>> def callback_function(response):
+        >>>     pprint(response)
+        >>>
+        >>> thread = api.get_pet_by_id(pet_id, callback=callback_function)
+
+        :param callback function: The callback function
+            for asynchronous request. (optional)
+        :param int pet_id: ID of pet that needs to be fetched (required)
+        :return: Pet
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['pet_id']
+        all_params.append('callback')
+
+        params = locals()
+        for key, val in iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_pet_by_id" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        # verify the required parameter 'pet_id' is set
+        if ('pet_id' not in params) or (params['pet_id'] is None):
+            raise ValueError("Missing the required parameter `pet_id` when calling `get_pet_by_id`")
+
+        resource_path = '/pet/{petId}'.replace('{format}', 'json')
+        path_params = {}
+        if 'pet_id' in params:
+            path_params['petId'] = params['pet_id']
+
+        query_params = {}
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.\
+            select_header_accept(['application/json', 'application/xml'])
+        if not header_params['Accept']:
+            del header_params['Accept']
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.\
+            select_header_content_type([])
+
+        # Authentication setting
+        auth_settings = ['api_key', 'petstore_auth']
+
+        response = self.api_client.call_api(resource_path, 'GET',
+                                            path_params,
+                                            query_params,
+                                            header_params,
+                                            body=body_params,
+                                            post_params=form_params,
+                                            files=local_var_files,
+                                            response_type='Pet',
+                                            auth_settings=auth_settings,
+                                            callback=params.get('callback'))
+        return response
+
+    def get_pet_by_id_in_object(self, pet_id, **kwargs):
+        """
+        Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
+        Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please define a `callback` function
+        to be invoked when receiving the response.
+        >>> def callback_function(response):
+        >>>     pprint(response)
+        >>>
+        >>> thread = api.get_pet_by_id_in_object(pet_id, callback=callback_function)
+
+        :param callback function: The callback function
+            for asynchronous request. (optional)
+        :param int pet_id: ID of pet that needs to be fetched (required)
+        :return: InlineResponse200
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['pet_id']
+        all_params.append('callback')
+
+        params = locals()
+        for key, val in iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_pet_by_id_in_object" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        # verify the required parameter 'pet_id' is set
+        if ('pet_id' not in params) or (params['pet_id'] is None):
+            raise ValueError("Missing the required parameter `pet_id` when calling `get_pet_by_id_in_object`")
+
+        resource_path = '/pet/{petId}?response=inline_arbitrary_object'.replace('{format}', 'json')
+        path_params = {}
+        if 'pet_id' in params:
+            path_params['petId'] = params['pet_id']
+
+        query_params = {}
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.\
+            select_header_accept(['application/json', 'application/xml'])
+        if not header_params['Accept']:
+            del header_params['Accept']
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.\
+            select_header_content_type([])
+
+        # Authentication setting
+        auth_settings = ['api_key', 'petstore_auth']
+
+        response = self.api_client.call_api(resource_path, 'GET',
+                                            path_params,
+                                            query_params,
+                                            header_params,
+                                            body=body_params,
+                                            post_params=form_params,
+                                            files=local_var_files,
+                                            response_type='InlineResponse200',
+                                            auth_settings=auth_settings,
+                                            callback=params.get('callback'))
+        return response
+
+    def pet_pet_idtesting_byte_arraytrue_get(self, pet_id, **kwargs):
+        """
+        Fake endpoint to test byte array return by 'Find pet by ID'
+        Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please define a `callback` function
+        to be invoked when receiving the response.
+        >>> def callback_function(response):
+        >>>     pprint(response)
+        >>>
+        >>> thread = api.pet_pet_idtesting_byte_arraytrue_get(pet_id, callback=callback_function)
+
+        :param callback function: The callback function
+            for asynchronous request. (optional)
+        :param int pet_id: ID of pet that needs to be fetched (required)
+        :return: str
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['pet_id']
+        all_params.append('callback')
+
+        params = locals()
+        for key, val in iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method pet_pet_idtesting_byte_arraytrue_get" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        # verify the required parameter 'pet_id' is set
+        if ('pet_id' not in params) or (params['pet_id'] is None):
+            raise ValueError("Missing the required parameter `pet_id` when calling `pet_pet_idtesting_byte_arraytrue_get`")
+
+        resource_path = '/pet/{petId}?testing_byte_array=true'.replace('{format}', 'json')
+        path_params = {}
+        if 'pet_id' in params:
+            path_params['petId'] = params['pet_id']
+
+        query_params = {}
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.\
+            select_header_accept(['application/json', 'application/xml'])
+        if not header_params['Accept']:
+            del header_params['Accept']
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.\
+            select_header_content_type([])
+
+        # Authentication setting
+        auth_settings = ['api_key', 'petstore_auth']
+
+        response = self.api_client.call_api(resource_path, 'GET',
+                                            path_params,
+                                            query_params,
+                                            header_params,
+                                            body=body_params,
+                                            post_params=form_params,
+                                            files=local_var_files,
+                                            response_type='str',
+                                            auth_settings=auth_settings,
+                                            callback=params.get('callback'))
+        return response
+
+    def update_pet(self, **kwargs):
+        """
+        Update an existing pet
+        
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please define a `callback` function
+        to be invoked when receiving the response.
+        >>> def callback_function(response):
+        >>>     pprint(response)
+        >>>
+        >>> thread = api.update_pet(callback=callback_function)
+
+        :param callback function: The callback function
+            for asynchronous request. (optional)
+        :param Pet body: Pet object that needs to be added to the store
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']
+        all_params.append('callback')
+
+        params = locals()
+        for key, val in iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method update_pet" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+
+        resource_path = '/pet'.replace('{format}', 'json')
+        path_params = {}
+
+        query_params = {}
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.\
+            select_header_accept(['application/json', 'application/xml'])
+        if not header_params['Accept']:
+            del header_params['Accept']
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.\
+            select_header_content_type(['application/json', 'application/xml'])
+
+        # Authentication setting
+        auth_settings = ['petstore_auth']
+
+        response = self.api_client.call_api(resource_path, 'PUT',
+                                            path_params,
+                                            query_params,
+                                            header_params,
+                                            body=body_params,
+                                            post_params=form_params,
+                                            files=local_var_files,
+                                            response_type=None,
+                                            auth_settings=auth_settings,
+                                            callback=params.get('callback'))
+        return response
+
+    def update_pet_with_form(self, pet_id, **kwargs):
+        """
+        Updates a pet in the store with form data
+        
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please define a `callback` function
+        to be invoked when receiving the response.
+        >>> def callback_function(response):
+        >>>     pprint(response)
+        >>>
+        >>> thread = api.update_pet_with_form(pet_id, callback=callback_function)
+
+        :param callback function: The callback function
+            for asynchronous request. (optional)
+        :param str pet_id: ID of pet that needs to be updated (required)
+        :param str name: Updated name of the pet
+        :param str status: Updated status of the pet
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['pet_id', 'name', 'status']
+        all_params.append('callback')
+
+        params = locals()
+        for key, val in iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method update_pet_with_form" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        # verify the required parameter 'pet_id' is set
+        if ('pet_id' not in params) or (params['pet_id'] is None):
+            raise ValueError("Missing the required parameter `pet_id` when calling `update_pet_with_form`")
+
+        resource_path = '/pet/{petId}'.replace('{format}', 'json')
+        path_params = {}
+        if 'pet_id' in params:
+            path_params['petId'] = params['pet_id']
+
+        query_params = {}
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+        if 'name' in params:
+            form_params.append(('name', params['name']))
+        if 'status' in params:
+            form_params.append(('status', params['status']))
+
+        body_params = None
+
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.\
+            select_header_accept(['application/json', 'application/xml'])
+        if not header_params['Accept']:
+            del header_params['Accept']
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.\
+            select_header_content_type(['application/x-www-form-urlencoded'])
+
+        # Authentication setting
+        auth_settings = ['petstore_auth']
+
+        response = self.api_client.call_api(resource_path, 'POST',
+                                            path_params,
+                                            query_params,
+                                            header_params,
+                                            body=body_params,
+                                            post_params=form_params,
+                                            files=local_var_files,
                                             response_type=None,
                                             auth_settings=auth_settings,
                                             callback=params.get('callback'))
@@ -636,8 +850,6 @@ class PetApi(object):
             raise ValueError("Missing the required parameter `pet_id` when calling `upload_file`")
 
         resource_path = '/pet/{petId}/uploadImage'.replace('{format}', 'json')
-        method = 'POST'
-
         path_params = {}
         if 'pet_id' in params:
             path_params['petId'] = params['pet_id']
@@ -646,12 +858,12 @@ class PetApi(object):
 
         header_params = {}
 
-        form_params = {}
-        files = {}
+        form_params = []
+        local_var_files = {}
         if 'additional_metadata' in params:
-            form_params['additionalMetadata'] = params['additional_metadata']
+            form_params.append(('additionalMetadata', params['additional_metadata']))
         if 'file' in params:
-            files['file'] = params['file']
+            local_var_files['file'] = params['file']
 
         body_params = None
 
@@ -668,13 +880,13 @@ class PetApi(object):
         # Authentication setting
         auth_settings = ['petstore_auth']
 
-        response = self.api_client.call_api(resource_path, method,
+        response = self.api_client.call_api(resource_path, 'POST',
                                             path_params,
                                             query_params,
                                             header_params,
                                             body=body_params,
                                             post_params=form_params,
-                                            files=files,
+                                            files=local_var_files,
                                             response_type=None,
                                             auth_settings=auth_settings,
                                             callback=params.get('callback'))
diff --git a/samples/client/petstore/python/swagger_client/apis/store_api.py b/samples/client/petstore/python/swagger_client/apis/store_api.py
index e3835990a30..85bb90ed40c 100644
--- a/samples/client/petstore/python/swagger_client/apis/store_api.py
+++ b/samples/client/petstore/python/swagger_client/apis/store_api.py
@@ -2,7 +2,7 @@
 
 """
 StoreApi.py
-Copyright 2015 SmartBear Software
+Copyright 2016 SmartBear Software
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -45,6 +45,157 @@ class StoreApi(object):
                 config.api_client = ApiClient()
             self.api_client = config.api_client
 
+    def delete_order(self, order_id, **kwargs):
+        """
+        Delete purchase order by ID
+        For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please define a `callback` function
+        to be invoked when receiving the response.
+        >>> def callback_function(response):
+        >>>     pprint(response)
+        >>>
+        >>> thread = api.delete_order(order_id, callback=callback_function)
+
+        :param callback function: The callback function
+            for asynchronous request. (optional)
+        :param str order_id: ID of the order that needs to be deleted (required)
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['order_id']
+        all_params.append('callback')
+
+        params = locals()
+        for key, val in iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method delete_order" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        # verify the required parameter 'order_id' is set
+        if ('order_id' not in params) or (params['order_id'] is None):
+            raise ValueError("Missing the required parameter `order_id` when calling `delete_order`")
+
+        resource_path = '/store/order/{orderId}'.replace('{format}', 'json')
+        path_params = {}
+        if 'order_id' in params:
+            path_params['orderId'] = params['order_id']
+
+        query_params = {}
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.\
+            select_header_accept(['application/json', 'application/xml'])
+        if not header_params['Accept']:
+            del header_params['Accept']
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.\
+            select_header_content_type([])
+
+        # Authentication setting
+        auth_settings = []
+
+        response = self.api_client.call_api(resource_path, 'DELETE',
+                                            path_params,
+                                            query_params,
+                                            header_params,
+                                            body=body_params,
+                                            post_params=form_params,
+                                            files=local_var_files,
+                                            response_type=None,
+                                            auth_settings=auth_settings,
+                                            callback=params.get('callback'))
+        return response
+
+    def find_orders_by_status(self, **kwargs):
+        """
+        Finds orders by status
+        A single status value can be provided as a string
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please define a `callback` function
+        to be invoked when receiving the response.
+        >>> def callback_function(response):
+        >>>     pprint(response)
+        >>>
+        >>> thread = api.find_orders_by_status(callback=callback_function)
+
+        :param callback function: The callback function
+            for asynchronous request. (optional)
+        :param str status: Status value that needs to be considered for query
+        :return: list[Order]
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['status']
+        all_params.append('callback')
+
+        params = locals()
+        for key, val in iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method find_orders_by_status" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+
+        resource_path = '/store/findByStatus'.replace('{format}', 'json')
+        path_params = {}
+
+        query_params = {}
+        if 'status' in params:
+            query_params['status'] = params['status']
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.\
+            select_header_accept(['application/json', 'application/xml'])
+        if not header_params['Accept']:
+            del header_params['Accept']
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.\
+            select_header_content_type([])
+
+        # Authentication setting
+        auth_settings = ['test_api_client_id', 'test_api_client_secret']
+
+        response = self.api_client.call_api(resource_path, 'GET',
+                                            path_params,
+                                            query_params,
+                                            header_params,
+                                            body=body_params,
+                                            post_params=form_params,
+                                            files=local_var_files,
+                                            response_type='list[Order]',
+                                            auth_settings=auth_settings,
+                                            callback=params.get('callback'))
+        return response
+
     def get_inventory(self, **kwargs):
         """
         Returns pet inventories by status
@@ -80,16 +231,14 @@ class StoreApi(object):
 
 
         resource_path = '/store/inventory'.replace('{format}', 'json')
-        method = 'GET'
-
         path_params = {}
 
         query_params = {}
 
         header_params = {}
 
-        form_params = {}
-        files = {}
+        form_params = []
+        local_var_files = {}
 
         body_params = None
 
@@ -106,22 +255,22 @@ class StoreApi(object):
         # Authentication setting
         auth_settings = ['api_key']
 
-        response = self.api_client.call_api(resource_path, method,
+        response = self.api_client.call_api(resource_path, 'GET',
                                             path_params,
                                             query_params,
                                             header_params,
                                             body=body_params,
                                             post_params=form_params,
-                                            files=files,
+                                            files=local_var_files,
                                             response_type='dict(str, int)',
                                             auth_settings=auth_settings,
                                             callback=params.get('callback'))
         return response
 
-    def place_order(self, **kwargs):
+    def get_inventory_in_object(self, **kwargs):
         """
-        Place an order for a pet
-        
+        Fake endpoint to test arbitrary object return by 'Get inventory'
+        Returns an arbitrary object which is actually a map of status codes to quantities
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please define a `callback` function
@@ -129,17 +278,16 @@ class StoreApi(object):
         >>> def callback_function(response):
         >>>     pprint(response)
         >>>
-        >>> thread = api.place_order(callback=callback_function)
+        >>> thread = api.get_inventory_in_object(callback=callback_function)
 
         :param callback function: The callback function
             for asynchronous request. (optional)
-        :param Order body: order placed for purchasing the pet
-        :return: Order
+        :return: object
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['body']
+        all_params = []
         all_params.append('callback')
 
         params = locals()
@@ -147,27 +295,23 @@ class StoreApi(object):
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method place_order" % key
+                    " to method get_inventory_in_object" % key
                 )
             params[key] = val
         del params['kwargs']
 
 
-        resource_path = '/store/order'.replace('{format}', 'json')
-        method = 'POST'
-
+        resource_path = '/store/inventory?response=arbitrary_object'.replace('{format}', 'json')
         path_params = {}
 
         query_params = {}
 
         header_params = {}
 
-        form_params = {}
-        files = {}
+        form_params = []
+        local_var_files = {}
 
         body_params = None
-        if 'body' in params:
-            body_params = params['body']
 
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
@@ -180,16 +324,16 @@ class StoreApi(object):
             select_header_content_type([])
 
         # Authentication setting
-        auth_settings = []
+        auth_settings = ['api_key']
 
-        response = self.api_client.call_api(resource_path, method,
+        response = self.api_client.call_api(resource_path, 'GET',
                                             path_params,
                                             query_params,
                                             header_params,
                                             body=body_params,
                                             post_params=form_params,
-                                            files=files,
-                                            response_type='Order',
+                                            files=local_var_files,
+                                            response_type='object',
                                             auth_settings=auth_settings,
                                             callback=params.get('callback'))
         return response
@@ -233,8 +377,6 @@ class StoreApi(object):
             raise ValueError("Missing the required parameter `order_id` when calling `get_order_by_id`")
 
         resource_path = '/store/order/{orderId}'.replace('{format}', 'json')
-        method = 'GET'
-
         path_params = {}
         if 'order_id' in params:
             path_params['orderId'] = params['order_id']
@@ -243,8 +385,8 @@ class StoreApi(object):
 
         header_params = {}
 
-        form_params = {}
-        files = {}
+        form_params = []
+        local_var_files = {}
 
         body_params = None
 
@@ -259,24 +401,24 @@ class StoreApi(object):
             select_header_content_type([])
 
         # Authentication setting
-        auth_settings = []
+        auth_settings = ['test_api_key_header', 'test_api_key_query']
 
-        response = self.api_client.call_api(resource_path, method,
+        response = self.api_client.call_api(resource_path, 'GET',
                                             path_params,
                                             query_params,
                                             header_params,
                                             body=body_params,
                                             post_params=form_params,
-                                            files=files,
+                                            files=local_var_files,
                                             response_type='Order',
                                             auth_settings=auth_settings,
                                             callback=params.get('callback'))
         return response
 
-    def delete_order(self, order_id, **kwargs):
+    def place_order(self, **kwargs):
         """
-        Delete purchase order by ID
-        For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+        Place an order for a pet
+        
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please define a `callback` function
@@ -284,17 +426,17 @@ class StoreApi(object):
         >>> def callback_function(response):
         >>>     pprint(response)
         >>>
-        >>> thread = api.delete_order(order_id, callback=callback_function)
+        >>> thread = api.place_order(callback=callback_function)
 
         :param callback function: The callback function
             for asynchronous request. (optional)
-        :param str order_id: ID of the order that needs to be deleted (required)
-        :return: None
+        :param Order body: order placed for purchasing the pet
+        :return: Order
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['order_id']
+        all_params = ['body']
         all_params.append('callback')
 
         params = locals()
@@ -302,30 +444,25 @@ class StoreApi(object):
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method delete_order" % key
+                    " to method place_order" % key
                 )
             params[key] = val
         del params['kwargs']
 
-        # verify the required parameter 'order_id' is set
-        if ('order_id' not in params) or (params['order_id'] is None):
-            raise ValueError("Missing the required parameter `order_id` when calling `delete_order`")
-
-        resource_path = '/store/order/{orderId}'.replace('{format}', 'json')
-        method = 'DELETE'
 
+        resource_path = '/store/order'.replace('{format}', 'json')
         path_params = {}
-        if 'order_id' in params:
-            path_params['orderId'] = params['order_id']
 
         query_params = {}
 
         header_params = {}
 
-        form_params = {}
-        files = {}
+        form_params = []
+        local_var_files = {}
 
         body_params = None
+        if 'body' in params:
+            body_params = params['body']
 
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
@@ -338,16 +475,16 @@ class StoreApi(object):
             select_header_content_type([])
 
         # Authentication setting
-        auth_settings = []
+        auth_settings = ['test_api_client_id', 'test_api_client_secret']
 
-        response = self.api_client.call_api(resource_path, method,
+        response = self.api_client.call_api(resource_path, 'POST',
                                             path_params,
                                             query_params,
                                             header_params,
                                             body=body_params,
                                             post_params=form_params,
-                                            files=files,
-                                            response_type=None,
+                                            files=local_var_files,
+                                            response_type='Order',
                                             auth_settings=auth_settings,
                                             callback=params.get('callback'))
         return response
diff --git a/samples/client/petstore/python/swagger_client/apis/user_api.py b/samples/client/petstore/python/swagger_client/apis/user_api.py
index 4394941b1d5..07d976b0bf5 100644
--- a/samples/client/petstore/python/swagger_client/apis/user_api.py
+++ b/samples/client/petstore/python/swagger_client/apis/user_api.py
@@ -2,7 +2,7 @@
 
 """
 UserApi.py
-Copyright 2015 SmartBear Software
+Copyright 2016 SmartBear Software
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -81,16 +81,14 @@ class UserApi(object):
 
 
         resource_path = '/user'.replace('{format}', 'json')
-        method = 'POST'
-
         path_params = {}
 
         query_params = {}
 
         header_params = {}
 
-        form_params = {}
-        files = {}
+        form_params = []
+        local_var_files = {}
 
         body_params = None
         if 'body' in params:
@@ -109,13 +107,13 @@ class UserApi(object):
         # Authentication setting
         auth_settings = []
 
-        response = self.api_client.call_api(resource_path, method,
+        response = self.api_client.call_api(resource_path, 'POST',
                                             path_params,
                                             query_params,
                                             header_params,
                                             body=body_params,
                                             post_params=form_params,
-                                            files=files,
+                                            files=local_var_files,
                                             response_type=None,
                                             auth_settings=auth_settings,
                                             callback=params.get('callback'))
@@ -157,16 +155,14 @@ class UserApi(object):
 
 
         resource_path = '/user/createWithArray'.replace('{format}', 'json')
-        method = 'POST'
-
         path_params = {}
 
         query_params = {}
 
         header_params = {}
 
-        form_params = {}
-        files = {}
+        form_params = []
+        local_var_files = {}
 
         body_params = None
         if 'body' in params:
@@ -185,13 +181,13 @@ class UserApi(object):
         # Authentication setting
         auth_settings = []
 
-        response = self.api_client.call_api(resource_path, method,
+        response = self.api_client.call_api(resource_path, 'POST',
                                             path_params,
                                             query_params,
                                             header_params,
                                             body=body_params,
                                             post_params=form_params,
-                                            files=files,
+                                            files=local_var_files,
                                             response_type=None,
                                             auth_settings=auth_settings,
                                             callback=params.get('callback'))
@@ -233,16 +229,14 @@ class UserApi(object):
 
 
         resource_path = '/user/createWithList'.replace('{format}', 'json')
-        method = 'POST'
-
         path_params = {}
 
         query_params = {}
 
         header_params = {}
 
-        form_params = {}
-        files = {}
+        form_params = []
+        local_var_files = {}
 
         body_params = None
         if 'body' in params:
@@ -261,326 +255,13 @@ class UserApi(object):
         # Authentication setting
         auth_settings = []
 
-        response = self.api_client.call_api(resource_path, method,
+        response = self.api_client.call_api(resource_path, 'POST',
                                             path_params,
                                             query_params,
                                             header_params,
                                             body=body_params,
                                             post_params=form_params,
-                                            files=files,
-                                            response_type=None,
-                                            auth_settings=auth_settings,
-                                            callback=params.get('callback'))
-        return response
-
-    def login_user(self, **kwargs):
-        """
-        Logs user into the system
-        
-
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please define a `callback` function
-        to be invoked when receiving the response.
-        >>> def callback_function(response):
-        >>>     pprint(response)
-        >>>
-        >>> thread = api.login_user(callback=callback_function)
-
-        :param callback function: The callback function
-            for asynchronous request. (optional)
-        :param str username: The user name for login
-        :param str password: The password for login in clear text
-        :return: str
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['username', 'password']
-        all_params.append('callback')
-
-        params = locals()
-        for key, val in iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method login_user" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-
-        resource_path = '/user/login'.replace('{format}', 'json')
-        method = 'GET'
-
-        path_params = {}
-
-        query_params = {}
-        if 'username' in params:
-            query_params['username'] = params['username']
-        if 'password' in params:
-            query_params['password'] = params['password']
-
-        header_params = {}
-
-        form_params = {}
-        files = {}
-
-        body_params = None
-
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
-        if not header_params['Accept']:
-            del header_params['Accept']
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.\
-            select_header_content_type([])
-
-        # Authentication setting
-        auth_settings = []
-
-        response = self.api_client.call_api(resource_path, method,
-                                            path_params,
-                                            query_params,
-                                            header_params,
-                                            body=body_params,
-                                            post_params=form_params,
-                                            files=files,
-                                            response_type='str',
-                                            auth_settings=auth_settings,
-                                            callback=params.get('callback'))
-        return response
-
-    def logout_user(self, **kwargs):
-        """
-        Logs out current logged in user session
-        
-
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please define a `callback` function
-        to be invoked when receiving the response.
-        >>> def callback_function(response):
-        >>>     pprint(response)
-        >>>
-        >>> thread = api.logout_user(callback=callback_function)
-
-        :param callback function: The callback function
-            for asynchronous request. (optional)
-        :return: None
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = []
-        all_params.append('callback')
-
-        params = locals()
-        for key, val in iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method logout_user" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-
-        resource_path = '/user/logout'.replace('{format}', 'json')
-        method = 'GET'
-
-        path_params = {}
-
-        query_params = {}
-
-        header_params = {}
-
-        form_params = {}
-        files = {}
-
-        body_params = None
-
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
-        if not header_params['Accept']:
-            del header_params['Accept']
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.\
-            select_header_content_type([])
-
-        # Authentication setting
-        auth_settings = []
-
-        response = self.api_client.call_api(resource_path, method,
-                                            path_params,
-                                            query_params,
-                                            header_params,
-                                            body=body_params,
-                                            post_params=form_params,
-                                            files=files,
-                                            response_type=None,
-                                            auth_settings=auth_settings,
-                                            callback=params.get('callback'))
-        return response
-
-    def get_user_by_name(self, username, **kwargs):
-        """
-        Get user by user name
-        
-
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please define a `callback` function
-        to be invoked when receiving the response.
-        >>> def callback_function(response):
-        >>>     pprint(response)
-        >>>
-        >>> thread = api.get_user_by_name(username, callback=callback_function)
-
-        :param callback function: The callback function
-            for asynchronous request. (optional)
-        :param str username: The name that needs to be fetched. Use user1 for testing. (required)
-        :return: User
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['username']
-        all_params.append('callback')
-
-        params = locals()
-        for key, val in iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method get_user_by_name" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        # verify the required parameter 'username' is set
-        if ('username' not in params) or (params['username'] is None):
-            raise ValueError("Missing the required parameter `username` when calling `get_user_by_name`")
-
-        resource_path = '/user/{username}'.replace('{format}', 'json')
-        method = 'GET'
-
-        path_params = {}
-        if 'username' in params:
-            path_params['username'] = params['username']
-
-        query_params = {}
-
-        header_params = {}
-
-        form_params = {}
-        files = {}
-
-        body_params = None
-
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
-        if not header_params['Accept']:
-            del header_params['Accept']
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.\
-            select_header_content_type([])
-
-        # Authentication setting
-        auth_settings = []
-
-        response = self.api_client.call_api(resource_path, method,
-                                            path_params,
-                                            query_params,
-                                            header_params,
-                                            body=body_params,
-                                            post_params=form_params,
-                                            files=files,
-                                            response_type='User',
-                                            auth_settings=auth_settings,
-                                            callback=params.get('callback'))
-        return response
-
-    def update_user(self, username, **kwargs):
-        """
-        Updated user
-        This can only be done by the logged in user.
-
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please define a `callback` function
-        to be invoked when receiving the response.
-        >>> def callback_function(response):
-        >>>     pprint(response)
-        >>>
-        >>> thread = api.update_user(username, callback=callback_function)
-
-        :param callback function: The callback function
-            for asynchronous request. (optional)
-        :param str username: name that need to be deleted (required)
-        :param User body: Updated user object
-        :return: None
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['username', 'body']
-        all_params.append('callback')
-
-        params = locals()
-        for key, val in iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method update_user" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        # verify the required parameter 'username' is set
-        if ('username' not in params) or (params['username'] is None):
-            raise ValueError("Missing the required parameter `username` when calling `update_user`")
-
-        resource_path = '/user/{username}'.replace('{format}', 'json')
-        method = 'PUT'
-
-        path_params = {}
-        if 'username' in params:
-            path_params['username'] = params['username']
-
-        query_params = {}
-
-        header_params = {}
-
-        form_params = {}
-        files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
-        if not header_params['Accept']:
-            del header_params['Accept']
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.\
-            select_header_content_type([])
-
-        # Authentication setting
-        auth_settings = []
-
-        response = self.api_client.call_api(resource_path, method,
-                                            path_params,
-                                            query_params,
-                                            header_params,
-                                            body=body_params,
-                                            post_params=form_params,
-                                            files=files,
+                                            files=local_var_files,
                                             response_type=None,
                                             auth_settings=auth_settings,
                                             callback=params.get('callback'))
@@ -625,8 +306,6 @@ class UserApi(object):
             raise ValueError("Missing the required parameter `username` when calling `delete_user`")
 
         resource_path = '/user/{username}'.replace('{format}', 'json')
-        method = 'DELETE'
-
         path_params = {}
         if 'username' in params:
             path_params['username'] = params['username']
@@ -635,8 +314,85 @@ class UserApi(object):
 
         header_params = {}
 
-        form_params = {}
-        files = {}
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.\
+            select_header_accept(['application/json', 'application/xml'])
+        if not header_params['Accept']:
+            del header_params['Accept']
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.\
+            select_header_content_type([])
+
+        # Authentication setting
+        auth_settings = ['test_http_basic']
+
+        response = self.api_client.call_api(resource_path, 'DELETE',
+                                            path_params,
+                                            query_params,
+                                            header_params,
+                                            body=body_params,
+                                            post_params=form_params,
+                                            files=local_var_files,
+                                            response_type=None,
+                                            auth_settings=auth_settings,
+                                            callback=params.get('callback'))
+        return response
+
+    def get_user_by_name(self, username, **kwargs):
+        """
+        Get user by user name
+        
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please define a `callback` function
+        to be invoked when receiving the response.
+        >>> def callback_function(response):
+        >>>     pprint(response)
+        >>>
+        >>> thread = api.get_user_by_name(username, callback=callback_function)
+
+        :param callback function: The callback function
+            for asynchronous request. (optional)
+        :param str username: The name that needs to be fetched. Use user1 for testing. (required)
+        :return: User
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['username']
+        all_params.append('callback')
+
+        params = locals()
+        for key, val in iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_user_by_name" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        # verify the required parameter 'username' is set
+        if ('username' not in params) or (params['username'] is None):
+            raise ValueError("Missing the required parameter `username` when calling `get_user_by_name`")
+
+        resource_path = '/user/{username}'.replace('{format}', 'json')
+        path_params = {}
+        if 'username' in params:
+            path_params['username'] = params['username']
+
+        query_params = {}
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
 
         body_params = None
 
@@ -653,13 +409,241 @@ class UserApi(object):
         # Authentication setting
         auth_settings = []
 
-        response = self.api_client.call_api(resource_path, method,
+        response = self.api_client.call_api(resource_path, 'GET',
                                             path_params,
                                             query_params,
                                             header_params,
                                             body=body_params,
                                             post_params=form_params,
-                                            files=files,
+                                            files=local_var_files,
+                                            response_type='User',
+                                            auth_settings=auth_settings,
+                                            callback=params.get('callback'))
+        return response
+
+    def login_user(self, **kwargs):
+        """
+        Logs user into the system
+        
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please define a `callback` function
+        to be invoked when receiving the response.
+        >>> def callback_function(response):
+        >>>     pprint(response)
+        >>>
+        >>> thread = api.login_user(callback=callback_function)
+
+        :param callback function: The callback function
+            for asynchronous request. (optional)
+        :param str username: The user name for login
+        :param str password: The password for login in clear text
+        :return: str
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['username', 'password']
+        all_params.append('callback')
+
+        params = locals()
+        for key, val in iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method login_user" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+
+        resource_path = '/user/login'.replace('{format}', 'json')
+        path_params = {}
+
+        query_params = {}
+        if 'username' in params:
+            query_params['username'] = params['username']
+        if 'password' in params:
+            query_params['password'] = params['password']
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.\
+            select_header_accept(['application/json', 'application/xml'])
+        if not header_params['Accept']:
+            del header_params['Accept']
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.\
+            select_header_content_type([])
+
+        # Authentication setting
+        auth_settings = []
+
+        response = self.api_client.call_api(resource_path, 'GET',
+                                            path_params,
+                                            query_params,
+                                            header_params,
+                                            body=body_params,
+                                            post_params=form_params,
+                                            files=local_var_files,
+                                            response_type='str',
+                                            auth_settings=auth_settings,
+                                            callback=params.get('callback'))
+        return response
+
+    def logout_user(self, **kwargs):
+        """
+        Logs out current logged in user session
+        
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please define a `callback` function
+        to be invoked when receiving the response.
+        >>> def callback_function(response):
+        >>>     pprint(response)
+        >>>
+        >>> thread = api.logout_user(callback=callback_function)
+
+        :param callback function: The callback function
+            for asynchronous request. (optional)
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = []
+        all_params.append('callback')
+
+        params = locals()
+        for key, val in iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method logout_user" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+
+        resource_path = '/user/logout'.replace('{format}', 'json')
+        path_params = {}
+
+        query_params = {}
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.\
+            select_header_accept(['application/json', 'application/xml'])
+        if not header_params['Accept']:
+            del header_params['Accept']
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.\
+            select_header_content_type([])
+
+        # Authentication setting
+        auth_settings = []
+
+        response = self.api_client.call_api(resource_path, 'GET',
+                                            path_params,
+                                            query_params,
+                                            header_params,
+                                            body=body_params,
+                                            post_params=form_params,
+                                            files=local_var_files,
+                                            response_type=None,
+                                            auth_settings=auth_settings,
+                                            callback=params.get('callback'))
+        return response
+
+    def update_user(self, username, **kwargs):
+        """
+        Updated user
+        This can only be done by the logged in user.
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please define a `callback` function
+        to be invoked when receiving the response.
+        >>> def callback_function(response):
+        >>>     pprint(response)
+        >>>
+        >>> thread = api.update_user(username, callback=callback_function)
+
+        :param callback function: The callback function
+            for asynchronous request. (optional)
+        :param str username: name that need to be deleted (required)
+        :param User body: Updated user object
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['username', 'body']
+        all_params.append('callback')
+
+        params = locals()
+        for key, val in iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method update_user" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        # verify the required parameter 'username' is set
+        if ('username' not in params) or (params['username'] is None):
+            raise ValueError("Missing the required parameter `username` when calling `update_user`")
+
+        resource_path = '/user/{username}'.replace('{format}', 'json')
+        path_params = {}
+        if 'username' in params:
+            path_params['username'] = params['username']
+
+        query_params = {}
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.\
+            select_header_accept(['application/json', 'application/xml'])
+        if not header_params['Accept']:
+            del header_params['Accept']
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.\
+            select_header_content_type([])
+
+        # Authentication setting
+        auth_settings = []
+
+        response = self.api_client.call_api(resource_path, 'PUT',
+                                            path_params,
+                                            query_params,
+                                            header_params,
+                                            body=body_params,
+                                            post_params=form_params,
+                                            files=local_var_files,
                                             response_type=None,
                                             auth_settings=auth_settings,
                                             callback=params.get('callback'))
diff --git a/samples/client/petstore/python/swagger_client/configuration.py b/samples/client/petstore/python/swagger_client/configuration.py
index ecbecf7e9f9..8f66e4428c5 100644
--- a/samples/client/petstore/python/swagger_client/configuration.py
+++ b/samples/client/petstore/python/swagger_client/configuration.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-Copyright 2015 SmartBear Software
+Copyright 2016 SmartBear Software
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -217,6 +217,13 @@ class Configuration(object):
         :return: The Auth Settings information dict.
         """
         return {
+            'test_api_key_header':
+                {
+                    'type': 'api_key',
+                    'in': 'header',
+                    'key': 'test_api_key_header',
+                    'value': self.get_api_key_with_prefix('test_api_key_header')
+                },
             'api_key':
                 {
                     'type': 'api_key',
@@ -224,6 +231,34 @@ class Configuration(object):
                     'key': 'api_key',
                     'value': self.get_api_key_with_prefix('api_key')
                 },
+            'test_http_basic':
+                {
+                    'type': 'basic',
+                    'in': 'header',
+                    'key': 'Authorization',
+                    'value': self.get_basic_auth_token()
+                },
+            'test_api_client_secret':
+                {
+                    'type': 'api_key',
+                    'in': 'header',
+                    'key': 'x-test_api_client_secret',
+                    'value': self.get_api_key_with_prefix('x-test_api_client_secret')
+                },
+            'test_api_client_id':
+                {
+                    'type': 'api_key',
+                    'in': 'header',
+                    'key': 'x-test_api_client_id',
+                    'value': self.get_api_key_with_prefix('x-test_api_client_id')
+                },
+            'test_api_key_query':
+                {
+                    'type': 'api_key',
+                    'in': 'query',
+                    'key': 'test_api_key_query',
+                    'value': self.get_api_key_with_prefix('test_api_key_query')
+                },
 
         }
 
diff --git a/samples/client/petstore/python/swagger_client/models/__init__.py b/samples/client/petstore/python/swagger_client/models/__init__.py
index 236f10e934a..baccc53b4d6 100644
--- a/samples/client/petstore/python/swagger_client/models/__init__.py
+++ b/samples/client/petstore/python/swagger_client/models/__init__.py
@@ -1,8 +1,13 @@
 from __future__ import absolute_import
 
 # import models into model package
-from .user import User
 from .category import Category
-from .pet import Pet
-from .tag import Tag
+from .inline_response_200 import InlineResponse200
+from .model_200_response import Model200Response
+from .model_return import ModelReturn
+from .name import Name
 from .order import Order
+from .pet import Pet
+from .special_model_name import SpecialModelName
+from .tag import Tag
+from .user import User
diff --git a/samples/client/petstore/python/swagger_client/models/category.py b/samples/client/petstore/python/swagger_client/models/category.py
index 7c36ea3ec47..b8d540c51bd 100644
--- a/samples/client/petstore/python/swagger_client/models/category.py
+++ b/samples/client/petstore/python/swagger_client/models/category.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-Copyright 2015 SmartBear Software
+Copyright 2016 SmartBear Software
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -108,6 +108,12 @@ class Category(object):
                 ))
             elif hasattr(value, "to_dict"):
                 result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
             else:
                 result[attr] = value
 
@@ -125,14 +131,14 @@ class Category(object):
         """
         return self.to_str()
 
-    def __eq__(self, other): 
+    def __eq__(self, other):
         """
         Returns true if both objects are equal
         """
         return self.__dict__ == other.__dict__
 
     def __ne__(self, other):
-        """ 
+        """
         Returns true if both objects are not equal
         """
         return not self == other
diff --git a/samples/client/petstore/python/swagger_client/models/inline_response_200.py b/samples/client/petstore/python/swagger_client/models/inline_response_200.py
new file mode 100644
index 00000000000..f55ff5ee4d5
--- /dev/null
+++ b/samples/client/petstore/python/swagger_client/models/inline_response_200.py
@@ -0,0 +1,251 @@
+# coding: utf-8
+
+"""
+Copyright 2016 SmartBear Software
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+    Ref: https://github.com/swagger-api/swagger-codegen
+"""
+
+from pprint import pformat
+from six import iteritems
+
+
+class InlineResponse200(object):
+    """
+    NOTE: This class is auto generated by the swagger code generator program.
+    Do not edit the class manually.
+    """
+    def __init__(self):
+        """
+        InlineResponse200 - a model defined in Swagger
+
+        :param dict swaggerTypes: The key is attribute name
+                                  and the value is attribute type.
+        :param dict attributeMap: The key is attribute name
+                                  and the value is json key in definition.
+        """
+        self.swagger_types = {
+            'tags': 'list[Tag]',
+            'id': 'int',
+            'category': 'object',
+            'status': 'str',
+            'name': 'str',
+            'photo_urls': 'list[str]'
+        }
+
+        self.attribute_map = {
+            'tags': 'tags',
+            'id': 'id',
+            'category': 'category',
+            'status': 'status',
+            'name': 'name',
+            'photo_urls': 'photoUrls'
+        }
+
+        self._tags = None
+        self._id = None
+        self._category = None
+        self._status = None
+        self._name = None
+        self._photo_urls = None
+
+    @property
+    def tags(self):
+        """
+        Gets the tags of this InlineResponse200.
+
+
+        :return: The tags of this InlineResponse200.
+        :rtype: list[Tag]
+        """
+        return self._tags
+
+    @tags.setter
+    def tags(self, tags):
+        """
+        Sets the tags of this InlineResponse200.
+
+
+        :param tags: The tags of this InlineResponse200.
+        :type: list[Tag]
+        """
+        self._tags = tags
+
+    @property
+    def id(self):
+        """
+        Gets the id of this InlineResponse200.
+
+
+        :return: The id of this InlineResponse200.
+        :rtype: int
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """
+        Sets the id of this InlineResponse200.
+
+
+        :param id: The id of this InlineResponse200.
+        :type: int
+        """
+        self._id = id
+
+    @property
+    def category(self):
+        """
+        Gets the category of this InlineResponse200.
+
+
+        :return: The category of this InlineResponse200.
+        :rtype: object
+        """
+        return self._category
+
+    @category.setter
+    def category(self, category):
+        """
+        Sets the category of this InlineResponse200.
+
+
+        :param category: The category of this InlineResponse200.
+        :type: object
+        """
+        self._category = category
+
+    @property
+    def status(self):
+        """
+        Gets the status of this InlineResponse200.
+        pet status in the store
+
+        :return: The status of this InlineResponse200.
+        :rtype: str
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """
+        Sets the status of this InlineResponse200.
+        pet status in the store
+
+        :param status: The status of this InlineResponse200.
+        :type: str
+        """
+        allowed_values = ["available", "pending", "sold"]
+        if status not in allowed_values:
+            raise ValueError(
+                "Invalid value for `status`, must be one of {0}"
+                .format(allowed_values)
+            )
+        self._status = status
+
+    @property
+    def name(self):
+        """
+        Gets the name of this InlineResponse200.
+
+
+        :return: The name of this InlineResponse200.
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """
+        Sets the name of this InlineResponse200.
+
+
+        :param name: The name of this InlineResponse200.
+        :type: str
+        """
+        self._name = name
+
+    @property
+    def photo_urls(self):
+        """
+        Gets the photo_urls of this InlineResponse200.
+
+
+        :return: The photo_urls of this InlineResponse200.
+        :rtype: list[str]
+        """
+        return self._photo_urls
+
+    @photo_urls.setter
+    def photo_urls(self, photo_urls):
+        """
+        Sets the photo_urls of this InlineResponse200.
+
+
+        :param photo_urls: The photo_urls of this InlineResponse200.
+        :type: list[str]
+        """
+        self._photo_urls = photo_urls
+
+    def to_dict(self):
+        """
+        Returns the model properties as a dict
+        """
+        result = {}
+
+        for attr, _ in iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """
+        Returns the string representation of the model
+        """
+        return pformat(self.to_dict())
+
+    def __repr__(self):
+        """
+        For `print` and `pprint`
+        """
+        return self.to_str()
+
+    def __eq__(self, other):
+        """
+        Returns true if both objects are equal
+        """
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """
+        Returns true if both objects are not equal
+        """
+        return not self == other
+
diff --git a/samples/client/petstore/python/swagger_client/models/model_200_response.py b/samples/client/petstore/python/swagger_client/models/model_200_response.py
new file mode 100644
index 00000000000..681de963e6e
--- /dev/null
+++ b/samples/client/petstore/python/swagger_client/models/model_200_response.py
@@ -0,0 +1,120 @@
+# coding: utf-8
+
+"""
+Copyright 2016 SmartBear Software
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+    Ref: https://github.com/swagger-api/swagger-codegen
+"""
+
+from pprint import pformat
+from six import iteritems
+
+
+class Model200Response(object):
+    """
+    NOTE: This class is auto generated by the swagger code generator program.
+    Do not edit the class manually.
+    """
+    def __init__(self):
+        """
+        Model200Response - a model defined in Swagger
+
+        :param dict swaggerTypes: The key is attribute name
+                                  and the value is attribute type.
+        :param dict attributeMap: The key is attribute name
+                                  and the value is json key in definition.
+        """
+        self.swagger_types = {
+            'name': 'int'
+        }
+
+        self.attribute_map = {
+            'name': 'name'
+        }
+
+        self._name = None
+
+    @property
+    def name(self):
+        """
+        Gets the name of this Model200Response.
+
+
+        :return: The name of this Model200Response.
+        :rtype: int
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """
+        Sets the name of this Model200Response.
+
+
+        :param name: The name of this Model200Response.
+        :type: int
+        """
+        self._name = name
+
+    def to_dict(self):
+        """
+        Returns the model properties as a dict
+        """
+        result = {}
+
+        for attr, _ in iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """
+        Returns the string representation of the model
+        """
+        return pformat(self.to_dict())
+
+    def __repr__(self):
+        """
+        For `print` and `pprint`
+        """
+        return self.to_str()
+
+    def __eq__(self, other):
+        """
+        Returns true if both objects are equal
+        """
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """
+        Returns true if both objects are not equal
+        """
+        return not self == other
+
diff --git a/samples/client/petstore/python/swagger_client/models/model_return.py b/samples/client/petstore/python/swagger_client/models/model_return.py
new file mode 100644
index 00000000000..75b46259d6f
--- /dev/null
+++ b/samples/client/petstore/python/swagger_client/models/model_return.py
@@ -0,0 +1,120 @@
+# coding: utf-8
+
+"""
+Copyright 2016 SmartBear Software
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+    Ref: https://github.com/swagger-api/swagger-codegen
+"""
+
+from pprint import pformat
+from six import iteritems
+
+
+class ModelReturn(object):
+    """
+    NOTE: This class is auto generated by the swagger code generator program.
+    Do not edit the class manually.
+    """
+    def __init__(self):
+        """
+        ModelReturn - a model defined in Swagger
+
+        :param dict swaggerTypes: The key is attribute name
+                                  and the value is attribute type.
+        :param dict attributeMap: The key is attribute name
+                                  and the value is json key in definition.
+        """
+        self.swagger_types = {
+            '_return': 'int'
+        }
+
+        self.attribute_map = {
+            '_return': 'return'
+        }
+
+        self.__return = None
+
+    @property
+    def _return(self):
+        """
+        Gets the _return of this ModelReturn.
+
+
+        :return: The _return of this ModelReturn.
+        :rtype: int
+        """
+        return self.__return
+
+    @_return.setter
+    def _return(self, _return):
+        """
+        Sets the _return of this ModelReturn.
+
+
+        :param _return: The _return of this ModelReturn.
+        :type: int
+        """
+        self.__return = _return
+
+    def to_dict(self):
+        """
+        Returns the model properties as a dict
+        """
+        result = {}
+
+        for attr, _ in iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """
+        Returns the string representation of the model
+        """
+        return pformat(self.to_dict())
+
+    def __repr__(self):
+        """
+        For `print` and `pprint`
+        """
+        return self.to_str()
+
+    def __eq__(self, other):
+        """
+        Returns true if both objects are equal
+        """
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """
+        Returns true if both objects are not equal
+        """
+        return not self == other
+
diff --git a/samples/client/petstore/python/swagger_client/models/name.py b/samples/client/petstore/python/swagger_client/models/name.py
new file mode 100644
index 00000000000..52187bd7bc5
--- /dev/null
+++ b/samples/client/petstore/python/swagger_client/models/name.py
@@ -0,0 +1,120 @@
+# coding: utf-8
+
+"""
+Copyright 2016 SmartBear Software
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+    Ref: https://github.com/swagger-api/swagger-codegen
+"""
+
+from pprint import pformat
+from six import iteritems
+
+
+class Name(object):
+    """
+    NOTE: This class is auto generated by the swagger code generator program.
+    Do not edit the class manually.
+    """
+    def __init__(self):
+        """
+        Name - a model defined in Swagger
+
+        :param dict swaggerTypes: The key is attribute name
+                                  and the value is attribute type.
+        :param dict attributeMap: The key is attribute name
+                                  and the value is json key in definition.
+        """
+        self.swagger_types = {
+            'name': 'int'
+        }
+
+        self.attribute_map = {
+            'name': 'name'
+        }
+
+        self._name = None
+
+    @property
+    def name(self):
+        """
+        Gets the name of this Name.
+
+
+        :return: The name of this Name.
+        :rtype: int
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """
+        Sets the name of this Name.
+
+
+        :param name: The name of this Name.
+        :type: int
+        """
+        self._name = name
+
+    def to_dict(self):
+        """
+        Returns the model properties as a dict
+        """
+        result = {}
+
+        for attr, _ in iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """
+        Returns the string representation of the model
+        """
+        return pformat(self.to_dict())
+
+    def __repr__(self):
+        """
+        For `print` and `pprint`
+        """
+        return self.to_str()
+
+    def __eq__(self, other):
+        """
+        Returns true if both objects are equal
+        """
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """
+        Returns true if both objects are not equal
+        """
+        return not self == other
+
diff --git a/samples/client/petstore/python/swagger_client/models/order.py b/samples/client/petstore/python/swagger_client/models/order.py
index 39081233b11..4c8911f267b 100644
--- a/samples/client/petstore/python/swagger_client/models/order.py
+++ b/samples/client/petstore/python/swagger_client/models/order.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-Copyright 2015 SmartBear Software
+Copyright 2016 SmartBear Software
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -214,6 +214,12 @@ class Order(object):
                 ))
             elif hasattr(value, "to_dict"):
                 result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
             else:
                 result[attr] = value
 
@@ -231,14 +237,14 @@ class Order(object):
         """
         return self.to_str()
 
-    def __eq__(self, other): 
+    def __eq__(self, other):
         """
         Returns true if both objects are equal
         """
         return self.__dict__ == other.__dict__
 
     def __ne__(self, other):
-        """ 
+        """
         Returns true if both objects are not equal
         """
         return not self == other
diff --git a/samples/client/petstore/python/swagger_client/models/pet.py b/samples/client/petstore/python/swagger_client/models/pet.py
index eafb352f2d0..dfa614b1e9b 100644
--- a/samples/client/petstore/python/swagger_client/models/pet.py
+++ b/samples/client/petstore/python/swagger_client/models/pet.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-Copyright 2015 SmartBear Software
+Copyright 2016 SmartBear Software
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -214,6 +214,12 @@ class Pet(object):
                 ))
             elif hasattr(value, "to_dict"):
                 result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
             else:
                 result[attr] = value
 
@@ -231,14 +237,14 @@ class Pet(object):
         """
         return self.to_str()
 
-    def __eq__(self, other): 
+    def __eq__(self, other):
         """
         Returns true if both objects are equal
         """
         return self.__dict__ == other.__dict__
 
     def __ne__(self, other):
-        """ 
+        """
         Returns true if both objects are not equal
         """
         return not self == other
diff --git a/samples/client/petstore/python/swagger_client/models/special_model_name.py b/samples/client/petstore/python/swagger_client/models/special_model_name.py
new file mode 100644
index 00000000000..191798d7d9a
--- /dev/null
+++ b/samples/client/petstore/python/swagger_client/models/special_model_name.py
@@ -0,0 +1,120 @@
+# coding: utf-8
+
+"""
+Copyright 2016 SmartBear Software
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+    Ref: https://github.com/swagger-api/swagger-codegen
+"""
+
+from pprint import pformat
+from six import iteritems
+
+
+class SpecialModelName(object):
+    """
+    NOTE: This class is auto generated by the swagger code generator program.
+    Do not edit the class manually.
+    """
+    def __init__(self):
+        """
+        SpecialModelName - a model defined in Swagger
+
+        :param dict swaggerTypes: The key is attribute name
+                                  and the value is attribute type.
+        :param dict attributeMap: The key is attribute name
+                                  and the value is json key in definition.
+        """
+        self.swagger_types = {
+            'special_property_name': 'int'
+        }
+
+        self.attribute_map = {
+            'special_property_name': '$special[property.name]'
+        }
+
+        self._special_property_name = None
+
+    @property
+    def special_property_name(self):
+        """
+        Gets the special_property_name of this SpecialModelName.
+
+
+        :return: The special_property_name of this SpecialModelName.
+        :rtype: int
+        """
+        return self._special_property_name
+
+    @special_property_name.setter
+    def special_property_name(self, special_property_name):
+        """
+        Sets the special_property_name of this SpecialModelName.
+
+
+        :param special_property_name: The special_property_name of this SpecialModelName.
+        :type: int
+        """
+        self._special_property_name = special_property_name
+
+    def to_dict(self):
+        """
+        Returns the model properties as a dict
+        """
+        result = {}
+
+        for attr, _ in iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """
+        Returns the string representation of the model
+        """
+        return pformat(self.to_dict())
+
+    def __repr__(self):
+        """
+        For `print` and `pprint`
+        """
+        return self.to_str()
+
+    def __eq__(self, other):
+        """
+        Returns true if both objects are equal
+        """
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """
+        Returns true if both objects are not equal
+        """
+        return not self == other
+
diff --git a/samples/client/petstore/python/swagger_client/models/tag.py b/samples/client/petstore/python/swagger_client/models/tag.py
index 2041940dadf..50f829d65e3 100644
--- a/samples/client/petstore/python/swagger_client/models/tag.py
+++ b/samples/client/petstore/python/swagger_client/models/tag.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-Copyright 2015 SmartBear Software
+Copyright 2016 SmartBear Software
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -108,6 +108,12 @@ class Tag(object):
                 ))
             elif hasattr(value, "to_dict"):
                 result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
             else:
                 result[attr] = value
 
@@ -125,14 +131,14 @@ class Tag(object):
         """
         return self.to_str()
 
-    def __eq__(self, other): 
+    def __eq__(self, other):
         """
         Returns true if both objects are equal
         """
         return self.__dict__ == other.__dict__
 
     def __ne__(self, other):
-        """ 
+        """
         Returns true if both objects are not equal
         """
         return not self == other
diff --git a/samples/client/petstore/python/swagger_client/models/user.py b/samples/client/petstore/python/swagger_client/models/user.py
index a3ad99fa4c5..fd6d16824b3 100644
--- a/samples/client/petstore/python/swagger_client/models/user.py
+++ b/samples/client/petstore/python/swagger_client/models/user.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-Copyright 2015 SmartBear Software
+Copyright 2016 SmartBear Software
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -258,6 +258,12 @@ class User(object):
                 ))
             elif hasattr(value, "to_dict"):
                 result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
             else:
                 result[attr] = value
 
@@ -275,14 +281,14 @@ class User(object):
         """
         return self.to_str()
 
-    def __eq__(self, other): 
+    def __eq__(self, other):
         """
         Returns true if both objects are equal
         """
         return self.__dict__ == other.__dict__
 
     def __ne__(self, other):
-        """ 
+        """
         Returns true if both objects are not equal
         """
         return not self == other
diff --git a/samples/client/petstore/python/swagger_client/rest.py b/samples/client/petstore/python/swagger_client/rest.py
index 0d1f4ce1da8..c5b9a4e6f91 100644
--- a/samples/client/petstore/python/swagger_client/rest.py
+++ b/samples/client/petstore/python/swagger_client/rest.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-Copyright 2015 SmartBear Software
+Copyright 2016 SmartBear Software
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/samples/client/petstore/qt5cpp/client/SWGPet.h b/samples/client/petstore/qt5cpp/client/SWGPet.h
index 3f9320f1507..7b96ffc03f3 100644
--- a/samples/client/petstore/qt5cpp/client/SWGPet.h
+++ b/samples/client/petstore/qt5cpp/client/SWGPet.h
@@ -10,10 +10,10 @@
 #include <QJsonObject>
 
 
-#include <QString>
 #include "SWGCategory.h"
-#include <QList>
 #include "SWGTag.h"
+#include <QList>
+#include <QString>
 
 #include "SWGObject.h"
 
diff --git a/samples/client/petstore/qt5cpp/client/SWGPetApi.cpp b/samples/client/petstore/qt5cpp/client/SWGPetApi.cpp
index 2171b8ed50c..a50c172d5bf 100644
--- a/samples/client/petstore/qt5cpp/client/SWGPetApi.cpp
+++ b/samples/client/petstore/qt5cpp/client/SWGPetApi.cpp
@@ -123,10 +123,10 @@ SWGPetApi::findPetsByStatus(QList<QString*>* status) {
 
     
 
-    if(status->size() > 0) {
-      if(QString("multi").indexOf("multi") == 0) {
+    if (status->size() > 0) {
+      if (QString("multi").indexOf("multi") == 0) {
         foreach(QString* t, *status) {
-          if(fullPath.indexOf("?") > 0)
+          if (fullPath.indexOf("?") > 0)
             fullPath.append("&");
           else 
             fullPath.append("?");
@@ -134,28 +134,28 @@ SWGPetApi::findPetsByStatus(QList<QString*>* status) {
         }
       }
       else if (QString("multi").indexOf("ssv") == 0) {
-        if(fullPath.indexOf("?") > 0)
+        if (fullPath.indexOf("?") > 0)
           fullPath.append("&");
         else 
           fullPath.append("?");
         fullPath.append("status=");
         qint32 count = 0;
         foreach(QString* t, *status) {
-          if(count > 0) {
+          if (count > 0) {
             fullPath.append(" ");
           }
           fullPath.append(stringValue(t));
         }
       }
       else if (QString("multi").indexOf("tsv") == 0) {
-        if(fullPath.indexOf("?") > 0)
+        if (fullPath.indexOf("?") > 0)
           fullPath.append("&");
         else 
           fullPath.append("?");
         fullPath.append("status=");
         qint32 count = 0;
         foreach(QString* t, *status) {
-          if(count > 0) {
+          if (count > 0) {
             fullPath.append("\t");
           }
           fullPath.append(stringValue(t));
@@ -228,10 +228,10 @@ SWGPetApi::findPetsByTags(QList<QString*>* tags) {
 
     
 
-    if(tags->size() > 0) {
-      if(QString("multi").indexOf("multi") == 0) {
+    if (tags->size() > 0) {
+      if (QString("multi").indexOf("multi") == 0) {
         foreach(QString* t, *tags) {
-          if(fullPath.indexOf("?") > 0)
+          if (fullPath.indexOf("?") > 0)
             fullPath.append("&");
           else 
             fullPath.append("?");
@@ -239,28 +239,28 @@ SWGPetApi::findPetsByTags(QList<QString*>* tags) {
         }
       }
       else if (QString("multi").indexOf("ssv") == 0) {
-        if(fullPath.indexOf("?") > 0)
+        if (fullPath.indexOf("?") > 0)
           fullPath.append("&");
         else 
           fullPath.append("?");
         fullPath.append("tags=");
         qint32 count = 0;
         foreach(QString* t, *tags) {
-          if(count > 0) {
+          if (count > 0) {
             fullPath.append(" ");
           }
           fullPath.append(stringValue(t));
         }
       }
       else if (QString("multi").indexOf("tsv") == 0) {
-        if(fullPath.indexOf("?") > 0)
+        if (fullPath.indexOf("?") > 0)
           fullPath.append("&");
         else 
           fullPath.append("?");
         fullPath.append("tags=");
         qint32 count = 0;
         foreach(QString* t, *tags) {
-          if(count > 0) {
+          if (count > 0) {
             fullPath.append("\t");
           }
           fullPath.append(stringValue(t));
@@ -391,12 +391,10 @@ SWGPetApi::updatePetWithForm(QString* petId, QString* name, QString* status) {
     HttpRequestWorker *worker = new HttpRequestWorker();
     HttpRequestInput input(fullPath, "POST");
 
-    
-    if(name != NULL) {
+    if (name != NULL) {
         input.add_var("name", *name);
     }
-    
-    if(status != NULL) {
+    if (status != NULL) {
         input.add_var("status", *status);
     }
     
@@ -493,10 +491,12 @@ SWGPetApi::uploadFile(qint64 petId, QString* additionalMetadata, SWGHttpRequestI
     HttpRequestWorker *worker = new HttpRequestWorker();
     HttpRequestInput input(fullPath, "POST");
 
-    
-    if(additionalMetadata != NULL) {
+    if (additionalMetadata != NULL) {
         input.add_var("additionalMetadata", *additionalMetadata);
     }
+    if (file != NULL) {
+        input.add_file("file", *file.local_filename, *file.request_filename, *file.mime_type);
+    }
     
 
     
@@ -528,4 +528,107 @@ SWGPetApi::uploadFileCallback(HttpRequestWorker * worker) {
     
     emit uploadFileSignal();
 }
+void
+SWGPetApi::getPetByIdWithByteArray(qint64 petId) {
+    QString fullPath;
+    fullPath.append(this->host).append(this->basePath).append("/pet/{petId}?testing_byte_array=true");
+
+    
+    QString petIdPathParam("{"); petIdPathParam.append("petId").append("}");
+    fullPath.replace(petIdPathParam, stringValue(petId));
+    
+
+    
+
+    HttpRequestWorker *worker = new HttpRequestWorker();
+    HttpRequestInput input(fullPath, "GET");
+
+    
+
+    
+
+    
+
+    connect(worker,
+            &HttpRequestWorker::on_execution_finished,
+            this,
+            &SWGPetApi::getPetByIdWithByteArrayCallback);
+
+    worker->execute(&input);
+}
+
+void
+SWGPetApi::getPetByIdWithByteArrayCallback(HttpRequestWorker * worker) {
+    QString msg;
+    if (worker->error_type == QNetworkReply::NoError) {
+        msg = QString("Success! %1 bytes").arg(worker->response.length());
+    }
+    else {
+        msg = "Error: " + worker->error_str;
+    }
+
+    
+
+    
+    
+    
+    QString json(worker->response);
+    QString* output = static_cast<QString*>(create(json, QString("QString")));
+    
+    
+    
+
+    worker->deleteLater();
+
+    emit getPetByIdWithByteArraySignal(output);
+    
+}
+void
+SWGPetApi::addPetUsingByteArray(QString* body) {
+    QString fullPath;
+    fullPath.append(this->host).append(this->basePath).append("/pet?testing_byte_array=true");
+
+    
+
+    
+
+    HttpRequestWorker *worker = new HttpRequestWorker();
+    HttpRequestInput input(fullPath, "POST");
+
+    
+
+    
+    
+    
+    QString output = body.asJson();
+    input.request_body.append(output);
+    
+
+    
+
+    connect(worker,
+            &HttpRequestWorker::on_execution_finished,
+            this,
+            &SWGPetApi::addPetUsingByteArrayCallback);
+
+    worker->execute(&input);
+}
+
+void
+SWGPetApi::addPetUsingByteArrayCallback(HttpRequestWorker * worker) {
+    QString msg;
+    if (worker->error_type == QNetworkReply::NoError) {
+        msg = QString("Success! %1 bytes").arg(worker->response.length());
+    }
+    else {
+        msg = "Error: " + worker->error_str;
+    }
+
+    
+
+    worker->deleteLater();
+
+    
+    emit addPetUsingByteArraySignal();
+}
 } /* namespace Swagger */
diff --git a/samples/client/petstore/qt5cpp/client/SWGPetApi.h b/samples/client/petstore/qt5cpp/client/SWGPetApi.h
index f74f8f10839..89055da3b3d 100644
--- a/samples/client/petstore/qt5cpp/client/SWGPetApi.h
+++ b/samples/client/petstore/qt5cpp/client/SWGPetApi.h
@@ -30,6 +30,8 @@ public:
     void updatePetWithForm(QString* petId, QString* name, QString* status);
     void deletePet(qint64 petId, QString* apiKey);
     void uploadFile(qint64 petId, QString* additionalMetadata, SWGHttpRequestInputFileElement* file);
+    void getPetByIdWithByteArray(qint64 petId);
+    void addPetUsingByteArray(QString* body);
     
 private:
     void updatePetCallback (HttpRequestWorker * worker);
@@ -40,6 +42,8 @@ private:
     void updatePetWithFormCallback (HttpRequestWorker * worker);
     void deletePetCallback (HttpRequestWorker * worker);
     void uploadFileCallback (HttpRequestWorker * worker);
+    void getPetByIdWithByteArrayCallback (HttpRequestWorker * worker);
+    void addPetUsingByteArrayCallback (HttpRequestWorker * worker);
     
 signals:
     void updatePetSignal();
@@ -50,6 +54,8 @@ signals:
     void updatePetWithFormSignal();
     void deletePetSignal();
     void uploadFileSignal();
+    void getPetByIdWithByteArraySignal(QString* summary);
+    void addPetUsingByteArraySignal();
     
 };
 }
diff --git a/samples/client/petstore/qt5cpp/client/SWGUserApi.cpp b/samples/client/petstore/qt5cpp/client/SWGUserApi.cpp
index 6341231a884..61b92fc5501 100644
--- a/samples/client/petstore/qt5cpp/client/SWGUserApi.cpp
+++ b/samples/client/petstore/qt5cpp/client/SWGUserApi.cpp
@@ -178,7 +178,7 @@ SWGUserApi::loginUser(QString* username, QString* password) {
 
     
     
-    if(fullPath.indexOf("?") > 0) 
+    if (fullPath.indexOf("?") > 0) 
       fullPath.append("&");
     else 
       fullPath.append("?");
@@ -190,7 +190,7 @@ SWGUserApi::loginUser(QString* username, QString* password) {
     
     
     
-    if(fullPath.indexOf("?") > 0) 
+    if (fullPath.indexOf("?") > 0) 
       fullPath.append("&");
     else 
       fullPath.append("?");
diff --git a/samples/client/petstore/ruby/.gitignore b/samples/client/petstore/ruby/.gitignore
new file mode 100644
index 00000000000..a8b1cda23f8
--- /dev/null
+++ b/samples/client/petstore/ruby/.gitignore
@@ -0,0 +1,36 @@
+*.gem
+*.rbc
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/spec/examples.txt
+/test/tmp/
+/test/version_tmp/
+/tmp/
+
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalization:
+/.bundle/
+/vendor/bundle
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+# Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
diff --git a/samples/client/petstore/ruby/Gemfile.lock b/samples/client/petstore/ruby/Gemfile.lock
index 05a6aa23790..e7812e45845 100644
--- a/samples/client/petstore/ruby/Gemfile.lock
+++ b/samples/client/petstore/ruby/Gemfile.lock
@@ -12,7 +12,7 @@ GEM
     addressable (2.3.8)
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
-    autotest-fsevent (0.2.10)
+    autotest-fsevent (0.2.11)
       sys-uname
     autotest-growl (0.2.16)
     autotest-rails-pure (4.1.2)
@@ -51,7 +51,7 @@ PLATFORMS
 
 DEPENDENCIES
   autotest (~> 4.4, >= 4.4.6)
-  autotest-fsevent (~> 0.2, >= 0.2.10)
+  autotest-fsevent (~> 0.2, >= 0.2.11)
   autotest-growl (~> 0.2, >= 0.2.16)
   autotest-rails-pure (~> 4.1, >= 4.1.2)
   petstore!
diff --git a/samples/client/petstore/ruby/README.md b/samples/client/petstore/ruby/README.md
index dd6258ec696..9f04158f439 100644
--- a/samples/client/petstore/ruby/README.md
+++ b/samples/client/petstore/ruby/README.md
@@ -1,37 +1,47 @@
+# petstore
+
+Petstore - the Ruby gem for the Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+This SDK is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
+
+- API version: 1.0.0
+- Package version: 1.0.0
+- Build date: 2016-03-30T20:58:00.549+08:00
+- Build package: class io.swagger.codegen.languages.RubyClientCodegen
+
 ## Installation
 
 ### Build a gem
 
-You can build the generated client into a gem:
+To build the Ruby code into a gem:
 
 ```shell
 gem build petstore.gemspec
 ```
 
-Then you can either install the gem:
+Then either install the gem locally:
 
 ```shell
 gem install ./petstore-1.0.0.gem
 ```
 
-or publish the gem to a gem server like [RubyGems](https://rubygems.org/).
+or publish the gem to a gem hosting service, e.g. [RubyGems](https://rubygems.org/).
 
-Finally add this to your Gemfile:
+Finally add this to the Gemfile:
 
     gem 'petstore', '~> 1.0.0'
 
-### Host as a git repository
+### Install from Git
 
-You can also choose to host the generated client as a git repository, e.g. on github:
-https://github.com/xhh/swagger-petstore-ruby
+If the Ruby gem is hosted at a git repository: https://github.com/YOUR_GIT_USR_ID/YOUR_GIT_REPO_ID, then add the following in the Gemfile:
 
-Then you can reference it in Gemfile:
+    gem 'petstore', :git => 'https://github.com/YOUR_GIT_USR_ID/YOUR_GIT_REPO_ID.git'
 
-    gem 'petstore', :git => 'https://github.com/xhh/swagger-petstore-ruby.git'
+### Include the Ruby code directly
 
-### Use without installation
-
-You can also use the client directly like this:
+Include the Ruby code directly using `-I` as follows:
 
 ```shell
 ruby -Ilib script.rb
@@ -39,18 +49,125 @@ ruby -Ilib script.rb
 
 ## Getting Started
 
+Please follow the [installation](#installation) procedure and then run the following code:
 ```ruby
+# Load the gem
 require 'petstore'
 
+# Setup authorization
 Petstore.configure do |config|
-  config.api_key['api_key'] = 'special-key'
-  config.host = 'petstore.swagger.io'
-  config.base_path = '/v2'
-  # enable debugging (default is disabled)
-  config.debugging = true
+  # Configure OAuth2 access token for authorization: petstore_auth
+  config.access_token = 'YOUR ACCESS TOKEN'
+end
+
+api_instance = Petstore::PetApi.new
+
+opts = { 
+  body: Petstore::Pet.new # Pet | Pet object that needs to be added to the store
+}
+
+begin
+  #Add a new pet to the store
+  api_instance.add_pet(opts)
+rescue Petstore::ApiError => e
+  puts "Exception when calling PetApi->add_pet: #{e}"
 end
 
-pet_api = Petstore::PetApi.new
-pet = pet_api.get_pet_by_id(5)
-puts pet.to_body
 ```
+
+## Documentation for API Endpoints
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*Petstore::PetApi* | [**add_pet**](docs/PetApi.md#add_pet) | **POST** /pet | Add a new pet to the store
+*Petstore::PetApi* | [**add_pet_using_byte_array**](docs/PetApi.md#add_pet_using_byte_array) | **POST** /pet?testing_byte_array=true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
+*Petstore::PetApi* | [**delete_pet**](docs/PetApi.md#delete_pet) | **DELETE** /pet/{petId} | Deletes a pet
+*Petstore::PetApi* | [**find_pets_by_status**](docs/PetApi.md#find_pets_by_status) | **GET** /pet/findByStatus | Finds Pets by status
+*Petstore::PetApi* | [**find_pets_by_tags**](docs/PetApi.md#find_pets_by_tags) | **GET** /pet/findByTags | Finds Pets by tags
+*Petstore::PetApi* | [**get_pet_by_id**](docs/PetApi.md#get_pet_by_id) | **GET** /pet/{petId} | Find pet by ID
+*Petstore::PetApi* | [**get_pet_by_id_in_object**](docs/PetApi.md#get_pet_by_id_in_object) | **GET** /pet/{petId}?response=inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
+*Petstore::PetApi* | [**pet_pet_idtesting_byte_arraytrue_get**](docs/PetApi.md#pet_pet_idtesting_byte_arraytrue_get) | **GET** /pet/{petId}?testing_byte_array=true | Fake endpoint to test byte array return by 'Find pet by ID'
+*Petstore::PetApi* | [**update_pet**](docs/PetApi.md#update_pet) | **PUT** /pet | Update an existing pet
+*Petstore::PetApi* | [**update_pet_with_form**](docs/PetApi.md#update_pet_with_form) | **POST** /pet/{petId} | Updates a pet in the store with form data
+*Petstore::PetApi* | [**upload_file**](docs/PetApi.md#upload_file) | **POST** /pet/{petId}/uploadImage | uploads an image
+*Petstore::StoreApi* | [**delete_order**](docs/StoreApi.md#delete_order) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
+*Petstore::StoreApi* | [**find_orders_by_status**](docs/StoreApi.md#find_orders_by_status) | **GET** /store/findByStatus | Finds orders by status
+*Petstore::StoreApi* | [**get_inventory**](docs/StoreApi.md#get_inventory) | **GET** /store/inventory | Returns pet inventories by status
+*Petstore::StoreApi* | [**get_inventory_in_object**](docs/StoreApi.md#get_inventory_in_object) | **GET** /store/inventory?response=arbitrary_object | Fake endpoint to test arbitrary object return by 'Get inventory'
+*Petstore::StoreApi* | [**get_order_by_id**](docs/StoreApi.md#get_order_by_id) | **GET** /store/order/{orderId} | Find purchase order by ID
+*Petstore::StoreApi* | [**place_order**](docs/StoreApi.md#place_order) | **POST** /store/order | Place an order for a pet
+*Petstore::UserApi* | [**create_user**](docs/UserApi.md#create_user) | **POST** /user | Create user
+*Petstore::UserApi* | [**create_users_with_array_input**](docs/UserApi.md#create_users_with_array_input) | **POST** /user/createWithArray | Creates list of users with given input array
+*Petstore::UserApi* | [**create_users_with_list_input**](docs/UserApi.md#create_users_with_list_input) | **POST** /user/createWithList | Creates list of users with given input array
+*Petstore::UserApi* | [**delete_user**](docs/UserApi.md#delete_user) | **DELETE** /user/{username} | Delete user
+*Petstore::UserApi* | [**get_user_by_name**](docs/UserApi.md#get_user_by_name) | **GET** /user/{username} | Get user by user name
+*Petstore::UserApi* | [**login_user**](docs/UserApi.md#login_user) | **GET** /user/login | Logs user into the system
+*Petstore::UserApi* | [**logout_user**](docs/UserApi.md#logout_user) | **GET** /user/logout | Logs out current logged in user session
+*Petstore::UserApi* | [**update_user**](docs/UserApi.md#update_user) | **PUT** /user/{username} | Updated user
+
+
+## Documentation for Models
+
+ - [Petstore::Animal](docs/Animal.md)
+ - [Petstore::Cat](docs/Cat.md)
+ - [Petstore::Category](docs/Category.md)
+ - [Petstore::Dog](docs/Dog.md)
+ - [Petstore::InlineResponse200](docs/InlineResponse200.md)
+ - [Petstore::Model200Response](docs/Model200Response.md)
+ - [Petstore::ModelReturn](docs/ModelReturn.md)
+ - [Petstore::Name](docs/Name.md)
+ - [Petstore::Order](docs/Order.md)
+ - [Petstore::Pet](docs/Pet.md)
+ - [Petstore::SpecialModelName](docs/SpecialModelName.md)
+ - [Petstore::Tag](docs/Tag.md)
+ - [Petstore::User](docs/User.md)
+
+
+## Documentation for Authorization
+
+
+### test_api_key_header
+
+- **Type**: API key
+- **API key parameter name**: test_api_key_header
+- **Location**: HTTP header
+
+### api_key
+
+- **Type**: API key
+- **API key parameter name**: api_key
+- **Location**: HTTP header
+
+### test_http_basic
+
+- **Type**: HTTP basic authentication
+
+### test_api_client_secret
+
+- **Type**: API key
+- **API key parameter name**: x-test_api_client_secret
+- **Location**: HTTP header
+
+### test_api_client_id
+
+- **Type**: API key
+- **API key parameter name**: x-test_api_client_id
+- **Location**: HTTP header
+
+### test_api_key_query
+
+- **Type**: API key
+- **API key parameter name**: test_api_key_query
+- **Location**: URL query string
+
+### petstore_auth
+
+- **Type**: OAuth
+- **Flow**: implicit
+- **Authorizatoin URL**: http://petstore.swagger.io/api/oauth/dialog
+- **Scopes**: 
+  - write:pets: modify pets in your account
+  - read:pets: read your pets
+
diff --git a/samples/client/petstore/ruby/docs/Animal.md b/samples/client/petstore/ruby/docs/Animal.md
new file mode 100644
index 00000000000..0e262c78726
--- /dev/null
+++ b/samples/client/petstore/ruby/docs/Animal.md
@@ -0,0 +1,8 @@
+# Petstore::Animal
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**class_name** | **String** |  | 
+
+
diff --git a/samples/client/petstore/ruby/docs/Cat.md b/samples/client/petstore/ruby/docs/Cat.md
new file mode 100644
index 00000000000..6b7dfb710df
--- /dev/null
+++ b/samples/client/petstore/ruby/docs/Cat.md
@@ -0,0 +1,9 @@
+# Petstore::Cat
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**class_name** | **String** |  | 
+**declawed** | **BOOLEAN** |  | [optional] 
+
+
diff --git a/samples/client/petstore/ruby/docs/Category.md b/samples/client/petstore/ruby/docs/Category.md
new file mode 100644
index 00000000000..f642a3d6b86
--- /dev/null
+++ b/samples/client/petstore/ruby/docs/Category.md
@@ -0,0 +1,9 @@
+# Petstore::Category
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **Integer** |  | [optional] 
+**name** | **String** |  | [optional] 
+
+
diff --git a/samples/client/petstore/ruby/docs/Dog.md b/samples/client/petstore/ruby/docs/Dog.md
new file mode 100644
index 00000000000..7af6f549d5d
--- /dev/null
+++ b/samples/client/petstore/ruby/docs/Dog.md
@@ -0,0 +1,9 @@
+# Petstore::Dog
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**class_name** | **String** |  | 
+**breed** | **String** |  | [optional] 
+
+
diff --git a/samples/client/petstore/ruby/docs/InlineResponse200.md b/samples/client/petstore/ruby/docs/InlineResponse200.md
new file mode 100644
index 00000000000..c3b0d978c07
--- /dev/null
+++ b/samples/client/petstore/ruby/docs/InlineResponse200.md
@@ -0,0 +1,13 @@
+# Petstore::InlineResponse200
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**tags** | [**Array&lt;Tag&gt;**](Tag.md) |  | [optional] 
+**id** | **Integer** |  | 
+**category** | **Object** |  | [optional] 
+**status** | **String** | pet status in the store | [optional] 
+**name** | **String** |  | [optional] 
+**photo_urls** | **Array&lt;String&gt;** |  | [optional] 
+
+
diff --git a/samples/client/petstore/ruby/docs/Model200Response.md b/samples/client/petstore/ruby/docs/Model200Response.md
new file mode 100644
index 00000000000..f440810f2b8
--- /dev/null
+++ b/samples/client/petstore/ruby/docs/Model200Response.md
@@ -0,0 +1,8 @@
+# Petstore::Model200Response
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **Integer** |  | [optional] 
+
+
diff --git a/samples/client/petstore/ruby/docs/ModelReturn.md b/samples/client/petstore/ruby/docs/ModelReturn.md
new file mode 100644
index 00000000000..dfcfff1dd06
--- /dev/null
+++ b/samples/client/petstore/ruby/docs/ModelReturn.md
@@ -0,0 +1,8 @@
+# Petstore::ModelReturn
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**_return** | **Integer** |  | [optional] 
+
+
diff --git a/samples/client/petstore/ruby/docs/Name.md b/samples/client/petstore/ruby/docs/Name.md
new file mode 100644
index 00000000000..d4d89f6c4ce
--- /dev/null
+++ b/samples/client/petstore/ruby/docs/Name.md
@@ -0,0 +1,9 @@
+# Petstore::Name
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **Integer** |  | [optional] 
+**snake_case** | **Integer** |  | [optional] 
+
+
diff --git a/samples/client/petstore/ruby/docs/Order.md b/samples/client/petstore/ruby/docs/Order.md
new file mode 100644
index 00000000000..ed1b69874ee
--- /dev/null
+++ b/samples/client/petstore/ruby/docs/Order.md
@@ -0,0 +1,13 @@
+# Petstore::Order
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **Integer** |  | [optional] 
+**pet_id** | **Integer** |  | [optional] 
+**quantity** | **Integer** |  | [optional] 
+**ship_date** | **DateTime** |  | [optional] 
+**status** | **String** | Order Status | [optional] 
+**complete** | **BOOLEAN** |  | [optional] 
+
+
diff --git a/samples/client/petstore/ruby/docs/Pet.md b/samples/client/petstore/ruby/docs/Pet.md
new file mode 100644
index 00000000000..f4320a0b72b
--- /dev/null
+++ b/samples/client/petstore/ruby/docs/Pet.md
@@ -0,0 +1,13 @@
+# Petstore::Pet
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **Integer** |  | [optional] 
+**category** | [**Category**](Category.md) |  | [optional] 
+**name** | **String** |  | 
+**photo_urls** | **Array&lt;String&gt;** |  | 
+**tags** | [**Array&lt;Tag&gt;**](Tag.md) |  | [optional] 
+**status** | **String** | pet status in the store | [optional] 
+
+
diff --git a/samples/client/petstore/ruby/docs/PetApi.md b/samples/client/petstore/ruby/docs/PetApi.md
new file mode 100644
index 00000000000..c29505ff419
--- /dev/null
+++ b/samples/client/petstore/ruby/docs/PetApi.md
@@ -0,0 +1,621 @@
+# Petstore::PetApi
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**add_pet**](PetApi.md#add_pet) | **POST** /pet | Add a new pet to the store
+[**add_pet_using_byte_array**](PetApi.md#add_pet_using_byte_array) | **POST** /pet?testing_byte_array=true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
+[**delete_pet**](PetApi.md#delete_pet) | **DELETE** /pet/{petId} | Deletes a pet
+[**find_pets_by_status**](PetApi.md#find_pets_by_status) | **GET** /pet/findByStatus | Finds Pets by status
+[**find_pets_by_tags**](PetApi.md#find_pets_by_tags) | **GET** /pet/findByTags | Finds Pets by tags
+[**get_pet_by_id**](PetApi.md#get_pet_by_id) | **GET** /pet/{petId} | Find pet by ID
+[**get_pet_by_id_in_object**](PetApi.md#get_pet_by_id_in_object) | **GET** /pet/{petId}?response=inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+[**pet_pet_idtesting_byte_arraytrue_get**](PetApi.md#pet_pet_idtesting_byte_arraytrue_get) | **GET** /pet/{petId}?testing_byte_array=true | Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+[**update_pet**](PetApi.md#update_pet) | **PUT** /pet | Update an existing pet
+[**update_pet_with_form**](PetApi.md#update_pet_with_form) | **POST** /pet/{petId} | Updates a pet in the store with form data
+[**upload_file**](PetApi.md#upload_file) | **POST** /pet/{petId}/uploadImage | uploads an image
+
+
+# **add_pet**
+> add_pet(opts)
+
+Add a new pet to the store
+
+
+
+### Example
+```ruby
+# load the gem
+require 'petstore'
+# setup authorization 
+Petstore.configure do |config|
+  # Configure OAuth2 access token for authorization: petstore_auth
+  config.access_token = 'YOUR ACCESS TOKEN'
+end
+
+api_instance = Petstore::PetApi.new
+
+opts = { 
+  body: Petstore::Pet.new # Pet | Pet object that needs to be added to the store
+}
+
+begin
+  #Add a new pet to the store
+  api_instance.add_pet(opts)
+rescue Petstore::ApiError => e
+  puts "Exception when calling PetApi->add_pet: #{e}"
+end
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | [optional] 
+
+### Return type
+
+nil (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: application/json, application/xml
+
+
+
+# **add_pet_using_byte_array**
+> add_pet_using_byte_array(opts)
+
+Fake endpoint to test byte array in body parameter for adding a new pet to the store
+
+
+
+### Example
+```ruby
+# load the gem
+require 'petstore'
+# setup authorization 
+Petstore.configure do |config|
+  # Configure OAuth2 access token for authorization: petstore_auth
+  config.access_token = 'YOUR ACCESS TOKEN'
+end
+
+api_instance = Petstore::PetApi.new
+
+opts = { 
+  body: "B" # String | Pet object in the form of byte array
+}
+
+begin
+  #Fake endpoint to test byte array in body parameter for adding a new pet to the store
+  api_instance.add_pet_using_byte_array(opts)
+rescue Petstore::ApiError => e
+  puts "Exception when calling PetApi->add_pet_using_byte_array: #{e}"
+end
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | **String**| Pet object in the form of byte array | [optional] 
+
+### Return type
+
+nil (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: application/json, application/xml
+
+
+
+# **delete_pet**
+> delete_pet(pet_id, opts)
+
+Deletes a pet
+
+
+
+### Example
+```ruby
+# load the gem
+require 'petstore'
+# setup authorization 
+Petstore.configure do |config|
+  # Configure OAuth2 access token for authorization: petstore_auth
+  config.access_token = 'YOUR ACCESS TOKEN'
+end
+
+api_instance = Petstore::PetApi.new
+
+pet_id = 789 # Integer | Pet id to delete
+
+opts = { 
+  api_key: "api_key_example" # String | 
+}
+
+begin
+  #Deletes a pet
+  api_instance.delete_pet(pet_id, opts)
+rescue Petstore::ApiError => e
+  puts "Exception when calling PetApi->delete_pet: #{e}"
+end
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **pet_id** | **Integer**| Pet id to delete | 
+ **api_key** | **String**|  | [optional] 
+
+### Return type
+
+nil (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+
+
+# **find_pets_by_status**
+> Array&lt;Pet&gt; find_pets_by_status(opts)
+
+Finds Pets by status
+
+Multiple status values can be provided with comma separated strings
+
+### Example
+```ruby
+# load the gem
+require 'petstore'
+# setup authorization 
+Petstore.configure do |config|
+  # Configure OAuth2 access token for authorization: petstore_auth
+  config.access_token = 'YOUR ACCESS TOKEN'
+end
+
+api_instance = Petstore::PetApi.new
+
+opts = { 
+  status: ["available"] # Array<String> | Status values that need to be considered for query
+}
+
+begin
+  #Finds Pets by status
+  result = api_instance.find_pets_by_status(opts)
+  p result
+rescue Petstore::ApiError => e
+  puts "Exception when calling PetApi->find_pets_by_status: #{e}"
+end
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **status** | [**Array&lt;String&gt;**](String.md)| Status values that need to be considered for query | [optional] [default to available]
+
+### Return type
+
+[**Array&lt;Pet&gt;**](Pet.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+
+
+# **find_pets_by_tags**
+> Array&lt;Pet&gt; find_pets_by_tags(opts)
+
+Finds Pets by tags
+
+Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+
+### Example
+```ruby
+# load the gem
+require 'petstore'
+# setup authorization 
+Petstore.configure do |config|
+  # Configure OAuth2 access token for authorization: petstore_auth
+  config.access_token = 'YOUR ACCESS TOKEN'
+end
+
+api_instance = Petstore::PetApi.new
+
+opts = { 
+  tags: ["tags_example"] # Array<String> | Tags to filter by
+}
+
+begin
+  #Finds Pets by tags
+  result = api_instance.find_pets_by_tags(opts)
+  p result
+rescue Petstore::ApiError => e
+  puts "Exception when calling PetApi->find_pets_by_tags: #{e}"
+end
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **tags** | [**Array&lt;String&gt;**](String.md)| Tags to filter by | [optional] 
+
+### Return type
+
+[**Array&lt;Pet&gt;**](Pet.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+
+
+# **get_pet_by_id**
+> Pet get_pet_by_id(pet_id)
+
+Find pet by ID
+
+Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
+
+### Example
+```ruby
+# load the gem
+require 'petstore'
+# setup authorization 
+Petstore.configure do |config|
+  # Configure API key authorization: api_key
+  config.api_key['api_key'] = 'YOUR API KEY'
+  # Uncomment the following line to set a prefix for the API key, e.g. 'BEARER' (defaults to nil)
+  #config.api_key_prefix['api_key'] = 'BEARER'
+
+  # Configure OAuth2 access token for authorization: petstore_auth
+  config.access_token = 'YOUR ACCESS TOKEN'
+end
+
+api_instance = Petstore::PetApi.new
+
+pet_id = 789 # Integer | ID of pet that needs to be fetched
+
+
+begin
+  #Find pet by ID
+  result = api_instance.get_pet_by_id(pet_id)
+  p result
+rescue Petstore::ApiError => e
+  puts "Exception when calling PetApi->get_pet_by_id: #{e}"
+end
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **pet_id** | **Integer**| ID of pet that needs to be fetched | 
+
+### Return type
+
+[**Pet**](Pet.md)
+
+### Authorization
+
+[api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+
+
+# **get_pet_by_id_in_object**
+> InlineResponse200 get_pet_by_id_in_object(pet_id)
+
+Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
+
+Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
+
+### Example
+```ruby
+# load the gem
+require 'petstore'
+# setup authorization 
+Petstore.configure do |config|
+  # Configure API key authorization: api_key
+  config.api_key['api_key'] = 'YOUR API KEY'
+  # Uncomment the following line to set a prefix for the API key, e.g. 'BEARER' (defaults to nil)
+  #config.api_key_prefix['api_key'] = 'BEARER'
+
+  # Configure OAuth2 access token for authorization: petstore_auth
+  config.access_token = 'YOUR ACCESS TOKEN'
+end
+
+api_instance = Petstore::PetApi.new
+
+pet_id = 789 # Integer | ID of pet that needs to be fetched
+
+
+begin
+  #Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
+  result = api_instance.get_pet_by_id_in_object(pet_id)
+  p result
+rescue Petstore::ApiError => e
+  puts "Exception when calling PetApi->get_pet_by_id_in_object: #{e}"
+end
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **pet_id** | **Integer**| ID of pet that needs to be fetched | 
+
+### Return type
+
+[**InlineResponse200**](InlineResponse200.md)
+
+### Authorization
+
+[api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+
+
+# **pet_pet_idtesting_byte_arraytrue_get**
+> String pet_pet_idtesting_byte_arraytrue_get(pet_id)
+
+Fake endpoint to test byte array return by 'Find pet by ID'
+
+Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
+
+### Example
+```ruby
+# load the gem
+require 'petstore'
+# setup authorization 
+Petstore.configure do |config|
+  # Configure API key authorization: api_key
+  config.api_key['api_key'] = 'YOUR API KEY'
+  # Uncomment the following line to set a prefix for the API key, e.g. 'BEARER' (defaults to nil)
+  #config.api_key_prefix['api_key'] = 'BEARER'
+
+  # Configure OAuth2 access token for authorization: petstore_auth
+  config.access_token = 'YOUR ACCESS TOKEN'
+end
+
+api_instance = Petstore::PetApi.new
+
+pet_id = 789 # Integer | ID of pet that needs to be fetched
+
+
+begin
+  #Fake endpoint to test byte array return by 'Find pet by ID'
+  result = api_instance.pet_pet_idtesting_byte_arraytrue_get(pet_id)
+  p result
+rescue Petstore::ApiError => e
+  puts "Exception when calling PetApi->pet_pet_idtesting_byte_arraytrue_get: #{e}"
+end
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **pet_id** | **Integer**| ID of pet that needs to be fetched | 
+
+### Return type
+
+**String**
+
+### Authorization
+
+[api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+
+
+# **update_pet**
+> update_pet(opts)
+
+Update an existing pet
+
+
+
+### Example
+```ruby
+# load the gem
+require 'petstore'
+# setup authorization 
+Petstore.configure do |config|
+  # Configure OAuth2 access token for authorization: petstore_auth
+  config.access_token = 'YOUR ACCESS TOKEN'
+end
+
+api_instance = Petstore::PetApi.new
+
+opts = { 
+  body: Petstore::Pet.new # Pet | Pet object that needs to be added to the store
+}
+
+begin
+  #Update an existing pet
+  api_instance.update_pet(opts)
+rescue Petstore::ApiError => e
+  puts "Exception when calling PetApi->update_pet: #{e}"
+end
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | [optional] 
+
+### Return type
+
+nil (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: application/json, application/xml
+
+
+
+# **update_pet_with_form**
+> update_pet_with_form(pet_id, opts)
+
+Updates a pet in the store with form data
+
+
+
+### Example
+```ruby
+# load the gem
+require 'petstore'
+# setup authorization 
+Petstore.configure do |config|
+  # Configure OAuth2 access token for authorization: petstore_auth
+  config.access_token = 'YOUR ACCESS TOKEN'
+end
+
+api_instance = Petstore::PetApi.new
+
+pet_id = "pet_id_example" # String | ID of pet that needs to be updated
+
+opts = { 
+  name: "name_example", # String | Updated name of the pet
+  status: "status_example" # String | Updated status of the pet
+}
+
+begin
+  #Updates a pet in the store with form data
+  api_instance.update_pet_with_form(pet_id, opts)
+rescue Petstore::ApiError => e
+  puts "Exception when calling PetApi->update_pet_with_form: #{e}"
+end
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **pet_id** | **String**| ID of pet that needs to be updated | 
+ **name** | **String**| Updated name of the pet | [optional] 
+ **status** | **String**| Updated status of the pet | [optional] 
+
+### Return type
+
+nil (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: application/x-www-form-urlencoded
+ - **Accept**: application/json, application/xml
+
+
+
+# **upload_file**
+> upload_file(pet_id, opts)
+
+uploads an image
+
+
+
+### Example
+```ruby
+# load the gem
+require 'petstore'
+# setup authorization 
+Petstore.configure do |config|
+  # Configure OAuth2 access token for authorization: petstore_auth
+  config.access_token = 'YOUR ACCESS TOKEN'
+end
+
+api_instance = Petstore::PetApi.new
+
+pet_id = 789 # Integer | ID of pet to update
+
+opts = { 
+  additional_metadata: "additional_metadata_example", # String | Additional data to pass to server
+  file: File.new("/path/to/file.txt") # File | file to upload
+}
+
+begin
+  #uploads an image
+  api_instance.upload_file(pet_id, opts)
+rescue Petstore::ApiError => e
+  puts "Exception when calling PetApi->upload_file: #{e}"
+end
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **pet_id** | **Integer**| ID of pet to update | 
+ **additional_metadata** | **String**| Additional data to pass to server | [optional] 
+ **file** | **File**| file to upload | [optional] 
+
+### Return type
+
+nil (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: multipart/form-data
+ - **Accept**: application/json, application/xml
+
+
+
diff --git a/samples/client/petstore/ruby/docs/SpecialModelName.md b/samples/client/petstore/ruby/docs/SpecialModelName.md
new file mode 100644
index 00000000000..581ab6907ef
--- /dev/null
+++ b/samples/client/petstore/ruby/docs/SpecialModelName.md
@@ -0,0 +1,8 @@
+# Petstore::SpecialModelName
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**special_property_name** | **Integer** |  | [optional] 
+
+
diff --git a/samples/client/petstore/ruby/docs/StoreApi.md b/samples/client/petstore/ruby/docs/StoreApi.md
new file mode 100644
index 00000000000..57717e2a159
--- /dev/null
+++ b/samples/client/petstore/ruby/docs/StoreApi.md
@@ -0,0 +1,335 @@
+# Petstore::StoreApi
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**delete_order**](StoreApi.md#delete_order) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
+[**find_orders_by_status**](StoreApi.md#find_orders_by_status) | **GET** /store/findByStatus | Finds orders by status
+[**get_inventory**](StoreApi.md#get_inventory) | **GET** /store/inventory | Returns pet inventories by status
+[**get_inventory_in_object**](StoreApi.md#get_inventory_in_object) | **GET** /store/inventory?response=arbitrary_object | Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+[**get_order_by_id**](StoreApi.md#get_order_by_id) | **GET** /store/order/{orderId} | Find purchase order by ID
+[**place_order**](StoreApi.md#place_order) | **POST** /store/order | Place an order for a pet
+
+
+# **delete_order**
+> delete_order(order_id)
+
+Delete purchase order by ID
+
+For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+
+### Example
+```ruby
+# load the gem
+require 'petstore'
+
+api_instance = Petstore::StoreApi.new
+
+order_id = "order_id_example" # String | ID of the order that needs to be deleted
+
+
+begin
+  #Delete purchase order by ID
+  api_instance.delete_order(order_id)
+rescue Petstore::ApiError => e
+  puts "Exception when calling StoreApi->delete_order: #{e}"
+end
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **order_id** | **String**| ID of the order that needs to be deleted | 
+
+### Return type
+
+nil (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+
+
+# **find_orders_by_status**
+> Array&lt;Order&gt; find_orders_by_status(opts)
+
+Finds orders by status
+
+A single status value can be provided as a string
+
+### Example
+```ruby
+# load the gem
+require 'petstore'
+# setup authorization 
+Petstore.configure do |config|
+  # Configure API key authorization: test_api_client_id
+  config.api_key['x-test_api_client_id'] = 'YOUR API KEY'
+  # Uncomment the following line to set a prefix for the API key, e.g. 'BEARER' (defaults to nil)
+  #config.api_key_prefix['x-test_api_client_id'] = 'BEARER'
+
+  # Configure API key authorization: test_api_client_secret
+  config.api_key['x-test_api_client_secret'] = 'YOUR API KEY'
+  # Uncomment the following line to set a prefix for the API key, e.g. 'BEARER' (defaults to nil)
+  #config.api_key_prefix['x-test_api_client_secret'] = 'BEARER'
+end
+
+api_instance = Petstore::StoreApi.new
+
+opts = { 
+  status: "placed" # String | Status value that needs to be considered for query
+}
+
+begin
+  #Finds orders by status
+  result = api_instance.find_orders_by_status(opts)
+  p result
+rescue Petstore::ApiError => e
+  puts "Exception when calling StoreApi->find_orders_by_status: #{e}"
+end
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **status** | **String**| Status value that needs to be considered for query | [optional] [default to placed]
+
+### Return type
+
+[**Array&lt;Order&gt;**](Order.md)
+
+### Authorization
+
+[test_api_client_id](../README.md#test_api_client_id), [test_api_client_secret](../README.md#test_api_client_secret)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+
+
+# **get_inventory**
+> Hash&lt;String, Integer&gt; get_inventory
+
+Returns pet inventories by status
+
+Returns a map of status codes to quantities
+
+### Example
+```ruby
+# load the gem
+require 'petstore'
+# setup authorization 
+Petstore.configure do |config|
+  # Configure API key authorization: api_key
+  config.api_key['api_key'] = 'YOUR API KEY'
+  # Uncomment the following line to set a prefix for the API key, e.g. 'BEARER' (defaults to nil)
+  #config.api_key_prefix['api_key'] = 'BEARER'
+end
+
+api_instance = Petstore::StoreApi.new
+
+begin
+  #Returns pet inventories by status
+  result = api_instance.get_inventory
+  p result
+rescue Petstore::ApiError => e
+  puts "Exception when calling StoreApi->get_inventory: #{e}"
+end
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+**Hash&lt;String, Integer&gt;**
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+
+
+# **get_inventory_in_object**
+> Object get_inventory_in_object
+
+Fake endpoint to test arbitrary object return by 'Get inventory'
+
+Returns an arbitrary object which is actually a map of status codes to quantities
+
+### Example
+```ruby
+# load the gem
+require 'petstore'
+# setup authorization 
+Petstore.configure do |config|
+  # Configure API key authorization: api_key
+  config.api_key['api_key'] = 'YOUR API KEY'
+  # Uncomment the following line to set a prefix for the API key, e.g. 'BEARER' (defaults to nil)
+  #config.api_key_prefix['api_key'] = 'BEARER'
+end
+
+api_instance = Petstore::StoreApi.new
+
+begin
+  #Fake endpoint to test arbitrary object return by 'Get inventory'
+  result = api_instance.get_inventory_in_object
+  p result
+rescue Petstore::ApiError => e
+  puts "Exception when calling StoreApi->get_inventory_in_object: #{e}"
+end
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+**Object**
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+
+
+# **get_order_by_id**
+> Order get_order_by_id(order_id)
+
+Find purchase order by ID
+
+For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+
+### Example
+```ruby
+# load the gem
+require 'petstore'
+# setup authorization 
+Petstore.configure do |config|
+  # Configure API key authorization: test_api_key_header
+  config.api_key['test_api_key_header'] = 'YOUR API KEY'
+  # Uncomment the following line to set a prefix for the API key, e.g. 'BEARER' (defaults to nil)
+  #config.api_key_prefix['test_api_key_header'] = 'BEARER'
+
+  # Configure API key authorization: test_api_key_query
+  config.api_key['test_api_key_query'] = 'YOUR API KEY'
+  # Uncomment the following line to set a prefix for the API key, e.g. 'BEARER' (defaults to nil)
+  #config.api_key_prefix['test_api_key_query'] = 'BEARER'
+end
+
+api_instance = Petstore::StoreApi.new
+
+order_id = "order_id_example" # String | ID of pet that needs to be fetched
+
+
+begin
+  #Find purchase order by ID
+  result = api_instance.get_order_by_id(order_id)
+  p result
+rescue Petstore::ApiError => e
+  puts "Exception when calling StoreApi->get_order_by_id: #{e}"
+end
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **order_id** | **String**| ID of pet that needs to be fetched | 
+
+### Return type
+
+[**Order**](Order.md)
+
+### Authorization
+
+[test_api_key_header](../README.md#test_api_key_header), [test_api_key_query](../README.md#test_api_key_query)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+
+
+# **place_order**
+> Order place_order(opts)
+
+Place an order for a pet
+
+
+
+### Example
+```ruby
+# load the gem
+require 'petstore'
+# setup authorization 
+Petstore.configure do |config|
+  # Configure API key authorization: test_api_client_id
+  config.api_key['x-test_api_client_id'] = 'YOUR API KEY'
+  # Uncomment the following line to set a prefix for the API key, e.g. 'BEARER' (defaults to nil)
+  #config.api_key_prefix['x-test_api_client_id'] = 'BEARER'
+
+  # Configure API key authorization: test_api_client_secret
+  config.api_key['x-test_api_client_secret'] = 'YOUR API KEY'
+  # Uncomment the following line to set a prefix for the API key, e.g. 'BEARER' (defaults to nil)
+  #config.api_key_prefix['x-test_api_client_secret'] = 'BEARER'
+end
+
+api_instance = Petstore::StoreApi.new
+
+opts = { 
+  body: Petstore::Order.new # Order | order placed for purchasing the pet
+}
+
+begin
+  #Place an order for a pet
+  result = api_instance.place_order(opts)
+  p result
+rescue Petstore::ApiError => e
+  puts "Exception when calling StoreApi->place_order: #{e}"
+end
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Order**](Order.md)| order placed for purchasing the pet | [optional] 
+
+### Return type
+
+[**Order**](Order.md)
+
+### Authorization
+
+[test_api_client_id](../README.md#test_api_client_id), [test_api_client_secret](../README.md#test_api_client_secret)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+
+
diff --git a/samples/client/petstore/ruby/docs/Tag.md b/samples/client/petstore/ruby/docs/Tag.md
new file mode 100644
index 00000000000..5bd94d6c04e
--- /dev/null
+++ b/samples/client/petstore/ruby/docs/Tag.md
@@ -0,0 +1,9 @@
+# Petstore::Tag
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **Integer** |  | [optional] 
+**name** | **String** |  | [optional] 
+
+
diff --git a/samples/client/petstore/ruby/docs/User.md b/samples/client/petstore/ruby/docs/User.md
new file mode 100644
index 00000000000..bd76116e023
--- /dev/null
+++ b/samples/client/petstore/ruby/docs/User.md
@@ -0,0 +1,15 @@
+# Petstore::User
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **Integer** |  | [optional] 
+**username** | **String** |  | [optional] 
+**first_name** | **String** |  | [optional] 
+**last_name** | **String** |  | [optional] 
+**email** | **String** |  | [optional] 
+**password** | **String** |  | [optional] 
+**phone** | **String** |  | [optional] 
+**user_status** | **Integer** | User Status | [optional] 
+
+
diff --git a/samples/client/petstore/ruby/docs/UserApi.md b/samples/client/petstore/ruby/docs/UserApi.md
new file mode 100644
index 00000000000..c8c3f5a9ccc
--- /dev/null
+++ b/samples/client/petstore/ruby/docs/UserApi.md
@@ -0,0 +1,396 @@
+# Petstore::UserApi
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**create_user**](UserApi.md#create_user) | **POST** /user | Create user
+[**create_users_with_array_input**](UserApi.md#create_users_with_array_input) | **POST** /user/createWithArray | Creates list of users with given input array
+[**create_users_with_list_input**](UserApi.md#create_users_with_list_input) | **POST** /user/createWithList | Creates list of users with given input array
+[**delete_user**](UserApi.md#delete_user) | **DELETE** /user/{username} | Delete user
+[**get_user_by_name**](UserApi.md#get_user_by_name) | **GET** /user/{username} | Get user by user name
+[**login_user**](UserApi.md#login_user) | **GET** /user/login | Logs user into the system
+[**logout_user**](UserApi.md#logout_user) | **GET** /user/logout | Logs out current logged in user session
+[**update_user**](UserApi.md#update_user) | **PUT** /user/{username} | Updated user
+
+
+# **create_user**
+> create_user(opts)
+
+Create user
+
+This can only be done by the logged in user.
+
+### Example
+```ruby
+# load the gem
+require 'petstore'
+
+api_instance = Petstore::UserApi.new
+
+opts = { 
+  body: Petstore::User.new # User | Created user object
+}
+
+begin
+  #Create user
+  api_instance.create_user(opts)
+rescue Petstore::ApiError => e
+  puts "Exception when calling UserApi->create_user: #{e}"
+end
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**User**](User.md)| Created user object | [optional] 
+
+### Return type
+
+nil (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+
+
+# **create_users_with_array_input**
+> create_users_with_array_input(opts)
+
+Creates list of users with given input array
+
+
+
+### Example
+```ruby
+# load the gem
+require 'petstore'
+
+api_instance = Petstore::UserApi.new
+
+opts = { 
+  body: [Petstore::User.new] # Array<User> | List of user object
+}
+
+begin
+  #Creates list of users with given input array
+  api_instance.create_users_with_array_input(opts)
+rescue Petstore::ApiError => e
+  puts "Exception when calling UserApi->create_users_with_array_input: #{e}"
+end
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Array&lt;User&gt;**](User.md)| List of user object | [optional] 
+
+### Return type
+
+nil (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+
+
+# **create_users_with_list_input**
+> create_users_with_list_input(opts)
+
+Creates list of users with given input array
+
+
+
+### Example
+```ruby
+# load the gem
+require 'petstore'
+
+api_instance = Petstore::UserApi.new
+
+opts = { 
+  body: [Petstore::User.new] # Array<User> | List of user object
+}
+
+begin
+  #Creates list of users with given input array
+  api_instance.create_users_with_list_input(opts)
+rescue Petstore::ApiError => e
+  puts "Exception when calling UserApi->create_users_with_list_input: #{e}"
+end
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Array&lt;User&gt;**](User.md)| List of user object | [optional] 
+
+### Return type
+
+nil (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+
+
+# **delete_user**
+> delete_user(username)
+
+Delete user
+
+This can only be done by the logged in user.
+
+### Example
+```ruby
+# load the gem
+require 'petstore'
+# setup authorization 
+Petstore.configure do |config|
+  # Configure HTTP basic authorization: test_http_basic
+  config.username = 'YOUR USERNAME'
+  config.password = 'YOUR PASSWORD'
+end
+
+api_instance = Petstore::UserApi.new
+
+username = "username_example" # String | The name that needs to be deleted
+
+
+begin
+  #Delete user
+  api_instance.delete_user(username)
+rescue Petstore::ApiError => e
+  puts "Exception when calling UserApi->delete_user: #{e}"
+end
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **String**| The name that needs to be deleted | 
+
+### Return type
+
+nil (empty response body)
+
+### Authorization
+
+[test_http_basic](../README.md#test_http_basic)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+
+
+# **get_user_by_name**
+> User get_user_by_name(username)
+
+Get user by user name
+
+
+
+### Example
+```ruby
+# load the gem
+require 'petstore'
+
+api_instance = Petstore::UserApi.new
+
+username = "username_example" # String | The name that needs to be fetched. Use user1 for testing.
+
+
+begin
+  #Get user by user name
+  result = api_instance.get_user_by_name(username)
+  p result
+rescue Petstore::ApiError => e
+  puts "Exception when calling UserApi->get_user_by_name: #{e}"
+end
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **String**| The name that needs to be fetched. Use user1 for testing. | 
+
+### Return type
+
+[**User**](User.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+
+
+# **login_user**
+> String login_user(opts)
+
+Logs user into the system
+
+
+
+### Example
+```ruby
+# load the gem
+require 'petstore'
+
+api_instance = Petstore::UserApi.new
+
+opts = { 
+  username: "username_example", # String | The user name for login
+  password: "password_example" # String | The password for login in clear text
+}
+
+begin
+  #Logs user into the system
+  result = api_instance.login_user(opts)
+  p result
+rescue Petstore::ApiError => e
+  puts "Exception when calling UserApi->login_user: #{e}"
+end
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **String**| The user name for login | [optional] 
+ **password** | **String**| The password for login in clear text | [optional] 
+
+### Return type
+
+**String**
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+
+
+# **logout_user**
+> logout_user
+
+Logs out current logged in user session
+
+
+
+### Example
+```ruby
+# load the gem
+require 'petstore'
+
+api_instance = Petstore::UserApi.new
+
+begin
+  #Logs out current logged in user session
+  api_instance.logout_user
+rescue Petstore::ApiError => e
+  puts "Exception when calling UserApi->logout_user: #{e}"
+end
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+nil (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+
+
+# **update_user**
+> update_user(username, opts)
+
+Updated user
+
+This can only be done by the logged in user.
+
+### Example
+```ruby
+# load the gem
+require 'petstore'
+
+api_instance = Petstore::UserApi.new
+
+username = "username_example" # String | name that need to be deleted
+
+opts = { 
+  body: Petstore::User.new # User | Updated user object
+}
+
+begin
+  #Updated user
+  api_instance.update_user(username, opts)
+rescue Petstore::ApiError => e
+  puts "Exception when calling UserApi->update_user: #{e}"
+end
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **String**| name that need to be deleted | 
+ **body** | [**User**](User.md)| Updated user object | [optional] 
+
+### Return type
+
+nil (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+
+
diff --git a/samples/client/petstore/ruby/git_push.sh b/samples/client/petstore/ruby/git_push.sh
new file mode 100644
index 00000000000..1a36388db02
--- /dev/null
+++ b/samples/client/petstore/ruby/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="YOUR_GIT_USR_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="YOUR_GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/client/petstore/ruby/lib/petstore.rb b/samples/client/petstore/ruby/lib/petstore.rb
index 82d51d44124..4b848d0c3a0 100644
--- a/samples/client/petstore/ruby/lib/petstore.rb
+++ b/samples/client/petstore/ruby/lib/petstore.rb
@@ -1,3 +1,19 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
 # Common files
 require 'petstore/api_client'
 require 'petstore/api_error'
@@ -5,16 +21,24 @@ require 'petstore/version'
 require 'petstore/configuration'
 
 # Models
-require 'petstore/models/user'
+require 'petstore/models/animal'
+require 'petstore/models/cat'
 require 'petstore/models/category'
-require 'petstore/models/pet'
-require 'petstore/models/tag'
+require 'petstore/models/dog'
+require 'petstore/models/inline_response_200'
+require 'petstore/models/model_200_response'
+require 'petstore/models/model_return'
+require 'petstore/models/name'
 require 'petstore/models/order'
+require 'petstore/models/pet'
+require 'petstore/models/special_model_name'
+require 'petstore/models/tag'
+require 'petstore/models/user'
 
 # APIs
-require 'petstore/api/user_api'
 require 'petstore/api/pet_api'
 require 'petstore/api/store_api'
+require 'petstore/api/user_api'
 
 module Petstore
   class << self
diff --git a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
index 9641ad0b707..a2828c18873 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
@@ -1,3 +1,19 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
 require "uri"
 
 module Petstore
@@ -8,63 +24,6 @@ module Petstore
       @api_client = api_client
     end
 
-    # Update an existing pet
-    # 
-    # @param [Hash] opts the optional parameters
-    # @option opts [Pet] :body Pet object that needs to be added to the store
-    # @return [nil]
-    def update_pet(opts = {})
-      update_pet_with_http_info(opts)
-      return nil
-    end
-
-    # Update an existing pet
-    # 
-    # @param [Hash] opts the optional parameters
-    # @option opts [Pet] :body Pet object that needs to be added to the store
-    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
-    def update_pet_with_http_info(opts = {})
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: PetApi#update_pet ..."
-      end
-      
-      # resource path
-      path = "/pet".sub('{format}','json')
-
-      # query parameters
-      query_params = {}
-
-      # header parameters
-      header_params = {}
-
-      # HTTP header 'Accept' (if needed)
-      _header_accept = ['application/json', 'application/xml']
-      _header_accept_result = @api_client.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result
-
-      # HTTP header 'Content-Type'
-      _header_content_type = ['application/json', 'application/xml']
-      header_params['Content-Type'] = @api_client.select_header_content_type(_header_content_type)
-
-      # form parameters
-      form_params = {}
-
-      # http body (model)
-      post_body = @api_client.object_to_http_body(opts[:'body'])
-      
-
-      auth_names = ['petstore_auth']
-      data, status_code, headers = @api_client.call_api(:PUT, path,
-        :header_params => header_params,
-        :query_params => query_params,
-        :form_params => form_params,
-        :body => post_body,
-        :auth_names => auth_names)
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: PetApi#update_pet\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
-      end
-      return data, status_code, headers
-    end
-
     # Add a new pet to the store
     # 
     # @param [Hash] opts the optional parameters
@@ -86,7 +45,7 @@ module Petstore
       end
       
       # resource path
-      path = "/pet".sub('{format}','json')
+      local_var_path = "/pet".sub('{format}','json')
 
       # query parameters
       query_params = {}
@@ -108,9 +67,8 @@ module Petstore
       # http body (model)
       post_body = @api_client.object_to_http_body(opts[:'body'])
       
-
       auth_names = ['petstore_auth']
-      data, status_code, headers = @api_client.call_api(:POST, path,
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
@@ -122,10 +80,128 @@ module Petstore
       return data, status_code, headers
     end
 
-    # Finds Pets by status
-    # Multiple status values can be provided with comma seperated strings
+    # Fake endpoint to test byte array in body parameter for adding a new pet to the store
+    # 
     # @param [Hash] opts the optional parameters
-    # @option opts [Array<String>] :status Status values that need to be considered for filter
+    # @option opts [String] :body Pet object in the form of byte array
+    # @return [nil]
+    def add_pet_using_byte_array(opts = {})
+      add_pet_using_byte_array_with_http_info(opts)
+      return nil
+    end
+
+    # Fake endpoint to test byte array in body parameter for adding a new pet to the store
+    # 
+    # @param [Hash] opts the optional parameters
+    # @option opts [String] :body Pet object in the form of byte array
+    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
+    def add_pet_using_byte_array_with_http_info(opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "Calling API: PetApi#add_pet_using_byte_array ..."
+      end
+      
+      # resource path
+      local_var_path = "/pet?testing_byte_array=true".sub('{format}','json')
+
+      # query parameters
+      query_params = {}
+
+      # header parameters
+      header_params = {}
+
+      # HTTP header 'Accept' (if needed)
+      _header_accept = ['application/json', 'application/xml']
+      _header_accept_result = @api_client.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result
+
+      # HTTP header 'Content-Type'
+      _header_content_type = ['application/json', 'application/xml']
+      header_params['Content-Type'] = @api_client.select_header_content_type(_header_content_type)
+
+      # form parameters
+      form_params = {}
+
+      # http body (model)
+      post_body = @api_client.object_to_http_body(opts[:'body'])
+      
+      auth_names = ['petstore_auth']
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: PetApi#add_pet_using_byte_array\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
+    # Deletes a pet
+    # 
+    # @param pet_id Pet id to delete
+    # @param [Hash] opts the optional parameters
+    # @option opts [String] :api_key 
+    # @return [nil]
+    def delete_pet(pet_id, opts = {})
+      delete_pet_with_http_info(pet_id, opts)
+      return nil
+    end
+
+    # Deletes a pet
+    # 
+    # @param pet_id Pet id to delete
+    # @param [Hash] opts the optional parameters
+    # @option opts [String] :api_key 
+    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
+    def delete_pet_with_http_info(pet_id, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "Calling API: PetApi#delete_pet ..."
+      end
+      
+      # verify the required parameter 'pet_id' is set
+      fail "Missing the required parameter 'pet_id' when calling delete_pet" if pet_id.nil?
+      
+      # resource path
+      local_var_path = "/pet/{petId}".sub('{format}','json').sub('{' + 'petId' + '}', pet_id.to_s)
+
+      # query parameters
+      query_params = {}
+
+      # header parameters
+      header_params = {}
+
+      # HTTP header 'Accept' (if needed)
+      _header_accept = ['application/json', 'application/xml']
+      _header_accept_result = @api_client.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result
+
+      # HTTP header 'Content-Type'
+      _header_content_type = []
+      header_params['Content-Type'] = @api_client.select_header_content_type(_header_content_type)
+      header_params[:'api_key'] = opts[:'api_key'] if opts[:'api_key']
+
+      # form parameters
+      form_params = {}
+
+      # http body (model)
+      post_body = nil
+      
+      auth_names = ['petstore_auth']
+      data, status_code, headers = @api_client.call_api(:DELETE, local_var_path,
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: PetApi#delete_pet\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
+    # Finds Pets by status
+    # Multiple status values can be provided with comma separated strings
+    # @param [Hash] opts the optional parameters
+    # @option opts [Array<String>] :status Status values that need to be considered for query (default to available)
     # @return [Array<Pet>]
     def find_pets_by_status(opts = {})
       data, status_code, headers = find_pets_by_status_with_http_info(opts)
@@ -133,9 +209,9 @@ module Petstore
     end
 
     # Finds Pets by status
-    # Multiple status values can be provided with comma seperated strings
+    # Multiple status values can be provided with comma separated strings
     # @param [Hash] opts the optional parameters
-    # @option opts [Array<String>] :status Status values that need to be considered for filter
+    # @option opts [Array<String>] :status Status values that need to be considered for query
     # @return [Array<(Array<Pet>, Fixnum, Hash)>] Array<Pet> data, response status code and response headers
     def find_pets_by_status_with_http_info(opts = {})
       if @api_client.config.debugging
@@ -143,7 +219,7 @@ module Petstore
       end
       
       # resource path
-      path = "/pet/findByStatus".sub('{format}','json')
+      local_var_path = "/pet/findByStatus".sub('{format}','json')
 
       # query parameters
       query_params = {}
@@ -166,9 +242,8 @@ module Petstore
       # http body (model)
       post_body = nil
       
-
       auth_names = ['petstore_auth']
-      data, status_code, headers = @api_client.call_api(:GET, path,
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
@@ -202,7 +277,7 @@ module Petstore
       end
       
       # resource path
-      path = "/pet/findByTags".sub('{format}','json')
+      local_var_path = "/pet/findByTags".sub('{format}','json')
 
       # query parameters
       query_params = {}
@@ -225,9 +300,8 @@ module Petstore
       # http body (model)
       post_body = nil
       
-
       auth_names = ['petstore_auth']
-      data, status_code, headers = @api_client.call_api(:GET, path,
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
@@ -241,7 +315,7 @@ module Petstore
     end
 
     # Find pet by ID
-    # Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+    # Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
     # @param pet_id ID of pet that needs to be fetched
     # @param [Hash] opts the optional parameters
     # @return [Pet]
@@ -264,7 +338,7 @@ module Petstore
       fail "Missing the required parameter 'pet_id' when calling get_pet_by_id" if pet_id.nil?
       
       # resource path
-      path = "/pet/{petId}".sub('{format}','json').sub('{' + 'petId' + '}', pet_id.to_s)
+      local_var_path = "/pet/{petId}".sub('{format}','json').sub('{' + 'petId' + '}', pet_id.to_s)
 
       # query parameters
       query_params = {}
@@ -286,9 +360,8 @@ module Petstore
       # http body (model)
       post_body = nil
       
-
-      auth_names = ['api_key']
-      data, status_code, headers = @api_client.call_api(:GET, path,
+      auth_names = ['api_key', 'petstore_auth']
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
@@ -301,6 +374,182 @@ module Petstore
       return data, status_code, headers
     end
 
+    # Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
+    # Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
+    # @param pet_id ID of pet that needs to be fetched
+    # @param [Hash] opts the optional parameters
+    # @return [InlineResponse200]
+    def get_pet_by_id_in_object(pet_id, opts = {})
+      data, status_code, headers = get_pet_by_id_in_object_with_http_info(pet_id, opts)
+      return data
+    end
+
+    # Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+    # Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+    # @param pet_id ID of pet that needs to be fetched
+    # @param [Hash] opts the optional parameters
+    # @return [Array<(InlineResponse200, Fixnum, Hash)>] InlineResponse200 data, response status code and response headers
+    def get_pet_by_id_in_object_with_http_info(pet_id, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "Calling API: PetApi#get_pet_by_id_in_object ..."
+      end
+      
+      # verify the required parameter 'pet_id' is set
+      fail "Missing the required parameter 'pet_id' when calling get_pet_by_id_in_object" if pet_id.nil?
+      
+      # resource path
+      local_var_path = "/pet/{petId}?response=inline_arbitrary_object".sub('{format}','json').sub('{' + 'petId' + '}', pet_id.to_s)
+
+      # query parameters
+      query_params = {}
+
+      # header parameters
+      header_params = {}
+
+      # HTTP header 'Accept' (if needed)
+      _header_accept = ['application/json', 'application/xml']
+      _header_accept_result = @api_client.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result
+
+      # HTTP header 'Content-Type'
+      _header_content_type = []
+      header_params['Content-Type'] = @api_client.select_header_content_type(_header_content_type)
+
+      # form parameters
+      form_params = {}
+
+      # http body (model)
+      post_body = nil
+      
+      auth_names = ['api_key', 'petstore_auth']
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => 'InlineResponse200')
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: PetApi#get_pet_by_id_in_object\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
+    # Fake endpoint to test byte array return by 'Find pet by ID'
+    # Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
+    # @param pet_id ID of pet that needs to be fetched
+    # @param [Hash] opts the optional parameters
+    # @return [String]
+    def pet_pet_idtesting_byte_arraytrue_get(pet_id, opts = {})
+      data, status_code, headers = pet_pet_idtesting_byte_arraytrue_get_with_http_info(pet_id, opts)
+      return data
+    end
+
+    # Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+    # Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+    # @param pet_id ID of pet that needs to be fetched
+    # @param [Hash] opts the optional parameters
+    # @return [Array<(String, Fixnum, Hash)>] String data, response status code and response headers
+    def pet_pet_idtesting_byte_arraytrue_get_with_http_info(pet_id, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "Calling API: PetApi#pet_pet_idtesting_byte_arraytrue_get ..."
+      end
+      
+      # verify the required parameter 'pet_id' is set
+      fail "Missing the required parameter 'pet_id' when calling pet_pet_idtesting_byte_arraytrue_get" if pet_id.nil?
+      
+      # resource path
+      local_var_path = "/pet/{petId}?testing_byte_array=true".sub('{format}','json').sub('{' + 'petId' + '}', pet_id.to_s)
+
+      # query parameters
+      query_params = {}
+
+      # header parameters
+      header_params = {}
+
+      # HTTP header 'Accept' (if needed)
+      _header_accept = ['application/json', 'application/xml']
+      _header_accept_result = @api_client.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result
+
+      # HTTP header 'Content-Type'
+      _header_content_type = []
+      header_params['Content-Type'] = @api_client.select_header_content_type(_header_content_type)
+
+      # form parameters
+      form_params = {}
+
+      # http body (model)
+      post_body = nil
+      
+      auth_names = ['api_key', 'petstore_auth']
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => 'String')
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: PetApi#pet_pet_idtesting_byte_arraytrue_get\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
+    # Update an existing pet
+    # 
+    # @param [Hash] opts the optional parameters
+    # @option opts [Pet] :body Pet object that needs to be added to the store
+    # @return [nil]
+    def update_pet(opts = {})
+      update_pet_with_http_info(opts)
+      return nil
+    end
+
+    # Update an existing pet
+    # 
+    # @param [Hash] opts the optional parameters
+    # @option opts [Pet] :body Pet object that needs to be added to the store
+    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
+    def update_pet_with_http_info(opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "Calling API: PetApi#update_pet ..."
+      end
+      
+      # resource path
+      local_var_path = "/pet".sub('{format}','json')
+
+      # query parameters
+      query_params = {}
+
+      # header parameters
+      header_params = {}
+
+      # HTTP header 'Accept' (if needed)
+      _header_accept = ['application/json', 'application/xml']
+      _header_accept_result = @api_client.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result
+
+      # HTTP header 'Content-Type'
+      _header_content_type = ['application/json', 'application/xml']
+      header_params['Content-Type'] = @api_client.select_header_content_type(_header_content_type)
+
+      # form parameters
+      form_params = {}
+
+      # http body (model)
+      post_body = @api_client.object_to_http_body(opts[:'body'])
+      
+      auth_names = ['petstore_auth']
+      data, status_code, headers = @api_client.call_api(:PUT, local_var_path,
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: PetApi#update_pet\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
     # Updates a pet in the store with form data
     # 
     # @param pet_id ID of pet that needs to be updated
@@ -329,7 +578,7 @@ module Petstore
       fail "Missing the required parameter 'pet_id' when calling update_pet_with_form" if pet_id.nil?
       
       # resource path
-      path = "/pet/{petId}".sub('{format}','json').sub('{' + 'petId' + '}', pet_id.to_s)
+      local_var_path = "/pet/{petId}".sub('{format}','json').sub('{' + 'petId' + '}', pet_id.to_s)
 
       # query parameters
       query_params = {}
@@ -353,9 +602,8 @@ module Petstore
       # http body (model)
       post_body = nil
       
-
       auth_names = ['petstore_auth']
-      data, status_code, headers = @api_client.call_api(:POST, path,
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
@@ -367,69 +615,6 @@ module Petstore
       return data, status_code, headers
     end
 
-    # Deletes a pet
-    # 
-    # @param pet_id Pet id to delete
-    # @param [Hash] opts the optional parameters
-    # @option opts [String] :api_key 
-    # @return [nil]
-    def delete_pet(pet_id, opts = {})
-      delete_pet_with_http_info(pet_id, opts)
-      return nil
-    end
-
-    # Deletes a pet
-    # 
-    # @param pet_id Pet id to delete
-    # @param [Hash] opts the optional parameters
-    # @option opts [String] :api_key 
-    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
-    def delete_pet_with_http_info(pet_id, opts = {})
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: PetApi#delete_pet ..."
-      end
-      
-      # verify the required parameter 'pet_id' is set
-      fail "Missing the required parameter 'pet_id' when calling delete_pet" if pet_id.nil?
-      
-      # resource path
-      path = "/pet/{petId}".sub('{format}','json').sub('{' + 'petId' + '}', pet_id.to_s)
-
-      # query parameters
-      query_params = {}
-
-      # header parameters
-      header_params = {}
-
-      # HTTP header 'Accept' (if needed)
-      _header_accept = ['application/json', 'application/xml']
-      _header_accept_result = @api_client.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result
-
-      # HTTP header 'Content-Type'
-      _header_content_type = []
-      header_params['Content-Type'] = @api_client.select_header_content_type(_header_content_type)
-      header_params[:'api_key'] = opts[:'api_key'] if opts[:'api_key']
-
-      # form parameters
-      form_params = {}
-
-      # http body (model)
-      post_body = nil
-      
-
-      auth_names = ['petstore_auth']
-      data, status_code, headers = @api_client.call_api(:DELETE, path,
-        :header_params => header_params,
-        :query_params => query_params,
-        :form_params => form_params,
-        :body => post_body,
-        :auth_names => auth_names)
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: PetApi#delete_pet\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
-      end
-      return data, status_code, headers
-    end
-
     # uploads an image
     # 
     # @param pet_id ID of pet to update
@@ -458,7 +643,7 @@ module Petstore
       fail "Missing the required parameter 'pet_id' when calling upload_file" if pet_id.nil?
       
       # resource path
-      path = "/pet/{petId}/uploadImage".sub('{format}','json').sub('{' + 'petId' + '}', pet_id.to_s)
+      local_var_path = "/pet/{petId}/uploadImage".sub('{format}','json').sub('{' + 'petId' + '}', pet_id.to_s)
 
       # query parameters
       query_params = {}
@@ -482,9 +667,8 @@ module Petstore
       # http body (model)
       post_body = nil
       
-
       auth_names = ['petstore_auth']
-      data, status_code, headers = @api_client.call_api(:POST, path,
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
@@ -497,7 +681,3 @@ module Petstore
     end
   end
 end
-
-
-
-
diff --git a/samples/client/petstore/ruby/lib/petstore/api/store_api.rb b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb
index 1d8a92e288f..5c154f6ccd6 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/store_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb
@@ -1,3 +1,19 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
 require "uri"
 
 module Petstore
@@ -8,26 +24,31 @@ module Petstore
       @api_client = api_client
     end
 
-    # Returns pet inventories by status
-    # Returns a map of status codes to quantities
+    # Delete purchase order by ID
+    # For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+    # @param order_id ID of the order that needs to be deleted
     # @param [Hash] opts the optional parameters
-    # @return [Hash<String, Integer>]
-    def get_inventory(opts = {})
-      data, status_code, headers = get_inventory_with_http_info(opts)
-      return data
+    # @return [nil]
+    def delete_order(order_id, opts = {})
+      delete_order_with_http_info(order_id, opts)
+      return nil
     end
 
-    # Returns pet inventories by status
-    # Returns a map of status codes to quantities
+    # Delete purchase order by ID
+    # For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+    # @param order_id ID of the order that needs to be deleted
     # @param [Hash] opts the optional parameters
-    # @return [Array<(Hash<String, Integer>, Fixnum, Hash)>] Hash<String, Integer> data, response status code and response headers
-    def get_inventory_with_http_info(opts = {})
+    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
+    def delete_order_with_http_info(order_id, opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: StoreApi#get_inventory ..."
+        @api_client.config.logger.debug "Calling API: StoreApi#delete_order ..."
       end
       
+      # verify the required parameter 'order_id' is set
+      fail "Missing the required parameter 'order_id' when calling delete_order" if order_id.nil?
+      
       # resource path
-      path = "/store/inventory".sub('{format}','json')
+      local_var_path = "/store/order/{orderId}".sub('{format}','json').sub('{' + 'orderId' + '}', order_id.to_s)
 
       # query parameters
       query_params = {}
@@ -49,9 +70,124 @@ module Petstore
       # http body (model)
       post_body = nil
       
+      auth_names = []
+      data, status_code, headers = @api_client.call_api(:DELETE, local_var_path,
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: StoreApi#delete_order\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
 
+    # Finds orders by status
+    # A single status value can be provided as a string
+    # @param [Hash] opts the optional parameters
+    # @option opts [String] :status Status value that needs to be considered for query (default to placed)
+    # @return [Array<Order>]
+    def find_orders_by_status(opts = {})
+      data, status_code, headers = find_orders_by_status_with_http_info(opts)
+      return data
+    end
+
+    # Finds orders by status
+    # A single status value can be provided as a string
+    # @param [Hash] opts the optional parameters
+    # @option opts [String] :status Status value that needs to be considered for query
+    # @return [Array<(Array<Order>, Fixnum, Hash)>] Array<Order> data, response status code and response headers
+    def find_orders_by_status_with_http_info(opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "Calling API: StoreApi#find_orders_by_status ..."
+      end
+      
+      if opts[:'status'] && !['placed', 'approved', 'delivered'].include?(opts[:'status'])
+        fail 'invalid value for "status", must be one of placed, approved, delivered'
+      end
+      
+      # resource path
+      local_var_path = "/store/findByStatus".sub('{format}','json')
+
+      # query parameters
+      query_params = {}
+      query_params[:'status'] = opts[:'status'] if opts[:'status']
+
+      # header parameters
+      header_params = {}
+
+      # HTTP header 'Accept' (if needed)
+      _header_accept = ['application/json', 'application/xml']
+      _header_accept_result = @api_client.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result
+
+      # HTTP header 'Content-Type'
+      _header_content_type = []
+      header_params['Content-Type'] = @api_client.select_header_content_type(_header_content_type)
+
+      # form parameters
+      form_params = {}
+
+      # http body (model)
+      post_body = nil
+      
+      auth_names = ['test_api_client_id', 'test_api_client_secret']
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => 'Array<Order>')
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: StoreApi#find_orders_by_status\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
+    # Returns pet inventories by status
+    # Returns a map of status codes to quantities
+    # @param [Hash] opts the optional parameters
+    # @return [Hash<String, Integer>]
+    def get_inventory(opts = {})
+      data, status_code, headers = get_inventory_with_http_info(opts)
+      return data
+    end
+
+    # Returns pet inventories by status
+    # Returns a map of status codes to quantities
+    # @param [Hash] opts the optional parameters
+    # @return [Array<(Hash<String, Integer>, Fixnum, Hash)>] Hash<String, Integer> data, response status code and response headers
+    def get_inventory_with_http_info(opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "Calling API: StoreApi#get_inventory ..."
+      end
+      
+      # resource path
+      local_var_path = "/store/inventory".sub('{format}','json')
+
+      # query parameters
+      query_params = {}
+
+      # header parameters
+      header_params = {}
+
+      # HTTP header 'Accept' (if needed)
+      _header_accept = ['application/json', 'application/xml']
+      _header_accept_result = @api_client.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result
+
+      # HTTP header 'Content-Type'
+      _header_content_type = []
+      header_params['Content-Type'] = @api_client.select_header_content_type(_header_content_type)
+
+      # form parameters
+      form_params = {}
+
+      # http body (model)
+      post_body = nil
+      
       auth_names = ['api_key']
-      data, status_code, headers = @api_client.call_api(:GET, path,
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
@@ -64,6 +200,121 @@ module Petstore
       return data, status_code, headers
     end
 
+    # Fake endpoint to test arbitrary object return by 'Get inventory'
+    # Returns an arbitrary object which is actually a map of status codes to quantities
+    # @param [Hash] opts the optional parameters
+    # @return [Object]
+    def get_inventory_in_object(opts = {})
+      data, status_code, headers = get_inventory_in_object_with_http_info(opts)
+      return data
+    end
+
+    # Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+    # Returns an arbitrary object which is actually a map of status codes to quantities
+    # @param [Hash] opts the optional parameters
+    # @return [Array<(Object, Fixnum, Hash)>] Object data, response status code and response headers
+    def get_inventory_in_object_with_http_info(opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "Calling API: StoreApi#get_inventory_in_object ..."
+      end
+      
+      # resource path
+      local_var_path = "/store/inventory?response=arbitrary_object".sub('{format}','json')
+
+      # query parameters
+      query_params = {}
+
+      # header parameters
+      header_params = {}
+
+      # HTTP header 'Accept' (if needed)
+      _header_accept = ['application/json', 'application/xml']
+      _header_accept_result = @api_client.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result
+
+      # HTTP header 'Content-Type'
+      _header_content_type = []
+      header_params['Content-Type'] = @api_client.select_header_content_type(_header_content_type)
+
+      # form parameters
+      form_params = {}
+
+      # http body (model)
+      post_body = nil
+      
+      auth_names = ['api_key']
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => 'Object')
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: StoreApi#get_inventory_in_object\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
+    # Find purchase order by ID
+    # For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    # @param order_id ID of pet that needs to be fetched
+    # @param [Hash] opts the optional parameters
+    # @return [Order]
+    def get_order_by_id(order_id, opts = {})
+      data, status_code, headers = get_order_by_id_with_http_info(order_id, opts)
+      return data
+    end
+
+    # Find purchase order by ID
+    # For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+    # @param order_id ID of pet that needs to be fetched
+    # @param [Hash] opts the optional parameters
+    # @return [Array<(Order, Fixnum, Hash)>] Order data, response status code and response headers
+    def get_order_by_id_with_http_info(order_id, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "Calling API: StoreApi#get_order_by_id ..."
+      end
+      
+      # verify the required parameter 'order_id' is set
+      fail "Missing the required parameter 'order_id' when calling get_order_by_id" if order_id.nil?
+      
+      # resource path
+      local_var_path = "/store/order/{orderId}".sub('{format}','json').sub('{' + 'orderId' + '}', order_id.to_s)
+
+      # query parameters
+      query_params = {}
+
+      # header parameters
+      header_params = {}
+
+      # HTTP header 'Accept' (if needed)
+      _header_accept = ['application/json', 'application/xml']
+      _header_accept_result = @api_client.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result
+
+      # HTTP header 'Content-Type'
+      _header_content_type = []
+      header_params['Content-Type'] = @api_client.select_header_content_type(_header_content_type)
+
+      # form parameters
+      form_params = {}
+
+      # http body (model)
+      post_body = nil
+      
+      auth_names = ['test_api_key_header', 'test_api_key_query']
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => 'Order')
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: StoreApi#get_order_by_id\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
     # Place an order for a pet
     # 
     # @param [Hash] opts the optional parameters
@@ -85,7 +336,7 @@ module Petstore
       end
       
       # resource path
-      path = "/store/order".sub('{format}','json')
+      local_var_path = "/store/order".sub('{format}','json')
 
       # query parameters
       query_params = {}
@@ -107,9 +358,8 @@ module Petstore
       # http body (model)
       post_body = @api_client.object_to_http_body(opts[:'body'])
       
-
-      auth_names = []
-      data, status_code, headers = @api_client.call_api(:POST, path,
+      auth_names = ['test_api_client_id', 'test_api_client_secret']
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
@@ -121,130 +371,5 @@ module Petstore
       end
       return data, status_code, headers
     end
-
-    # Find purchase order by ID
-    # For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-    # @param order_id ID of pet that needs to be fetched
-    # @param [Hash] opts the optional parameters
-    # @return [Order]
-    def get_order_by_id(order_id, opts = {})
-      data, status_code, headers = get_order_by_id_with_http_info(order_id, opts)
-      return data
-    end
-
-    # Find purchase order by ID
-    # For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-    # @param order_id ID of pet that needs to be fetched
-    # @param [Hash] opts the optional parameters
-    # @return [Array<(Order, Fixnum, Hash)>] Order data, response status code and response headers
-    def get_order_by_id_with_http_info(order_id, opts = {})
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: StoreApi#get_order_by_id ..."
-      end
-      
-      # verify the required parameter 'order_id' is set
-      fail "Missing the required parameter 'order_id' when calling get_order_by_id" if order_id.nil?
-      
-      # resource path
-      path = "/store/order/{orderId}".sub('{format}','json').sub('{' + 'orderId' + '}', order_id.to_s)
-
-      # query parameters
-      query_params = {}
-
-      # header parameters
-      header_params = {}
-
-      # HTTP header 'Accept' (if needed)
-      _header_accept = ['application/json', 'application/xml']
-      _header_accept_result = @api_client.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result
-
-      # HTTP header 'Content-Type'
-      _header_content_type = []
-      header_params['Content-Type'] = @api_client.select_header_content_type(_header_content_type)
-
-      # form parameters
-      form_params = {}
-
-      # http body (model)
-      post_body = nil
-      
-
-      auth_names = []
-      data, status_code, headers = @api_client.call_api(:GET, path,
-        :header_params => header_params,
-        :query_params => query_params,
-        :form_params => form_params,
-        :body => post_body,
-        :auth_names => auth_names,
-        :return_type => 'Order')
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: StoreApi#get_order_by_id\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
-      end
-      return data, status_code, headers
-    end
-
-    # Delete purchase order by ID
-    # For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-    # @param order_id ID of the order that needs to be deleted
-    # @param [Hash] opts the optional parameters
-    # @return [nil]
-    def delete_order(order_id, opts = {})
-      delete_order_with_http_info(order_id, opts)
-      return nil
-    end
-
-    # Delete purchase order by ID
-    # For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-    # @param order_id ID of the order that needs to be deleted
-    # @param [Hash] opts the optional parameters
-    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
-    def delete_order_with_http_info(order_id, opts = {})
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: StoreApi#delete_order ..."
-      end
-      
-      # verify the required parameter 'order_id' is set
-      fail "Missing the required parameter 'order_id' when calling delete_order" if order_id.nil?
-      
-      # resource path
-      path = "/store/order/{orderId}".sub('{format}','json').sub('{' + 'orderId' + '}', order_id.to_s)
-
-      # query parameters
-      query_params = {}
-
-      # header parameters
-      header_params = {}
-
-      # HTTP header 'Accept' (if needed)
-      _header_accept = ['application/json', 'application/xml']
-      _header_accept_result = @api_client.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result
-
-      # HTTP header 'Content-Type'
-      _header_content_type = []
-      header_params['Content-Type'] = @api_client.select_header_content_type(_header_content_type)
-
-      # form parameters
-      form_params = {}
-
-      # http body (model)
-      post_body = nil
-      
-
-      auth_names = []
-      data, status_code, headers = @api_client.call_api(:DELETE, path,
-        :header_params => header_params,
-        :query_params => query_params,
-        :form_params => form_params,
-        :body => post_body,
-        :auth_names => auth_names)
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: StoreApi#delete_order\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
-      end
-      return data, status_code, headers
-    end
   end
 end
-
-
-
-
diff --git a/samples/client/petstore/ruby/lib/petstore/api/user_api.rb b/samples/client/petstore/ruby/lib/petstore/api/user_api.rb
index e1c8332b835..54d943bdc44 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/user_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/user_api.rb
@@ -1,3 +1,19 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
 require "uri"
 
 module Petstore
@@ -29,7 +45,7 @@ module Petstore
       end
       
       # resource path
-      path = "/user".sub('{format}','json')
+      local_var_path = "/user".sub('{format}','json')
 
       # query parameters
       query_params = {}
@@ -51,9 +67,8 @@ module Petstore
       # http body (model)
       post_body = @api_client.object_to_http_body(opts[:'body'])
       
-
       auth_names = []
-      data, status_code, headers = @api_client.call_api(:POST, path,
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
@@ -86,7 +101,7 @@ module Petstore
       end
       
       # resource path
-      path = "/user/createWithArray".sub('{format}','json')
+      local_var_path = "/user/createWithArray".sub('{format}','json')
 
       # query parameters
       query_params = {}
@@ -108,9 +123,8 @@ module Petstore
       # http body (model)
       post_body = @api_client.object_to_http_body(opts[:'body'])
       
-
       auth_names = []
-      data, status_code, headers = @api_client.call_api(:POST, path,
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
@@ -143,7 +157,7 @@ module Petstore
       end
       
       # resource path
-      path = "/user/createWithList".sub('{format}','json')
+      local_var_path = "/user/createWithList".sub('{format}','json')
 
       # query parameters
       query_params = {}
@@ -165,9 +179,8 @@ module Petstore
       # http body (model)
       post_body = @api_client.object_to_http_body(opts[:'body'])
       
-
       auth_names = []
-      data, status_code, headers = @api_client.call_api(:POST, path,
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
@@ -179,6 +192,125 @@ module Petstore
       return data, status_code, headers
     end
 
+    # Delete user
+    # This can only be done by the logged in user.
+    # @param username The name that needs to be deleted
+    # @param [Hash] opts the optional parameters
+    # @return [nil]
+    def delete_user(username, opts = {})
+      delete_user_with_http_info(username, opts)
+      return nil
+    end
+
+    # Delete user
+    # This can only be done by the logged in user.
+    # @param username The name that needs to be deleted
+    # @param [Hash] opts the optional parameters
+    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
+    def delete_user_with_http_info(username, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "Calling API: UserApi#delete_user ..."
+      end
+      
+      # verify the required parameter 'username' is set
+      fail "Missing the required parameter 'username' when calling delete_user" if username.nil?
+      
+      # resource path
+      local_var_path = "/user/{username}".sub('{format}','json').sub('{' + 'username' + '}', username.to_s)
+
+      # query parameters
+      query_params = {}
+
+      # header parameters
+      header_params = {}
+
+      # HTTP header 'Accept' (if needed)
+      _header_accept = ['application/json', 'application/xml']
+      _header_accept_result = @api_client.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result
+
+      # HTTP header 'Content-Type'
+      _header_content_type = []
+      header_params['Content-Type'] = @api_client.select_header_content_type(_header_content_type)
+
+      # form parameters
+      form_params = {}
+
+      # http body (model)
+      post_body = nil
+      
+      auth_names = ['test_http_basic']
+      data, status_code, headers = @api_client.call_api(:DELETE, local_var_path,
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: UserApi#delete_user\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
+    # Get user by user name
+    # 
+    # @param username The name that needs to be fetched. Use user1 for testing.
+    # @param [Hash] opts the optional parameters
+    # @return [User]
+    def get_user_by_name(username, opts = {})
+      data, status_code, headers = get_user_by_name_with_http_info(username, opts)
+      return data
+    end
+
+    # Get user by user name
+    # 
+    # @param username The name that needs to be fetched. Use user1 for testing.
+    # @param [Hash] opts the optional parameters
+    # @return [Array<(User, Fixnum, Hash)>] User data, response status code and response headers
+    def get_user_by_name_with_http_info(username, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "Calling API: UserApi#get_user_by_name ..."
+      end
+      
+      # verify the required parameter 'username' is set
+      fail "Missing the required parameter 'username' when calling get_user_by_name" if username.nil?
+      
+      # resource path
+      local_var_path = "/user/{username}".sub('{format}','json').sub('{' + 'username' + '}', username.to_s)
+
+      # query parameters
+      query_params = {}
+
+      # header parameters
+      header_params = {}
+
+      # HTTP header 'Accept' (if needed)
+      _header_accept = ['application/json', 'application/xml']
+      _header_accept_result = @api_client.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result
+
+      # HTTP header 'Content-Type'
+      _header_content_type = []
+      header_params['Content-Type'] = @api_client.select_header_content_type(_header_content_type)
+
+      # form parameters
+      form_params = {}
+
+      # http body (model)
+      post_body = nil
+      
+      auth_names = []
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => 'User')
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: UserApi#get_user_by_name\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
     # Logs user into the system
     # 
     # @param [Hash] opts the optional parameters
@@ -202,7 +334,7 @@ module Petstore
       end
       
       # resource path
-      path = "/user/login".sub('{format}','json')
+      local_var_path = "/user/login".sub('{format}','json')
 
       # query parameters
       query_params = {}
@@ -226,9 +358,8 @@ module Petstore
       # http body (model)
       post_body = nil
       
-
       auth_names = []
-      data, status_code, headers = @api_client.call_api(:GET, path,
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
@@ -260,7 +391,7 @@ module Petstore
       end
       
       # resource path
-      path = "/user/logout".sub('{format}','json')
+      local_var_path = "/user/logout".sub('{format}','json')
 
       # query parameters
       query_params = {}
@@ -282,9 +413,8 @@ module Petstore
       # http body (model)
       post_body = nil
       
-
       auth_names = []
-      data, status_code, headers = @api_client.call_api(:GET, path,
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
@@ -296,67 +426,6 @@ module Petstore
       return data, status_code, headers
     end
 
-    # Get user by user name
-    # 
-    # @param username The name that needs to be fetched. Use user1 for testing.
-    # @param [Hash] opts the optional parameters
-    # @return [User]
-    def get_user_by_name(username, opts = {})
-      data, status_code, headers = get_user_by_name_with_http_info(username, opts)
-      return data
-    end
-
-    # Get user by user name
-    # 
-    # @param username The name that needs to be fetched. Use user1 for testing.
-    # @param [Hash] opts the optional parameters
-    # @return [Array<(User, Fixnum, Hash)>] User data, response status code and response headers
-    def get_user_by_name_with_http_info(username, opts = {})
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: UserApi#get_user_by_name ..."
-      end
-      
-      # verify the required parameter 'username' is set
-      fail "Missing the required parameter 'username' when calling get_user_by_name" if username.nil?
-      
-      # resource path
-      path = "/user/{username}".sub('{format}','json').sub('{' + 'username' + '}', username.to_s)
-
-      # query parameters
-      query_params = {}
-
-      # header parameters
-      header_params = {}
-
-      # HTTP header 'Accept' (if needed)
-      _header_accept = ['application/json', 'application/xml']
-      _header_accept_result = @api_client.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result
-
-      # HTTP header 'Content-Type'
-      _header_content_type = []
-      header_params['Content-Type'] = @api_client.select_header_content_type(_header_content_type)
-
-      # form parameters
-      form_params = {}
-
-      # http body (model)
-      post_body = nil
-      
-
-      auth_names = []
-      data, status_code, headers = @api_client.call_api(:GET, path,
-        :header_params => header_params,
-        :query_params => query_params,
-        :form_params => form_params,
-        :body => post_body,
-        :auth_names => auth_names,
-        :return_type => 'User')
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: UserApi#get_user_by_name\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
-      end
-      return data, status_code, headers
-    end
-
     # Updated user
     # This can only be done by the logged in user.
     # @param username name that need to be deleted
@@ -383,7 +452,7 @@ module Petstore
       fail "Missing the required parameter 'username' when calling update_user" if username.nil?
       
       # resource path
-      path = "/user/{username}".sub('{format}','json').sub('{' + 'username' + '}', username.to_s)
+      local_var_path = "/user/{username}".sub('{format}','json').sub('{' + 'username' + '}', username.to_s)
 
       # query parameters
       query_params = {}
@@ -405,9 +474,8 @@ module Petstore
       # http body (model)
       post_body = @api_client.object_to_http_body(opts[:'body'])
       
-
       auth_names = []
-      data, status_code, headers = @api_client.call_api(:PUT, path,
+      data, status_code, headers = @api_client.call_api(:PUT, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
@@ -418,69 +486,5 @@ module Petstore
       end
       return data, status_code, headers
     end
-
-    # Delete user
-    # This can only be done by the logged in user.
-    # @param username The name that needs to be deleted
-    # @param [Hash] opts the optional parameters
-    # @return [nil]
-    def delete_user(username, opts = {})
-      delete_user_with_http_info(username, opts)
-      return nil
-    end
-
-    # Delete user
-    # This can only be done by the logged in user.
-    # @param username The name that needs to be deleted
-    # @param [Hash] opts the optional parameters
-    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
-    def delete_user_with_http_info(username, opts = {})
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: UserApi#delete_user ..."
-      end
-      
-      # verify the required parameter 'username' is set
-      fail "Missing the required parameter 'username' when calling delete_user" if username.nil?
-      
-      # resource path
-      path = "/user/{username}".sub('{format}','json').sub('{' + 'username' + '}', username.to_s)
-
-      # query parameters
-      query_params = {}
-
-      # header parameters
-      header_params = {}
-
-      # HTTP header 'Accept' (if needed)
-      _header_accept = ['application/json', 'application/xml']
-      _header_accept_result = @api_client.select_header_accept(_header_accept) and header_params['Accept'] = _header_accept_result
-
-      # HTTP header 'Content-Type'
-      _header_content_type = []
-      header_params['Content-Type'] = @api_client.select_header_content_type(_header_content_type)
-
-      # form parameters
-      form_params = {}
-
-      # http body (model)
-      post_body = nil
-      
-
-      auth_names = []
-      data, status_code, headers = @api_client.call_api(:DELETE, path,
-        :header_params => header_params,
-        :query_params => query_params,
-        :form_params => form_params,
-        :body => post_body,
-        :auth_names => auth_names)
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: UserApi#delete_user\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
-      end
-      return data, status_code, headers
-    end
   end
 end
-
-
-
-
diff --git a/samples/client/petstore/ruby/lib/petstore/api_client.rb b/samples/client/petstore/ruby/lib/petstore/api_client.rb
index 53be21db3b0..7ec9de18a3e 100644
--- a/samples/client/petstore/ruby/lib/petstore/api_client.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api_client.rb
@@ -1,3 +1,19 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
 require 'date'
 require 'json'
 require 'logger'
@@ -17,7 +33,7 @@ module Petstore
 
     def initialize(config = Configuration.default)
       @config = config
-      @user_agent = "ruby-swagger-#{VERSION}"
+      @user_agent = "Swagger-Codegen/#{VERSION}/ruby"
       @default_headers = {
         'Content-Type' => "application/json",
         'User-Agent' => @user_agent
@@ -75,10 +91,11 @@ module Petstore
         :ssl_verifypeer => @config.verify_ssl,
         :sslcert => @config.cert_file,
         :sslkey => @config.key_file,
-        :cainfo => @config.ssl_ca_cert,
         :verbose => @config.debugging
       }
 
+      req_opts[:cainfo] = @config.ssl_ca_cert if @config.ssl_ca_cert
+
       if [:post, :patch, :put, :delete].include?(http_method)
         req_body = build_request_body(header_params, form_params, opts[:body])
         req_opts.update :body => req_body
@@ -106,6 +123,9 @@ module Petstore
       body = response.body
       return nil if body.nil? || body.empty?
 
+      # return response body directly for String return type
+      return body if return_type == 'String'
+
       # handle file downloading - save response body into a tmp file and return the File instance
       return download_file(response) if return_type == 'File'
 
@@ -146,7 +166,7 @@ module Petstore
         # parse date time (expecting ISO 8601 format)
         Date.parse data
       when 'Object'
-        # generic object, return directly
+        # generic object (usually a Hash), return directly
         data
       when /\AArray<(.+)>\z/
         # e.g. Array<Pet>
@@ -170,23 +190,37 @@ module Petstore
     # from the "Content-Disposition" header if provided, otherwise a random filename.
     #
     # @see Configuration#temp_folder_path
-    # @return [File] the file downloaded
+    # @return [Tempfile] the file downloaded
     def download_file(response)
-      tmp_file = Tempfile.new '', @config.temp_folder_path
       content_disposition = response.headers['Content-Disposition']
       if content_disposition
         filename = content_disposition[/filename=['"]?([^'"\s]+)['"]?/, 1]
-        path = File.join File.dirname(tmp_file), filename
+        prefix = sanitize_filename(filename)
       else
-        path = tmp_file.path
+        prefix = 'download-'
       end
-      # close and delete temp file
-      tmp_file.close!
+      prefix = prefix + '-' unless prefix.end_with?('-')
 
-      File.open(path, 'w') { |file| file.write(response.body) }
-      @config.logger.info "File written to #{path}. Please move the file to a proper folder "\
-                          "for further processing and delete the temp afterwards"
-      File.new(path)
+      tempfile = nil
+      encoding = response.body.encoding
+      Tempfile.open(prefix, @config.temp_folder_path, encoding: encoding) do |file|
+        file.write(response.body)
+        tempfile = file
+      end
+      @config.logger.info "Temp file written to #{tempfile.path}, please copy the file to a proper folder "\
+                          "with e.g. `FileUtils.cp(tempfile.path, '/new/file/path')` otherwise the temp file "\
+                          "will be deleted automatically with GC. It's also recommended to delete the temp file "\
+                          "explicitly with `tempfile.delete`"
+      tempfile
+    end
+
+    # Sanitize filename by removing path.
+    # e.g. ../../sun.gif becomes sun.gif
+    #
+    # @param [String] filename the filename to be sanitized
+    # @return [String] the sanitized filename
+    def sanitize_filename(filename)
+      filename.gsub /.*[\/\\]/, ''
     end
 
     def build_request_url(path)
@@ -260,7 +294,7 @@ module Petstore
     # @param [Object] model object to be converted into JSON string
     # @return [String] JSON string representation of the object
     def object_to_http_body(model)
-      return if model.nil?
+      return model if model.nil? || model.is_a?(String)
       _body = nil
       if model.is_a?(Array)
         _body = model.map{|m| object_to_hash(m) }
diff --git a/samples/client/petstore/ruby/lib/petstore/api_error.rb b/samples/client/petstore/ruby/lib/petstore/api_error.rb
index e1b6b3acfd6..b05ca2fdaf6 100644
--- a/samples/client/petstore/ruby/lib/petstore/api_error.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api_error.rb
@@ -1,3 +1,19 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
 module Petstore
   class ApiError < StandardError
     attr_reader :code, :response_headers, :response_body
diff --git a/samples/client/petstore/ruby/lib/petstore/configuration.rb b/samples/client/petstore/ruby/lib/petstore/configuration.rb
index 05973753287..5125ebe5960 100644
--- a/samples/client/petstore/ruby/lib/petstore/configuration.rb
+++ b/samples/client/petstore/ruby/lib/petstore/configuration.rb
@@ -157,6 +157,13 @@ module Petstore
     # Returns Auth Settings hash for api client.
     def auth_settings
       {
+        'test_api_key_header' =>
+          {
+            type: 'api_key',
+            in: 'header',
+            key: 'test_api_key_header',
+            value: api_key_with_prefix('test_api_key_header')
+          },
         'api_key' =>
           {
             type: 'api_key',
@@ -164,6 +171,34 @@ module Petstore
             key: 'api_key',
             value: api_key_with_prefix('api_key')
           },
+        'test_http_basic' =>
+          {
+            type: 'basic',
+            in: 'header',
+            key: 'Authorization',
+            value: basic_auth_token
+          },
+        'test_api_client_secret' =>
+          {
+            type: 'api_key',
+            in: 'header',
+            key: 'x-test_api_client_secret',
+            value: api_key_with_prefix('x-test_api_client_secret')
+          },
+        'test_api_client_id' =>
+          {
+            type: 'api_key',
+            in: 'header',
+            key: 'x-test_api_client_id',
+            value: api_key_with_prefix('x-test_api_client_id')
+          },
+        'test_api_key_query' =>
+          {
+            type: 'api_key',
+            in: 'query',
+            key: 'test_api_key_query',
+            value: api_key_with_prefix('test_api_key_query')
+          },
         'petstore_auth' =>
           {
             type: 'oauth2',
diff --git a/samples/client/petstore/ruby/lib/petstore/models/animal.rb b/samples/client/petstore/ruby/lib/petstore/models/animal.rb
new file mode 100644
index 00000000000..cf5fa7c1c94
--- /dev/null
+++ b/samples/client/petstore/ruby/lib/petstore/models/animal.rb
@@ -0,0 +1,165 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'date'
+
+module Petstore
+  class Animal
+    attr_accessor :class_name
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        
+        :'class_name' => :'className'
+        
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        :'class_name' => :'String'
+        
+      }
+    end
+
+    def initialize(attributes = {})
+      return unless attributes.is_a?(Hash)
+
+      # convert string to symbol for hash key
+      attributes = attributes.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+
+      
+      if attributes[:'className']
+        self.class_name = attributes[:'className']
+      end
+      
+    end
+
+    # Check equality by comparing each attribute.
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          class_name == o.class_name
+    end
+
+    # @see the `==` method
+    def eql?(o)
+      self == o
+    end
+
+    # Calculate hash code according to all attributes.
+    def hash
+      [class_name].hash
+    end
+
+    # build the object from hash
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+      self.class.swagger_types.each_pair do |key, type|
+        if type =~ /^Array<(.*)>/i
+          if attributes[self.class.attribute_map[key]].is_a?(Array)
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } )
+          else
+            #TODO show warning in debug mode
+          end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        else
+          # data not found in attributes(hash), not an issue as the data can be optional
+        end
+      end
+
+      self
+    end
+
+    def _deserialize(type, value)
+      case type.to_sym
+      when :DateTime
+        DateTime.parse(value)
+      when :Date
+        Date.parse(value)
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :BOOLEAN
+        if value.to_s =~ /^(true|t|yes|y|1)$/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else # model
+        _model = Petstore.const_get(type).new
+        _model.build_from_hash(value)
+      end
+    end
+
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_body (backward compatibility))
+    def to_body
+      to_hash
+    end
+
+    # return the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        next if value.nil?
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    # Method to output non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map{ |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+
+  end
+end
diff --git a/samples/client/petstore/ruby/lib/petstore/models/cat.rb b/samples/client/petstore/ruby/lib/petstore/models/cat.rb
new file mode 100644
index 00000000000..db40e8eab2c
--- /dev/null
+++ b/samples/client/petstore/ruby/lib/petstore/models/cat.rb
@@ -0,0 +1,175 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'date'
+
+module Petstore
+  class Cat
+    attr_accessor :class_name
+
+    attr_accessor :declawed
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        
+        :'class_name' => :'className',
+        
+        :'declawed' => :'declawed'
+        
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        :'class_name' => :'String',
+        :'declawed' => :'BOOLEAN'
+        
+      }
+    end
+
+    def initialize(attributes = {})
+      return unless attributes.is_a?(Hash)
+
+      # convert string to symbol for hash key
+      attributes = attributes.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+
+      
+      if attributes[:'className']
+        self.class_name = attributes[:'className']
+      end
+      
+      if attributes[:'declawed']
+        self.declawed = attributes[:'declawed']
+      end
+      
+    end
+
+    # Check equality by comparing each attribute.
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          class_name == o.class_name &&
+          declawed == o.declawed
+    end
+
+    # @see the `==` method
+    def eql?(o)
+      self == o
+    end
+
+    # Calculate hash code according to all attributes.
+    def hash
+      [class_name, declawed].hash
+    end
+
+    # build the object from hash
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+      self.class.swagger_types.each_pair do |key, type|
+        if type =~ /^Array<(.*)>/i
+          if attributes[self.class.attribute_map[key]].is_a?(Array)
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } )
+          else
+            #TODO show warning in debug mode
+          end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        else
+          # data not found in attributes(hash), not an issue as the data can be optional
+        end
+      end
+
+      self
+    end
+
+    def _deserialize(type, value)
+      case type.to_sym
+      when :DateTime
+        DateTime.parse(value)
+      when :Date
+        Date.parse(value)
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :BOOLEAN
+        if value.to_s =~ /^(true|t|yes|y|1)$/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else # model
+        _model = Petstore.const_get(type).new
+        _model.build_from_hash(value)
+      end
+    end
+
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_body (backward compatibility))
+    def to_body
+      to_hash
+    end
+
+    # return the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        next if value.nil?
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    # Method to output non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map{ |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+
+  end
+end
diff --git a/samples/client/petstore/ruby/lib/petstore/models/category.rb b/samples/client/petstore/ruby/lib/petstore/models/category.rb
index 2e6effd24c0..3defc6193d1 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/category.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/category.rb
@@ -1,3 +1,19 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
 require 'date'
 
 module Petstore
@@ -94,11 +110,14 @@ module Petstore
       when :Float
         value.to_f
       when :BOOLEAN
-        if value =~ /^(true|t|yes|y|1)$/i
+        if value.to_s =~ /^(true|t|yes|y|1)$/i
           true
         else
           false
         end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
       when /\AArray<(?<inner_type>.+)>\z/
         inner_type = Regexp.last_match[:inner_type]
         value.map { |v| _deserialize(inner_type, v) }
diff --git a/samples/client/petstore/ruby/lib/petstore/models/dog.rb b/samples/client/petstore/ruby/lib/petstore/models/dog.rb
new file mode 100644
index 00000000000..a7f19f2b913
--- /dev/null
+++ b/samples/client/petstore/ruby/lib/petstore/models/dog.rb
@@ -0,0 +1,175 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'date'
+
+module Petstore
+  class Dog
+    attr_accessor :class_name
+
+    attr_accessor :breed
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        
+        :'class_name' => :'className',
+        
+        :'breed' => :'breed'
+        
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        :'class_name' => :'String',
+        :'breed' => :'String'
+        
+      }
+    end
+
+    def initialize(attributes = {})
+      return unless attributes.is_a?(Hash)
+
+      # convert string to symbol for hash key
+      attributes = attributes.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+
+      
+      if attributes[:'className']
+        self.class_name = attributes[:'className']
+      end
+      
+      if attributes[:'breed']
+        self.breed = attributes[:'breed']
+      end
+      
+    end
+
+    # Check equality by comparing each attribute.
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          class_name == o.class_name &&
+          breed == o.breed
+    end
+
+    # @see the `==` method
+    def eql?(o)
+      self == o
+    end
+
+    # Calculate hash code according to all attributes.
+    def hash
+      [class_name, breed].hash
+    end
+
+    # build the object from hash
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+      self.class.swagger_types.each_pair do |key, type|
+        if type =~ /^Array<(.*)>/i
+          if attributes[self.class.attribute_map[key]].is_a?(Array)
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } )
+          else
+            #TODO show warning in debug mode
+          end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        else
+          # data not found in attributes(hash), not an issue as the data can be optional
+        end
+      end
+
+      self
+    end
+
+    def _deserialize(type, value)
+      case type.to_sym
+      when :DateTime
+        DateTime.parse(value)
+      when :Date
+        Date.parse(value)
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :BOOLEAN
+        if value.to_s =~ /^(true|t|yes|y|1)$/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else # model
+        _model = Petstore.const_get(type).new
+        _model.build_from_hash(value)
+      end
+    end
+
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_body (backward compatibility))
+    def to_body
+      to_hash
+    end
+
+    # return the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        next if value.nil?
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    # Method to output non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map{ |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+
+  end
+end
diff --git a/samples/client/petstore/ruby/lib/petstore/models/inline_response_200.rb b/samples/client/petstore/ruby/lib/petstore/models/inline_response_200.rb
new file mode 100644
index 00000000000..190170f18eb
--- /dev/null
+++ b/samples/client/petstore/ruby/lib/petstore/models/inline_response_200.rb
@@ -0,0 +1,229 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'date'
+
+module Petstore
+  class InlineResponse200
+    attr_accessor :tags
+
+    attr_accessor :id
+
+    attr_accessor :category
+
+    # pet status in the store
+    attr_accessor :status
+
+    attr_accessor :name
+
+    attr_accessor :photo_urls
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        
+        :'tags' => :'tags',
+        
+        :'id' => :'id',
+        
+        :'category' => :'category',
+        
+        :'status' => :'status',
+        
+        :'name' => :'name',
+        
+        :'photo_urls' => :'photoUrls'
+        
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        :'tags' => :'Array<Tag>',
+        :'id' => :'Integer',
+        :'category' => :'Object',
+        :'status' => :'String',
+        :'name' => :'String',
+        :'photo_urls' => :'Array<String>'
+        
+      }
+    end
+
+    def initialize(attributes = {})
+      return unless attributes.is_a?(Hash)
+
+      # convert string to symbol for hash key
+      attributes = attributes.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+
+      
+      if attributes[:'tags']
+        if (value = attributes[:'tags']).is_a?(Array)
+          self.tags = value
+        end
+      end
+      
+      if attributes[:'id']
+        self.id = attributes[:'id']
+      end
+      
+      if attributes[:'category']
+        self.category = attributes[:'category']
+      end
+      
+      if attributes[:'status']
+        self.status = attributes[:'status']
+      end
+      
+      if attributes[:'name']
+        self.name = attributes[:'name']
+      end
+      
+      if attributes[:'photoUrls']
+        if (value = attributes[:'photoUrls']).is_a?(Array)
+          self.photo_urls = value
+        end
+      end
+      
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    def status=(status)
+      allowed_values = ["available", "pending", "sold"]
+      if status && !allowed_values.include?(status)
+        fail "invalid value for 'status', must be one of #{allowed_values}"
+      end
+      @status = status
+    end
+
+    # Check equality by comparing each attribute.
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          tags == o.tags &&
+          id == o.id &&
+          category == o.category &&
+          status == o.status &&
+          name == o.name &&
+          photo_urls == o.photo_urls
+    end
+
+    # @see the `==` method
+    def eql?(o)
+      self == o
+    end
+
+    # Calculate hash code according to all attributes.
+    def hash
+      [tags, id, category, status, name, photo_urls].hash
+    end
+
+    # build the object from hash
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+      self.class.swagger_types.each_pair do |key, type|
+        if type =~ /^Array<(.*)>/i
+          if attributes[self.class.attribute_map[key]].is_a?(Array)
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } )
+          else
+            #TODO show warning in debug mode
+          end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        else
+          # data not found in attributes(hash), not an issue as the data can be optional
+        end
+      end
+
+      self
+    end
+
+    def _deserialize(type, value)
+      case type.to_sym
+      when :DateTime
+        DateTime.parse(value)
+      when :Date
+        Date.parse(value)
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :BOOLEAN
+        if value.to_s =~ /^(true|t|yes|y|1)$/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else # model
+        _model = Petstore.const_get(type).new
+        _model.build_from_hash(value)
+      end
+    end
+
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_body (backward compatibility))
+    def to_body
+      to_hash
+    end
+
+    # return the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        next if value.nil?
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    # Method to output non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map{ |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+
+  end
+end
diff --git a/samples/client/petstore/ruby/lib/petstore/models/model_200_response.rb b/samples/client/petstore/ruby/lib/petstore/models/model_200_response.rb
new file mode 100644
index 00000000000..e98cac47609
--- /dev/null
+++ b/samples/client/petstore/ruby/lib/petstore/models/model_200_response.rb
@@ -0,0 +1,165 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'date'
+
+module Petstore
+  class Model200Response
+    attr_accessor :name
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        
+        :'name' => :'name'
+        
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        :'name' => :'Integer'
+        
+      }
+    end
+
+    def initialize(attributes = {})
+      return unless attributes.is_a?(Hash)
+
+      # convert string to symbol for hash key
+      attributes = attributes.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+
+      
+      if attributes[:'name']
+        self.name = attributes[:'name']
+      end
+      
+    end
+
+    # Check equality by comparing each attribute.
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          name == o.name
+    end
+
+    # @see the `==` method
+    def eql?(o)
+      self == o
+    end
+
+    # Calculate hash code according to all attributes.
+    def hash
+      [name].hash
+    end
+
+    # build the object from hash
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+      self.class.swagger_types.each_pair do |key, type|
+        if type =~ /^Array<(.*)>/i
+          if attributes[self.class.attribute_map[key]].is_a?(Array)
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } )
+          else
+            #TODO show warning in debug mode
+          end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        else
+          # data not found in attributes(hash), not an issue as the data can be optional
+        end
+      end
+
+      self
+    end
+
+    def _deserialize(type, value)
+      case type.to_sym
+      when :DateTime
+        DateTime.parse(value)
+      when :Date
+        Date.parse(value)
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :BOOLEAN
+        if value.to_s =~ /^(true|t|yes|y|1)$/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else # model
+        _model = Petstore.const_get(type).new
+        _model.build_from_hash(value)
+      end
+    end
+
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_body (backward compatibility))
+    def to_body
+      to_hash
+    end
+
+    # return the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        next if value.nil?
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    # Method to output non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map{ |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+
+  end
+end
diff --git a/samples/client/petstore/ruby/lib/petstore/models/model_return.rb b/samples/client/petstore/ruby/lib/petstore/models/model_return.rb
new file mode 100644
index 00000000000..4f8cb498690
--- /dev/null
+++ b/samples/client/petstore/ruby/lib/petstore/models/model_return.rb
@@ -0,0 +1,165 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'date'
+
+module Petstore
+  class ModelReturn
+    attr_accessor :_return
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        
+        :'_return' => :'return'
+        
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        :'_return' => :'Integer'
+        
+      }
+    end
+
+    def initialize(attributes = {})
+      return unless attributes.is_a?(Hash)
+
+      # convert string to symbol for hash key
+      attributes = attributes.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+
+      
+      if attributes[:'return']
+        self._return = attributes[:'return']
+      end
+      
+    end
+
+    # Check equality by comparing each attribute.
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          _return == o._return
+    end
+
+    # @see the `==` method
+    def eql?(o)
+      self == o
+    end
+
+    # Calculate hash code according to all attributes.
+    def hash
+      [_return].hash
+    end
+
+    # build the object from hash
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+      self.class.swagger_types.each_pair do |key, type|
+        if type =~ /^Array<(.*)>/i
+          if attributes[self.class.attribute_map[key]].is_a?(Array)
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } )
+          else
+            #TODO show warning in debug mode
+          end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        else
+          # data not found in attributes(hash), not an issue as the data can be optional
+        end
+      end
+
+      self
+    end
+
+    def _deserialize(type, value)
+      case type.to_sym
+      when :DateTime
+        DateTime.parse(value)
+      when :Date
+        Date.parse(value)
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :BOOLEAN
+        if value.to_s =~ /^(true|t|yes|y|1)$/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else # model
+        _model = Petstore.const_get(type).new
+        _model.build_from_hash(value)
+      end
+    end
+
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_body (backward compatibility))
+    def to_body
+      to_hash
+    end
+
+    # return the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        next if value.nil?
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    # Method to output non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map{ |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+
+  end
+end
diff --git a/samples/client/petstore/ruby/lib/petstore/models/name.rb b/samples/client/petstore/ruby/lib/petstore/models/name.rb
new file mode 100644
index 00000000000..478bd018788
--- /dev/null
+++ b/samples/client/petstore/ruby/lib/petstore/models/name.rb
@@ -0,0 +1,175 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'date'
+
+module Petstore
+  class Name
+    attr_accessor :name
+
+    attr_accessor :snake_case
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        
+        :'name' => :'name',
+        
+        :'snake_case' => :'snake_case'
+        
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        :'name' => :'Integer',
+        :'snake_case' => :'Integer'
+        
+      }
+    end
+
+    def initialize(attributes = {})
+      return unless attributes.is_a?(Hash)
+
+      # convert string to symbol for hash key
+      attributes = attributes.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+
+      
+      if attributes[:'name']
+        self.name = attributes[:'name']
+      end
+      
+      if attributes[:'snake_case']
+        self.snake_case = attributes[:'snake_case']
+      end
+      
+    end
+
+    # Check equality by comparing each attribute.
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          name == o.name &&
+          snake_case == o.snake_case
+    end
+
+    # @see the `==` method
+    def eql?(o)
+      self == o
+    end
+
+    # Calculate hash code according to all attributes.
+    def hash
+      [name, snake_case].hash
+    end
+
+    # build the object from hash
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+      self.class.swagger_types.each_pair do |key, type|
+        if type =~ /^Array<(.*)>/i
+          if attributes[self.class.attribute_map[key]].is_a?(Array)
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } )
+          else
+            #TODO show warning in debug mode
+          end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        else
+          # data not found in attributes(hash), not an issue as the data can be optional
+        end
+      end
+
+      self
+    end
+
+    def _deserialize(type, value)
+      case type.to_sym
+      when :DateTime
+        DateTime.parse(value)
+      when :Date
+        Date.parse(value)
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :BOOLEAN
+        if value.to_s =~ /^(true|t|yes|y|1)$/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else # model
+        _model = Petstore.const_get(type).new
+        _model.build_from_hash(value)
+      end
+    end
+
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_body (backward compatibility))
+    def to_body
+      to_hash
+    end
+
+    # return the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        next if value.nil?
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    # Method to output non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map{ |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+
+  end
+end
diff --git a/samples/client/petstore/ruby/lib/petstore/models/object_return.rb b/samples/client/petstore/ruby/lib/petstore/models/object_return.rb
new file mode 100644
index 00000000000..06c9d99fccc
--- /dev/null
+++ b/samples/client/petstore/ruby/lib/petstore/models/object_return.rb
@@ -0,0 +1,165 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'date'
+
+module Petstore
+  class ObjectReturn
+    attr_accessor :_return
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        
+        :'_return' => :'return'
+        
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        :'_return' => :'Integer'
+        
+      }
+    end
+
+    def initialize(attributes = {})
+      return unless attributes.is_a?(Hash)
+
+      # convert string to symbol for hash key
+      attributes = attributes.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+
+      
+      if attributes[:'return']
+        self._return = attributes[:'return']
+      end
+      
+    end
+
+    # Check equality by comparing each attribute.
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          _return == o._return
+    end
+
+    # @see the `==` method
+    def eql?(o)
+      self == o
+    end
+
+    # Calculate hash code according to all attributes.
+    def hash
+      [_return].hash
+    end
+
+    # build the object from hash
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+      self.class.swagger_types.each_pair do |key, type|
+        if type =~ /^Array<(.*)>/i
+          if attributes[self.class.attribute_map[key]].is_a?(Array)
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } )
+          else
+            #TODO show warning in debug mode
+          end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        else
+          # data not found in attributes(hash), not an issue as the data can be optional
+        end
+      end
+
+      self
+    end
+
+    def _deserialize(type, value)
+      case type.to_sym
+      when :DateTime
+        DateTime.parse(value)
+      when :Date
+        Date.parse(value)
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :BOOLEAN
+        if value.to_s =~ /^(true|t|yes|y|1)$/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else # model
+        _model = Petstore.const_get(type).new
+        _model.build_from_hash(value)
+      end
+    end
+
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_body (backward compatibility))
+    def to_body
+      to_hash
+    end
+
+    # return the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        next if value.nil?
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    # Method to output non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map{ |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+
+  end
+end
diff --git a/samples/client/petstore/ruby/lib/petstore/models/order.rb b/samples/client/petstore/ruby/lib/petstore/models/order.rb
index 0ff43744c75..c7a6076a269 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/order.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/order.rb
@@ -1,3 +1,19 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
 require 'date'
 
 module Petstore
@@ -144,11 +160,14 @@ module Petstore
       when :Float
         value.to_f
       when :BOOLEAN
-        if value =~ /^(true|t|yes|y|1)$/i
+        if value.to_s =~ /^(true|t|yes|y|1)$/i
           true
         else
           false
         end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
       when /\AArray<(?<inner_type>.+)>\z/
         inner_type = Regexp.last_match[:inner_type]
         value.map { |v| _deserialize(inner_type, v) }
diff --git a/samples/client/petstore/ruby/lib/petstore/models/pet.rb b/samples/client/petstore/ruby/lib/petstore/models/pet.rb
index cba403d7e28..fb0eaa05a72 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/pet.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/pet.rb
@@ -1,3 +1,19 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
 require 'date'
 
 module Petstore
@@ -148,11 +164,14 @@ module Petstore
       when :Float
         value.to_f
       when :BOOLEAN
-        if value =~ /^(true|t|yes|y|1)$/i
+        if value.to_s =~ /^(true|t|yes|y|1)$/i
           true
         else
           false
         end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
       when /\AArray<(?<inner_type>.+)>\z/
         inner_type = Regexp.last_match[:inner_type]
         value.map { |v| _deserialize(inner_type, v) }
diff --git a/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb b/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb
new file mode 100644
index 00000000000..b8e97d55940
--- /dev/null
+++ b/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb
@@ -0,0 +1,165 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'date'
+
+module Petstore
+  class SpecialModelName
+    attr_accessor :special_property_name
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        
+        :'special_property_name' => :'$special[property.name]'
+        
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        :'special_property_name' => :'Integer'
+        
+      }
+    end
+
+    def initialize(attributes = {})
+      return unless attributes.is_a?(Hash)
+
+      # convert string to symbol for hash key
+      attributes = attributes.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+
+      
+      if attributes[:'$special[property.name]']
+        self.special_property_name = attributes[:'$special[property.name]']
+      end
+      
+    end
+
+    # Check equality by comparing each attribute.
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          special_property_name == o.special_property_name
+    end
+
+    # @see the `==` method
+    def eql?(o)
+      self == o
+    end
+
+    # Calculate hash code according to all attributes.
+    def hash
+      [special_property_name].hash
+    end
+
+    # build the object from hash
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+      self.class.swagger_types.each_pair do |key, type|
+        if type =~ /^Array<(.*)>/i
+          if attributes[self.class.attribute_map[key]].is_a?(Array)
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } )
+          else
+            #TODO show warning in debug mode
+          end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        else
+          # data not found in attributes(hash), not an issue as the data can be optional
+        end
+      end
+
+      self
+    end
+
+    def _deserialize(type, value)
+      case type.to_sym
+      when :DateTime
+        DateTime.parse(value)
+      when :Date
+        Date.parse(value)
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :BOOLEAN
+        if value.to_s =~ /^(true|t|yes|y|1)$/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else # model
+        _model = Petstore.const_get(type).new
+        _model.build_from_hash(value)
+      end
+    end
+
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_body (backward compatibility))
+    def to_body
+      to_hash
+    end
+
+    # return the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        next if value.nil?
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    # Method to output non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map{ |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+
+  end
+end
diff --git a/samples/client/petstore/ruby/lib/petstore/models/tag.rb b/samples/client/petstore/ruby/lib/petstore/models/tag.rb
index a821b665d17..8c4bb743bf3 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/tag.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/tag.rb
@@ -1,3 +1,19 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
 require 'date'
 
 module Petstore
@@ -94,11 +110,14 @@ module Petstore
       when :Float
         value.to_f
       when :BOOLEAN
-        if value =~ /^(true|t|yes|y|1)$/i
+        if value.to_s =~ /^(true|t|yes|y|1)$/i
           true
         else
           false
         end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
       when /\AArray<(?<inner_type>.+)>\z/
         inner_type = Regexp.last_match[:inner_type]
         value.map { |v| _deserialize(inner_type, v) }
diff --git a/samples/client/petstore/ruby/lib/petstore/models/user.rb b/samples/client/petstore/ruby/lib/petstore/models/user.rb
index 1959adeaa42..dd37878bdc1 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/user.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/user.rb
@@ -1,3 +1,19 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
 require 'date'
 
 module Petstore
@@ -155,11 +171,14 @@ module Petstore
       when :Float
         value.to_f
       when :BOOLEAN
-        if value =~ /^(true|t|yes|y|1)$/i
+        if value.to_s =~ /^(true|t|yes|y|1)$/i
           true
         else
           false
         end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
       when /\AArray<(?<inner_type>.+)>\z/
         inner_type = Regexp.last_match[:inner_type]
         value.map { |v| _deserialize(inner_type, v) }
diff --git a/samples/client/petstore/ruby/lib/petstore/version.rb b/samples/client/petstore/ruby/lib/petstore/version.rb
index fed78553ed3..2c3d31c3399 100644
--- a/samples/client/petstore/ruby/lib/petstore/version.rb
+++ b/samples/client/petstore/ruby/lib/petstore/version.rb
@@ -1,3 +1,19 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
 module Petstore
   VERSION = "1.0.0"
 end
diff --git a/samples/client/petstore/ruby/petstore.gemspec b/samples/client/petstore/ruby/petstore.gemspec
index 6e41479fe46..d9bb07c1902 100644
--- a/samples/client/petstore/ruby/petstore.gemspec
+++ b/samples/client/petstore/ruby/petstore.gemspec
@@ -6,12 +6,13 @@ Gem::Specification.new do |s|
   s.name        = "petstore"
   s.version     = Petstore::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Zeke Sikelianos", "Tony Tam"]
-  s.email       = ["zeke@wordnik.com", "fehguy@gmail.com"]
-  s.homepage    = "http://swagger.io"
-  s.summary     = %q{A ruby wrapper for the swagger APIs}
-  s.description = %q{This gem maps to a swagger API}
-  s.license     = "Apache-2.0"
+  s.authors     = [""]
+  s.email       = [""]
+  s.homepage    = ""
+  s.summary     = ""
+  s.description = ""
+  s.license     = ""
+
 
   s.add_runtime_dependency 'typhoeus', '~> 0.2', '>= 0.2.1'
   s.add_runtime_dependency 'json', '~> 1.4', '>= 1.4.6'
@@ -22,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'autotest', '~> 4.4', '>= 4.4.6'
   s.add_development_dependency 'autotest-rails-pure', '~> 4.1', '>= 4.1.2'
   s.add_development_dependency 'autotest-growl', '~> 0.2', '>= 0.2.16'
-  s.add_development_dependency 'autotest-fsevent', '~> 0.2', '>= 0.2.10'
+  s.add_development_dependency 'autotest-fsevent', '~> 0.2', '>= 0.2.11'
 
   s.files         = `find *`.split("\n").uniq.sort.select{|f| !f.empty? }
   s.test_files    = `find spec/*`.split("\n")
diff --git a/samples/client/petstore/ruby/press_anykey_to_continue.sh b/samples/client/petstore/ruby/press_anykey_to_continue.sh
new file mode 100644
index 00000000000..8976ca65367
--- /dev/null
+++ b/samples/client/petstore/ruby/press_anykey_to_continue.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+# a script to simply wait for X seconds before contining the CI tests
+# the delay can help prevent 2 CI tests running at the same time as 
+# all CI tests use the same petstore server for testing.
+
+TIMEOUT=$(( ( RANDOM % 60 )  + 1 ))
+
+read -p 'Press any key to continue or wait for $TIMEOUT seconds' -t $TIMEOUT
diff --git a/samples/client/petstore/ruby/spec/api/pet_api_spec.rb b/samples/client/petstore/ruby/spec/api/pet_api_spec.rb
new file mode 100644
index 00000000000..12cdc70dc57
--- /dev/null
+++ b/samples/client/petstore/ruby/spec/api/pet_api_spec.rb
@@ -0,0 +1,220 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'spec_helper'
+require 'json'
+
+# Unit tests for Petstore::PetApi
+# Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
+# Please update as you see appropriate
+describe 'PetApi' do
+  before do
+    # run before each test
+    @instance = Petstore::PetApi.new
+  end
+
+  after do
+    # run after each test
+  end
+
+  describe 'test an instance of PetApi' do
+    it 'should create an instact of PetApi' do
+      @instance.should be_a(Petstore::PetApi)
+    end
+  end
+
+  # unit tests for add_pet
+  # Add a new pet to the store
+  # 
+  # @param [Hash] opts the optional parameters
+  # @option opts [Pet] :body Pet object that needs to be added to the store
+  # @return [nil]
+  describe 'add_pet test' do
+    it "should work" do
+      # assertion here
+      # should be_a()
+      # should be_nil
+      # should ==
+      # should_not ==
+    end
+  end
+
+  # unit tests for add_pet_using_byte_array
+  # Fake endpoint to test byte array in body parameter for adding a new pet to the store
+  # 
+  # @param [Hash] opts the optional parameters
+  # @option opts [String] :body Pet object in the form of byte array
+  # @return [nil]
+  describe 'add_pet_using_byte_array test' do
+    it "should work" do
+      # assertion here
+      # should be_a()
+      # should be_nil
+      # should ==
+      # should_not ==
+    end
+  end
+
+  # unit tests for delete_pet
+  # Deletes a pet
+  # 
+  # @param pet_id Pet id to delete
+  # @param [Hash] opts the optional parameters
+  # @option opts [String] :api_key 
+  # @return [nil]
+  describe 'delete_pet test' do
+    it "should work" do
+      # assertion here
+      # should be_a()
+      # should be_nil
+      # should ==
+      # should_not ==
+    end
+  end
+
+  # unit tests for find_pets_by_status
+  # Finds Pets by status
+  # Multiple status values can be provided with comma separated strings
+  # @param [Hash] opts the optional parameters
+  # @option opts [Array<String>] :status Status values that need to be considered for query
+  # @return [Array<Pet>]
+  describe 'find_pets_by_status test' do
+    it "should work" do
+      # assertion here
+      # should be_a()
+      # should be_nil
+      # should ==
+      # should_not ==
+    end
+  end
+
+  # unit tests for find_pets_by_tags
+  # Finds Pets by tags
+  # Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+  # @param [Hash] opts the optional parameters
+  # @option opts [Array<String>] :tags Tags to filter by
+  # @return [Array<Pet>]
+  describe 'find_pets_by_tags test' do
+    it "should work" do
+      # assertion here
+      # should be_a()
+      # should be_nil
+      # should ==
+      # should_not ==
+    end
+  end
+
+  # unit tests for get_pet_by_id
+  # Find pet by ID
+  # Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+  # @param pet_id ID of pet that needs to be fetched
+  # @param [Hash] opts the optional parameters
+  # @return [Pet]
+  describe 'get_pet_by_id test' do
+    it "should work" do
+      # assertion here
+      # should be_a()
+      # should be_nil
+      # should ==
+      # should_not ==
+    end
+  end
+
+  # unit tests for get_pet_by_id_in_object
+  # Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+  # Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+  # @param pet_id ID of pet that needs to be fetched
+  # @param [Hash] opts the optional parameters
+  # @return [InlineResponse200]
+  describe 'get_pet_by_id_in_object test' do
+    it "should work" do
+      # assertion here
+      # should be_a()
+      # should be_nil
+      # should ==
+      # should_not ==
+    end
+  end
+
+  # unit tests for pet_pet_idtesting_byte_arraytrue_get
+  # Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+  # Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+  # @param pet_id ID of pet that needs to be fetched
+  # @param [Hash] opts the optional parameters
+  # @return [String]
+  describe 'pet_pet_idtesting_byte_arraytrue_get test' do
+    it "should work" do
+      # assertion here
+      # should be_a()
+      # should be_nil
+      # should ==
+      # should_not ==
+    end
+  end
+
+  # unit tests for update_pet
+  # Update an existing pet
+  # 
+  # @param [Hash] opts the optional parameters
+  # @option opts [Pet] :body Pet object that needs to be added to the store
+  # @return [nil]
+  describe 'update_pet test' do
+    it "should work" do
+      # assertion here
+      # should be_a()
+      # should be_nil
+      # should ==
+      # should_not ==
+    end
+  end
+
+  # unit tests for update_pet_with_form
+  # Updates a pet in the store with form data
+  # 
+  # @param pet_id ID of pet that needs to be updated
+  # @param [Hash] opts the optional parameters
+  # @option opts [String] :name Updated name of the pet
+  # @option opts [String] :status Updated status of the pet
+  # @return [nil]
+  describe 'update_pet_with_form test' do
+    it "should work" do
+      # assertion here
+      # should be_a()
+      # should be_nil
+      # should ==
+      # should_not ==
+    end
+  end
+
+  # unit tests for upload_file
+  # uploads an image
+  # 
+  # @param pet_id ID of pet to update
+  # @param [Hash] opts the optional parameters
+  # @option opts [String] :additional_metadata Additional data to pass to server
+  # @option opts [File] :file file to upload
+  # @return [nil]
+  describe 'upload_file test' do
+    it "should work" do
+      # assertion here
+      # should be_a()
+      # should be_nil
+      # should ==
+      # should_not ==
+    end
+  end
+
+end
diff --git a/samples/client/petstore/ruby/spec/api/store_api_spec.rb b/samples/client/petstore/ruby/spec/api/store_api_spec.rb
new file mode 100644
index 00000000000..3c6e2f2deac
--- /dev/null
+++ b/samples/client/petstore/ruby/spec/api/store_api_spec.rb
@@ -0,0 +1,133 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'spec_helper'
+require 'json'
+
+# Unit tests for Petstore::StoreApi
+# Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
+# Please update as you see appropriate
+describe 'StoreApi' do
+  before do
+    # run before each test
+    @instance = Petstore::StoreApi.new
+  end
+
+  after do
+    # run after each test
+  end
+
+  describe 'test an instance of StoreApi' do
+    it 'should create an instact of StoreApi' do
+      @instance.should be_a(Petstore::StoreApi)
+    end
+  end
+
+  # unit tests for delete_order
+  # Delete purchase order by ID
+  # For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+  # @param order_id ID of the order that needs to be deleted
+  # @param [Hash] opts the optional parameters
+  # @return [nil]
+  describe 'delete_order test' do
+    it "should work" do
+      # assertion here
+      # should be_a()
+      # should be_nil
+      # should ==
+      # should_not ==
+    end
+  end
+
+  # unit tests for find_orders_by_status
+  # Finds orders by status
+  # A single status value can be provided as a string
+  # @param [Hash] opts the optional parameters
+  # @option opts [String] :status Status value that needs to be considered for query
+  # @return [Array<Order>]
+  describe 'find_orders_by_status test' do
+    it "should work" do
+      # assertion here
+      # should be_a()
+      # should be_nil
+      # should ==
+      # should_not ==
+    end
+  end
+
+  # unit tests for get_inventory
+  # Returns pet inventories by status
+  # Returns a map of status codes to quantities
+  # @param [Hash] opts the optional parameters
+  # @return [Hash<String, Integer>]
+  describe 'get_inventory test' do
+    it "should work" do
+      # assertion here
+      # should be_a()
+      # should be_nil
+      # should ==
+      # should_not ==
+    end
+  end
+
+  # unit tests for get_inventory_in_object
+  # Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+  # Returns an arbitrary object which is actually a map of status codes to quantities
+  # @param [Hash] opts the optional parameters
+  # @return [Object]
+  describe 'get_inventory_in_object test' do
+    it "should work" do
+      # assertion here
+      # should be_a()
+      # should be_nil
+      # should ==
+      # should_not ==
+    end
+  end
+
+  # unit tests for get_order_by_id
+  # Find purchase order by ID
+  # For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+  # @param order_id ID of pet that needs to be fetched
+  # @param [Hash] opts the optional parameters
+  # @return [Order]
+  describe 'get_order_by_id test' do
+    it "should work" do
+      # assertion here
+      # should be_a()
+      # should be_nil
+      # should ==
+      # should_not ==
+    end
+  end
+
+  # unit tests for place_order
+  # Place an order for a pet
+  # 
+  # @param [Hash] opts the optional parameters
+  # @option opts [Order] :body order placed for purchasing the pet
+  # @return [Order]
+  describe 'place_order test' do
+    it "should work" do
+      # assertion here
+      # should be_a()
+      # should be_nil
+      # should ==
+      # should_not ==
+    end
+  end
+
+end
diff --git a/samples/client/petstore/ruby/spec/api/user_api_spec.rb b/samples/client/petstore/ruby/spec/api/user_api_spec.rb
new file mode 100644
index 00000000000..408e4544c51
--- /dev/null
+++ b/samples/client/petstore/ruby/spec/api/user_api_spec.rb
@@ -0,0 +1,168 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'spec_helper'
+require 'json'
+
+# Unit tests for Petstore::UserApi
+# Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
+# Please update as you see appropriate
+describe 'UserApi' do
+  before do
+    # run before each test
+    @instance = Petstore::UserApi.new
+  end
+
+  after do
+    # run after each test
+  end
+
+  describe 'test an instance of UserApi' do
+    it 'should create an instact of UserApi' do
+      @instance.should be_a(Petstore::UserApi)
+    end
+  end
+
+  # unit tests for create_user
+  # Create user
+  # This can only be done by the logged in user.
+  # @param [Hash] opts the optional parameters
+  # @option opts [User] :body Created user object
+  # @return [nil]
+  describe 'create_user test' do
+    it "should work" do
+      # assertion here
+      # should be_a()
+      # should be_nil
+      # should ==
+      # should_not ==
+    end
+  end
+
+  # unit tests for create_users_with_array_input
+  # Creates list of users with given input array
+  # 
+  # @param [Hash] opts the optional parameters
+  # @option opts [Array<User>] :body List of user object
+  # @return [nil]
+  describe 'create_users_with_array_input test' do
+    it "should work" do
+      # assertion here
+      # should be_a()
+      # should be_nil
+      # should ==
+      # should_not ==
+    end
+  end
+
+  # unit tests for create_users_with_list_input
+  # Creates list of users with given input array
+  # 
+  # @param [Hash] opts the optional parameters
+  # @option opts [Array<User>] :body List of user object
+  # @return [nil]
+  describe 'create_users_with_list_input test' do
+    it "should work" do
+      # assertion here
+      # should be_a()
+      # should be_nil
+      # should ==
+      # should_not ==
+    end
+  end
+
+  # unit tests for delete_user
+  # Delete user
+  # This can only be done by the logged in user.
+  # @param username The name that needs to be deleted
+  # @param [Hash] opts the optional parameters
+  # @return [nil]
+  describe 'delete_user test' do
+    it "should work" do
+      # assertion here
+      # should be_a()
+      # should be_nil
+      # should ==
+      # should_not ==
+    end
+  end
+
+  # unit tests for get_user_by_name
+  # Get user by user name
+  # 
+  # @param username The name that needs to be fetched. Use user1 for testing.
+  # @param [Hash] opts the optional parameters
+  # @return [User]
+  describe 'get_user_by_name test' do
+    it "should work" do
+      # assertion here
+      # should be_a()
+      # should be_nil
+      # should ==
+      # should_not ==
+    end
+  end
+
+  # unit tests for login_user
+  # Logs user into the system
+  # 
+  # @param [Hash] opts the optional parameters
+  # @option opts [String] :username The user name for login
+  # @option opts [String] :password The password for login in clear text
+  # @return [String]
+  describe 'login_user test' do
+    it "should work" do
+      # assertion here
+      # should be_a()
+      # should be_nil
+      # should ==
+      # should_not ==
+    end
+  end
+
+  # unit tests for logout_user
+  # Logs out current logged in user session
+  # 
+  # @param [Hash] opts the optional parameters
+  # @return [nil]
+  describe 'logout_user test' do
+    it "should work" do
+      # assertion here
+      # should be_a()
+      # should be_nil
+      # should ==
+      # should_not ==
+    end
+  end
+
+  # unit tests for update_user
+  # Updated user
+  # This can only be done by the logged in user.
+  # @param username name that need to be deleted
+  # @param [Hash] opts the optional parameters
+  # @option opts [User] :body Updated user object
+  # @return [nil]
+  describe 'update_user test' do
+    it "should work" do
+      # assertion here
+      # should be_a()
+      # should be_nil
+      # should ==
+      # should_not ==
+    end
+  end
+
+end
diff --git a/samples/client/petstore/ruby/spec/api_client_spec.rb b/samples/client/petstore/ruby/spec/api_client_spec.rb
index aeb4eefad51..a02d4a2d760 100644
--- a/samples/client/petstore/ruby/spec/api_client_spec.rb
+++ b/samples/client/petstore/ruby/spec/api_client_spec.rb
@@ -112,6 +112,24 @@ describe Petstore::ApiClient do
   end
 
   describe "#deserialize" do
+    it "handles Array<Integer>" do
+      api_client = Petstore::ApiClient.new
+      headers = {'Content-Type' => 'application/json'}
+      response = double('response', headers: headers, body: '[12, 34]')
+      data = api_client.deserialize(response, 'Array<Integer>')
+      data.should be_a(Array)
+      data.should == [12, 34]
+    end
+
+    it "handles Array<Array<Integer>>" do
+      api_client = Petstore::ApiClient.new
+      headers = {'Content-Type' => 'application/json'}
+      response = double('response', headers: headers, body: '[[12, 34], [56]]')
+      data = api_client.deserialize(response, 'Array<Array<Integer>>')
+      data.should be_a(Array)
+      data.should == [[12, 34], [56]]
+    end
+
     it "handles Hash<String, String>" do
       api_client = Petstore::ApiClient.new
       headers = {'Content-Type' => 'application/json'}
@@ -132,6 +150,21 @@ describe Petstore::ApiClient do
       pet.should be_a(Petstore::Pet)
       pet.id.should == 1
     end
+
+    it "handles Hash<String, Hash<String, Pet>>" do
+      api_client = Petstore::ApiClient.new
+      headers = {'Content-Type' => 'application/json'}
+      response = double('response', headers: headers, body: '{"data": {"pet": {"id": 1}}}')
+      result = api_client.deserialize(response, 'Hash<String, Hash<String, Pet>>')
+      result.should be_a(Hash)
+      result.keys.should == [:data]
+      data = result[:data]
+      data.should be_a(Hash)
+      data.keys.should == [:pet]
+      pet = data[:pet]
+      pet.should be_a(Petstore::Pet)
+      pet.id.should == 1
+    end
   end
 
   describe "#object_to_hash" do
@@ -225,4 +258,20 @@ describe Petstore::ApiClient do
     end
   end
 
+  describe "#sanitize_filename" do
+    let(:api_client) { Petstore::ApiClient.new }
+
+    it "works" do
+      api_client.sanitize_filename('sun').should == 'sun'
+      api_client.sanitize_filename('sun.gif').should == 'sun.gif'
+      api_client.sanitize_filename('../sun.gif').should == 'sun.gif'
+      api_client.sanitize_filename('/var/tmp/sun.gif').should == 'sun.gif'
+      api_client.sanitize_filename('./sun.gif').should == 'sun.gif'
+      api_client.sanitize_filename('..\sun.gif').should == 'sun.gif'
+      api_client.sanitize_filename('\var\tmp\sun.gif').should == 'sun.gif'
+      api_client.sanitize_filename('c:\var\tmp\sun.gif').should == 'sun.gif'
+      api_client.sanitize_filename('.\sun.gif').should == 'sun.gif'
+    end
+  end
+
 end
diff --git a/samples/client/petstore/ruby/spec/base_object_spec.rb b/samples/client/petstore/ruby/spec/base_object_spec.rb
index a2614ba9c16..61dcb4d6d9d 100644
--- a/samples/client/petstore/ruby/spec/base_object_spec.rb
+++ b/samples/client/petstore/ruby/spec/base_object_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 class ArrayMapObject < Petstore::Category
-  attr_accessor :int_arr, :pet_arr, :int_map, :pet_map, :int_arr_map, :pet_arr_map
+  attr_accessor :int_arr, :pet_arr, :int_map, :pet_map, :int_arr_map, :pet_arr_map, :boolean_true_arr, :boolean_false_arr
 
   def self.attribute_map
     {
@@ -10,7 +10,9 @@ class ArrayMapObject < Petstore::Category
       :int_map => :int_map,
       :pet_map => :pet_map,
       :int_arr_map => :int_arr_map,
-      :pet_arr_map => :pet_arr_map
+      :pet_arr_map => :pet_arr_map,
+      :boolean_true_arr  => :boolean_true_arr,
+      :boolean_false_arr => :boolean_false_arr,
     }
   end
 
@@ -21,7 +23,9 @@ class ArrayMapObject < Petstore::Category
       :int_map => :'Hash<String, Integer>',
       :pet_map => :'Hash<String, Pet>',
       :int_arr_map => :'Hash<String, Array<Integer>>',
-      :pet_arr_map => :'Hash<String, Array<Pet>>'
+      :pet_arr_map => :'Hash<String, Array<Pet>>',
+      :boolean_true_arr  => :'Array<BOOLEAN>',
+      :boolean_false_arr => :'Array<BOOLEAN>',
     }
   end
 end
@@ -37,7 +41,9 @@ describe 'BaseObject' do
        int_map: {'int' => 123},
        pet_map: {'pet' => {name: 'Kitty'}},
        int_arr_map: {'int_arr' => [123, 456]},
-       pet_arr_map: {'pet_arr' => [{name: 'Kitty'}]}
+       pet_arr_map: {'pet_arr' => [{name: 'Kitty'}]},
+       boolean_true_arr:  [true, "true", "TruE", 1, "y", "yes", "1", "t", "T"],
+       boolean_false_arr: [false, "", 0, "0", "f", nil, "null"],
       }
     end
 
@@ -71,11 +77,24 @@ describe 'BaseObject' do
       pet = arr.first
       pet.should be_a(Petstore::Pet)
       pet.name.should == 'Kitty'
+
+      obj.boolean_true_arr.should be_a(Array)
+      obj.boolean_true_arr.each do |b|
+        b.should eq true
+      end
+
+      obj.boolean_false_arr.should be_a(Array)
+      obj.boolean_false_arr.each do |b|
+        b.should eq false
+      end
     end
 
     it 'works for #to_hash' do
       obj.build_from_hash(data)
-      obj.to_hash.should == data
+      expect_data = data.dup
+      expect_data[:boolean_true_arr].map! {true}
+      expect_data[:boolean_false_arr].map! {false}
+      obj.to_hash.should == expect_data
     end
   end
 end
diff --git a/samples/client/petstore/ruby/spec/models/animal_spec.rb b/samples/client/petstore/ruby/spec/models/animal_spec.rb
new file mode 100644
index 00000000000..ddbfeca85f9
--- /dev/null
+++ b/samples/client/petstore/ruby/spec/models/animal_spec.rb
@@ -0,0 +1,50 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'spec_helper'
+require 'json'
+require 'date'
+
+# Unit tests for Petstore::Animal
+# Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
+# Please update as you see appropriate
+describe 'Animal' do
+  before do
+    # run before each test
+    @instance = Petstore::Animal.new
+  end
+
+  after do
+    # run after each test
+  end
+
+  describe 'test an instance of Animal' do
+    it 'should create an instact of Animal' do
+      @instance.should be_a(Petstore::Animal) 
+    end
+  end
+  describe 'test attribute "class_name"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+end
+
diff --git a/samples/client/petstore/ruby/spec/models/cat_spec.rb b/samples/client/petstore/ruby/spec/models/cat_spec.rb
new file mode 100644
index 00000000000..220a37dfebe
--- /dev/null
+++ b/samples/client/petstore/ruby/spec/models/cat_spec.rb
@@ -0,0 +1,60 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'spec_helper'
+require 'json'
+require 'date'
+
+# Unit tests for Petstore::Cat
+# Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
+# Please update as you see appropriate
+describe 'Cat' do
+  before do
+    # run before each test
+    @instance = Petstore::Cat.new
+  end
+
+  after do
+    # run after each test
+  end
+
+  describe 'test an instance of Cat' do
+    it 'should create an instact of Cat' do
+      @instance.should be_a(Petstore::Cat) 
+    end
+  end
+  describe 'test attribute "class_name"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "declawed"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+end
+
diff --git a/samples/client/petstore/ruby/spec/models/category_spec.rb b/samples/client/petstore/ruby/spec/models/category_spec.rb
new file mode 100644
index 00000000000..745974cbabd
--- /dev/null
+++ b/samples/client/petstore/ruby/spec/models/category_spec.rb
@@ -0,0 +1,60 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'spec_helper'
+require 'json'
+require 'date'
+
+# Unit tests for Petstore::Category
+# Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
+# Please update as you see appropriate
+describe 'Category' do
+  before do
+    # run before each test
+    @instance = Petstore::Category.new
+  end
+
+  after do
+    # run after each test
+  end
+
+  describe 'test an instance of Category' do
+    it 'should create an instact of Category' do
+      @instance.should be_a(Petstore::Category) 
+    end
+  end
+  describe 'test attribute "id"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "name"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+end
+
diff --git a/samples/client/petstore/ruby/spec/models/dog_spec.rb b/samples/client/petstore/ruby/spec/models/dog_spec.rb
new file mode 100644
index 00000000000..23b1b9a83f7
--- /dev/null
+++ b/samples/client/petstore/ruby/spec/models/dog_spec.rb
@@ -0,0 +1,60 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'spec_helper'
+require 'json'
+require 'date'
+
+# Unit tests for Petstore::Dog
+# Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
+# Please update as you see appropriate
+describe 'Dog' do
+  before do
+    # run before each test
+    @instance = Petstore::Dog.new
+  end
+
+  after do
+    # run after each test
+  end
+
+  describe 'test an instance of Dog' do
+    it 'should create an instact of Dog' do
+      @instance.should be_a(Petstore::Dog) 
+    end
+  end
+  describe 'test attribute "class_name"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "breed"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+end
+
diff --git a/samples/client/petstore/ruby/spec/models/inline_response_200_spec.rb b/samples/client/petstore/ruby/spec/models/inline_response_200_spec.rb
new file mode 100644
index 00000000000..858b6504908
--- /dev/null
+++ b/samples/client/petstore/ruby/spec/models/inline_response_200_spec.rb
@@ -0,0 +1,100 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'spec_helper'
+require 'json'
+require 'date'
+
+# Unit tests for Petstore::InlineResponse200
+# Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
+# Please update as you see appropriate
+describe 'InlineResponse200' do
+  before do
+    # run before each test
+    @instance = Petstore::InlineResponse200.new
+  end
+
+  after do
+    # run after each test
+  end
+
+  describe 'test an instance of InlineResponse200' do
+    it 'should create an instact of InlineResponse200' do
+      @instance.should be_a(Petstore::InlineResponse200) 
+    end
+  end
+  describe 'test attribute "tags"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "id"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "category"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "status"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "name"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "photo_urls"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+end
+
diff --git a/samples/client/petstore/ruby/spec/models/model_200_response_spec.rb b/samples/client/petstore/ruby/spec/models/model_200_response_spec.rb
new file mode 100644
index 00000000000..4e2f92c5212
--- /dev/null
+++ b/samples/client/petstore/ruby/spec/models/model_200_response_spec.rb
@@ -0,0 +1,50 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'spec_helper'
+require 'json'
+require 'date'
+
+# Unit tests for Petstore::Model200Response
+# Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
+# Please update as you see appropriate
+describe 'Model200Response' do
+  before do
+    # run before each test
+    @instance = Petstore::Model200Response.new
+  end
+
+  after do
+    # run after each test
+  end
+
+  describe 'test an instance of Model200Response' do
+    it 'should create an instact of Model200Response' do
+      @instance.should be_a(Petstore::Model200Response) 
+    end
+  end
+  describe 'test attribute "name"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+end
+
diff --git a/samples/client/petstore/ruby/spec/models/model_return_spec.rb b/samples/client/petstore/ruby/spec/models/model_return_spec.rb
new file mode 100644
index 00000000000..018798b47e3
--- /dev/null
+++ b/samples/client/petstore/ruby/spec/models/model_return_spec.rb
@@ -0,0 +1,50 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'spec_helper'
+require 'json'
+require 'date'
+
+# Unit tests for Petstore::ModelReturn
+# Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
+# Please update as you see appropriate
+describe 'ModelReturn' do
+  before do
+    # run before each test
+    @instance = Petstore::ModelReturn.new
+  end
+
+  after do
+    # run after each test
+  end
+
+  describe 'test an instance of ModelReturn' do
+    it 'should create an instact of ModelReturn' do
+      @instance.should be_a(Petstore::ModelReturn) 
+    end
+  end
+  describe 'test attribute "_return"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+end
+
diff --git a/samples/client/petstore/ruby/spec/models/name_spec.rb b/samples/client/petstore/ruby/spec/models/name_spec.rb
new file mode 100644
index 00000000000..5d66fd078f3
--- /dev/null
+++ b/samples/client/petstore/ruby/spec/models/name_spec.rb
@@ -0,0 +1,60 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'spec_helper'
+require 'json'
+require 'date'
+
+# Unit tests for Petstore::Name
+# Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
+# Please update as you see appropriate
+describe 'Name' do
+  before do
+    # run before each test
+    @instance = Petstore::Name.new
+  end
+
+  after do
+    # run after each test
+  end
+
+  describe 'test an instance of Name' do
+    it 'should create an instact of Name' do
+      @instance.should be_a(Petstore::Name) 
+    end
+  end
+  describe 'test attribute "name"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "snake_case"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+end
+
diff --git a/samples/client/petstore/ruby/spec/models/order_spec.rb b/samples/client/petstore/ruby/spec/models/order_spec.rb
new file mode 100644
index 00000000000..698f3af9268
--- /dev/null
+++ b/samples/client/petstore/ruby/spec/models/order_spec.rb
@@ -0,0 +1,100 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'spec_helper'
+require 'json'
+require 'date'
+
+# Unit tests for Petstore::Order
+# Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
+# Please update as you see appropriate
+describe 'Order' do
+  before do
+    # run before each test
+    @instance = Petstore::Order.new
+  end
+
+  after do
+    # run after each test
+  end
+
+  describe 'test an instance of Order' do
+    it 'should create an instact of Order' do
+      @instance.should be_a(Petstore::Order) 
+    end
+  end
+  describe 'test attribute "id"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "pet_id"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "quantity"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "ship_date"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "status"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "complete"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+end
+
diff --git a/samples/client/petstore/ruby/spec/models/pet_spec.rb b/samples/client/petstore/ruby/spec/models/pet_spec.rb
new file mode 100644
index 00000000000..cf18e1a5f3a
--- /dev/null
+++ b/samples/client/petstore/ruby/spec/models/pet_spec.rb
@@ -0,0 +1,100 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'spec_helper'
+require 'json'
+require 'date'
+
+# Unit tests for Petstore::Pet
+# Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
+# Please update as you see appropriate
+describe 'Pet' do
+  before do
+    # run before each test
+    @instance = Petstore::Pet.new
+  end
+
+  after do
+    # run after each test
+  end
+
+  describe 'test an instance of Pet' do
+    it 'should create an instact of Pet' do
+      @instance.should be_a(Petstore::Pet) 
+    end
+  end
+  describe 'test attribute "id"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "category"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "name"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "photo_urls"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "tags"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "status"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+end
+
diff --git a/samples/client/petstore/ruby/spec/models/special_model_name_spec.rb b/samples/client/petstore/ruby/spec/models/special_model_name_spec.rb
new file mode 100644
index 00000000000..e3201cb2e31
--- /dev/null
+++ b/samples/client/petstore/ruby/spec/models/special_model_name_spec.rb
@@ -0,0 +1,50 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'spec_helper'
+require 'json'
+require 'date'
+
+# Unit tests for Petstore::SpecialModelName
+# Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
+# Please update as you see appropriate
+describe 'SpecialModelName' do
+  before do
+    # run before each test
+    @instance = Petstore::SpecialModelName.new
+  end
+
+  after do
+    # run after each test
+  end
+
+  describe 'test an instance of SpecialModelName' do
+    it 'should create an instact of SpecialModelName' do
+      @instance.should be_a(Petstore::SpecialModelName) 
+    end
+  end
+  describe 'test attribute "special_property_name"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+end
+
diff --git a/samples/client/petstore/ruby/spec/models/tag_spec.rb b/samples/client/petstore/ruby/spec/models/tag_spec.rb
new file mode 100644
index 00000000000..4b3ff7ac611
--- /dev/null
+++ b/samples/client/petstore/ruby/spec/models/tag_spec.rb
@@ -0,0 +1,60 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'spec_helper'
+require 'json'
+require 'date'
+
+# Unit tests for Petstore::Tag
+# Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
+# Please update as you see appropriate
+describe 'Tag' do
+  before do
+    # run before each test
+    @instance = Petstore::Tag.new
+  end
+
+  after do
+    # run after each test
+  end
+
+  describe 'test an instance of Tag' do
+    it 'should create an instact of Tag' do
+      @instance.should be_a(Petstore::Tag) 
+    end
+  end
+  describe 'test attribute "id"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "name"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+end
+
diff --git a/samples/client/petstore/ruby/spec/models/user_spec.rb b/samples/client/petstore/ruby/spec/models/user_spec.rb
new file mode 100644
index 00000000000..2c289705417
--- /dev/null
+++ b/samples/client/petstore/ruby/spec/models/user_spec.rb
@@ -0,0 +1,120 @@
+=begin
+Swagger Petstore
+
+This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'spec_helper'
+require 'json'
+require 'date'
+
+# Unit tests for Petstore::User
+# Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
+# Please update as you see appropriate
+describe 'User' do
+  before do
+    # run before each test
+    @instance = Petstore::User.new
+  end
+
+  after do
+    # run after each test
+  end
+
+  describe 'test an instance of User' do
+    it 'should create an instact of User' do
+      @instance.should be_a(Petstore::User) 
+    end
+  end
+  describe 'test attribute "id"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "username"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "first_name"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "last_name"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "email"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "password"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "phone"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "user_status"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+end
+
diff --git a/samples/client/petstore/ruby/spec/pet_spec.rb b/samples/client/petstore/ruby/spec/pet_spec.rb
index 9426d2024b9..fc1f3087678 100644
--- a/samples/client/petstore/ruby/spec/pet_spec.rb
+++ b/samples/client/petstore/ruby/spec/pet_spec.rb
@@ -1,10 +1,30 @@
 require 'spec_helper'
 require 'json'
 
+def serialize_json(o)
+  API_CLIENT.object_to_http_body(o)
+end
+
+def deserialize_json(s, type)
+  headers = {'Content-Type' => 'application/json'}
+  response = double('response', headers: headers, body: s)
+  API_CLIENT.deserialize(response, type)
+end
+
 describe "Pet" do
   before do
     @pet_api = Petstore::PetApi.new(API_CLIENT)
-    prepare_pet @pet_api
+    @pet_id = prepare_pet(@pet_api)
+  end
+
+  after do
+    # remove the testing pet
+    begin
+      @pet_api.delete_pet(@pet_id)
+    rescue Petstore::ApiError => e
+      # ignore ApiError 404 (Not Found)
+      raise e if e.code != 404
+    end
   end
 
   describe "pet methods" do
@@ -14,7 +34,7 @@ describe "Pet" do
       category1 = Petstore::Category.new({:id => 1, :name => 'category unknown'})
       # initalize using both string and symbol key
       pet_hash = {
-        :id => 10002,
+        :id => @pet_id,
         :name => "RUBY UNIT TESTING",
         :status => "pending",
         :photo_urls => ["url1", "url2"],
@@ -25,7 +45,7 @@ describe "Pet" do
       # test new
       pet.name.should == "RUBY UNIT TESTING"
       pet.status.should == "pending"
-      pet.id.should == 10002
+      pet.id.should == @pet_id
       pet.tags[0].id.should == 1
       pet.tags[1].name.should == 'tag2'
       pet.category.name.should == 'category unknown'
@@ -42,20 +62,20 @@ describe "Pet" do
     end
 
     it "should fetch a pet object" do
-      pet = @pet_api.get_pet_by_id(10002)
+      pet = @pet_api.get_pet_by_id(@pet_id)
       pet.should be_a(Petstore::Pet)
-      pet.id.should == 10002
+      pet.id.should == @pet_id
       pet.name.should == "RUBY UNIT TESTING"
       pet.tags[0].name.should == "tag test"
       pet.category.name.should == "category test"
     end
 
     it "should fetch a pet object with http info" do
-      pet, status_code, headers = @pet_api.get_pet_by_id_with_http_info(10002)
+      pet, status_code, headers = @pet_api.get_pet_by_id_with_http_info(@pet_id)
       status_code.should == 200
       headers['Content-Type'].should == 'application/json'
       pet.should be_a(Petstore::Pet)
-      pet.id.should == 10002
+      pet.id.should == @pet_id
       pet.name.should == "RUBY UNIT TESTING"
       pet.tags[0].name.should == "tag test"
       pet.category.name.should == "category test"
@@ -63,7 +83,7 @@ describe "Pet" do
 
     it "should not find a pet that does not exist" do
       begin
-        @pet_api.get_pet_by_id(-10002)
+        @pet_api.get_pet_by_id(-@pet_id)
         fail 'it should raise error'
       rescue Petstore::ApiError => e
         e.code.should == 404
@@ -74,6 +94,47 @@ describe "Pet" do
       end
     end
 
+    it "should create and get pet with byte array (binary, string)" do
+      pet = @pet_api.get_pet_by_id(@pet_id)
+      pet.id = @pet_id + 1
+      str = serialize_json(pet)
+      @pet_api.add_pet_using_byte_array(body: str)
+
+      fetched_str = @pet_api.pet_pet_idtesting_byte_arraytrue_get(pet.id)
+      fetched_str.should be_a(String)
+      fetched = deserialize_json(fetched_str, 'Pet')
+      fetched.should be_a(Petstore::Pet)
+      fetched.id.should == pet.id
+      fetched.category.should be_a(Petstore::Category)
+      fetched.category.name.should == pet.category.name
+
+      @pet_api.delete_pet(pet.id)
+    end
+
+    it "should get pet in bject" do
+      pet = @pet_api.get_pet_by_id_in_object(@pet_id)
+      pet.should be_a(Petstore::InlineResponse200)
+      pet.id.should == @pet_id
+      pet.name.should == "RUBY UNIT TESTING"
+      pet.category.should be_a(Hash)
+      pet.category[:id].should == 20002
+      pet.category[:name].should == 'category test'
+    end
+
+    it "should update a pet" do
+      pet = @pet_api.get_pet_by_id(@pet_id)
+      pet.id.should == @pet_id
+      pet.name.should == "RUBY UNIT TESTING"
+      pet.status.should == 'pending'
+
+      @pet_api.update_pet_with_form(@pet_id, name: 'new name', status: 'sold')
+
+      fetched = @pet_api.get_pet_by_id(@pet_id)
+      fetched.id.should == @pet_id
+      fetched.name.should == "new name"
+      fetched.status.should == 'sold'
+    end
+
     it "should find pets by status" do
       pets = @pet_api.find_pets_by_status(:status => 'available')
       pets.length.should >= 3
@@ -97,43 +158,29 @@ describe "Pet" do
       end
     end
 
-    it "should update a pet" do
-      pet = Petstore::Pet.new({'id' => 10002, 'status' => 'sold'})
-      @pet_api.add_pet(:body => pet)
-
-      fetched = @pet_api.get_pet_by_id(10002)
-      fetched.id.should == 10002
-      fetched.status.should == 'sold'
-    end
-
     it "should create a pet" do
-      pet = Petstore::Pet.new('id' => 10002, 'name' => "RUBY UNIT TESTING")
+      id = @pet_id + 1
+
+      pet = Petstore::Pet.new('id' => id, 'name' => "RUBY UNIT TESTING")
       result = @pet_api.add_pet(:body => pet)
       # nothing is returned
       result.should be_nil
 
-      pet = @pet_api.get_pet_by_id(10002)
-      pet.id.should == 10002
+      pet = @pet_api.get_pet_by_id(id)
+      pet.id.should == id
       pet.name.should == "RUBY UNIT TESTING"
+
+      @pet_api.delete_pet(id)
     end
 
     it "should upload a file to a pet" do
-      pet = Petstore::Pet.new('id' => 10002, 'name' => "RUBY UNIT TESTING")
-      result = @pet_api.add_pet(:body => pet)
-      # nothing is returned
-      result.should be_nil
-
-      result = @pet_api.upload_file(10002, file: File.new('hello.txt'))
+      result = @pet_api.upload_file(@pet_id, file: File.new('hello.txt'))
       # nothing is returned
       result.should be_nil
     end
 
     it "should upload a file with form parameter to a pet" do
-      pet = Petstore::Pet.new('id' => 10002, 'name' => 'RUBY UNIT TESTING')
-      result = @pet_api.add_pet(body: pet)
-      result.should be_nil
-
-      result = @pet_api.upload_file(10002, file: File.new('hello.txt'), additional_metadata: 'metadata')
+      result = @pet_api.upload_file(@pet_id, file: File.new('hello.txt'), additional_metadata: 'metadata')
       result.should be_nil
     end
 
diff --git a/samples/client/petstore/ruby/spec/spec_helper.rb b/samples/client/petstore/ruby/spec/spec_helper.rb
index 26da98f9c42..5382a3879ef 100644
--- a/samples/client/petstore/ruby/spec/spec_helper.rb
+++ b/samples/client/petstore/ruby/spec/spec_helper.rb
@@ -38,28 +38,32 @@ end
 
 API_CLIENT = Petstore::ApiClient.new(Petstore::Configuration.new)
 
-# always delete and then re-create the pet object with 10002
-def prepare_pet(pet_api)
-  # remove the pet
-  pet_api.delete_pet(10002)
-  # recreate the pet
-  category = Petstore::Category.new('id' => 20002, 'name' => 'category test')
-  tag = Petstore::Tag.new('id' => 30002, 'name' => 'tag test')
-  pet = Petstore::Pet.new('id' => 10002, 'name' => "RUBY UNIT TESTING", 'photo_urls' => 'photo url',
-                               'category' => category, 'tags' => [tag], 'status' => 'pending')
-
-  pet_api.add_pet(:'body'=> pet)
+def random_id
+  rand(1000000) + 20000
 end
 
-# always delete and then re-create the store order
+# create a random pet, return its id
+def prepare_pet(pet_api)
+  pet_id = random_id
+  category = Petstore::Category.new('id' => 20002, 'name' => 'category test')
+  tag = Petstore::Tag.new('id' => 30002, 'name' => 'tag test')
+  pet = Petstore::Pet.new('id' => pet_id, 'name' => "RUBY UNIT TESTING", 'photo_urls' => 'photo url',
+                          'category' => category, 'tags' => [tag], 'status' => 'pending')
+  pet_api.add_pet(:'body'=> pet)
+  return pet_id
+end
+
+# create a random order, return its id
 def prepare_store(store_api)
-  order = Petstore::Order.new("id" => 10002,
-		  "petId" => 10002,
+  order_id = random_id
+  order = Petstore::Order.new("id" => order_id,
+		  "petId" => 123,
 		  "quantity" => 789,
 		  "shipDate" => "2015-04-06T23:42:01.678Z",
 		  "status" => "placed",
 		  "complete" => false)
   store_api.place_order(:body => order)
+  return order_id
 end
 
 # A random string to tack onto stuff to ensure we're not seeing
diff --git a/samples/client/petstore/ruby/spec/store_spec.rb b/samples/client/petstore/ruby/spec/store_spec.rb
index 1e0f035d143..67b678575d0 100644
--- a/samples/client/petstore/ruby/spec/store_spec.rb
+++ b/samples/client/petstore/ruby/spec/store_spec.rb
@@ -3,12 +3,15 @@ require 'spec_helper'
 describe "Store" do
   before do
     @api = Petstore::StoreApi.new(API_CLIENT)
-    prepare_store @api
   end
 
   it "should fetch an order" do
-    item = @api.get_order_by_id(10002)
-    item.id.should == 10002
+    @order_id = prepare_store(@api)
+
+    item = @api.get_order_by_id(@order_id)
+    item.id.should == @order_id
+
+    @api.delete_order(@order_id)
   end
 
   it "should featch the inventory" do
@@ -20,4 +23,14 @@ describe "Store" do
       v.should be_a(Integer)
     end
   end
+
+  it "should featch the inventory in object" do
+    result = @api.get_inventory_in_object
+    result.should be_a(Hash)
+    result.should_not be_empty
+    result.each do |k, v|
+      k.should be_a(Symbol)
+      v.should be_a(Integer)
+    end
+  end
 end
diff --git a/samples/client/petstore/scala/.gitignore b/samples/client/petstore/scala/.gitignore
new file mode 100644
index 00000000000..c58d83b3189
--- /dev/null
+++ b/samples/client/petstore/scala/.gitignore
@@ -0,0 +1,17 @@
+*.class
+*.log
+
+# sbt specific
+.cache
+.history
+.lib/
+dist/*
+target/
+lib_managed/
+src_managed/
+project/boot/
+project/plugins/project/
+
+# Scala-IDE specific
+.scala_dependencies
+.worksheet
diff --git a/samples/client/petstore/scala/git_push.sh b/samples/client/petstore/scala/git_push.sh
new file mode 100644
index 00000000000..1a36388db02
--- /dev/null
+++ b/samples/client/petstore/scala/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="YOUR_GIT_USR_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="YOUR_GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/client/petstore/scala/pom.xml b/samples/client/petstore/scala/pom.xml
index ff38920fcdd..c700bebfc83 100644
--- a/samples/client/petstore/scala/pom.xml
+++ b/samples/client/petstore/scala/pom.xml
@@ -210,7 +210,7 @@
     <joda-version>1.2</joda-version>
     <joda-time-version>2.2</joda-time-version>
     <jersey-version>1.19</jersey-version>
-    <swagger-core-version>1.5.4</swagger-core-version>
+    <swagger-core-version>1.5.7</swagger-core-version>
     <jersey-async-version>1.0.5</jersey-async-version>
     <maven-plugin.version>1.0.0</maven-plugin.version>
     <jackson-version>2.4.2</jackson-version>
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala
index a11cab9211b..c52f7159e4c 100644
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala
@@ -1,6 +1,7 @@
 package io.swagger.client.api
 
 import io.swagger.client.model.Pet
+import io.swagger.client.model.InlineResponse200
 import java.io.File
 import io.swagger.client.ApiInvoker
 import io.swagger.client.ApiException
@@ -23,57 +24,10 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   def addHeader(key: String, value: String) = apiInvoker.defaultHeaders += key -> value 
 
   
-  /**
-   * Update an existing pet
-   * 
-   * @param body Pet object that needs to be added to the store
-   * @return void
-   */
-  def updatePet (body: Pet)  = {
-    // create path and map variables
-    val path = "/pet".replaceAll("\\{format\\}","json")
-
-    val contentTypes = List("application/json", "application/xml", "application/json")
-    val contentType = contentTypes(0)
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-    val formParams = new HashMap[String, String]
-
-    
-
-    
-    
-    
-
-    var postBody: AnyRef = body
-
-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
-      postBody = mp
-    }
-    else {
-      
-    }
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "PUT", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
-        case s: String =>
-           
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-  
   /**
    * Add a new pet to the store
    * 
-   * @param body Pet object that needs to be added to the store
+   * @param body Pet object that needs to be added to the store (optional)
    * @return void
    */
   def addPet (body: Pet)  = {
@@ -117,10 +71,108 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     }
   }
   
+  /**
+   * Fake endpoint to test byte array in body parameter for adding a new pet to the store
+   * 
+   * @param body Pet object in the form of byte array (optional)
+   * @return void
+   */
+  def addPetUsingByteArray (body: String)  = {
+    // create path and map variables
+    val path = "/pet?testing_byte_array=true".replaceAll("\\{format\\}","json")
+
+    val contentTypes = List("application/json", "application/xml", "application/json")
+    val contentType = contentTypes(0)
+
+    // query params
+    val queryParams = new HashMap[String, String]
+    val headerParams = new HashMap[String, String]
+    val formParams = new HashMap[String, String]
+
+    
+
+    
+    
+    
+
+    var postBody: AnyRef = body
+
+    if(contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart()
+      
+      postBody = mp
+    }
+    else {
+      
+    }
+
+    try {
+      apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
+        case s: String =>
+           
+        case _ => None
+      }
+    } catch {
+      case ex: ApiException if ex.code == 404 => None
+      case ex: ApiException => throw ex
+    }
+  }
+  
+  /**
+   * Deletes a pet
+   * 
+   * @param petId Pet id to delete 
+   * @param apiKey  (optional)
+   * @return void
+   */
+  def deletePet (petId: Long, apiKey: String)  = {
+    // create path and map variables
+    val path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId))
+
+    
+
+    val contentTypes = List("application/json")
+    val contentType = contentTypes(0)
+
+    // query params
+    val queryParams = new HashMap[String, String]
+    val headerParams = new HashMap[String, String]
+    val formParams = new HashMap[String, String]
+
+    
+
+    
+    
+    headerParams += "api_key" -> apiKey
+    
+
+    var postBody: AnyRef = null
+
+    if(contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart()
+      
+      postBody = mp
+    }
+    else {
+      
+    }
+
+    try {
+      apiInvoker.invokeApi(basePath, path, "DELETE", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
+        case s: String =>
+           
+        case _ => None
+      }
+    } catch {
+      case ex: ApiException if ex.code == 404 => None
+      case ex: ApiException => throw ex
+    }
+  }
+  
   /**
    * Finds Pets by status
-   * Multiple status values can be provided with comma seperated strings
-   * @param status Status values that need to be considered for filter
+   * Multiple status values can be provided with comma separated strings
+   * @param status Status values that need to be considered for query (optional, default to available)
    * @return List[Pet]
    */
   def findPetsByStatus (status: List[String] /* = available */) : Option[List[Pet]] = {
@@ -169,7 +221,7 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   /**
    * Finds Pets by tags
    * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-   * @param tags Tags to filter by
+   * @param tags Tags to filter by (optional)
    * @return List[Pet]
    */
   def findPetsByTags (tags: List[String]) : Option[List[Pet]] = {
@@ -218,7 +270,7 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   /**
    * Find pet by ID
    * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-   * @param petId ID of pet that needs to be fetched
+   * @param petId ID of pet that needs to be fetched 
    * @return Pet
    */
   def getPetById (petId: Long) : Option[Pet] = {
@@ -265,12 +317,159 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     }
   }
   
+  /**
+   * Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched 
+   * @return InlineResponse200
+   */
+  def getPetByIdInObject (petId: Long) : Option[InlineResponse200] = {
+    // create path and map variables
+    val path = "/pet/{petId}?response=inline_arbitrary_object".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId))
+
+    
+
+    val contentTypes = List("application/json")
+    val contentType = contentTypes(0)
+
+    // query params
+    val queryParams = new HashMap[String, String]
+    val headerParams = new HashMap[String, String]
+    val formParams = new HashMap[String, String]
+
+    
+
+    
+    
+    
+
+    var postBody: AnyRef = null
+
+    if(contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart()
+      
+      postBody = mp
+    }
+    else {
+      
+    }
+
+    try {
+      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
+        case s: String =>
+           Some(ApiInvoker.deserialize(s, "", classOf[InlineResponse200]).asInstanceOf[InlineResponse200])
+         
+        case _ => None
+      }
+    } catch {
+      case ex: ApiException if ex.code == 404 => None
+      case ex: ApiException => throw ex
+    }
+  }
+  
+  /**
+   * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched 
+   * @return String
+   */
+  def petPetIdtestingByteArraytrueGet (petId: Long) : Option[String] = {
+    // create path and map variables
+    val path = "/pet/{petId}?testing_byte_array=true".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId))
+
+    
+
+    val contentTypes = List("application/json")
+    val contentType = contentTypes(0)
+
+    // query params
+    val queryParams = new HashMap[String, String]
+    val headerParams = new HashMap[String, String]
+    val formParams = new HashMap[String, String]
+
+    
+
+    
+    
+    
+
+    var postBody: AnyRef = null
+
+    if(contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart()
+      
+      postBody = mp
+    }
+    else {
+      
+    }
+
+    try {
+      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
+        case s: String =>
+           Some(ApiInvoker.deserialize(s, "", classOf[String]).asInstanceOf[String])
+         
+        case _ => None
+      }
+    } catch {
+      case ex: ApiException if ex.code == 404 => None
+      case ex: ApiException => throw ex
+    }
+  }
+  
+  /**
+   * Update an existing pet
+   * 
+   * @param body Pet object that needs to be added to the store (optional)
+   * @return void
+   */
+  def updatePet (body: Pet)  = {
+    // create path and map variables
+    val path = "/pet".replaceAll("\\{format\\}","json")
+
+    val contentTypes = List("application/json", "application/xml", "application/json")
+    val contentType = contentTypes(0)
+
+    // query params
+    val queryParams = new HashMap[String, String]
+    val headerParams = new HashMap[String, String]
+    val formParams = new HashMap[String, String]
+
+    
+
+    
+    
+    
+
+    var postBody: AnyRef = body
+
+    if(contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart()
+      
+      postBody = mp
+    }
+    else {
+      
+    }
+
+    try {
+      apiInvoker.invokeApi(basePath, path, "PUT", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
+        case s: String =>
+           
+        case _ => None
+      }
+    } catch {
+      case ex: ApiException if ex.code == 404 => None
+      case ex: ApiException => throw ex
+    }
+  }
+  
   /**
    * Updates a pet in the store with form data
    * 
-   * @param petId ID of pet that needs to be updated
-   * @param name Updated name of the pet
-   * @param status Updated status of the pet
+   * @param petId ID of pet that needs to be updated 
+   * @param name Updated name of the pet (optional)
+   * @param status Updated status of the pet (optional)
    * @return void
    */
   def updatePetWithForm (petId: String, name: String, status: String)  = {
@@ -322,63 +521,12 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     }
   }
   
-  /**
-   * Deletes a pet
-   * 
-   * @param petId Pet id to delete
-   * @param apiKey 
-   * @return void
-   */
-  def deletePet (petId: Long, apiKey: String)  = {
-    // create path and map variables
-    val path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId))
-
-    
-
-    val contentTypes = List("application/json")
-    val contentType = contentTypes(0)
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-    val formParams = new HashMap[String, String]
-
-    
-
-    
-    
-    headerParams += "api_key" -> apiKey
-    
-
-    var postBody: AnyRef = null
-
-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
-      postBody = mp
-    }
-    else {
-      
-    }
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "DELETE", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
-        case s: String =>
-           
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-  
   /**
    * uploads an image
    * 
-   * @param petId ID of pet to update
-   * @param additionalMetadata Additional data to pass to server
-   * @param file file to upload
+   * @param petId ID of pet to update 
+   * @param additionalMetadata Additional data to pass to server (optional)
+   * @param file file to upload (optional)
    * @return void
    */
   def uploadFile (petId: Long, additionalMetadata: String, file: File)  = {
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/StoreApi.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/StoreApi.scala
index 9b3cc91d788..388c612976f 100644
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/StoreApi.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/StoreApi.scala
@@ -22,6 +22,104 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   def addHeader(key: String, value: String) = apiInvoker.defaultHeaders += key -> value 
 
   
+  /**
+   * Delete purchase order by ID
+   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+   * @param orderId ID of the order that needs to be deleted 
+   * @return void
+   */
+  def deleteOrder (orderId: String)  = {
+    // create path and map variables
+    val path = "/store/order/{orderId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "orderId" + "\\}",apiInvoker.escape(orderId))
+
+    
+
+    val contentTypes = List("application/json")
+    val contentType = contentTypes(0)
+
+    // query params
+    val queryParams = new HashMap[String, String]
+    val headerParams = new HashMap[String, String]
+    val formParams = new HashMap[String, String]
+
+    
+
+    
+    
+    
+
+    var postBody: AnyRef = null
+
+    if(contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart()
+      
+      postBody = mp
+    }
+    else {
+      
+    }
+
+    try {
+      apiInvoker.invokeApi(basePath, path, "DELETE", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
+        case s: String =>
+           
+        case _ => None
+      }
+    } catch {
+      case ex: ApiException if ex.code == 404 => None
+      case ex: ApiException => throw ex
+    }
+  }
+  
+  /**
+   * Finds orders by status
+   * A single status value can be provided as a string
+   * @param status Status value that needs to be considered for query (optional, default to placed)
+   * @return List[Order]
+   */
+  def findOrdersByStatus (status: String /* = placed */) : Option[List[Order]] = {
+    // create path and map variables
+    val path = "/store/findByStatus".replaceAll("\\{format\\}","json")
+
+    val contentTypes = List("application/json")
+    val contentType = contentTypes(0)
+
+    // query params
+    val queryParams = new HashMap[String, String]
+    val headerParams = new HashMap[String, String]
+    val formParams = new HashMap[String, String]
+
+    
+
+    if(String.valueOf(status) != "null") queryParams += "status" -> status.toString
+    
+    
+    
+
+    var postBody: AnyRef = null
+
+    if(contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart()
+      
+      postBody = mp
+    }
+    else {
+      
+    }
+
+    try {
+      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
+        case s: String =>
+           Some(ApiInvoker.deserialize(s, "array", classOf[Order]).asInstanceOf[List[Order]])
+         
+        case _ => None
+      }
+    } catch {
+      case ex: ApiException if ex.code == 404 => None
+      case ex: ApiException => throw ex
+    }
+  }
+  
   /**
    * Returns pet inventories by status
    * Returns a map of status codes to quantities
@@ -70,14 +168,13 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   }
   
   /**
-   * Place an order for a pet
-   * 
-   * @param body order placed for purchasing the pet
-   * @return Order
+   * Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+   * Returns an arbitrary object which is actually a map of status codes to quantities
+   * @return Any
    */
-  def placeOrder (body: Order) : Option[Order] = {
+  def getInventoryInObject () : Option[Any] = {
     // create path and map variables
-    val path = "/store/order".replaceAll("\\{format\\}","json")
+    val path = "/store/inventory?response=arbitrary_object".replaceAll("\\{format\\}","json")
 
     val contentTypes = List("application/json")
     val contentType = contentTypes(0)
@@ -93,7 +190,7 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     
     
 
-    var postBody: AnyRef = body
+    var postBody: AnyRef = null
 
     if(contentType.startsWith("multipart/form-data")) {
       val mp = new FormDataMultiPart()
@@ -105,9 +202,9 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     }
 
     try {
-      apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
+      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
         case s: String =>
-           Some(ApiInvoker.deserialize(s, "", classOf[Order]).asInstanceOf[Order])
+           Some(ApiInvoker.deserialize(s, "", classOf[Any]).asInstanceOf[Any])
          
         case _ => None
       }
@@ -120,7 +217,7 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   /**
    * Find purchase order by ID
    * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-   * @param orderId ID of pet that needs to be fetched
+   * @param orderId ID of pet that needs to be fetched 
    * @return Order
    */
   def getOrderById (orderId: String) : Option[Order] = {
@@ -168,16 +265,14 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   }
   
   /**
-   * Delete purchase order by ID
-   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-   * @param orderId ID of the order that needs to be deleted
-   * @return void
+   * Place an order for a pet
+   * 
+   * @param body order placed for purchasing the pet (optional)
+   * @return Order
    */
-  def deleteOrder (orderId: String)  = {
+  def placeOrder (body: Order) : Option[Order] = {
     // create path and map variables
-    val path = "/store/order/{orderId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "orderId" + "\\}",apiInvoker.escape(orderId))
-
-    
+    val path = "/store/order".replaceAll("\\{format\\}","json")
 
     val contentTypes = List("application/json")
     val contentType = contentTypes(0)
@@ -193,7 +288,7 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     
     
 
-    var postBody: AnyRef = null
+    var postBody: AnyRef = body
 
     if(contentType.startsWith("multipart/form-data")) {
       val mp = new FormDataMultiPart()
@@ -205,9 +300,10 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     }
 
     try {
-      apiInvoker.invokeApi(basePath, path, "DELETE", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
+      apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
         case s: String =>
-           
+           Some(ApiInvoker.deserialize(s, "", classOf[Order]).asInstanceOf[Order])
+         
         case _ => None
       }
     } catch {
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/UserApi.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/UserApi.scala
index 802cf01c25b..e68922f3cce 100644
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/UserApi.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/UserApi.scala
@@ -25,7 +25,7 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   /**
    * Create user
    * This can only be done by the logged in user.
-   * @param body Created user object
+   * @param body Created user object (optional)
    * @return void
    */
   def createUser (body: User)  = {
@@ -72,7 +72,7 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   /**
    * Creates list of users with given input array
    * 
-   * @param body List of user object
+   * @param body List of user object (optional)
    * @return void
    */
   def createUsersWithArrayInput (body: List[User])  = {
@@ -119,7 +119,7 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   /**
    * Creates list of users with given input array
    * 
-   * @param body List of user object
+   * @param body List of user object (optional)
    * @return void
    */
   def createUsersWithListInput (body: List[User])  = {
@@ -163,11 +163,110 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     }
   }
   
+  /**
+   * Delete user
+   * This can only be done by the logged in user.
+   * @param username The name that needs to be deleted 
+   * @return void
+   */
+  def deleteUser (username: String)  = {
+    // create path and map variables
+    val path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}",apiInvoker.escape(username))
+
+    
+
+    val contentTypes = List("application/json")
+    val contentType = contentTypes(0)
+
+    // query params
+    val queryParams = new HashMap[String, String]
+    val headerParams = new HashMap[String, String]
+    val formParams = new HashMap[String, String]
+
+    
+
+    
+    
+    
+
+    var postBody: AnyRef = null
+
+    if(contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart()
+      
+      postBody = mp
+    }
+    else {
+      
+    }
+
+    try {
+      apiInvoker.invokeApi(basePath, path, "DELETE", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
+        case s: String =>
+           
+        case _ => None
+      }
+    } catch {
+      case ex: ApiException if ex.code == 404 => None
+      case ex: ApiException => throw ex
+    }
+  }
+  
+  /**
+   * Get user by user name
+   * 
+   * @param username The name that needs to be fetched. Use user1 for testing. 
+   * @return User
+   */
+  def getUserByName (username: String) : Option[User] = {
+    // create path and map variables
+    val path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}",apiInvoker.escape(username))
+
+    
+
+    val contentTypes = List("application/json")
+    val contentType = contentTypes(0)
+
+    // query params
+    val queryParams = new HashMap[String, String]
+    val headerParams = new HashMap[String, String]
+    val formParams = new HashMap[String, String]
+
+    
+
+    
+    
+    
+
+    var postBody: AnyRef = null
+
+    if(contentType.startsWith("multipart/form-data")) {
+      val mp = new FormDataMultiPart()
+      
+      postBody = mp
+    }
+    else {
+      
+    }
+
+    try {
+      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
+        case s: String =>
+           Some(ApiInvoker.deserialize(s, "", classOf[User]).asInstanceOf[User])
+         
+        case _ => None
+      }
+    } catch {
+      case ex: ApiException if ex.code == 404 => None
+      case ex: ApiException => throw ex
+    }
+  }
+  
   /**
    * Logs user into the system
    * 
-   * @param username The user name for login
-   * @param password The password for login in clear text
+   * @param username The user name for login (optional)
+   * @param password The password for login in clear text (optional)
    * @return String
    */
   def loginUser (username: String, password: String) : Option[String] = {
@@ -260,61 +359,11 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     }
   }
   
-  /**
-   * Get user by user name
-   * 
-   * @param username The name that needs to be fetched. Use user1 for testing.
-   * @return User
-   */
-  def getUserByName (username: String) : Option[User] = {
-    // create path and map variables
-    val path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}",apiInvoker.escape(username))
-
-    
-
-    val contentTypes = List("application/json")
-    val contentType = contentTypes(0)
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-    val formParams = new HashMap[String, String]
-
-    
-
-    
-    
-    
-
-    var postBody: AnyRef = null
-
-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
-      postBody = mp
-    }
-    else {
-      
-    }
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
-        case s: String =>
-           Some(ApiInvoker.deserialize(s, "", classOf[User]).asInstanceOf[User])
-         
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-  
   /**
    * Updated user
    * This can only be done by the logged in user.
-   * @param username name that need to be deleted
-   * @param body Updated user object
+   * @param username name that need to be deleted 
+   * @param body Updated user object (optional)
    * @return void
    */
   def updateUser (username: String, body: User)  = {
@@ -360,53 +409,4 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     }
   }
   
-  /**
-   * Delete user
-   * This can only be done by the logged in user.
-   * @param username The name that needs to be deleted
-   * @return void
-   */
-  def deleteUser (username: String)  = {
-    // create path and map variables
-    val path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}",apiInvoker.escape(username))
-
-    
-
-    val contentTypes = List("application/json")
-    val contentType = contentTypes(0)
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-    val formParams = new HashMap[String, String]
-
-    
-
-    
-    
-    
-
-    var postBody: AnyRef = null
-
-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
-      postBody = mp
-    }
-    else {
-      
-    }
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "DELETE", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
-        case s: String =>
-           
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-  
 }
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/InlineResponse200.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/InlineResponse200.scala
new file mode 100644
index 00000000000..e13f63eeefb
--- /dev/null
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/InlineResponse200.scala
@@ -0,0 +1,14 @@
+package io.swagger.client.model
+
+
+
+
+case class InlineResponse200 (
+  tags: List[Tag],
+  id: Long,
+  category: Any,
+  /* pet status in the store */
+  status: String,
+  name: String,
+  photoUrls: List[String])
+  
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Model200Response.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Model200Response.scala
new file mode 100644
index 00000000000..68601a84e1a
--- /dev/null
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Model200Response.scala
@@ -0,0 +1,8 @@
+package io.swagger.client.model
+
+
+
+
+case class Model200Response (
+  name: Integer)
+  
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/ModelReturn.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/ModelReturn.scala
new file mode 100644
index 00000000000..e4ac8eb1ea7
--- /dev/null
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/ModelReturn.scala
@@ -0,0 +1,8 @@
+package io.swagger.client.model
+
+
+
+
+case class ModelReturn (
+  _return: Integer)
+  
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Name.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Name.scala
new file mode 100644
index 00000000000..854a11e6088
--- /dev/null
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Name.scala
@@ -0,0 +1,8 @@
+package io.swagger.client.model
+
+
+
+
+case class Name (
+  name: Integer)
+  
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/SpecialModelName.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/SpecialModelName.scala
new file mode 100644
index 00000000000..2fee09a7f7c
--- /dev/null
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/SpecialModelName.scala
@@ -0,0 +1,8 @@
+package io.swagger.client.model
+
+
+
+
+case class SpecialModelName (
+  specialPropertyName: Long)
+  
diff --git a/samples/client/petstore/swift/.gitignore b/samples/client/petstore/swift/.gitignore
new file mode 100644
index 00000000000..5e5d5cebcf4
--- /dev/null
+++ b/samples/client/petstore/swift/.gitignore
@@ -0,0 +1,63 @@
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+
+## Other
+*.xccheckout
+*.moved-aside
+*.xcuserstate
+*.xcscmblueprint
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+
+## Playgrounds
+timeline.xctimeline
+playground.xcworkspace
+
+# Swift Package Manager
+#
+# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
+# Packages/
+.build/
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# Pods/
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the 
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
+
+fastlane/report.xml
+fastlane/screenshots
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift
index 5fc929a20a2..ddb328e8ee5 100644
--- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift
@@ -8,371 +8,853 @@
 import Alamofire
 import PromiseKit
 
-extension PetstoreClientAPI {
-    
-    public class PetAPI: APIBase {
-    
-        /**
-         
-         Update an existing pet
-         
-         - PUT /pet
-         - 
-         - OAuth:
-           - type: oauth2
-           - name: petstore_auth
-         
-         - parameter body: (body) Pet object that needs to be added to the store
 
-         - returns: RequestBuilder<Void> 
-         */
-        public class func updatePet(body body: Pet?) -> RequestBuilder<Void> {
-            let path = "/pet"
-            let URLString = PetstoreClientAPI.basePath + path
-            
-            let parameters = body?.encodeToJSON() as? [String:AnyObject]
 
-            let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-            return requestBuilder.init(method: "PUT", URLString: URLString, parameters: parameters, isBody: true)
+public class PetAPI: APIBase {
+    /**
+     
+     Add a new pet to the store
+     
+     - parameter body: (body) Pet object that needs to be added to the store (optional)
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    public class func addPet(body body: Pet?, completion: ((error: ErrorType?) -> Void)) {
+        addPetWithRequestBuilder(body: body).execute { (response, error) -> Void in
+            completion(error: error);
         }
-    
-        /**
-         
-         Add a new pet to the store
-         
-         - POST /pet
-         - 
-         - OAuth:
-           - type: oauth2
-           - name: petstore_auth
-         
-         - parameter body: (body) Pet object that needs to be added to the store
-
-         - returns: RequestBuilder<Void> 
-         */
-        public class func addPet(body body: Pet?) -> RequestBuilder<Void> {
-            let path = "/pet"
-            let URLString = PetstoreClientAPI.basePath + path
-            
-            let parameters = body?.encodeToJSON() as? [String:AnyObject]
-
-            let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-            return requestBuilder.init(method: "POST", URLString: URLString, parameters: parameters, isBody: true)
-        }
-    
-        /**
-         
-         Finds Pets by status
-         
-         - GET /pet/findByStatus
-         - Multiple status values can be provided with comma seperated strings
-         - OAuth:
-           - type: oauth2
-           - name: petstore_auth
-         - examples: [{example=[ {
-  "tags" : [ {
-    "id" : 123456789,
-    "name" : "aeiou"
-  } ],
-  "id" : 123456789,
-  "category" : {
-    "id" : 123456789,
-    "name" : "aeiou"
-  },
-  "status" : "aeiou",
-  "name" : "doggie",
-  "photoUrls" : [ "aeiou" ]
-} ], contentType=application/json}, {example=<Pet>
-  <id>123456</id>
-  <name>doggie</name>
-  <photoUrls>
-    <photoUrls>string</photoUrls>
-  </photoUrls>
-  <tags>
-  </tags>
-  <status>string</status>
-</Pet>, contentType=application/xml}]
-         - examples: [{example=[ {
-  "tags" : [ {
-    "id" : 123456789,
-    "name" : "aeiou"
-  } ],
-  "id" : 123456789,
-  "category" : {
-    "id" : 123456789,
-    "name" : "aeiou"
-  },
-  "status" : "aeiou",
-  "name" : "doggie",
-  "photoUrls" : [ "aeiou" ]
-} ], contentType=application/json}, {example=<Pet>
-  <id>123456</id>
-  <name>doggie</name>
-  <photoUrls>
-    <photoUrls>string</photoUrls>
-  </photoUrls>
-  <tags>
-  </tags>
-  <status>string</status>
-</Pet>, contentType=application/xml}]
-         
-         - parameter status: (query) Status values that need to be considered for filter
-
-         - returns: RequestBuilder<[Pet]> 
-         */
-        public class func findPetsByStatus(status status: [String]?) -> RequestBuilder<[Pet]> {
-            let path = "/pet/findByStatus"
-            let URLString = PetstoreClientAPI.basePath + path
-            
-            let nillableParameters: [String:AnyObject?] = [
-                "status": status
-            ]
-            let parameters = APIHelper.rejectNil(nillableParameters)
-
-            let requestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-            return requestBuilder.init(method: "GET", URLString: URLString, parameters: parameters, isBody: false)
-        }
-    
-        /**
-         
-         Finds Pets by tags
-         
-         - GET /pet/findByTags
-         - Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-         - OAuth:
-           - type: oauth2
-           - name: petstore_auth
-         - examples: [{example=[ {
-  "tags" : [ {
-    "id" : 123456789,
-    "name" : "aeiou"
-  } ],
-  "id" : 123456789,
-  "category" : {
-    "id" : 123456789,
-    "name" : "aeiou"
-  },
-  "status" : "aeiou",
-  "name" : "doggie",
-  "photoUrls" : [ "aeiou" ]
-} ], contentType=application/json}, {example=<Pet>
-  <id>123456</id>
-  <name>doggie</name>
-  <photoUrls>
-    <photoUrls>string</photoUrls>
-  </photoUrls>
-  <tags>
-  </tags>
-  <status>string</status>
-</Pet>, contentType=application/xml}]
-         - examples: [{example=[ {
-  "tags" : [ {
-    "id" : 123456789,
-    "name" : "aeiou"
-  } ],
-  "id" : 123456789,
-  "category" : {
-    "id" : 123456789,
-    "name" : "aeiou"
-  },
-  "status" : "aeiou",
-  "name" : "doggie",
-  "photoUrls" : [ "aeiou" ]
-} ], contentType=application/json}, {example=<Pet>
-  <id>123456</id>
-  <name>doggie</name>
-  <photoUrls>
-    <photoUrls>string</photoUrls>
-  </photoUrls>
-  <tags>
-  </tags>
-  <status>string</status>
-</Pet>, contentType=application/xml}]
-         
-         - parameter tags: (query) Tags to filter by
-
-         - returns: RequestBuilder<[Pet]> 
-         */
-        public class func findPetsByTags(tags tags: [String]?) -> RequestBuilder<[Pet]> {
-            let path = "/pet/findByTags"
-            let URLString = PetstoreClientAPI.basePath + path
-            
-            let nillableParameters: [String:AnyObject?] = [
-                "tags": tags
-            ]
-            let parameters = APIHelper.rejectNil(nillableParameters)
-
-            let requestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-            return requestBuilder.init(method: "GET", URLString: URLString, parameters: parameters, isBody: false)
-        }
-    
-        /**
-         
-         Find pet by ID
-         
-         - GET /pet/{petId}
-         - Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
-         - API Key:
-           - type: apiKey api_key 
-           - name: api_key
-         - examples: [{example={
-  "tags" : [ {
-    "id" : 123456789,
-    "name" : "aeiou"
-  } ],
-  "id" : 123456789,
-  "category" : {
-    "id" : 123456789,
-    "name" : "aeiou"
-  },
-  "status" : "aeiou",
-  "name" : "doggie",
-  "photoUrls" : [ "aeiou" ]
-}, contentType=application/json}, {example=<Pet>
-  <id>123456</id>
-  <name>doggie</name>
-  <photoUrls>
-    <photoUrls>string</photoUrls>
-  </photoUrls>
-  <tags>
-  </tags>
-  <status>string</status>
-</Pet>, contentType=application/xml}]
-         - examples: [{example={
-  "tags" : [ {
-    "id" : 123456789,
-    "name" : "aeiou"
-  } ],
-  "id" : 123456789,
-  "category" : {
-    "id" : 123456789,
-    "name" : "aeiou"
-  },
-  "status" : "aeiou",
-  "name" : "doggie",
-  "photoUrls" : [ "aeiou" ]
-}, contentType=application/json}, {example=<Pet>
-  <id>123456</id>
-  <name>doggie</name>
-  <photoUrls>
-    <photoUrls>string</photoUrls>
-  </photoUrls>
-  <tags>
-  </tags>
-  <status>string</status>
-</Pet>, contentType=application/xml}]
-         
-         - parameter petId: (path) ID of pet that needs to be fetched
-
-         - returns: RequestBuilder<Pet> 
-         */
-        public class func getPetById(petId petId: Int) -> RequestBuilder<Pet> {
-            var path = "/pet/{petId}"
-            path = path.stringByReplacingOccurrencesOfString("{petId}", withString: "\(petId)", options: .LiteralSearch, range: nil)
-            let URLString = PetstoreClientAPI.basePath + path
-            
-            let nillableParameters: [String:AnyObject?] = [:]
-            let parameters = APIHelper.rejectNil(nillableParameters)
-
-            let requestBuilder: RequestBuilder<Pet>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-            return requestBuilder.init(method: "GET", URLString: URLString, parameters: parameters, isBody: true)
-        }
-    
-        /**
-         
-         Updates a pet in the store with form data
-         
-         - POST /pet/{petId}
-         - 
-         - OAuth:
-           - type: oauth2
-           - name: petstore_auth
-         
-         - parameter petId: (path) ID of pet that needs to be updated
-         - parameter name: (form) Updated name of the pet
-         - parameter status: (form) Updated status of the pet
-
-         - returns: RequestBuilder<Void> 
-         */
-        public class func updatePetWithForm(petId petId: String, name: String?, status: String?) -> RequestBuilder<Void> {
-            var path = "/pet/{petId}"
-            path = path.stringByReplacingOccurrencesOfString("{petId}", withString: "\(petId)", options: .LiteralSearch, range: nil)
-            let URLString = PetstoreClientAPI.basePath + path
-            
-            let nillableParameters: [String:AnyObject?] = [
-                "name": name,
-                "status": status
-            ]
-            let parameters = APIHelper.rejectNil(nillableParameters)
-
-            let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-            return requestBuilder.init(method: "POST", URLString: URLString, parameters: parameters, isBody: false)
-        }
-    
-        /**
-         
-         Deletes a pet
-         
-         - DELETE /pet/{petId}
-         - 
-         - OAuth:
-           - type: oauth2
-           - name: petstore_auth
-         
-         - parameter petId: (path) Pet id to delete
-
-         - returns: RequestBuilder<Void> 
-         */
-        public class func deletePet(petId petId: Int) -> RequestBuilder<Void> {
-            var path = "/pet/{petId}"
-            path = path.stringByReplacingOccurrencesOfString("{petId}", withString: "\(petId)", options: .LiteralSearch, range: nil)
-            let URLString = PetstoreClientAPI.basePath + path
-            
-            let nillableParameters: [String:AnyObject?] = [:]
-            let parameters = APIHelper.rejectNil(nillableParameters)
-
-            let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-            return requestBuilder.init(method: "DELETE", URLString: URLString, parameters: parameters, isBody: true)
-        }
-    
-        /**
-         
-         uploads an image
-         
-         - POST /pet/{petId}/uploadImage
-         - 
-         - OAuth:
-           - type: oauth2
-           - name: petstore_auth
-         
-         - parameter petId: (path) ID of pet to update
-         - parameter additionalMetadata: (form) Additional data to pass to server
-         - parameter file: (form) file to upload
-
-         - returns: RequestBuilder<Void> 
-         */
-        public class func uploadFile(petId petId: Int, additionalMetadata: String?, file: NSURL?) -> RequestBuilder<Void> {
-            var path = "/pet/{petId}/uploadImage"
-            path = path.stringByReplacingOccurrencesOfString("{petId}", withString: "\(petId)", options: .LiteralSearch, range: nil)
-            let URLString = PetstoreClientAPI.basePath + path
-            
-            let nillableParameters: [String:AnyObject?] = [
-                "additionalMetadata": additionalMetadata,
-                "file": file
-            ]
-            let parameters = APIHelper.rejectNil(nillableParameters)
-
-            let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-            return requestBuilder.init(method: "POST", URLString: URLString, parameters: parameters, isBody: false)
-        }
-    
     }
+
+    /**
+     
+     Add a new pet to the store
+     
+     - parameter body: (body) Pet object that needs to be added to the store (optional)
+     - returns: Promise<Void>
+     */
+    public class func addPet(body body: Pet?) -> Promise<Void> {
+        let deferred = Promise<Void>.pendingPromise()
+        addPet(body: body) { error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill()
+            }
+        }
+        return deferred.promise
+    }
+
+    /**
+     
+     Add a new pet to the store
+     
+     - POST /pet
+     - 
+     - OAuth:
+       - type: oauth2
+       - name: petstore_auth
+     
+     - parameter body: (body) Pet object that needs to be added to the store (optional)
+
+     - returns: RequestBuilder<Void> 
+     */
+    public class func addPetWithRequestBuilder(body body: Pet?) -> RequestBuilder<Void> {
+        let path = "/pet"
+        let URLString = PetstoreClientAPI.basePath + path
+        
+        let parameters = body?.encodeToJSON() as? [String:AnyObject]
+
+        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "POST", URLString: URLString, parameters: parameters, isBody: true)
+    }
+
+    /**
+     
+     Fake endpoint to test byte array in body parameter for adding a new pet to the store
+     
+     - parameter body: (body) Pet object in the form of byte array (optional)
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    public class func addPetUsingByteArray(body body: String?, completion: ((error: ErrorType?) -> Void)) {
+        addPetUsingByteArrayWithRequestBuilder(body: body).execute { (response, error) -> Void in
+            completion(error: error);
+        }
+    }
+
+    /**
+     
+     Fake endpoint to test byte array in body parameter for adding a new pet to the store
+     
+     - parameter body: (body) Pet object in the form of byte array (optional)
+     - returns: Promise<Void>
+     */
+    public class func addPetUsingByteArray(body body: String?) -> Promise<Void> {
+        let deferred = Promise<Void>.pendingPromise()
+        addPetUsingByteArray(body: body) { error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill()
+            }
+        }
+        return deferred.promise
+    }
+
+    /**
+     
+     Fake endpoint to test byte array in body parameter for adding a new pet to the store
+     
+     - POST /pet?testing_byte_array=true
+     - 
+     - OAuth:
+       - type: oauth2
+       - name: petstore_auth
+     
+     - parameter body: (body) Pet object in the form of byte array (optional)
+
+     - returns: RequestBuilder<Void> 
+     */
+    public class func addPetUsingByteArrayWithRequestBuilder(body body: String?) -> RequestBuilder<Void> {
+        let path = "/pet?testing_byte_array=true"
+        let URLString = PetstoreClientAPI.basePath + path
+        
+        let parameters = body?.encodeToJSON() as? [String:AnyObject]
+
+        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "POST", URLString: URLString, parameters: parameters, isBody: true)
+    }
+
+    /**
+     
+     Deletes a pet
+     
+     - parameter petId: (path) Pet id to delete 
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    public class func deletePet(petId petId: Int, completion: ((error: ErrorType?) -> Void)) {
+        deletePetWithRequestBuilder(petId: petId).execute { (response, error) -> Void in
+            completion(error: error);
+        }
+    }
+
+    /**
+     
+     Deletes a pet
+     
+     - parameter petId: (path) Pet id to delete 
+     - returns: Promise<Void>
+     */
+    public class func deletePet(petId petId: Int) -> Promise<Void> {
+        let deferred = Promise<Void>.pendingPromise()
+        deletePet(petId: petId) { error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill()
+            }
+        }
+        return deferred.promise
+    }
+
+    /**
+     
+     Deletes a pet
+     
+     - DELETE /pet/{petId}
+     - 
+     - OAuth:
+       - type: oauth2
+       - name: petstore_auth
+     
+     - parameter petId: (path) Pet id to delete 
+
+     - returns: RequestBuilder<Void> 
+     */
+    public class func deletePetWithRequestBuilder(petId petId: Int) -> RequestBuilder<Void> {
+        var path = "/pet/{petId}"
+        path = path.stringByReplacingOccurrencesOfString("{petId}", withString: "\(petId)", options: .LiteralSearch, range: nil)
+        let URLString = PetstoreClientAPI.basePath + path
+        
+        let nillableParameters: [String:AnyObject?] = [:]
+        let parameters = APIHelper.rejectNil(nillableParameters)
+
+        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "DELETE", URLString: URLString, parameters: parameters, isBody: true)
+    }
+
+    /**
+     
+     Finds Pets by status
+     
+     - parameter status: (query) Status values that need to be considered for query (optional, default to available)
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    public class func findPetsByStatus(status status: [String]?, completion: ((data: [Pet]?, error: ErrorType?) -> Void)) {
+        findPetsByStatusWithRequestBuilder(status: status).execute { (response, error) -> Void in
+            completion(data: response?.body, error: error);
+        }
+    }
+
+    /**
+     
+     Finds Pets by status
+     
+     - parameter status: (query) Status values that need to be considered for query (optional, default to available)
+     - returns: Promise<[Pet]>
+     */
+    public class func findPetsByStatus(status status: [String]?) -> Promise<[Pet]> {
+        let deferred = Promise<[Pet]>.pendingPromise()
+        findPetsByStatus(status: status) { data, error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill(data!)
+            }
+        }
+        return deferred.promise
+    }
+
+    /**
+     
+     Finds Pets by status
+     
+     - GET /pet/findByStatus
+     - Multiple status values can be provided with comma separated strings
+     - OAuth:
+       - type: oauth2
+       - name: petstore_auth
+     - examples: [{example=[ {
+  "tags" : [ {
+    "id" : 123456789,
+    "name" : "aeiou"
+  } ],
+  "id" : 123456789,
+  "category" : {
+    "id" : 123456789,
+    "name" : "aeiou"
+  },
+  "status" : "aeiou",
+  "name" : "doggie",
+  "photoUrls" : [ "aeiou" ]
+} ], contentType=application/json}, {example=<Pet>
+  <id>123456</id>
+  <name>doggie</name>
+  <photoUrls>
+    <photoUrls>string</photoUrls>
+  </photoUrls>
+  <tags>
+  </tags>
+  <status>string</status>
+</Pet>, contentType=application/xml}]
+     - examples: [{example=[ {
+  "tags" : [ {
+    "id" : 123456789,
+    "name" : "aeiou"
+  } ],
+  "id" : 123456789,
+  "category" : {
+    "id" : 123456789,
+    "name" : "aeiou"
+  },
+  "status" : "aeiou",
+  "name" : "doggie",
+  "photoUrls" : [ "aeiou" ]
+} ], contentType=application/json}, {example=<Pet>
+  <id>123456</id>
+  <name>doggie</name>
+  <photoUrls>
+    <photoUrls>string</photoUrls>
+  </photoUrls>
+  <tags>
+  </tags>
+  <status>string</status>
+</Pet>, contentType=application/xml}]
+     
+     - parameter status: (query) Status values that need to be considered for query (optional, default to available)
+
+     - returns: RequestBuilder<[Pet]> 
+     */
+    public class func findPetsByStatusWithRequestBuilder(status status: [String]?) -> RequestBuilder<[Pet]> {
+        let path = "/pet/findByStatus"
+        let URLString = PetstoreClientAPI.basePath + path
+        
+        let nillableParameters: [String:AnyObject?] = [
+            "status": status
+        ]
+        let parameters = APIHelper.rejectNil(nillableParameters)
+
+        let requestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "GET", URLString: URLString, parameters: parameters, isBody: false)
+    }
+
+    /**
+     
+     Finds Pets by tags
+     
+     - parameter tags: (query) Tags to filter by (optional)
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    public class func findPetsByTags(tags tags: [String]?, completion: ((data: [Pet]?, error: ErrorType?) -> Void)) {
+        findPetsByTagsWithRequestBuilder(tags: tags).execute { (response, error) -> Void in
+            completion(data: response?.body, error: error);
+        }
+    }
+
+    /**
+     
+     Finds Pets by tags
+     
+     - parameter tags: (query) Tags to filter by (optional)
+     - returns: Promise<[Pet]>
+     */
+    public class func findPetsByTags(tags tags: [String]?) -> Promise<[Pet]> {
+        let deferred = Promise<[Pet]>.pendingPromise()
+        findPetsByTags(tags: tags) { data, error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill(data!)
+            }
+        }
+        return deferred.promise
+    }
+
+    /**
+     
+     Finds Pets by tags
+     
+     - GET /pet/findByTags
+     - Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+     - OAuth:
+       - type: oauth2
+       - name: petstore_auth
+     - examples: [{example=[ {
+  "tags" : [ {
+    "id" : 123456789,
+    "name" : "aeiou"
+  } ],
+  "id" : 123456789,
+  "category" : {
+    "id" : 123456789,
+    "name" : "aeiou"
+  },
+  "status" : "aeiou",
+  "name" : "doggie",
+  "photoUrls" : [ "aeiou" ]
+} ], contentType=application/json}, {example=<Pet>
+  <id>123456</id>
+  <name>doggie</name>
+  <photoUrls>
+    <photoUrls>string</photoUrls>
+  </photoUrls>
+  <tags>
+  </tags>
+  <status>string</status>
+</Pet>, contentType=application/xml}]
+     - examples: [{example=[ {
+  "tags" : [ {
+    "id" : 123456789,
+    "name" : "aeiou"
+  } ],
+  "id" : 123456789,
+  "category" : {
+    "id" : 123456789,
+    "name" : "aeiou"
+  },
+  "status" : "aeiou",
+  "name" : "doggie",
+  "photoUrls" : [ "aeiou" ]
+} ], contentType=application/json}, {example=<Pet>
+  <id>123456</id>
+  <name>doggie</name>
+  <photoUrls>
+    <photoUrls>string</photoUrls>
+  </photoUrls>
+  <tags>
+  </tags>
+  <status>string</status>
+</Pet>, contentType=application/xml}]
+     
+     - parameter tags: (query) Tags to filter by (optional)
+
+     - returns: RequestBuilder<[Pet]> 
+     */
+    public class func findPetsByTagsWithRequestBuilder(tags tags: [String]?) -> RequestBuilder<[Pet]> {
+        let path = "/pet/findByTags"
+        let URLString = PetstoreClientAPI.basePath + path
+        
+        let nillableParameters: [String:AnyObject?] = [
+            "tags": tags
+        ]
+        let parameters = APIHelper.rejectNil(nillableParameters)
+
+        let requestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "GET", URLString: URLString, parameters: parameters, isBody: false)
+    }
+
+    /**
+     
+     Find pet by ID
+     
+     - parameter petId: (path) ID of pet that needs to be fetched 
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    public class func getPetById(petId petId: Int, completion: ((data: Pet?, error: ErrorType?) -> Void)) {
+        getPetByIdWithRequestBuilder(petId: petId).execute { (response, error) -> Void in
+            completion(data: response?.body, error: error);
+        }
+    }
+
+    /**
+     
+     Find pet by ID
+     
+     - parameter petId: (path) ID of pet that needs to be fetched 
+     - returns: Promise<Pet>
+     */
+    public class func getPetById(petId petId: Int) -> Promise<Pet> {
+        let deferred = Promise<Pet>.pendingPromise()
+        getPetById(petId: petId) { data, error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill(data!)
+            }
+        }
+        return deferred.promise
+    }
+
+    /**
+     
+     Find pet by ID
+     
+     - GET /pet/{petId}
+     - Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
+     - API Key:
+       - type: apiKey api_key 
+       - name: api_key
+     - OAuth:
+       - type: oauth2
+       - name: petstore_auth
+     - examples: [{example={
+  "tags" : [ {
+    "id" : 123456789,
+    "name" : "aeiou"
+  } ],
+  "id" : 123456789,
+  "category" : {
+    "id" : 123456789,
+    "name" : "aeiou"
+  },
+  "status" : "aeiou",
+  "name" : "doggie",
+  "photoUrls" : [ "aeiou" ]
+}, contentType=application/json}, {example=<Pet>
+  <id>123456</id>
+  <name>doggie</name>
+  <photoUrls>
+    <photoUrls>string</photoUrls>
+  </photoUrls>
+  <tags>
+  </tags>
+  <status>string</status>
+</Pet>, contentType=application/xml}]
+     - examples: [{example={
+  "tags" : [ {
+    "id" : 123456789,
+    "name" : "aeiou"
+  } ],
+  "id" : 123456789,
+  "category" : {
+    "id" : 123456789,
+    "name" : "aeiou"
+  },
+  "status" : "aeiou",
+  "name" : "doggie",
+  "photoUrls" : [ "aeiou" ]
+}, contentType=application/json}, {example=<Pet>
+  <id>123456</id>
+  <name>doggie</name>
+  <photoUrls>
+    <photoUrls>string</photoUrls>
+  </photoUrls>
+  <tags>
+  </tags>
+  <status>string</status>
+</Pet>, contentType=application/xml}]
+     
+     - parameter petId: (path) ID of pet that needs to be fetched 
+
+     - returns: RequestBuilder<Pet> 
+     */
+    public class func getPetByIdWithRequestBuilder(petId petId: Int) -> RequestBuilder<Pet> {
+        var path = "/pet/{petId}"
+        path = path.stringByReplacingOccurrencesOfString("{petId}", withString: "\(petId)", options: .LiteralSearch, range: nil)
+        let URLString = PetstoreClientAPI.basePath + path
+        
+        let nillableParameters: [String:AnyObject?] = [:]
+        let parameters = APIHelper.rejectNil(nillableParameters)
+
+        let requestBuilder: RequestBuilder<Pet>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "GET", URLString: URLString, parameters: parameters, isBody: true)
+    }
+
+    /**
+     
+     Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
+     
+     - parameter petId: (path) ID of pet that needs to be fetched 
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    public class func getPetByIdInObject(petId petId: Int, completion: ((data: InlineResponse200?, error: ErrorType?) -> Void)) {
+        getPetByIdInObjectWithRequestBuilder(petId: petId).execute { (response, error) -> Void in
+            completion(data: response?.body, error: error);
+        }
+    }
+
+    /**
+     
+     Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
+     
+     - parameter petId: (path) ID of pet that needs to be fetched 
+     - returns: Promise<InlineResponse200>
+     */
+    public class func getPetByIdInObject(petId petId: Int) -> Promise<InlineResponse200> {
+        let deferred = Promise<InlineResponse200>.pendingPromise()
+        getPetByIdInObject(petId: petId) { data, error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill(data!)
+            }
+        }
+        return deferred.promise
+    }
+
+    /**
+     
+     Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
+     
+     - GET /pet/{petId}?response=inline_arbitrary_object
+     - Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
+     - API Key:
+       - type: apiKey api_key 
+       - name: api_key
+     - OAuth:
+       - type: oauth2
+       - name: petstore_auth
+     - examples: [{example={
+  "id" : 123456789,
+  "tags" : [ {
+    "id" : 123456789,
+    "name" : "aeiou"
+  } ],
+  "category" : "{}",
+  "status" : "aeiou",
+  "name" : "doggie",
+  "photoUrls" : [ "aeiou" ]
+}, contentType=application/json}, {example=<null>
+  <id>123456</id>
+  <category>not implemented io.swagger.models.properties.ObjectProperty@37ff6855</category>
+  <status>string</status>
+  <name>doggie</name>
+  <photoUrls>string</photoUrls>
+</null>, contentType=application/xml}]
+     - examples: [{example={
+  "id" : 123456789,
+  "tags" : [ {
+    "id" : 123456789,
+    "name" : "aeiou"
+  } ],
+  "category" : "{}",
+  "status" : "aeiou",
+  "name" : "doggie",
+  "photoUrls" : [ "aeiou" ]
+}, contentType=application/json}, {example=<null>
+  <id>123456</id>
+  <category>not implemented io.swagger.models.properties.ObjectProperty@37ff6855</category>
+  <status>string</status>
+  <name>doggie</name>
+  <photoUrls>string</photoUrls>
+</null>, contentType=application/xml}]
+     
+     - parameter petId: (path) ID of pet that needs to be fetched 
+
+     - returns: RequestBuilder<InlineResponse200> 
+     */
+    public class func getPetByIdInObjectWithRequestBuilder(petId petId: Int) -> RequestBuilder<InlineResponse200> {
+        var path = "/pet/{petId}?response=inline_arbitrary_object"
+        path = path.stringByReplacingOccurrencesOfString("{petId}", withString: "\(petId)", options: .LiteralSearch, range: nil)
+        let URLString = PetstoreClientAPI.basePath + path
+        
+        let nillableParameters: [String:AnyObject?] = [:]
+        let parameters = APIHelper.rejectNil(nillableParameters)
+
+        let requestBuilder: RequestBuilder<InlineResponse200>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "GET", URLString: URLString, parameters: parameters, isBody: true)
+    }
+
+    /**
+     
+     Fake endpoint to test byte array return by 'Find pet by ID'
+     
+     - parameter petId: (path) ID of pet that needs to be fetched 
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    public class func petPetIdtestingByteArraytrueGet(petId petId: Int, completion: ((data: String?, error: ErrorType?) -> Void)) {
+        petPetIdtestingByteArraytrueGetWithRequestBuilder(petId: petId).execute { (response, error) -> Void in
+            completion(data: response?.body, error: error);
+        }
+    }
+
+    /**
+     
+     Fake endpoint to test byte array return by 'Find pet by ID'
+     
+     - parameter petId: (path) ID of pet that needs to be fetched 
+     - returns: Promise<String>
+     */
+    public class func petPetIdtestingByteArraytrueGet(petId petId: Int) -> Promise<String> {
+        let deferred = Promise<String>.pendingPromise()
+        petPetIdtestingByteArraytrueGet(petId: petId) { data, error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill(data!)
+            }
+        }
+        return deferred.promise
+    }
+
+    /**
+     
+     Fake endpoint to test byte array return by 'Find pet by ID'
+     
+     - GET /pet/{petId}?testing_byte_array=true
+     - Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
+     - API Key:
+       - type: apiKey api_key 
+       - name: api_key
+     - OAuth:
+       - type: oauth2
+       - name: petstore_auth
+     - examples: [{example="", contentType=application/json}, {example=not implemented io.swagger.models.properties.BinaryProperty@55e6ae9e, contentType=application/xml}]
+     - examples: [{example="", contentType=application/json}, {example=not implemented io.swagger.models.properties.BinaryProperty@55e6ae9e, contentType=application/xml}]
+     
+     - parameter petId: (path) ID of pet that needs to be fetched 
+
+     - returns: RequestBuilder<String> 
+     */
+    public class func petPetIdtestingByteArraytrueGetWithRequestBuilder(petId petId: Int) -> RequestBuilder<String> {
+        var path = "/pet/{petId}?testing_byte_array=true"
+        path = path.stringByReplacingOccurrencesOfString("{petId}", withString: "\(petId)", options: .LiteralSearch, range: nil)
+        let URLString = PetstoreClientAPI.basePath + path
+        
+        let nillableParameters: [String:AnyObject?] = [:]
+        let parameters = APIHelper.rejectNil(nillableParameters)
+
+        let requestBuilder: RequestBuilder<String>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "GET", URLString: URLString, parameters: parameters, isBody: true)
+    }
+
+    /**
+     
+     Update an existing pet
+     
+     - parameter body: (body) Pet object that needs to be added to the store (optional)
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    public class func updatePet(body body: Pet?, completion: ((error: ErrorType?) -> Void)) {
+        updatePetWithRequestBuilder(body: body).execute { (response, error) -> Void in
+            completion(error: error);
+        }
+    }
+
+    /**
+     
+     Update an existing pet
+     
+     - parameter body: (body) Pet object that needs to be added to the store (optional)
+     - returns: Promise<Void>
+     */
+    public class func updatePet(body body: Pet?) -> Promise<Void> {
+        let deferred = Promise<Void>.pendingPromise()
+        updatePet(body: body) { error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill()
+            }
+        }
+        return deferred.promise
+    }
+
+    /**
+     
+     Update an existing pet
+     
+     - PUT /pet
+     - 
+     - OAuth:
+       - type: oauth2
+       - name: petstore_auth
+     
+     - parameter body: (body) Pet object that needs to be added to the store (optional)
+
+     - returns: RequestBuilder<Void> 
+     */
+    public class func updatePetWithRequestBuilder(body body: Pet?) -> RequestBuilder<Void> {
+        let path = "/pet"
+        let URLString = PetstoreClientAPI.basePath + path
+        
+        let parameters = body?.encodeToJSON() as? [String:AnyObject]
+
+        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "PUT", URLString: URLString, parameters: parameters, isBody: true)
+    }
+
+    /**
+     
+     Updates a pet in the store with form data
+     
+     - parameter petId: (path) ID of pet that needs to be updated 
+     - parameter name: (form) Updated name of the pet (optional)
+     - parameter status: (form) Updated status of the pet (optional)
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    public class func updatePetWithForm(petId petId: String, name: String?, status: String?, completion: ((error: ErrorType?) -> Void)) {
+        updatePetWithFormWithRequestBuilder(petId: petId, name: name, status: status).execute { (response, error) -> Void in
+            completion(error: error);
+        }
+    }
+
+    /**
+     
+     Updates a pet in the store with form data
+     
+     - parameter petId: (path) ID of pet that needs to be updated 
+     - parameter name: (form) Updated name of the pet (optional)
+     - parameter status: (form) Updated status of the pet (optional)
+     - returns: Promise<Void>
+     */
+    public class func updatePetWithForm(petId petId: String, name: String?, status: String?) -> Promise<Void> {
+        let deferred = Promise<Void>.pendingPromise()
+        updatePetWithForm(petId: petId, name: name, status: status) { error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill()
+            }
+        }
+        return deferred.promise
+    }
+
+    /**
+     
+     Updates a pet in the store with form data
+     
+     - POST /pet/{petId}
+     - 
+     - OAuth:
+       - type: oauth2
+       - name: petstore_auth
+     
+     - parameter petId: (path) ID of pet that needs to be updated 
+     - parameter name: (form) Updated name of the pet (optional)
+     - parameter status: (form) Updated status of the pet (optional)
+
+     - returns: RequestBuilder<Void> 
+     */
+    public class func updatePetWithFormWithRequestBuilder(petId petId: String, name: String?, status: String?) -> RequestBuilder<Void> {
+        var path = "/pet/{petId}"
+        path = path.stringByReplacingOccurrencesOfString("{petId}", withString: "\(petId)", options: .LiteralSearch, range: nil)
+        let URLString = PetstoreClientAPI.basePath + path
+        
+        let nillableParameters: [String:AnyObject?] = [
+            "name": name,
+            "status": status
+        ]
+        let parameters = APIHelper.rejectNil(nillableParameters)
+
+        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "POST", URLString: URLString, parameters: parameters, isBody: false)
+    }
+
+    /**
+     
+     uploads an image
+     
+     - parameter petId: (path) ID of pet to update 
+     - parameter additionalMetadata: (form) Additional data to pass to server (optional)
+     - parameter _file: (form) file to upload (optional)
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    public class func uploadFile(petId petId: Int, additionalMetadata: String?, _file: NSURL?, completion: ((error: ErrorType?) -> Void)) {
+        uploadFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, _file: _file).execute { (response, error) -> Void in
+            completion(error: error);
+        }
+    }
+
+    /**
+     
+     uploads an image
+     
+     - parameter petId: (path) ID of pet to update 
+     - parameter additionalMetadata: (form) Additional data to pass to server (optional)
+     - parameter _file: (form) file to upload (optional)
+     - returns: Promise<Void>
+     */
+    public class func uploadFile(petId petId: Int, additionalMetadata: String?, _file: NSURL?) -> Promise<Void> {
+        let deferred = Promise<Void>.pendingPromise()
+        uploadFile(petId: petId, additionalMetadata: additionalMetadata, _file: _file) { error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill()
+            }
+        }
+        return deferred.promise
+    }
+
+    /**
+     
+     uploads an image
+     
+     - POST /pet/{petId}/uploadImage
+     - 
+     - OAuth:
+       - type: oauth2
+       - name: petstore_auth
+     
+     - parameter petId: (path) ID of pet to update 
+     - parameter additionalMetadata: (form) Additional data to pass to server (optional)
+     - parameter _file: (form) file to upload (optional)
+
+     - returns: RequestBuilder<Void> 
+     */
+    public class func uploadFileWithRequestBuilder(petId petId: Int, additionalMetadata: String?, _file: NSURL?) -> RequestBuilder<Void> {
+        var path = "/pet/{petId}/uploadImage"
+        path = path.stringByReplacingOccurrencesOfString("{petId}", withString: "\(petId)", options: .LiteralSearch, range: nil)
+        let URLString = PetstoreClientAPI.basePath + path
+        
+        let nillableParameters: [String:AnyObject?] = [
+            "additionalMetadata": additionalMetadata,
+            "file": _file
+        ]
+        let parameters = APIHelper.rejectNil(nillableParameters)
+
+        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "POST", URLString: URLString, parameters: parameters, isBody: false)
+    }
+
 }
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
index 301bc80285d..09390bc4728 100644
--- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
@@ -8,169 +8,454 @@
 import Alamofire
 import PromiseKit
 
-extension PetstoreClientAPI {
-    
-    public class StoreAPI: APIBase {
-    
-        /**
-         
-         Returns pet inventories by status
-         
-         - GET /store/inventory
-         - Returns a map of status codes to quantities
-         - API Key:
-           - type: apiKey api_key 
-           - name: api_key
-         - examples: [{example={
-  "key" : 123
-}, contentType=application/json}, {example=not implemented io.swagger.models.properties.MapProperty@d1e580af, contentType=application/xml}]
-         - examples: [{example={
-  "key" : 123
-}, contentType=application/json}, {example=not implemented io.swagger.models.properties.MapProperty@d1e580af, contentType=application/xml}]
 
-         - returns: RequestBuilder<[String:Int]> 
-         */
-        public class func getInventory() -> RequestBuilder<[String:Int]> {
-            let path = "/store/inventory"
-            let URLString = PetstoreClientAPI.basePath + path
-            
-            let nillableParameters: [String:AnyObject?] = [:]
-            let parameters = APIHelper.rejectNil(nillableParameters)
 
-            let requestBuilder: RequestBuilder<[String:Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-            return requestBuilder.init(method: "GET", URLString: URLString, parameters: parameters, isBody: true)
+public class StoreAPI: APIBase {
+    /**
+     
+     Delete purchase order by ID
+     
+     - parameter orderId: (path) ID of the order that needs to be deleted 
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    public class func deleteOrder(orderId orderId: String, completion: ((error: ErrorType?) -> Void)) {
+        deleteOrderWithRequestBuilder(orderId: orderId).execute { (response, error) -> Void in
+            completion(error: error);
         }
-    
-        /**
-         
-         Place an order for a pet
-         
-         - POST /store/order
-         - 
-         - examples: [{example={
-  "id" : 123456789,
-  "petId" : 123456789,
-  "complete" : true,
-  "status" : "aeiou",
-  "quantity" : 123,
-  "shipDate" : "2015-12-26T08:15:52.206+0000"
-}, contentType=application/json}, {example=<Order>
-  <id>123456</id>
-  <petId>123456</petId>
-  <quantity>0</quantity>
-  <shipDate>2015-12-26T16:15:52.210Z</shipDate>
-  <status>string</status>
-  <complete>true</complete>
-</Order>, contentType=application/xml}]
-         - examples: [{example={
-  "id" : 123456789,
-  "petId" : 123456789,
-  "complete" : true,
-  "status" : "aeiou",
-  "quantity" : 123,
-  "shipDate" : "2015-12-26T08:15:52.206+0000"
-}, contentType=application/json}, {example=<Order>
-  <id>123456</id>
-  <petId>123456</petId>
-  <quantity>0</quantity>
-  <shipDate>2015-12-26T16:15:52.210Z</shipDate>
-  <status>string</status>
-  <complete>true</complete>
-</Order>, contentType=application/xml}]
-         
-         - parameter body: (body) order placed for purchasing the pet
-
-         - returns: RequestBuilder<Order> 
-         */
-        public class func placeOrder(body body: Order?) -> RequestBuilder<Order> {
-            let path = "/store/order"
-            let URLString = PetstoreClientAPI.basePath + path
-            
-            let parameters = body?.encodeToJSON() as? [String:AnyObject]
-
-            let requestBuilder: RequestBuilder<Order>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-            return requestBuilder.init(method: "POST", URLString: URLString, parameters: parameters, isBody: true)
-        }
-    
-        /**
-         
-         Find purchase order by ID
-         
-         - GET /store/order/{orderId}
-         - For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
-         - examples: [{example={
-  "id" : 123456789,
-  "petId" : 123456789,
-  "complete" : true,
-  "status" : "aeiou",
-  "quantity" : 123,
-  "shipDate" : "2015-12-26T08:15:52.211+0000"
-}, contentType=application/json}, {example=<Order>
-  <id>123456</id>
-  <petId>123456</petId>
-  <quantity>0</quantity>
-  <shipDate>2015-12-26T16:15:52.212Z</shipDate>
-  <status>string</status>
-  <complete>true</complete>
-</Order>, contentType=application/xml}]
-         - examples: [{example={
-  "id" : 123456789,
-  "petId" : 123456789,
-  "complete" : true,
-  "status" : "aeiou",
-  "quantity" : 123,
-  "shipDate" : "2015-12-26T08:15:52.211+0000"
-}, contentType=application/json}, {example=<Order>
-  <id>123456</id>
-  <petId>123456</petId>
-  <quantity>0</quantity>
-  <shipDate>2015-12-26T16:15:52.212Z</shipDate>
-  <status>string</status>
-  <complete>true</complete>
-</Order>, contentType=application/xml}]
-         
-         - parameter orderId: (path) ID of pet that needs to be fetched
-
-         - returns: RequestBuilder<Order> 
-         */
-        public class func getOrderById(orderId orderId: String) -> RequestBuilder<Order> {
-            var path = "/store/order/{orderId}"
-            path = path.stringByReplacingOccurrencesOfString("{orderId}", withString: "\(orderId)", options: .LiteralSearch, range: nil)
-            let URLString = PetstoreClientAPI.basePath + path
-            
-            let nillableParameters: [String:AnyObject?] = [:]
-            let parameters = APIHelper.rejectNil(nillableParameters)
-
-            let requestBuilder: RequestBuilder<Order>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-            return requestBuilder.init(method: "GET", URLString: URLString, parameters: parameters, isBody: true)
-        }
-    
-        /**
-         
-         Delete purchase order by ID
-         
-         - DELETE /store/order/{orderId}
-         - For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
-         
-         - parameter orderId: (path) ID of the order that needs to be deleted
-
-         - returns: RequestBuilder<Void> 
-         */
-        public class func deleteOrder(orderId orderId: String) -> RequestBuilder<Void> {
-            var path = "/store/order/{orderId}"
-            path = path.stringByReplacingOccurrencesOfString("{orderId}", withString: "\(orderId)", options: .LiteralSearch, range: nil)
-            let URLString = PetstoreClientAPI.basePath + path
-            
-            let nillableParameters: [String:AnyObject?] = [:]
-            let parameters = APIHelper.rejectNil(nillableParameters)
-
-            let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-            return requestBuilder.init(method: "DELETE", URLString: URLString, parameters: parameters, isBody: true)
-        }
-    
     }
+
+    /**
+     
+     Delete purchase order by ID
+     
+     - parameter orderId: (path) ID of the order that needs to be deleted 
+     - returns: Promise<Void>
+     */
+    public class func deleteOrder(orderId orderId: String) -> Promise<Void> {
+        let deferred = Promise<Void>.pendingPromise()
+        deleteOrder(orderId: orderId) { error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill()
+            }
+        }
+        return deferred.promise
+    }
+
+    /**
+     
+     Delete purchase order by ID
+     
+     - DELETE /store/order/{orderId}
+     - For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+     
+     - parameter orderId: (path) ID of the order that needs to be deleted 
+
+     - returns: RequestBuilder<Void> 
+     */
+    public class func deleteOrderWithRequestBuilder(orderId orderId: String) -> RequestBuilder<Void> {
+        var path = "/store/order/{orderId}"
+        path = path.stringByReplacingOccurrencesOfString("{orderId}", withString: "\(orderId)", options: .LiteralSearch, range: nil)
+        let URLString = PetstoreClientAPI.basePath + path
+        
+        let nillableParameters: [String:AnyObject?] = [:]
+        let parameters = APIHelper.rejectNil(nillableParameters)
+
+        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "DELETE", URLString: URLString, parameters: parameters, isBody: true)
+    }
+
+    /**
+     
+     Finds orders by status
+     
+     - parameter status: (query) Status value that needs to be considered for query (optional, default to placed)
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    public class func findOrdersByStatus(status status: String?, completion: ((data: [Order]?, error: ErrorType?) -> Void)) {
+        findOrdersByStatusWithRequestBuilder(status: status).execute { (response, error) -> Void in
+            completion(data: response?.body, error: error);
+        }
+    }
+
+    /**
+     
+     Finds orders by status
+     
+     - parameter status: (query) Status value that needs to be considered for query (optional, default to placed)
+     - returns: Promise<[Order]>
+     */
+    public class func findOrdersByStatus(status status: String?) -> Promise<[Order]> {
+        let deferred = Promise<[Order]>.pendingPromise()
+        findOrdersByStatus(status: status) { data, error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill(data!)
+            }
+        }
+        return deferred.promise
+    }
+
+    /**
+     
+     Finds orders by status
+     
+     - GET /store/findByStatus
+     - A single status value can be provided as a string
+     - API Key:
+       - type: apiKey x-test_api_client_id 
+       - name: test_api_client_id
+     - API Key:
+       - type: apiKey x-test_api_client_secret 
+       - name: test_api_client_secret
+     - examples: [{example=[ {
+  "id" : 123456789,
+  "petId" : 123456789,
+  "complete" : true,
+  "status" : "aeiou",
+  "quantity" : 123,
+  "shipDate" : "2000-01-23T04:56:07.000+0000"
+} ], contentType=application/json}, {example=<Order>
+  <id>123456</id>
+  <petId>123456</petId>
+  <quantity>0</quantity>
+  <shipDate>2000-01-23T04:56:07.000Z</shipDate>
+  <status>string</status>
+  <complete>true</complete>
+</Order>, contentType=application/xml}]
+     - examples: [{example=[ {
+  "id" : 123456789,
+  "petId" : 123456789,
+  "complete" : true,
+  "status" : "aeiou",
+  "quantity" : 123,
+  "shipDate" : "2000-01-23T04:56:07.000+0000"
+} ], contentType=application/json}, {example=<Order>
+  <id>123456</id>
+  <petId>123456</petId>
+  <quantity>0</quantity>
+  <shipDate>2000-01-23T04:56:07.000Z</shipDate>
+  <status>string</status>
+  <complete>true</complete>
+</Order>, contentType=application/xml}]
+     
+     - parameter status: (query) Status value that needs to be considered for query (optional, default to placed)
+
+     - returns: RequestBuilder<[Order]> 
+     */
+    public class func findOrdersByStatusWithRequestBuilder(status status: String?) -> RequestBuilder<[Order]> {
+        let path = "/store/findByStatus"
+        let URLString = PetstoreClientAPI.basePath + path
+        
+        let nillableParameters: [String:AnyObject?] = [
+            "status": status
+        ]
+        let parameters = APIHelper.rejectNil(nillableParameters)
+
+        let requestBuilder: RequestBuilder<[Order]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "GET", URLString: URLString, parameters: parameters, isBody: false)
+    }
+
+    /**
+     
+     Returns pet inventories by status
+     
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    public class func getInventory(completion: ((data: [String:Int]?, error: ErrorType?) -> Void)) {
+        getInventoryWithRequestBuilder().execute { (response, error) -> Void in
+            completion(data: response?.body, error: error);
+        }
+    }
+
+    /**
+     
+     Returns pet inventories by status
+     
+     - returns: Promise<[String:Int]>
+     */
+    public class func getInventory() -> Promise<[String:Int]> {
+        let deferred = Promise<[String:Int]>.pendingPromise()
+        getInventory() { data, error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill(data!)
+            }
+        }
+        return deferred.promise
+    }
+
+    /**
+     
+     Returns pet inventories by status
+     
+     - GET /store/inventory
+     - Returns a map of status codes to quantities
+     - API Key:
+       - type: apiKey api_key 
+       - name: api_key
+     - examples: [{example={
+  "key" : 123
+}, contentType=application/json}, {example=not implemented io.swagger.models.properties.MapProperty@d1e580af, contentType=application/xml}]
+     - examples: [{example={
+  "key" : 123
+}, contentType=application/json}, {example=not implemented io.swagger.models.properties.MapProperty@d1e580af, contentType=application/xml}]
+
+     - returns: RequestBuilder<[String:Int]> 
+     */
+    public class func getInventoryWithRequestBuilder() -> RequestBuilder<[String:Int]> {
+        let path = "/store/inventory"
+        let URLString = PetstoreClientAPI.basePath + path
+        
+        let nillableParameters: [String:AnyObject?] = [:]
+        let parameters = APIHelper.rejectNil(nillableParameters)
+
+        let requestBuilder: RequestBuilder<[String:Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "GET", URLString: URLString, parameters: parameters, isBody: true)
+    }
+
+    /**
+     
+     Fake endpoint to test arbitrary object return by 'Get inventory'
+     
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    public class func getInventoryInObject(completion: ((data: AnyObject?, error: ErrorType?) -> Void)) {
+        getInventoryInObjectWithRequestBuilder().execute { (response, error) -> Void in
+            completion(data: response?.body, error: error);
+        }
+    }
+
+    /**
+     
+     Fake endpoint to test arbitrary object return by 'Get inventory'
+     
+     - returns: Promise<AnyObject>
+     */
+    public class func getInventoryInObject() -> Promise<AnyObject> {
+        let deferred = Promise<AnyObject>.pendingPromise()
+        getInventoryInObject() { data, error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill(data!)
+            }
+        }
+        return deferred.promise
+    }
+
+    /**
+     
+     Fake endpoint to test arbitrary object return by 'Get inventory'
+     
+     - GET /store/inventory?response=arbitrary_object
+     - Returns an arbitrary object which is actually a map of status codes to quantities
+     - API Key:
+       - type: apiKey api_key 
+       - name: api_key
+     - examples: [{example="{}", contentType=application/json}, {example=not implemented io.swagger.models.properties.ObjectProperty@37aadb4f, contentType=application/xml}]
+     - examples: [{example="{}", contentType=application/json}, {example=not implemented io.swagger.models.properties.ObjectProperty@37aadb4f, contentType=application/xml}]
+
+     - returns: RequestBuilder<AnyObject> 
+     */
+    public class func getInventoryInObjectWithRequestBuilder() -> RequestBuilder<AnyObject> {
+        let path = "/store/inventory?response=arbitrary_object"
+        let URLString = PetstoreClientAPI.basePath + path
+        
+        let nillableParameters: [String:AnyObject?] = [:]
+        let parameters = APIHelper.rejectNil(nillableParameters)
+
+        let requestBuilder: RequestBuilder<AnyObject>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "GET", URLString: URLString, parameters: parameters, isBody: true)
+    }
+
+    /**
+     
+     Find purchase order by ID
+     
+     - parameter orderId: (path) ID of pet that needs to be fetched 
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    public class func getOrderById(orderId orderId: String, completion: ((data: Order?, error: ErrorType?) -> Void)) {
+        getOrderByIdWithRequestBuilder(orderId: orderId).execute { (response, error) -> Void in
+            completion(data: response?.body, error: error);
+        }
+    }
+
+    /**
+     
+     Find purchase order by ID
+     
+     - parameter orderId: (path) ID of pet that needs to be fetched 
+     - returns: Promise<Order>
+     */
+    public class func getOrderById(orderId orderId: String) -> Promise<Order> {
+        let deferred = Promise<Order>.pendingPromise()
+        getOrderById(orderId: orderId) { data, error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill(data!)
+            }
+        }
+        return deferred.promise
+    }
+
+    /**
+     
+     Find purchase order by ID
+     
+     - GET /store/order/{orderId}
+     - For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     - API Key:
+       - type: apiKey test_api_key_header 
+       - name: test_api_key_header
+     - API Key:
+       - type: apiKey test_api_key_query (QUERY)
+       - name: test_api_key_query
+     - examples: [{example={
+  "id" : 123456789,
+  "petId" : 123456789,
+  "complete" : true,
+  "status" : "aeiou",
+  "quantity" : 123,
+  "shipDate" : "2000-01-23T04:56:07.000+0000"
+}, contentType=application/json}, {example=<Order>
+  <id>123456</id>
+  <petId>123456</petId>
+  <quantity>0</quantity>
+  <shipDate>2000-01-23T04:56:07.000Z</shipDate>
+  <status>string</status>
+  <complete>true</complete>
+</Order>, contentType=application/xml}]
+     - examples: [{example={
+  "id" : 123456789,
+  "petId" : 123456789,
+  "complete" : true,
+  "status" : "aeiou",
+  "quantity" : 123,
+  "shipDate" : "2000-01-23T04:56:07.000+0000"
+}, contentType=application/json}, {example=<Order>
+  <id>123456</id>
+  <petId>123456</petId>
+  <quantity>0</quantity>
+  <shipDate>2000-01-23T04:56:07.000Z</shipDate>
+  <status>string</status>
+  <complete>true</complete>
+</Order>, contentType=application/xml}]
+     
+     - parameter orderId: (path) ID of pet that needs to be fetched 
+
+     - returns: RequestBuilder<Order> 
+     */
+    public class func getOrderByIdWithRequestBuilder(orderId orderId: String) -> RequestBuilder<Order> {
+        var path = "/store/order/{orderId}"
+        path = path.stringByReplacingOccurrencesOfString("{orderId}", withString: "\(orderId)", options: .LiteralSearch, range: nil)
+        let URLString = PetstoreClientAPI.basePath + path
+        
+        let nillableParameters: [String:AnyObject?] = [:]
+        let parameters = APIHelper.rejectNil(nillableParameters)
+
+        let requestBuilder: RequestBuilder<Order>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "GET", URLString: URLString, parameters: parameters, isBody: true)
+    }
+
+    /**
+     
+     Place an order for a pet
+     
+     - parameter body: (body) order placed for purchasing the pet (optional)
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    public class func placeOrder(body body: Order?, completion: ((data: Order?, error: ErrorType?) -> Void)) {
+        placeOrderWithRequestBuilder(body: body).execute { (response, error) -> Void in
+            completion(data: response?.body, error: error);
+        }
+    }
+
+    /**
+     
+     Place an order for a pet
+     
+     - parameter body: (body) order placed for purchasing the pet (optional)
+     - returns: Promise<Order>
+     */
+    public class func placeOrder(body body: Order?) -> Promise<Order> {
+        let deferred = Promise<Order>.pendingPromise()
+        placeOrder(body: body) { data, error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill(data!)
+            }
+        }
+        return deferred.promise
+    }
+
+    /**
+     
+     Place an order for a pet
+     
+     - POST /store/order
+     - 
+     - API Key:
+       - type: apiKey x-test_api_client_id 
+       - name: test_api_client_id
+     - API Key:
+       - type: apiKey x-test_api_client_secret 
+       - name: test_api_client_secret
+     - examples: [{example={
+  "id" : 123456789,
+  "petId" : 123456789,
+  "complete" : true,
+  "status" : "aeiou",
+  "quantity" : 123,
+  "shipDate" : "2000-01-23T04:56:07.000+0000"
+}, contentType=application/json}, {example=<Order>
+  <id>123456</id>
+  <petId>123456</petId>
+  <quantity>0</quantity>
+  <shipDate>2000-01-23T04:56:07.000Z</shipDate>
+  <status>string</status>
+  <complete>true</complete>
+</Order>, contentType=application/xml}]
+     - examples: [{example={
+  "id" : 123456789,
+  "petId" : 123456789,
+  "complete" : true,
+  "status" : "aeiou",
+  "quantity" : 123,
+  "shipDate" : "2000-01-23T04:56:07.000+0000"
+}, contentType=application/json}, {example=<Order>
+  <id>123456</id>
+  <petId>123456</petId>
+  <quantity>0</quantity>
+  <shipDate>2000-01-23T04:56:07.000Z</shipDate>
+  <status>string</status>
+  <complete>true</complete>
+</Order>, contentType=application/xml}]
+     
+     - parameter body: (body) order placed for purchasing the pet (optional)
+
+     - returns: RequestBuilder<Order> 
+     */
+    public class func placeOrderWithRequestBuilder(body body: Order?) -> RequestBuilder<Order> {
+        let path = "/store/order"
+        let URLString = PetstoreClientAPI.basePath + path
+        
+        let parameters = body?.encodeToJSON() as? [String:AnyObject]
+
+        let requestBuilder: RequestBuilder<Order>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "POST", URLString: URLString, parameters: parameters, isBody: true)
+    }
+
 }
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
index 19cf534cea8..3f1d18dffb0 100644
--- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
@@ -8,133 +8,269 @@
 import Alamofire
 import PromiseKit
 
-extension PetstoreClientAPI {
-    
-    public class UserAPI: APIBase {
-    
-        /**
-         
-         Create user
-         
-         - POST /user
-         - This can only be done by the logged in user.
-         
-         - parameter body: (body) Created user object
 
-         - returns: RequestBuilder<Void> 
-         */
-        public class func createUser(body body: User?) -> RequestBuilder<Void> {
-            let path = "/user"
-            let URLString = PetstoreClientAPI.basePath + path
-            
-            let parameters = body?.encodeToJSON() as? [String:AnyObject]
 
-            let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-            return requestBuilder.init(method: "POST", URLString: URLString, parameters: parameters, isBody: true)
+public class UserAPI: APIBase {
+    /**
+     
+     Create user
+     
+     - parameter body: (body) Created user object (optional)
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    public class func createUser(body body: User?, completion: ((error: ErrorType?) -> Void)) {
+        createUserWithRequestBuilder(body: body).execute { (response, error) -> Void in
+            completion(error: error);
         }
-    
-        /**
-         
-         Creates list of users with given input array
-         
-         - POST /user/createWithArray
-         - 
-         
-         - parameter body: (body) List of user object
+    }
 
-         - returns: RequestBuilder<Void> 
-         */
-        public class func createUsersWithArrayInput(body body: [User]?) -> RequestBuilder<Void> {
-            let path = "/user/createWithArray"
-            let URLString = PetstoreClientAPI.basePath + path
-            
-            let parameters = body?.encodeToJSON() as? [String:AnyObject]
-
-            let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-            return requestBuilder.init(method: "POST", URLString: URLString, parameters: parameters, isBody: true)
+    /**
+     
+     Create user
+     
+     - parameter body: (body) Created user object (optional)
+     - returns: Promise<Void>
+     */
+    public class func createUser(body body: User?) -> Promise<Void> {
+        let deferred = Promise<Void>.pendingPromise()
+        createUser(body: body) { error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill()
+            }
         }
-    
-        /**
-         
-         Creates list of users with given input array
-         
-         - POST /user/createWithList
-         - 
-         
-         - parameter body: (body) List of user object
+        return deferred.promise
+    }
 
-         - returns: RequestBuilder<Void> 
-         */
-        public class func createUsersWithListInput(body body: [User]?) -> RequestBuilder<Void> {
-            let path = "/user/createWithList"
-            let URLString = PetstoreClientAPI.basePath + path
-            
-            let parameters = body?.encodeToJSON() as? [String:AnyObject]
+    /**
+     
+     Create user
+     
+     - POST /user
+     - This can only be done by the logged in user.
+     
+     - parameter body: (body) Created user object (optional)
 
-            let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+     - returns: RequestBuilder<Void> 
+     */
+    public class func createUserWithRequestBuilder(body body: User?) -> RequestBuilder<Void> {
+        let path = "/user"
+        let URLString = PetstoreClientAPI.basePath + path
+        
+        let parameters = body?.encodeToJSON() as? [String:AnyObject]
 
-            return requestBuilder.init(method: "POST", URLString: URLString, parameters: parameters, isBody: true)
+        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "POST", URLString: URLString, parameters: parameters, isBody: true)
+    }
+
+    /**
+     
+     Creates list of users with given input array
+     
+     - parameter body: (body) List of user object (optional)
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    public class func createUsersWithArrayInput(body body: [User]?, completion: ((error: ErrorType?) -> Void)) {
+        createUsersWithArrayInputWithRequestBuilder(body: body).execute { (response, error) -> Void in
+            completion(error: error);
         }
-    
-        /**
-         
-         Logs user into the system
-         
-         - GET /user/login
-         - 
-         - examples: [{example="aeiou", contentType=application/json}, {example=string, contentType=application/xml}]
-         - examples: [{example="aeiou", contentType=application/json}, {example=string, contentType=application/xml}]
-         
-         - parameter username: (query) The user name for login
-         - parameter password: (query) The password for login in clear text
+    }
 
-         - returns: RequestBuilder<String> 
-         */
-        public class func loginUser(username username: String?, password: String?) -> RequestBuilder<String> {
-            let path = "/user/login"
-            let URLString = PetstoreClientAPI.basePath + path
-            
-            let nillableParameters: [String:AnyObject?] = [
-                "username": username,
-                "password": password
-            ]
-            let parameters = APIHelper.rejectNil(nillableParameters)
-
-            let requestBuilder: RequestBuilder<String>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-            return requestBuilder.init(method: "GET", URLString: URLString, parameters: parameters, isBody: false)
+    /**
+     
+     Creates list of users with given input array
+     
+     - parameter body: (body) List of user object (optional)
+     - returns: Promise<Void>
+     */
+    public class func createUsersWithArrayInput(body body: [User]?) -> Promise<Void> {
+        let deferred = Promise<Void>.pendingPromise()
+        createUsersWithArrayInput(body: body) { error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill()
+            }
         }
-    
-        /**
-         
-         Logs out current logged in user session
-         
-         - GET /user/logout
-         - 
+        return deferred.promise
+    }
 
-         - returns: RequestBuilder<Void> 
-         */
-        public class func logoutUser() -> RequestBuilder<Void> {
-            let path = "/user/logout"
-            let URLString = PetstoreClientAPI.basePath + path
-            
-            let nillableParameters: [String:AnyObject?] = [:]
-            let parameters = APIHelper.rejectNil(nillableParameters)
+    /**
+     
+     Creates list of users with given input array
+     
+     - POST /user/createWithArray
+     - 
+     
+     - parameter body: (body) List of user object (optional)
 
-            let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+     - returns: RequestBuilder<Void> 
+     */
+    public class func createUsersWithArrayInputWithRequestBuilder(body body: [User]?) -> RequestBuilder<Void> {
+        let path = "/user/createWithArray"
+        let URLString = PetstoreClientAPI.basePath + path
+        
+        let parameters = body?.encodeToJSON() as? [String:AnyObject]
 
-            return requestBuilder.init(method: "GET", URLString: URLString, parameters: parameters, isBody: true)
+        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "POST", URLString: URLString, parameters: parameters, isBody: true)
+    }
+
+    /**
+     
+     Creates list of users with given input array
+     
+     - parameter body: (body) List of user object (optional)
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    public class func createUsersWithListInput(body body: [User]?, completion: ((error: ErrorType?) -> Void)) {
+        createUsersWithListInputWithRequestBuilder(body: body).execute { (response, error) -> Void in
+            completion(error: error);
         }
-    
-        /**
-         
-         Get user by user name
-         
-         - GET /user/{username}
-         - 
-         - examples: [{example={
+    }
+
+    /**
+     
+     Creates list of users with given input array
+     
+     - parameter body: (body) List of user object (optional)
+     - returns: Promise<Void>
+     */
+    public class func createUsersWithListInput(body body: [User]?) -> Promise<Void> {
+        let deferred = Promise<Void>.pendingPromise()
+        createUsersWithListInput(body: body) { error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill()
+            }
+        }
+        return deferred.promise
+    }
+
+    /**
+     
+     Creates list of users with given input array
+     
+     - POST /user/createWithList
+     - 
+     
+     - parameter body: (body) List of user object (optional)
+
+     - returns: RequestBuilder<Void> 
+     */
+    public class func createUsersWithListInputWithRequestBuilder(body body: [User]?) -> RequestBuilder<Void> {
+        let path = "/user/createWithList"
+        let URLString = PetstoreClientAPI.basePath + path
+        
+        let parameters = body?.encodeToJSON() as? [String:AnyObject]
+
+        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "POST", URLString: URLString, parameters: parameters, isBody: true)
+    }
+
+    /**
+     
+     Delete user
+     
+     - parameter username: (path) The name that needs to be deleted 
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    public class func deleteUser(username username: String, completion: ((error: ErrorType?) -> Void)) {
+        deleteUserWithRequestBuilder(username: username).execute { (response, error) -> Void in
+            completion(error: error);
+        }
+    }
+
+    /**
+     
+     Delete user
+     
+     - parameter username: (path) The name that needs to be deleted 
+     - returns: Promise<Void>
+     */
+    public class func deleteUser(username username: String) -> Promise<Void> {
+        let deferred = Promise<Void>.pendingPromise()
+        deleteUser(username: username) { error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill()
+            }
+        }
+        return deferred.promise
+    }
+
+    /**
+     
+     Delete user
+     
+     - DELETE /user/{username}
+     - This can only be done by the logged in user.
+     - BASIC:
+       - type: basic
+       - name: test_http_basic
+     
+     - parameter username: (path) The name that needs to be deleted 
+
+     - returns: RequestBuilder<Void> 
+     */
+    public class func deleteUserWithRequestBuilder(username username: String) -> RequestBuilder<Void> {
+        var path = "/user/{username}"
+        path = path.stringByReplacingOccurrencesOfString("{username}", withString: "\(username)", options: .LiteralSearch, range: nil)
+        let URLString = PetstoreClientAPI.basePath + path
+        
+        let nillableParameters: [String:AnyObject?] = [:]
+        let parameters = APIHelper.rejectNil(nillableParameters)
+
+        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "DELETE", URLString: URLString, parameters: parameters, isBody: true)
+    }
+
+    /**
+     
+     Get user by user name
+     
+     - parameter username: (path) The name that needs to be fetched. Use user1 for testing. 
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    public class func getUserByName(username username: String, completion: ((data: User?, error: ErrorType?) -> Void)) {
+        getUserByNameWithRequestBuilder(username: username).execute { (response, error) -> Void in
+            completion(data: response?.body, error: error);
+        }
+    }
+
+    /**
+     
+     Get user by user name
+     
+     - parameter username: (path) The name that needs to be fetched. Use user1 for testing. 
+     - returns: Promise<User>
+     */
+    public class func getUserByName(username username: String) -> Promise<User> {
+        let deferred = Promise<User>.pendingPromise()
+        getUserByName(username: username) { data, error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill(data!)
+            }
+        }
+        return deferred.promise
+    }
+
+    /**
+     
+     Get user by user name
+     
+     - GET /user/{username}
+     - 
+     - examples: [{example={
   "id" : 1,
   "username" : "johnp",
   "firstName" : "John",
@@ -144,71 +280,194 @@ extension PetstoreClientAPI {
   "phone" : "0123456789",
   "userStatus" : 0
 }, contentType=application/json}]
-         
-         - parameter username: (path) The name that needs to be fetched. Use user1 for testing.
+     
+     - parameter username: (path) The name that needs to be fetched. Use user1 for testing. 
 
-         - returns: RequestBuilder<User> 
-         */
-        public class func getUserByName(username username: String) -> RequestBuilder<User> {
-            var path = "/user/{username}"
-            path = path.stringByReplacingOccurrencesOfString("{username}", withString: "\(username)", options: .LiteralSearch, range: nil)
-            let URLString = PetstoreClientAPI.basePath + path
-            
-            let nillableParameters: [String:AnyObject?] = [:]
-            let parameters = APIHelper.rejectNil(nillableParameters)
+     - returns: RequestBuilder<User> 
+     */
+    public class func getUserByNameWithRequestBuilder(username username: String) -> RequestBuilder<User> {
+        var path = "/user/{username}"
+        path = path.stringByReplacingOccurrencesOfString("{username}", withString: "\(username)", options: .LiteralSearch, range: nil)
+        let URLString = PetstoreClientAPI.basePath + path
+        
+        let nillableParameters: [String:AnyObject?] = [:]
+        let parameters = APIHelper.rejectNil(nillableParameters)
 
-            let requestBuilder: RequestBuilder<User>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+        let requestBuilder: RequestBuilder<User>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
 
-            return requestBuilder.init(method: "GET", URLString: URLString, parameters: parameters, isBody: true)
-        }
-    
-        /**
-         
-         Updated user
-         
-         - PUT /user/{username}
-         - This can only be done by the logged in user.
-         
-         - parameter username: (path) name that need to be deleted
-         - parameter body: (body) Updated user object
-
-         - returns: RequestBuilder<Void> 
-         */
-        public class func updateUser(username username: String, body: User?) -> RequestBuilder<Void> {
-            var path = "/user/{username}"
-            path = path.stringByReplacingOccurrencesOfString("{username}", withString: "\(username)", options: .LiteralSearch, range: nil)
-            let URLString = PetstoreClientAPI.basePath + path
-            
-            let parameters = body?.encodeToJSON() as? [String:AnyObject]
-
-            let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-            return requestBuilder.init(method: "PUT", URLString: URLString, parameters: parameters, isBody: true)
-        }
-    
-        /**
-         
-         Delete user
-         
-         - DELETE /user/{username}
-         - This can only be done by the logged in user.
-         
-         - parameter username: (path) The name that needs to be deleted
-
-         - returns: RequestBuilder<Void> 
-         */
-        public class func deleteUser(username username: String) -> RequestBuilder<Void> {
-            var path = "/user/{username}"
-            path = path.stringByReplacingOccurrencesOfString("{username}", withString: "\(username)", options: .LiteralSearch, range: nil)
-            let URLString = PetstoreClientAPI.basePath + path
-            
-            let nillableParameters: [String:AnyObject?] = [:]
-            let parameters = APIHelper.rejectNil(nillableParameters)
-
-            let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-            return requestBuilder.init(method: "DELETE", URLString: URLString, parameters: parameters, isBody: true)
-        }
-    
+        return requestBuilder.init(method: "GET", URLString: URLString, parameters: parameters, isBody: true)
     }
+
+    /**
+     
+     Logs user into the system
+     
+     - parameter username: (query) The user name for login (optional)
+     - parameter password: (query) The password for login in clear text (optional)
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    public class func loginUser(username username: String?, password: String?, completion: ((data: String?, error: ErrorType?) -> Void)) {
+        loginUserWithRequestBuilder(username: username, password: password).execute { (response, error) -> Void in
+            completion(data: response?.body, error: error);
+        }
+    }
+
+    /**
+     
+     Logs user into the system
+     
+     - parameter username: (query) The user name for login (optional)
+     - parameter password: (query) The password for login in clear text (optional)
+     - returns: Promise<String>
+     */
+    public class func loginUser(username username: String?, password: String?) -> Promise<String> {
+        let deferred = Promise<String>.pendingPromise()
+        loginUser(username: username, password: password) { data, error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill(data!)
+            }
+        }
+        return deferred.promise
+    }
+
+    /**
+     
+     Logs user into the system
+     
+     - GET /user/login
+     - 
+     - examples: [{example="aeiou", contentType=application/json}, {example=string, contentType=application/xml}]
+     - examples: [{example="aeiou", contentType=application/json}, {example=string, contentType=application/xml}]
+     
+     - parameter username: (query) The user name for login (optional)
+     - parameter password: (query) The password for login in clear text (optional)
+
+     - returns: RequestBuilder<String> 
+     */
+    public class func loginUserWithRequestBuilder(username username: String?, password: String?) -> RequestBuilder<String> {
+        let path = "/user/login"
+        let URLString = PetstoreClientAPI.basePath + path
+        
+        let nillableParameters: [String:AnyObject?] = [
+            "username": username,
+            "password": password
+        ]
+        let parameters = APIHelper.rejectNil(nillableParameters)
+
+        let requestBuilder: RequestBuilder<String>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "GET", URLString: URLString, parameters: parameters, isBody: false)
+    }
+
+    /**
+     
+     Logs out current logged in user session
+     
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    public class func logoutUser(completion: ((error: ErrorType?) -> Void)) {
+        logoutUserWithRequestBuilder().execute { (response, error) -> Void in
+            completion(error: error);
+        }
+    }
+
+    /**
+     
+     Logs out current logged in user session
+     
+     - returns: Promise<Void>
+     */
+    public class func logoutUser() -> Promise<Void> {
+        let deferred = Promise<Void>.pendingPromise()
+        logoutUser() { error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill()
+            }
+        }
+        return deferred.promise
+    }
+
+    /**
+     
+     Logs out current logged in user session
+     
+     - GET /user/logout
+     - 
+
+     - returns: RequestBuilder<Void> 
+     */
+    public class func logoutUserWithRequestBuilder() -> RequestBuilder<Void> {
+        let path = "/user/logout"
+        let URLString = PetstoreClientAPI.basePath + path
+        
+        let nillableParameters: [String:AnyObject?] = [:]
+        let parameters = APIHelper.rejectNil(nillableParameters)
+
+        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "GET", URLString: URLString, parameters: parameters, isBody: true)
+    }
+
+    /**
+     
+     Updated user
+     
+     - parameter username: (path) name that need to be deleted 
+     - parameter body: (body) Updated user object (optional)
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    public class func updateUser(username username: String, body: User?, completion: ((error: ErrorType?) -> Void)) {
+        updateUserWithRequestBuilder(username: username, body: body).execute { (response, error) -> Void in
+            completion(error: error);
+        }
+    }
+
+    /**
+     
+     Updated user
+     
+     - parameter username: (path) name that need to be deleted 
+     - parameter body: (body) Updated user object (optional)
+     - returns: Promise<Void>
+     */
+    public class func updateUser(username username: String, body: User?) -> Promise<Void> {
+        let deferred = Promise<Void>.pendingPromise()
+        updateUser(username: username, body: body) { error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill()
+            }
+        }
+        return deferred.promise
+    }
+
+    /**
+     
+     Updated user
+     
+     - PUT /user/{username}
+     - This can only be done by the logged in user.
+     
+     - parameter username: (path) name that need to be deleted 
+     - parameter body: (body) Updated user object (optional)
+
+     - returns: RequestBuilder<Void> 
+     */
+    public class func updateUserWithRequestBuilder(username username: String, body: User?) -> RequestBuilder<Void> {
+        var path = "/user/{username}"
+        path = path.stringByReplacingOccurrencesOfString("{username}", withString: "\(username)", options: .LiteralSearch, range: nil)
+        let URLString = PetstoreClientAPI.basePath + path
+        
+        let parameters = body?.encodeToJSON() as? [String:AnyObject]
+
+        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "PUT", URLString: URLString, parameters: parameters, isBody: true)
+    }
+
 }
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models.swift
index 8266d08a1b2..3c62d5fa4c2 100644
--- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models.swift
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models.swift
@@ -109,15 +109,156 @@ class Decoders {
             }
             // Decoder for NSDate
             Decoders.addDecoder(clazz: NSDate.self) { (source: AnyObject) -> NSDate in
-                let sourceString = source as! String
-                for formatter in formatters {
-                    if let date = formatter.dateFromString(sourceString) {
-                        return date
+               if let sourceString = source as? String {
+                    for formatter in formatters {
+                        if let date = formatter.dateFromString(sourceString) {
+                            return date
+                        }
                     }
+                
                 }
-                fatalError("formatter failed to parse \(sourceString)")
+                if let sourceInt = source as? Int {
+                    // treat as a java date
+                    return NSDate(timeIntervalSince1970: Double(sourceInt / 1000) )
+                }
+                fatalError("formatter failed to parse \(source)")
             } 
 
+			// Decoder for [Category]
+            Decoders.addDecoder(clazz: [Category].self) { (source: AnyObject) -> [Category] in
+                return Decoders.decode(clazz: [Category].self, source: source)
+            }
+			// Decoder for Category
+            Decoders.addDecoder(clazz: Category.self) { (source: AnyObject) -> Category in
+                let sourceDictionary = source as! [NSObject:AnyObject]
+                let instance = Category()
+                instance.id = Decoders.decodeOptional(clazz: Int.self, source: sourceDictionary["id"])
+                instance.name = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["name"])
+                return instance
+            }
+			
+
+			// Decoder for [InlineResponse200]
+            Decoders.addDecoder(clazz: [InlineResponse200].self) { (source: AnyObject) -> [InlineResponse200] in
+                return Decoders.decode(clazz: [InlineResponse200].self, source: source)
+            }
+			// Decoder for InlineResponse200
+            Decoders.addDecoder(clazz: InlineResponse200.self) { (source: AnyObject) -> InlineResponse200 in
+                let sourceDictionary = source as! [NSObject:AnyObject]
+                let instance = InlineResponse200()
+                instance.tags = Decoders.decodeOptional(clazz: Array.self, source: sourceDictionary["tags"])
+                instance.id = Decoders.decodeOptional(clazz: Int.self, source: sourceDictionary["id"])
+                instance.category = Decoders.decodeOptional(clazz: AnyObject.self, source: sourceDictionary["category"])
+                instance.status = InlineResponse200.Status(rawValue: (sourceDictionary["status"] as? String) ?? "") 
+                instance.name = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["name"])
+                instance.photoUrls = Decoders.decodeOptional(clazz: Array.self, source: sourceDictionary["photoUrls"])
+                return instance
+            }
+			
+
+			// Decoder for [Model200Response]
+            Decoders.addDecoder(clazz: [Model200Response].self) { (source: AnyObject) -> [Model200Response] in
+                return Decoders.decode(clazz: [Model200Response].self, source: source)
+            }
+			// Decoder for Model200Response
+            Decoders.addDecoder(clazz: Model200Response.self) { (source: AnyObject) -> Model200Response in
+                let sourceDictionary = source as! [NSObject:AnyObject]
+                let instance = Model200Response()
+                instance.name = Decoders.decodeOptional(clazz: Int.self, source: sourceDictionary["name"])
+                return instance
+            }
+			
+
+			// Decoder for [ModelReturn]
+            Decoders.addDecoder(clazz: [ModelReturn].self) { (source: AnyObject) -> [ModelReturn] in
+                return Decoders.decode(clazz: [ModelReturn].self, source: source)
+            }
+			// Decoder for ModelReturn
+            Decoders.addDecoder(clazz: ModelReturn.self) { (source: AnyObject) -> ModelReturn in
+                let sourceDictionary = source as! [NSObject:AnyObject]
+                let instance = ModelReturn()
+                instance._return = Decoders.decodeOptional(clazz: Int.self, source: sourceDictionary["return"])
+                return instance
+            }
+			
+
+			// Decoder for [Name]
+            Decoders.addDecoder(clazz: [Name].self) { (source: AnyObject) -> [Name] in
+                return Decoders.decode(clazz: [Name].self, source: source)
+            }
+			// Decoder for Name
+            Decoders.addDecoder(clazz: Name.self) { (source: AnyObject) -> Name in
+                let sourceDictionary = source as! [NSObject:AnyObject]
+                let instance = Name()
+                instance.name = Decoders.decodeOptional(clazz: Int.self, source: sourceDictionary["name"])
+                instance.snakeCase = Decoders.decodeOptional(clazz: Int.self, source: sourceDictionary["snake_case"])
+                return instance
+            }
+			
+
+			// Decoder for [Order]
+            Decoders.addDecoder(clazz: [Order].self) { (source: AnyObject) -> [Order] in
+                return Decoders.decode(clazz: [Order].self, source: source)
+            }
+			// Decoder for Order
+            Decoders.addDecoder(clazz: Order.self) { (source: AnyObject) -> Order in
+                let sourceDictionary = source as! [NSObject:AnyObject]
+                let instance = Order()
+                instance.id = Decoders.decodeOptional(clazz: Int.self, source: sourceDictionary["id"])
+                instance.petId = Decoders.decodeOptional(clazz: Int.self, source: sourceDictionary["petId"])
+                instance.quantity = Decoders.decodeOptional(clazz: Int.self, source: sourceDictionary["quantity"])
+                instance.shipDate = Decoders.decodeOptional(clazz: NSDate.self, source: sourceDictionary["shipDate"])
+                instance.status = Order.Status(rawValue: (sourceDictionary["status"] as? String) ?? "") 
+                instance.complete = Decoders.decodeOptional(clazz: Bool.self, source: sourceDictionary["complete"])
+                return instance
+            }
+			
+
+			// Decoder for [Pet]
+            Decoders.addDecoder(clazz: [Pet].self) { (source: AnyObject) -> [Pet] in
+                return Decoders.decode(clazz: [Pet].self, source: source)
+            }
+			// Decoder for Pet
+            Decoders.addDecoder(clazz: Pet.self) { (source: AnyObject) -> Pet in
+                let sourceDictionary = source as! [NSObject:AnyObject]
+                let instance = Pet()
+                instance.id = Decoders.decodeOptional(clazz: Int.self, source: sourceDictionary["id"])
+                instance.category = Decoders.decodeOptional(clazz: Category.self, source: sourceDictionary["category"])
+                instance.name = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["name"])
+                instance.photoUrls = Decoders.decodeOptional(clazz: Array.self, source: sourceDictionary["photoUrls"])
+                instance.tags = Decoders.decodeOptional(clazz: Array.self, source: sourceDictionary["tags"])
+                instance.status = Pet.Status(rawValue: (sourceDictionary["status"] as? String) ?? "") 
+                return instance
+            }
+			
+
+			// Decoder for [SpecialModelName]
+            Decoders.addDecoder(clazz: [SpecialModelName].self) { (source: AnyObject) -> [SpecialModelName] in
+                return Decoders.decode(clazz: [SpecialModelName].self, source: source)
+            }
+			// Decoder for SpecialModelName
+            Decoders.addDecoder(clazz: SpecialModelName.self) { (source: AnyObject) -> SpecialModelName in
+                let sourceDictionary = source as! [NSObject:AnyObject]
+                let instance = SpecialModelName()
+                instance.specialPropertyName = Decoders.decodeOptional(clazz: Int.self, source: sourceDictionary["$special[property.name]"])
+                return instance
+            }
+			
+
+			// Decoder for [Tag]
+            Decoders.addDecoder(clazz: [Tag].self) { (source: AnyObject) -> [Tag] in
+                return Decoders.decode(clazz: [Tag].self, source: source)
+            }
+			// Decoder for Tag
+            Decoders.addDecoder(clazz: Tag.self) { (source: AnyObject) -> Tag in
+                let sourceDictionary = source as! [NSObject:AnyObject]
+                let instance = Tag()
+                instance.id = Decoders.decodeOptional(clazz: Int.self, source: sourceDictionary["id"])
+                instance.name = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["name"])
+                return instance
+            }
+			
+
 			// Decoder for [User]
             Decoders.addDecoder(clazz: [User].self) { (source: AnyObject) -> [User] in
                 return Decoders.decode(clazz: [User].self, source: source)
@@ -137,70 +278,6 @@ class Decoders {
                 return instance
             }
 			
-
-			// Decoder for [Category]
-            Decoders.addDecoder(clazz: [Category].self) { (source: AnyObject) -> [Category] in
-                return Decoders.decode(clazz: [Category].self, source: source)
-            }
-			// Decoder for Category
-            Decoders.addDecoder(clazz: Category.self) { (source: AnyObject) -> Category in
-                let sourceDictionary = source as! [NSObject:AnyObject]
-                let instance = Category()
-                instance.id = Decoders.decodeOptional(clazz: Int.self, source: sourceDictionary["id"])
-                instance.name = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["name"])
-                return instance
-            }
-			
-
-			// Decoder for [Pet]
-            Decoders.addDecoder(clazz: [Pet].self) { (source: AnyObject) -> [Pet] in
-                return Decoders.decode(clazz: [Pet].self, source: source)
-            }
-			// Decoder for Pet
-            Decoders.addDecoder(clazz: Pet.self) { (source: AnyObject) -> Pet in
-                let sourceDictionary = source as! [NSObject:AnyObject]
-                let instance = Pet()
-                instance.id = Decoders.decodeOptional(clazz: Int.self, source: sourceDictionary["id"])
-                instance.category = Decoders.decodeOptional(clazz: Category.self, source: sourceDictionary["category"])
-                instance.name = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["name"])
-                instance.photoUrls = Decoders.decodeOptional(clazz: Array.self, source: sourceDictionary["photoUrls"])
-                instance.tags = Decoders.decodeOptional(clazz: Array.self, source: sourceDictionary["tags"])
-                instance.status = (sourceDictionary["status"] as? String).map { Pet.Status(rawValue: $0)! } 
-                return instance
-            }
-			
-
-			// Decoder for [Tag]
-            Decoders.addDecoder(clazz: [Tag].self) { (source: AnyObject) -> [Tag] in
-                return Decoders.decode(clazz: [Tag].self, source: source)
-            }
-			// Decoder for Tag
-            Decoders.addDecoder(clazz: Tag.self) { (source: AnyObject) -> Tag in
-                let sourceDictionary = source as! [NSObject:AnyObject]
-                let instance = Tag()
-                instance.id = Decoders.decodeOptional(clazz: Int.self, source: sourceDictionary["id"])
-                instance.name = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["name"])
-                return instance
-            }
-			
-
-			// Decoder for [Order]
-            Decoders.addDecoder(clazz: [Order].self) { (source: AnyObject) -> [Order] in
-                return Decoders.decode(clazz: [Order].self, source: source)
-            }
-			// Decoder for Order
-            Decoders.addDecoder(clazz: Order.self) { (source: AnyObject) -> Order in
-                let sourceDictionary = source as! [NSObject:AnyObject]
-                let instance = Order()
-                instance.id = Decoders.decodeOptional(clazz: Int.self, source: sourceDictionary["id"])
-                instance.petId = Decoders.decodeOptional(clazz: Int.self, source: sourceDictionary["petId"])
-                instance.quantity = Decoders.decodeOptional(clazz: Int.self, source: sourceDictionary["quantity"])
-                instance.shipDate = Decoders.decodeOptional(clazz: NSDate.self, source: sourceDictionary["shipDate"])
-                instance.status = (sourceDictionary["status"] as? String).map { Order.Status(rawValue: $0)! } 
-                instance.complete = Decoders.decodeOptional(clazz: Bool.self, source: sourceDictionary["complete"])
-                return instance
-            }
-			
         }
     }
 }
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/InlineResponse200.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/InlineResponse200.swift
new file mode 100644
index 00000000000..5835a8d9899
--- /dev/null
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/InlineResponse200.swift
@@ -0,0 +1,42 @@
+//
+// InlineResponse200.swift
+//
+// Generated by swagger-codegen
+// https://github.com/swagger-api/swagger-codegen
+//
+
+import Foundation
+
+
+public class InlineResponse200: JSONEncodable {
+
+    public enum Status: String { 
+        case Available = "available"
+        case Pending = "pending"
+        case Sold = "sold"
+    }
+    
+    public var tags: [Tag]?
+    public var id: Int?
+    public var category: AnyObject?
+    /** pet status in the store */
+    public var status: Status?
+    public var name: String?
+    public var photoUrls: [String]?
+    
+
+    public init() {}
+
+    // MARK: JSONEncodable
+    func encodeToJSON() -> AnyObject {
+        var nillableDictionary = [String:AnyObject?]()
+        nillableDictionary["tags"] = self.tags?.encodeToJSON()
+        nillableDictionary["id"] = self.id
+        nillableDictionary["category"] = self.category
+        nillableDictionary["status"] = self.status?.rawValue
+        nillableDictionary["name"] = self.name
+        nillableDictionary["photoUrls"] = self.photoUrls?.encodeToJSON()
+        let dictionary: [String:AnyObject] = APIHelper.rejectNil(nillableDictionary) ?? [:]
+        return dictionary
+    }
+}
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift
new file mode 100644
index 00000000000..69b18379b28
--- /dev/null
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift
@@ -0,0 +1,25 @@
+//
+// Model200Response.swift
+//
+// Generated by swagger-codegen
+// https://github.com/swagger-api/swagger-codegen
+//
+
+import Foundation
+
+
+public class Model200Response: JSONEncodable {
+
+    public var name: Int?
+    
+
+    public init() {}
+
+    // MARK: JSONEncodable
+    func encodeToJSON() -> AnyObject {
+        var nillableDictionary = [String:AnyObject?]()
+        nillableDictionary["name"] = self.name
+        let dictionary: [String:AnyObject] = APIHelper.rejectNil(nillableDictionary) ?? [:]
+        return dictionary
+    }
+}
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/ModelReturn.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/ModelReturn.swift
new file mode 100644
index 00000000000..fbbcd5ec56f
--- /dev/null
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/ModelReturn.swift
@@ -0,0 +1,25 @@
+//
+// ModelReturn.swift
+//
+// Generated by swagger-codegen
+// https://github.com/swagger-api/swagger-codegen
+//
+
+import Foundation
+
+
+public class ModelReturn: JSONEncodable {
+
+    public var _return: Int?
+    
+
+    public init() {}
+
+    // MARK: JSONEncodable
+    func encodeToJSON() -> AnyObject {
+        var nillableDictionary = [String:AnyObject?]()
+        nillableDictionary["return"] = self._return
+        let dictionary: [String:AnyObject] = APIHelper.rejectNil(nillableDictionary) ?? [:]
+        return dictionary
+    }
+}
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Name.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Name.swift
new file mode 100644
index 00000000000..986d6f00041
--- /dev/null
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Name.swift
@@ -0,0 +1,27 @@
+//
+// Name.swift
+//
+// Generated by swagger-codegen
+// https://github.com/swagger-api/swagger-codegen
+//
+
+import Foundation
+
+
+public class Name: JSONEncodable {
+
+    public var name: Int?
+    public var snakeCase: Int?
+    
+
+    public init() {}
+
+    // MARK: JSONEncodable
+    func encodeToJSON() -> AnyObject {
+        var nillableDictionary = [String:AnyObject?]()
+        nillableDictionary["name"] = self.name
+        nillableDictionary["snake_case"] = self.snakeCase
+        let dictionary: [String:AnyObject] = APIHelper.rejectNil(nillableDictionary) ?? [:]
+        return dictionary
+    }
+}
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/ObjectReturn.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/ObjectReturn.swift
new file mode 100644
index 00000000000..85985274ef4
--- /dev/null
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/ObjectReturn.swift
@@ -0,0 +1,25 @@
+//
+// ObjectReturn.swift
+//
+// Generated by swagger-codegen
+// https://github.com/swagger-api/swagger-codegen
+//
+
+import Foundation
+
+
+public class ObjectReturn: JSONEncodable {
+
+    public var _return: Int?
+    
+
+    public init() {}
+
+    // MARK: JSONEncodable
+    func encodeToJSON() -> AnyObject {
+        var nillableDictionary = [String:AnyObject?]()
+        nillableDictionary["_return"] = self._return
+        let dictionary: [String:AnyObject] = APIHelper.rejectNil(nillableDictionary) ?? [:]
+        return dictionary
+    }
+}
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift
new file mode 100644
index 00000000000..d151c129965
--- /dev/null
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift
@@ -0,0 +1,25 @@
+//
+// SpecialModelName.swift
+//
+// Generated by swagger-codegen
+// https://github.com/swagger-api/swagger-codegen
+//
+
+import Foundation
+
+
+public class SpecialModelName: JSONEncodable {
+
+    public var specialPropertyName: Int?
+    
+
+    public init() {}
+
+    // MARK: JSONEncodable
+    func encodeToJSON() -> AnyObject {
+        var nillableDictionary = [String:AnyObject?]()
+        nillableDictionary["$special[property.name]"] = self.specialPropertyName
+        let dictionary: [String:AnyObject] = APIHelper.rejectNil(nillableDictionary) ?? [:]
+        return dictionary
+    }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Podfile b/samples/client/petstore/swift/SwaggerClientTests/Podfile
new file mode 100644
index 00000000000..5a8ad460aea
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Podfile
@@ -0,0 +1,4 @@
+use_frameworks!
+source 'https://github.com/CocoaPods/Specs.git'
+pod "PetstoreClient", :path => "../"
+
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Podfile.lock b/samples/client/petstore/swift/SwaggerClientTests/Podfile.lock
new file mode 100644
index 00000000000..76889714e21
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Podfile.lock
@@ -0,0 +1,39 @@
+PODS:
+  - Alamofire (3.1.5)
+  - OMGHTTPURLRQ (3.1.1):
+    - OMGHTTPURLRQ/RQ (= 3.1.1)
+  - OMGHTTPURLRQ/FormURLEncode (3.1.1)
+  - OMGHTTPURLRQ/RQ (3.1.1):
+    - OMGHTTPURLRQ/FormURLEncode
+    - OMGHTTPURLRQ/UserAgent
+  - OMGHTTPURLRQ/UserAgent (3.1.1)
+  - PetstoreClient (0.0.1):
+    - Alamofire (~> 3.1.4)
+    - PromiseKit (~> 3.0.0)
+  - PromiseKit (3.0.3):
+    - PromiseKit/Foundation (= 3.0.3)
+    - PromiseKit/QuartzCore (= 3.0.3)
+    - PromiseKit/UIKit (= 3.0.3)
+  - PromiseKit/CorePromise (3.0.3)
+  - PromiseKit/Foundation (3.0.3):
+    - OMGHTTPURLRQ (~> 3.1.0)
+    - PromiseKit/CorePromise
+  - PromiseKit/QuartzCore (3.0.3):
+    - PromiseKit/CorePromise
+  - PromiseKit/UIKit (3.0.3):
+    - PromiseKit/CorePromise
+
+DEPENDENCIES:
+  - PetstoreClient (from `../`)
+
+EXTERNAL SOURCES:
+  PetstoreClient:
+    :path: ../
+
+SPEC CHECKSUMS:
+  Alamofire: 5f730ba29fd113b7ddd71c1e65d0c630acf5d7b0
+  OMGHTTPURLRQ: 633f98ee745aeda02345935a52eec1784cddb589
+  PetstoreClient: c9a3d06cf7954479a767135676406c4922cd3c4a
+  PromiseKit: 00ec2a219bf5ad2833f95977698e921932b8dfd3
+
+COCOAPODS: 0.39.0
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/LICENSE b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/LICENSE
new file mode 100644
index 00000000000..bf300e4482e
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2014–2016 Alamofire Software Foundation (http://alamofire.org/)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/README.md b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/README.md
new file mode 100644
index 00000000000..bcc0ff4bd05
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/README.md
@@ -0,0 +1,1149 @@
+![Alamofire: Elegant Networking in Swift](https://raw.githubusercontent.com/Alamofire/Alamofire/assets/alamofire.png)
+
+[![Build Status](https://travis-ci.org/Alamofire/Alamofire.svg)](https://travis-ci.org/Alamofire/Alamofire)
+[![Cocoapods Compatible](https://img.shields.io/cocoapods/v/Alamofire.svg)](https://img.shields.io/cocoapods/v/Alamofire.svg)
+[![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
+[![Platform](https://img.shields.io/cocoapods/p/Alamofire.svg?style=flat)](http://cocoadocs.org/docsets/Alamofire)
+[![Twitter](https://img.shields.io/badge/twitter-@AlamofireSF-blue.svg?style=flat)](http://twitter.com/AlamofireSF)
+
+Alamofire is an HTTP networking library written in Swift.
+
+## Features
+
+- [x] Chainable Request / Response methods
+- [x] URL / JSON / plist Parameter Encoding
+- [x] Upload File / Data / Stream / MultipartFormData
+- [x] Download using Request or Resume data
+- [x] Authentication with NSURLCredential
+- [x] HTTP Response Validation
+- [x] TLS Certificate and Public Key Pinning
+- [x] Progress Closure & NSProgress
+- [x] cURL Debug Output
+- [x] Comprehensive Unit Test Coverage
+- [x] [Complete Documentation](http://cocoadocs.org/docsets/Alamofire)
+
+## Requirements
+
+- iOS 8.0+ / Mac OS X 10.9+ / tvOS 9.0+ / watchOS 2.0+
+- Xcode 7.2+
+
+## Migration Guides
+
+- [Alamofire 3.0 Migration Guide](https://github.com/Alamofire/Alamofire/blob/master/Documentation/Alamofire%203.0%20Migration%20Guide.md)
+- [Alamofire 2.0 Migration Guide](https://github.com/Alamofire/Alamofire/blob/master/Documentation/Alamofire%202.0%20Migration%20Guide.md)
+
+## Communication
+
+- If you **need help**, use [Stack Overflow](http://stackoverflow.com/questions/tagged/alamofire). (Tag 'alamofire')
+- If you'd like to **ask a general question**, use [Stack Overflow](http://stackoverflow.com/questions/tagged/alamofire).
+- If you **found a bug**, open an issue.
+- If you **have a feature request**, open an issue.
+- If you **want to contribute**, submit a pull request.
+
+## Installation
+
+> **Embedded frameworks require a minimum deployment target of iOS 8 or OS X Mavericks (10.9).**
+>
+> Alamofire is no longer supported on iOS 7 due to the lack of support for frameworks. Without frameworks, running Travis-CI against iOS 7 would require a second duplicated test target. The separate test suite would need to import all the Swift files and the tests would need to be duplicated and re-written. This split would be too difficult to maintain to ensure the highest possible quality of the Alamofire ecosystem.
+
+### CocoaPods
+
+[CocoaPods](http://cocoapods.org) is a dependency manager for Cocoa projects. You can install it with the following command:
+
+```bash
+$ gem install cocoapods
+```
+
+> CocoaPods 0.39.0+ is required to build Alamofire 3.0.0+.
+
+To integrate Alamofire into your Xcode project using CocoaPods, specify it in your `Podfile`:
+
+```ruby
+source 'https://github.com/CocoaPods/Specs.git'
+platform :ios, '8.0'
+use_frameworks!
+
+pod 'Alamofire', '~> 3.0'
+```
+
+Then, run the following command:
+
+```bash
+$ pod install
+```
+
+### Carthage
+
+[Carthage](https://github.com/Carthage/Carthage) is a decentralized dependency manager that builds your dependencies and provides you with binary frameworks.
+
+You can install Carthage with [Homebrew](http://brew.sh/) using the following command:
+
+```bash
+$ brew update
+$ brew install carthage
+```
+
+To integrate Alamofire into your Xcode project using Carthage, specify it in your `Cartfile`:
+
+```ogdl
+github "Alamofire/Alamofire" ~> 3.0
+```
+
+Run `carthage update` to build the framework and drag the built `Alamofire.framework` into your Xcode project.
+
+### Manually
+
+If you prefer not to use either of the aforementioned dependency managers, you can integrate Alamofire into your project manually.
+
+#### Embedded Framework
+
+- Open up Terminal, `cd` into your top-level project directory, and run the following command "if" your project is not initialized as a git repository:
+
+```bash
+$ git init
+```
+
+- Add Alamofire as a git [submodule](http://git-scm.com/docs/git-submodule) by running the following command:
+
+```bash
+$ git submodule add https://github.com/Alamofire/Alamofire.git
+```
+
+- Open the new `Alamofire` folder, and drag the `Alamofire.xcodeproj` into the Project Navigator of your application's Xcode project.
+
+    > It should appear nested underneath your application's blue project icon. Whether it is above or below all the other Xcode groups does not matter.
+
+- Select the `Alamofire.xcodeproj` in the Project Navigator and verify the deployment target matches that of your application target.
+- Next, select your application project in the Project Navigator (blue project icon) to navigate to the target configuration window and select the application target under the "Targets" heading in the sidebar.
+- In the tab bar at the top of that window, open the "General" panel.
+- Click on the `+` button under the "Embedded Binaries" section.
+- You will see two different `Alamofire.xcodeproj` folders each with two different versions of the `Alamofire.framework` nested inside a `Products` folder.
+
+    > It does not matter which `Products` folder you choose from, but it does matter whether you choose the top or bottom `Alamofire.framework`. 
+    
+- Select the top `Alamofire.framework` for iOS and the bottom one for OS X.
+
+    > You can verify which one you selected by inspecting the build log for your project. The build target for `Alamofire` will be listed as either `Alamofire iOS` or `Alamofire OSX`.
+
+- And that's it!
+
+> The `Alamofire.framework` is automagically added as a target dependency, linked framework and embedded framework in a copy files build phase which is all you need to build on the simulator and a device.
+
+---
+
+## Usage
+
+### Making a Request
+
+```swift
+import Alamofire
+
+Alamofire.request(.GET, "https://httpbin.org/get")
+```
+
+### Response Handling
+
+```swift
+Alamofire.request(.GET, "https://httpbin.org/get", parameters: ["foo": "bar"])
+         .responseJSON { response in
+             print(response.request)  // original URL request
+             print(response.response) // URL response
+             print(response.data)     // server data
+             print(response.result)   // result of response serialization
+
+             if let JSON = response.result.value {
+                 print("JSON: \(JSON)")
+             }
+         }
+```
+
+> Networking in Alamofire is done _asynchronously_. Asynchronous programming may be a source of frustration to programmers unfamiliar with the concept, but there are [very good reasons](https://developer.apple.com/library/ios/qa/qa1693/_index.html) for doing it this way.
+
+> Rather than blocking execution to wait for a response from the server, a [callback](http://en.wikipedia.org/wiki/Callback_%28computer_programming%29) is specified to handle the response once it's received. The result of a request is only available inside the scope of a response handler. Any execution contingent on the response or data received from the server must be done within a handler.
+
+### Response Serialization
+
+**Built-in Response Methods**
+
+- `response()`
+- `responseData()`
+- `responseString(encoding: NSStringEncoding)`
+- `responseJSON(options: NSJSONReadingOptions)`
+- `responsePropertyList(options: NSPropertyListReadOptions)`
+
+#### Response Handler
+
+```swift
+Alamofire.request(.GET, "https://httpbin.org/get", parameters: ["foo": "bar"])
+         .response { request, response, data, error in
+             print(request)
+             print(response)
+             print(data)
+             print(error)
+          }
+```
+
+> The `response` serializer does NOT evaluate any of the response data. It merely forwards on all the information directly from the URL session delegate. We strongly encourage you to leverage the other responser serializers taking advantage of `Response` and `Result` types.
+
+#### Response Data Handler
+
+```swift
+Alamofire.request(.GET, "https://httpbin.org/get", parameters: ["foo": "bar"])
+         .responseData { response in
+             print(response.request)
+             print(response.response)
+             print(response.result)
+          }
+```
+
+#### Response String Handler
+
+```swift
+Alamofire.request(.GET, "https://httpbin.org/get")
+         .responseString { response in
+             print("Success: \(response.result.isSuccess)")
+             print("Response String: \(response.result.value)")
+         }
+```
+
+#### Response JSON Handler
+
+```swift
+Alamofire.request(.GET, "https://httpbin.org/get")
+         .responseJSON { response in
+             debugPrint(response)
+         }
+```
+
+#### Chained Response Handlers
+
+Response handlers can even be chained:
+
+```swift
+Alamofire.request(.GET, "https://httpbin.org/get")
+         .responseString { response in
+             print("Response String: \(response.result.value)")
+         }
+         .responseJSON { response in
+             print("Response JSON: \(response.result.value)")
+         }
+```
+
+### HTTP Methods
+
+`Alamofire.Method` lists the HTTP methods defined in [RFC 7231 §4.3](http://tools.ietf.org/html/rfc7231#section-4.3):
+
+```swift
+public enum Method: String {
+    case OPTIONS, GET, HEAD, POST, PUT, PATCH, DELETE, TRACE, CONNECT
+}
+```
+
+These values can be passed as the first argument of the `Alamofire.request` method:
+
+```swift
+Alamofire.request(.POST, "https://httpbin.org/post")
+
+Alamofire.request(.PUT, "https://httpbin.org/put")
+
+Alamofire.request(.DELETE, "https://httpbin.org/delete")
+```
+
+### Parameters
+
+#### GET Request With URL-Encoded Parameters
+
+```swift
+Alamofire.request(.GET, "https://httpbin.org/get", parameters: ["foo": "bar"])
+// https://httpbin.org/get?foo=bar
+```
+
+#### POST Request With URL-Encoded Parameters
+
+```swift
+let parameters = [
+    "foo": "bar",
+    "baz": ["a", 1],
+    "qux": [
+        "x": 1,
+        "y": 2,
+        "z": 3
+    ]
+]
+
+Alamofire.request(.POST, "https://httpbin.org/post", parameters: parameters)
+// HTTP body: foo=bar&baz[]=a&baz[]=1&qux[x]=1&qux[y]=2&qux[z]=3
+```
+
+### Parameter Encoding
+
+Parameters can also be encoded as JSON, Property List, or any custom format, using the `ParameterEncoding` enum:
+
+```swift
+enum ParameterEncoding {
+    case URL
+    case URLEncodedInURL
+    case JSON
+    case PropertyList(format: NSPropertyListFormat, options: NSPropertyListWriteOptions)
+    case Custom((URLRequestConvertible, [String: AnyObject]?) -> (NSMutableURLRequest, NSError?))
+
+    func encode(request: NSURLRequest, parameters: [String: AnyObject]?) -> (NSURLRequest, NSError?)
+    { ... }
+}
+```
+
+- `URL`: A query string to be set as or appended to any existing URL query for `GET`, `HEAD`, and `DELETE` requests, or set as the body for requests with any other HTTP method. The `Content-Type` HTTP header field of an encoded request with HTTP body is set to `application/x-www-form-urlencoded`. _Since there is no published specification for how to encode collection types, Alamofire follows the convention of appending `[]` to the key for array values (`foo[]=1&foo[]=2`), and appending the key surrounded by square brackets for nested dictionary values (`foo[bar]=baz`)._
+- `URLEncodedInURL`: Creates query string to be set as or appended to any existing URL query. Uses the same implementation as the `.URL` case, but always applies the encoded result to the URL.
+- `JSON`: Uses `NSJSONSerialization` to create a JSON representation of the parameters object, which is set as the body of the request. The `Content-Type` HTTP header field of an encoded request is set to `application/json`.
+- `PropertyList`: Uses `NSPropertyListSerialization` to create a plist representation of the parameters object, according to the associated format and write options values, which is set as the body of the request. The `Content-Type` HTTP header field of an encoded request is set to `application/x-plist`.
+- `Custom`: Uses the associated closure value to construct a new request given an existing request and parameters.
+
+#### Manual Parameter Encoding of an NSURLRequest
+
+```swift
+let URL = NSURL(string: "https://httpbin.org/get")!
+var request = NSMutableURLRequest(URL: URL)
+
+let parameters = ["foo": "bar"]
+let encoding = Alamofire.ParameterEncoding.URL
+(request, _) = encoding.encode(request, parameters: parameters)
+```
+
+#### POST Request with JSON-encoded Parameters
+
+```swift
+let parameters = [
+    "foo": [1,2,3],
+    "bar": [
+        "baz": "qux"
+    ]
+]
+
+Alamofire.request(.POST, "https://httpbin.org/post", parameters: parameters, encoding: .JSON)
+// HTTP body: {"foo": [1, 2, 3], "bar": {"baz": "qux"}}
+```
+
+### HTTP Headers
+
+Adding a custom HTTP header to a `Request` is supported directly in the global `request` method. This makes it easy to attach HTTP headers to a `Request` that can be constantly changing.
+
+> For HTTP headers that do not change, it is recommended to set them on the `NSURLSessionConfiguration` so they are automatically applied to any `NSURLSessionTask` created by the underlying `NSURLSession`.
+
+```swift
+let headers = [
+    "Authorization": "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==",
+    "Content-Type": "application/x-www-form-urlencoded"
+]
+
+Alamofire.request(.GET, "https://httpbin.org/get", headers: headers)
+         .responseJSON { response in
+             debugPrint(response)
+         }
+```
+
+### Caching
+
+Caching is handled on the system framework level by [`NSURLCache`](https://developer.apple.com/library/mac/documentation/Cocoa/Reference/Foundation/Classes/NSURLCache_Class/Reference/Reference.html#//apple_ref/occ/cl/NSURLCache).
+
+### Uploading
+
+**Supported Upload Types**
+
+- File
+- Data
+- Stream
+- MultipartFormData
+
+#### Uploading a File
+
+```swift
+let fileURL = NSBundle.mainBundle().URLForResource("Default", withExtension: "png")
+Alamofire.upload(.POST, "https://httpbin.org/post", file: fileURL)
+```
+
+#### Uploading with Progress
+
+```swift
+Alamofire.upload(.POST, "https://httpbin.org/post", file: fileURL)
+         .progress { bytesWritten, totalBytesWritten, totalBytesExpectedToWrite in
+             print(totalBytesWritten)
+
+             // This closure is NOT called on the main queue for performance
+             // reasons. To update your ui, dispatch to the main queue.
+             dispatch_async(dispatch_get_main_queue()) {
+                 print("Total bytes written on main queue: \(totalBytesWritten)")
+             }
+         }
+         .responseJSON { response in
+             debugPrint(response)
+         }
+```
+
+#### Uploading MultipartFormData
+
+```swift
+Alamofire.upload(
+    .POST,
+    "https://httpbin.org/post",
+    multipartFormData: { multipartFormData in
+        multipartFormData.appendBodyPart(fileURL: unicornImageURL, name: "unicorn")
+        multipartFormData.appendBodyPart(fileURL: rainbowImageURL, name: "rainbow")
+    },
+    encodingCompletion: { encodingResult in
+    	switch encodingResult {
+    	case .Success(let upload, _, _):
+            upload.responseJSON { response in
+                debugPrint(response)
+            }
+    	case .Failure(let encodingError):
+    	    print(encodingError)
+    	}
+    }
+)
+```
+
+### Downloading
+
+**Supported Download Types**
+
+- Request
+- Resume Data
+
+#### Downloading a File
+
+```swift
+Alamofire.download(.GET, "https://httpbin.org/stream/100") { temporaryURL, response in
+    let fileManager = NSFileManager.defaultManager()
+    let directoryURL = fileManager.URLsForDirectory(.DocumentDirectory, inDomains: .UserDomainMask)[0]
+    let pathComponent = response.suggestedFilename
+
+    return directoryURL.URLByAppendingPathComponent(pathComponent!)
+}
+```
+
+#### Using the Default Download Destination
+
+```swift
+let destination = Alamofire.Request.suggestedDownloadDestination(directory: .DocumentDirectory, domain: .UserDomainMask)
+Alamofire.download(.GET, "https://httpbin.org/stream/100", destination: destination)
+```
+
+#### Downloading a File w/Progress
+
+```swift
+Alamofire.download(.GET, "https://httpbin.org/stream/100", destination: destination)
+         .progress { bytesRead, totalBytesRead, totalBytesExpectedToRead in
+             print(totalBytesRead)
+
+             // This closure is NOT called on the main queue for performance
+             // reasons. To update your ui, dispatch to the main queue.
+             dispatch_async(dispatch_get_main_queue()) {
+                 print("Total bytes read on main queue: \(totalBytesRead)")
+             }
+         }
+         .response { _, _, _, error in
+             if let error = error {
+                 print("Failed with error: \(error)")
+             } else {
+                 print("Downloaded file successfully")
+             }
+         }
+```
+
+#### Accessing Resume Data for Failed Downloads
+
+```swift
+Alamofire.download(.GET, "https://httpbin.org/stream/100", destination: destination)
+         .response { _, _, data, _ in
+             if let
+                 data = data,
+                 resumeDataString = NSString(data: data, encoding: NSUTF8StringEncoding)
+             {
+                 print("Resume Data: \(resumeDataString)")
+             } else {
+                 print("Resume Data was empty")
+             }
+         }
+```
+
+> The `data` parameter is automatically populated with the `resumeData` if available.
+
+```swift
+let download = Alamofire.download(.GET, "https://httpbin.org/stream/100", destination: destination)
+download.response { _, _, _, _ in
+    if let
+        resumeData = download.resumeData,
+        resumeDataString = NSString(data: resumeData, encoding: NSUTF8StringEncoding)
+    {
+        print("Resume Data: \(resumeDataString)")
+    } else {
+        print("Resume Data was empty")
+    }
+}
+```
+
+### Authentication
+
+Authentication is handled on the system framework level by [`NSURLCredential` and `NSURLAuthenticationChallenge`](https://developer.apple.com/library/mac/documentation/Cocoa/Reference/Foundation/Classes/NSURLAuthenticationChallenge_Class/Reference/Reference.html).
+
+**Supported Authentication Schemes**
+
+- [HTTP Basic](http://en.wikipedia.org/wiki/Basic_access_authentication)
+- [HTTP Digest](http://en.wikipedia.org/wiki/Digest_access_authentication)
+- [Kerberos](http://en.wikipedia.org/wiki/Kerberos_%28protocol%29)
+- [NTLM](http://en.wikipedia.org/wiki/NT_LAN_Manager)
+
+#### HTTP Basic Authentication
+
+The `authenticate` method on a `Request` will automatically provide an `NSURLCredential` to an `NSURLAuthenticationChallenge` when appropriate:
+
+```swift
+let user = "user"
+let password = "password"
+
+Alamofire.request(.GET, "https://httpbin.org/basic-auth/\(user)/\(password)")
+         .authenticate(user: user, password: password)
+         .responseJSON { response in
+             debugPrint(response)
+         }
+```
+
+Depending upon your server implementation, an `Authorization` header may also be appropriate:
+
+```swift
+let user = "user"
+let password = "password"
+
+let credentialData = "\(user):\(password)".dataUsingEncoding(NSUTF8StringEncoding)!
+let base64Credentials = credentialData.base64EncodedStringWithOptions([])
+
+let headers = ["Authorization": "Basic \(base64Credentials)"]
+
+Alamofire.request(.GET, "https://httpbin.org/basic-auth/user/password", headers: headers)
+         .responseJSON { response in
+             debugPrint(response)
+         }
+```
+
+#### Authentication with NSURLCredential
+
+```swift
+let user = "user"
+let password = "password"
+
+let credential = NSURLCredential(user: user, password: password, persistence: .ForSession)
+
+Alamofire.request(.GET, "https://httpbin.org/basic-auth/\(user)/\(password)")
+         .authenticate(usingCredential: credential)
+         .responseJSON { response in
+             debugPrint(response)
+         }
+```
+
+### Validation
+
+By default, Alamofire treats any completed request to be successful, regardless of the content of the response. Calling `validate` before a response handler causes an error to be generated if the response had an unacceptable status code or MIME type.
+
+#### Manual Validation
+
+```swift
+Alamofire.request(.GET, "https://httpbin.org/get", parameters: ["foo": "bar"])
+         .validate(statusCode: 200..<300)
+         .validate(contentType: ["application/json"])
+         .response { response in
+             print(response)
+         }
+```
+
+#### Automatic Validation
+
+Automatically validates status code within `200...299` range, and that the `Content-Type` header of the response matches the `Accept` header of the request, if one is provided.
+
+```swift
+Alamofire.request(.GET, "https://httpbin.org/get", parameters: ["foo": "bar"])
+         .validate()
+         .responseJSON { response in
+             switch response.result {
+             case .Success:
+                 print("Validation Successful")
+             case .Failure(let error):
+                 print(error)
+             }
+         }
+```
+
+### Printable
+
+```swift
+let request = Alamofire.request(.GET, "https://httpbin.org/ip")
+
+print(request)
+// GET https://httpbin.org/ip (200)
+```
+
+### DebugPrintable
+
+```swift
+let request = Alamofire.request(.GET, "https://httpbin.org/get", parameters: ["foo": "bar"])
+
+debugPrint(request)
+```
+
+#### Output (cURL)
+
+```bash
+$ curl -i \
+	-H "User-Agent: Alamofire" \
+	-H "Accept-Encoding: Accept-Encoding: gzip;q=1.0,compress;q=0.5" \
+	-H "Accept-Language: en;q=1.0,fr;q=0.9,de;q=0.8,zh-Hans;q=0.7,zh-Hant;q=0.6,ja;q=0.5" \
+	"https://httpbin.org/get?foo=bar"
+```
+
+---
+
+## Advanced Usage
+
+> Alamofire is built on `NSURLSession` and the Foundation URL Loading System. To make the most of
+this framework, it is recommended that you be familiar with the concepts and capabilities of the underlying networking stack.
+
+**Recommended Reading**
+
+- [URL Loading System Programming Guide](https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/URLLoadingSystem/URLLoadingSystem.html)
+- [NSURLSession Class Reference](https://developer.apple.com/library/mac/documentation/Foundation/Reference/NSURLSession_class/Introduction/Introduction.html#//apple_ref/occ/cl/NSURLSession)
+- [NSURLCache Class Reference](https://developer.apple.com/library/mac/documentation/Cocoa/Reference/Foundation/Classes/NSURLCache_Class/Reference/Reference.html#//apple_ref/occ/cl/NSURLCache)
+- [NSURLAuthenticationChallenge Class Reference](https://developer.apple.com/library/mac/documentation/Cocoa/Reference/Foundation/Classes/NSURLAuthenticationChallenge_Class/Reference/Reference.html)
+
+### Manager
+
+Top-level convenience methods like `Alamofire.request` use a shared instance of `Alamofire.Manager`, which is configured with the default `NSURLSessionConfiguration`.
+
+As such, the following two statements are equivalent:
+
+```swift
+Alamofire.request(.GET, "https://httpbin.org/get")
+```
+
+```swift
+let manager = Alamofire.Manager.sharedInstance
+manager.request(NSURLRequest(URL: NSURL(string: "https://httpbin.org/get")!))
+```
+
+Applications can create managers for background and ephemeral sessions, as well as new managers that customize the default session configuration, such as for default headers (`HTTPAdditionalHeaders`) or timeout interval (`timeoutIntervalForRequest`).
+
+#### Creating a Manager with Default Configuration
+
+```swift
+let configuration = NSURLSessionConfiguration.defaultSessionConfiguration()
+let manager = Alamofire.Manager(configuration: configuration)
+```
+
+#### Creating a Manager with Background Configuration
+
+```swift
+let configuration = NSURLSessionConfiguration.backgroundSessionConfigurationWithIdentifier("com.example.app.background")
+let manager = Alamofire.Manager(configuration: configuration)
+```
+
+#### Creating a Manager with Ephemeral Configuration
+
+```swift
+let configuration = NSURLSessionConfiguration.ephemeralSessionConfiguration()
+let manager = Alamofire.Manager(configuration: configuration)
+```
+
+#### Modifying Session Configuration
+
+```swift
+var defaultHeaders = Alamofire.Manager.sharedInstance.session.configuration.HTTPAdditionalHeaders ?? [:]
+defaultHeaders["DNT"] = "1 (Do Not Track Enabled)"
+
+let configuration = NSURLSessionConfiguration.defaultSessionConfiguration()
+configuration.HTTPAdditionalHeaders = defaultHeaders
+
+let manager = Alamofire.Manager(configuration: configuration)
+```
+
+> This is **not** recommended for `Authorization` or `Content-Type` headers. Instead, use `URLRequestConvertible` and `ParameterEncoding`, respectively.
+
+### Request
+
+The result of a `request`, `upload`, or `download` method is an instance of `Alamofire.Request`. A request is always created using a constructor method from an owning manager, and never initialized directly.
+
+Methods like `authenticate`, `validate` and `responseData` return the caller in order to facilitate chaining.
+
+Requests can be suspended, resumed, and cancelled:
+
+- `suspend()`: Suspends the underlying task and dispatch queue
+- `resume()`: Resumes the underlying task and dispatch queue. If the owning manager does not have `startRequestsImmediately` set to `true`, the request must call `resume()` in order to start.
+- `cancel()`: Cancels the underlying task, producing an error that is passed to any registered response handlers.
+
+### Response Serialization
+
+#### Creating a Custom Response Serializer
+
+Alamofire provides built-in response serialization for strings, JSON, and property lists, but others can be added in extensions on `Alamofire.Request`.
+
+For example, here's how a response handler using [Ono](https://github.com/mattt/Ono) might be implemented:
+
+```swift
+extension Request {
+    public static func XMLResponseSerializer() -> ResponseSerializer<ONOXMLDocument, NSError> {
+        return ResponseSerializer { request, response, data, error in
+            guard error == nil else { return .Failure(error!) }
+
+            guard let validData = data else {
+                let failureReason = "Data could not be serialized. Input data was nil."
+                let error = Error.errorWithCode(.DataSerializationFailed, failureReason: failureReason)
+                return .Failure(error)
+            }
+
+            do {
+                let XML = try ONOXMLDocument(data: validData)
+                return .Success(XML)
+            } catch {
+                return .Failure(error as NSError)
+            }
+        }
+    }
+
+    public func responseXMLDocument(completionHandler: Response<ONOXMLDocument, NSError> -> Void) -> Self {
+        return response(responseSerializer: Request.XMLResponseSerializer(), completionHandler: completionHandler)
+    }
+}
+```
+
+#### Generic Response Object Serialization
+
+Generics can be used to provide automatic, type-safe response object serialization.
+
+```swift
+public protocol ResponseObjectSerializable {
+    init?(response: NSHTTPURLResponse, representation: AnyObject)
+}
+
+extension Request {
+    public func responseObject<T: ResponseObjectSerializable>(completionHandler: Response<T, NSError> -> Void) -> Self {
+        let responseSerializer = ResponseSerializer<T, NSError> { request, response, data, error in
+            guard error == nil else { return .Failure(error!) }
+
+            let JSONResponseSerializer = Request.JSONResponseSerializer(options: .AllowFragments)
+            let result = JSONResponseSerializer.serializeResponse(request, response, data, error)
+
+            switch result {
+            case .Success(let value):
+                if let
+                    response = response,
+                    responseObject = T(response: response, representation: value)
+                {
+                    return .Success(responseObject)
+                } else {
+                    let failureReason = "JSON could not be serialized into response object: \(value)"
+                    let error = Error.errorWithCode(.JSONSerializationFailed, failureReason: failureReason)
+                    return .Failure(error)
+                }
+            case .Failure(let error):
+                return .Failure(error)
+            }
+        }
+
+        return response(responseSerializer: responseSerializer, completionHandler: completionHandler)
+    }
+}
+```
+
+```swift
+final class User: ResponseObjectSerializable {
+    let username: String
+    let name: String
+
+    init?(response: NSHTTPURLResponse, representation: AnyObject) {
+        self.username = response.URL!.lastPathComponent!
+        self.name = representation.valueForKeyPath("name") as! String
+    }
+}
+```
+
+```swift
+Alamofire.request(.GET, "https://example.com/users/mattt")
+         .responseObject { (response: Response<User, NSError>) in
+             debugPrint(response)
+         }
+```
+
+The same approach can also be used to handle endpoints that return a representation of a collection of objects:
+
+```swift
+public protocol ResponseCollectionSerializable {
+    static func collection(response response: NSHTTPURLResponse, representation: AnyObject) -> [Self]
+}
+
+extension Alamofire.Request {
+    public func responseCollection<T: ResponseCollectionSerializable>(completionHandler: Response<[T], NSError> -> Void) -> Self {
+        let responseSerializer = ResponseSerializer<[T], NSError> { request, response, data, error in
+            guard error == nil else { return .Failure(error!) }
+
+            let JSONSerializer = Request.JSONResponseSerializer(options: .AllowFragments)
+            let result = JSONSerializer.serializeResponse(request, response, data, error)
+
+            switch result {
+            case .Success(let value):
+                if let response = response {
+                    return .Success(T.collection(response: response, representation: value))
+                } else {
+                    let failureReason = "Response collection could not be serialized due to nil response"
+                    let error = Error.errorWithCode(.JSONSerializationFailed, failureReason: failureReason)
+                    return .Failure(error)
+                }
+            case .Failure(let error):
+                return .Failure(error)
+            }
+        }
+
+        return response(responseSerializer: responseSerializer, completionHandler: completionHandler)
+    }
+}
+```
+
+```swift
+final class User: ResponseObjectSerializable, ResponseCollectionSerializable {
+    let username: String
+    let name: String
+
+    init?(response: NSHTTPURLResponse, representation: AnyObject) {
+        self.username = response.URL!.lastPathComponent!
+        self.name = representation.valueForKeyPath("name") as! String
+    }
+
+    static func collection(response response: NSHTTPURLResponse, representation: AnyObject) -> [User] {
+        var users: [User] = []
+
+        if let representation = representation as? [[String: AnyObject]] {
+            for userRepresentation in representation {
+                if let user = User(response: response, representation: userRepresentation) {
+                    users.append(user)
+                }
+            }
+        }
+
+        return users
+    }
+}
+```
+
+```swift
+Alamofire.request(.GET, "http://example.com/users")
+         .responseCollection { (response: Response<[User], NSError>) in
+             debugPrint(response)
+         }
+```
+
+### URLStringConvertible
+
+Types adopting the `URLStringConvertible` protocol can be used to construct URL strings, which are then used to construct URL requests. `NSString`, `NSURL`, `NSURLComponents`, and `NSURLRequest` conform to `URLStringConvertible` by default, allowing any of them to be passed as `URLString` parameters to the `request`, `upload`, and `download` methods:
+
+```swift
+let string = NSString(string: "https://httpbin.org/post")
+Alamofire.request(.POST, string)
+
+let URL = NSURL(string: string)!
+Alamofire.request(.POST, URL)
+
+let URLRequest = NSURLRequest(URL: URL)
+Alamofire.request(.POST, URLRequest) // overrides `HTTPMethod` of `URLRequest`
+
+let URLComponents = NSURLComponents(URL: URL, resolvingAgainstBaseURL: true)
+Alamofire.request(.POST, URLComponents)
+```
+
+Applications interacting with web applications in a significant manner are encouraged to have custom types conform to `URLStringConvertible` as a convenient way to map domain-specific models to server resources.
+
+#### Type-Safe Routing
+
+```swift
+extension User: URLStringConvertible {
+    static let baseURLString = "http://example.com"
+
+    var URLString: String {
+        return User.baseURLString + "/users/\(username)/"
+    }
+}
+```
+
+```swift
+let user = User(username: "mattt")
+Alamofire.request(.GET, user) // http://example.com/users/mattt
+```
+
+### URLRequestConvertible
+
+Types adopting the `URLRequestConvertible` protocol can be used to construct URL requests. `NSURLRequest` conforms to `URLRequestConvertible` by default, allowing it to be passed into `request`, `upload`, and `download` methods directly (this is the recommended way to specify custom HTTP body for individual requests):
+
+```swift
+let URL = NSURL(string: "https://httpbin.org/post")!
+let mutableURLRequest = NSMutableURLRequest(URL: URL)
+mutableURLRequest.HTTPMethod = "POST"
+
+let parameters = ["foo": "bar"]
+
+do {
+    mutableURLRequest.HTTPBody = try NSJSONSerialization.dataWithJSONObject(parameters, options: NSJSONWritingOptions())
+} catch {
+    // No-op
+}
+
+mutableURLRequest.setValue("application/json", forHTTPHeaderField: "Content-Type")
+
+Alamofire.request(mutableURLRequest)
+```
+
+Applications interacting with web applications in a significant manner are encouraged to have custom types conform to `URLRequestConvertible` as a way to ensure consistency of requested endpoints. Such an approach can be used to abstract away server-side inconsistencies and provide type-safe routing, as well as manage authentication credentials and other state.
+
+#### API Parameter Abstraction
+
+```swift
+enum Router: URLRequestConvertible {
+    static let baseURLString = "http://example.com"
+    static let perPage = 50
+
+    case Search(query: String, page: Int)
+
+    // MARK: URLRequestConvertible
+
+    var URLRequest: NSMutableURLRequest {
+        let result: (path: String, parameters: [String: AnyObject]) = {
+            switch self {
+            case .Search(let query, let page) where page > 1:
+                return ("/search", ["q": query, "offset": Router.perPage * page])
+            case .Search(let query, _):
+                return ("/search", ["q": query])
+            }
+        }()
+
+        let URL = NSURL(string: Router.baseURLString)!
+        let URLRequest = NSURLRequest(URL: URL.URLByAppendingPathComponent(result.path))
+        let encoding = Alamofire.ParameterEncoding.URL
+
+        return encoding.encode(URLRequest, parameters: result.parameters).0
+    }
+}
+```
+
+```swift
+Alamofire.request(Router.Search(query: "foo bar", page: 1)) // ?q=foo%20bar&offset=50
+```
+
+#### CRUD & Authorization
+
+```swift
+enum Router: URLRequestConvertible {
+    static let baseURLString = "http://example.com"
+    static var OAuthToken: String?
+
+    case CreateUser([String: AnyObject])
+    case ReadUser(String)
+    case UpdateUser(String, [String: AnyObject])
+    case DestroyUser(String)
+
+    var method: Alamofire.Method {
+        switch self {
+        case .CreateUser:
+            return .POST
+        case .ReadUser:
+            return .GET
+        case .UpdateUser:
+            return .PUT
+        case .DestroyUser:
+            return .DELETE
+        }
+    }
+
+    var path: String {
+        switch self {
+        case .CreateUser:
+            return "/users"
+        case .ReadUser(let username):
+            return "/users/\(username)"
+        case .UpdateUser(let username, _):
+            return "/users/\(username)"
+        case .DestroyUser(let username):
+            return "/users/\(username)"
+        }
+    }
+
+    // MARK: URLRequestConvertible
+
+    var URLRequest: NSMutableURLRequest {
+        let URL = NSURL(string: Router.baseURLString)!
+        let mutableURLRequest = NSMutableURLRequest(URL: URL.URLByAppendingPathComponent(path))
+        mutableURLRequest.HTTPMethod = method.rawValue
+
+        if let token = Router.OAuthToken {
+            mutableURLRequest.setValue("Bearer \(token)", forHTTPHeaderField: "Authorization")
+        }
+
+        switch self {
+        case .CreateUser(let parameters):
+            return Alamofire.ParameterEncoding.JSON.encode(mutableURLRequest, parameters: parameters).0
+        case .UpdateUser(_, let parameters):
+            return Alamofire.ParameterEncoding.URL.encode(mutableURLRequest, parameters: parameters).0
+        default:
+            return mutableURLRequest
+        }
+    }
+}
+```
+
+```swift
+Alamofire.request(Router.ReadUser("mattt")) // GET /users/mattt
+```
+
+### Security
+
+Using a secure HTTPS connection when communicating with servers and web services is an important step in securing sensitive data. By default, Alamofire will evaluate the certificate chain provided by the server using Apple's built in validation provided by the Security framework. While this guarantees the certificate chain is valid, it does not prevent man-in-the-middle (MITM) attacks or other potential vulnerabilities. In order to mitigate MITM attacks, applications dealing with sensitive customer data or financial information should use certificate or public key pinning provided by the `ServerTrustPolicy`.
+
+#### ServerTrustPolicy
+
+The `ServerTrustPolicy` enumeration evaluates the server trust generally provided by an `NSURLAuthenticationChallenge` when connecting to a server over a secure HTTPS connection.
+
+```swift
+let serverTrustPolicy = ServerTrustPolicy.PinCertificates(
+    certificates: ServerTrustPolicy.certificatesInBundle(),
+    validateCertificateChain: true,
+    validateHost: true
+)
+```
+
+There are many different cases of server trust evaluation giving you complete control over the validation process:
+
+* `PerformDefaultEvaluation`: Uses the default server trust evaluation while allowing you to control whether to validate the host provided by the challenge. 
+* `PinCertificates`: Uses the pinned certificates to validate the server trust. The server trust is considered valid if one of the pinned certificates match one of the server certificates.
+* `PinPublicKeys`: Uses the pinned public keys to validate the server trust. The server trust is considered valid if one of the pinned public keys match one of the server certificate public keys.
+* `DisableEvaluation`: Disables all evaluation which in turn will always consider any server trust as valid.
+* `CustomEvaluation`: Uses the associated closure to evaluate the validity of the server trust thus giving you complete control over the validation process. Use with caution.
+
+#### Server Trust Policy Manager
+
+The `ServerTrustPolicyManager` is responsible for storing an internal mapping of server trust policies to a particular host. This allows Alamofire to evaluate each host against a different server trust policy. 
+
+```swift
+let serverTrustPolicies: [String: ServerTrustPolicy] = [
+    "test.example.com": .PinCertificates(
+        certificates: ServerTrustPolicy.certificatesInBundle(),
+        validateCertificateChain: true,
+        validateHost: true
+    ),
+    "insecure.expired-apis.com": .DisableEvaluation
+]
+
+let manager = Manager(
+    serverTrustPolicyManager: ServerTrustPolicyManager(policies: serverTrustPolicies)
+)
+```
+
+> Make sure to keep a reference to the new `Manager` instance, otherwise your requests will all get cancelled when your `manager` is deallocated.
+
+These server trust policies will result in the following behavior:
+
+* `test.example.com` will always use certificate pinning with certificate chain and host validation enabled thus requiring the following criteria to be met to allow the TLS handshake to succeed:
+  * Certificate chain MUST be valid.
+  * Certificate chain MUST include one of the pinned certificates.
+  * Challenge host MUST match the host in the certificate chain's leaf certificate.
+* `insecure.expired-apis.com` will never evaluate the certificate chain and will always allow the TLS handshake to succeed.
+* All other hosts will use the default evaluation provided by Apple.
+
+##### Subclassing Server Trust Policy Manager
+
+If you find yourself needing more flexible server trust policy matching behavior (i.e. wildcarded domains), then subclass the `ServerTrustPolicyManager` and override the `serverTrustPolicyForHost` method with your own custom implementation.
+
+```swift
+class CustomServerTrustPolicyManager: ServerTrustPolicyManager {
+    override func serverTrustPolicyForHost(host: String) -> ServerTrustPolicy? {
+        var policy: ServerTrustPolicy?
+
+        // Implement your custom domain matching behavior...
+
+        return policy
+    }
+}
+```
+
+#### Validating the Host
+
+The `.PerformDefaultEvaluation`, `.PinCertificates` and `.PinPublicKeys` server trust policies all take a `validateHost` parameter. Setting the value to `true` will cause the server trust evaluation to verify that hostname in the certificate matches the hostname of the challenge. If they do not match, evaluation will fail. A `validateHost` value of `false` will still evaluate the full certificate chain, but will not validate the hostname of the leaf certificate.
+
+> It is recommended that `validateHost` always be set to `true` in production environments.
+
+#### Validating the Certificate Chain
+
+Pinning certificates and public keys both have the option of validating the certificate chain using the `validateCertificateChain` parameter. By setting this value to `true`, the full certificate chain will be evaluated in addition to performing a byte equality check against the pinned certficates or public keys. A value of `false` will skip the certificate chain validation, but will still perform the byte equality check.
+
+There are several cases where it may make sense to disable certificate chain validation. The most common use cases for disabling validation are self-signed and expired certificates. The evaluation would always fail in both of these cases, but the byte equality check will still ensure you are receiving the certificate you expect from the server.
+
+> It is recommended that `validateCertificateChain` always be set to `true` in production environments.
+
+#### App Transport Security
+
+With the addition of App Transport Security (ATS) in iOS 9, it is possible that using a custom `ServerTrustPolicyManager` with several `ServerTrustPolicy` objects will have no effect. If you continuously see `CFNetwork SSLHandshake failed (-9806)` errors, you have probably run into this problem. Apple's ATS system overrides the entire challenge system unless you configure the ATS settings in your app's plist to disable enough of it to allow your app to evaluate the server trust.
+
+If you run into this problem (high probability with self-signed certificates), you can work around this issue by adding the following to your `Info.plist`.
+
+```xml
+<dict>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSExceptionDomains</key>
+		<dict>
+			<key>example.com</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+				<key>NSExceptionRequiresForwardSecrecy</key>
+				<false/>
+				<key>NSIncludesSubdomains</key>
+				<true/>
+				<!-- Optional: Specify minimum TLS version -->
+				<key>NSTemporaryExceptionMinimumTLSVersion</key>
+				<string>TLSv1.2</string>
+			</dict>
+		</dict>
+	</dict>
+</dict>
+```
+
+Whether you need to set the `NSExceptionRequiresForwardSecrecy` to `NO` depends on whether your TLS connection is using an allowed cipher suite. In certain cases, it will need to be set to `NO`. The `NSExceptionAllowsInsecureHTTPLoads` MUST be set to `YES` in order to allow the `SessionDelegate` to receive challenge callbacks. Once the challenge callbacks are being called, the `ServerTrustPolicyManager` will take over the server trust evaluation. You may also need to specify the `NSTemporaryExceptionMinimumTLSVersion` if you're trying to connect to a host that only supports TLS versions less than `1.2`.
+
+> It is recommended to always use valid certificates in production environments.
+
+---
+
+## Component Libraries
+
+In order to keep Alamofire focused specifically on core networking implementations, additional component libraries have been created by the [Alamofire Software Foundation](https://github.com/Alamofire/Foundation) to bring additional functionality to the Alamofire ecosystem.
+
+* [AlamofireImage](https://github.com/Alamofire/AlamofireImage) - An image library including image response serializers, `UIImage` and `UIImageView` extensions, custom image filters, an auto-purging in-memory cache and a priority-based image downloading system.
+
+## Open Rdars
+
+The following rdars have some affect on the current implementation of Alamofire.
+
+* [rdar://21349340](http://www.openradar.me/radar?id=5517037090635776) - Compiler throwing warning due to toll-free bridging issue in test case
+
+## FAQ
+
+### What's the origin of the name Alamofire?
+
+Alamofire is named after the [Alamo Fire flower](https://aggie-horticulture.tamu.edu/wildseed/alamofire.html), a hybrid variant of the Bluebonnet, the official state flower of Texas.
+
+---
+
+## Credits
+
+Alamofire is owned and maintained by the [Alamofire Software Foundation](http://alamofire.org). You can follow them on Twitter at [@AlamofireSF](https://twitter.com/AlamofireSF) for project updates and releases.
+
+### Security Disclosure
+
+If you believe you have identified a security vulnerability with Alamofire, you should report it as soon as possible via email to security@alamofire.org. Please do not post it to a public issue tracker.
+
+## License
+
+Alamofire is released under the MIT license. See LICENSE for details.
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Alamofire.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Alamofire.swift
new file mode 100644
index 00000000000..b866f42264f
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Alamofire.swift
@@ -0,0 +1,368 @@
+// Alamofire.swift
+//
+// Copyright (c) 2014–2016 Alamofire Software Foundation (http://alamofire.org/)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+
+// MARK: - URLStringConvertible
+
+/**
+    Types adopting the `URLStringConvertible` protocol can be used to construct URL strings, which are then used to 
+    construct URL requests.
+*/
+public protocol URLStringConvertible {
+    /**
+        A URL that conforms to RFC 2396.
+
+        Methods accepting a `URLStringConvertible` type parameter parse it according to RFCs 1738 and 1808.
+
+        See https://tools.ietf.org/html/rfc2396
+        See https://tools.ietf.org/html/rfc1738
+        See https://tools.ietf.org/html/rfc1808
+    */
+    var URLString: String { get }
+}
+
+extension String: URLStringConvertible {
+    public var URLString: String {
+        return self
+    }
+}
+
+extension NSURL: URLStringConvertible {
+    public var URLString: String {
+        return absoluteString
+    }
+}
+
+extension NSURLComponents: URLStringConvertible {
+    public var URLString: String {
+        return URL!.URLString
+    }
+}
+
+extension NSURLRequest: URLStringConvertible {
+    public var URLString: String {
+        return URL!.URLString
+    }
+}
+
+// MARK: - URLRequestConvertible
+
+/**
+    Types adopting the `URLRequestConvertible` protocol can be used to construct URL requests.
+*/
+public protocol URLRequestConvertible {
+    /// The URL request.
+    var URLRequest: NSMutableURLRequest { get }
+}
+
+extension NSURLRequest: URLRequestConvertible {
+    public var URLRequest: NSMutableURLRequest {
+        return self.mutableCopy() as! NSMutableURLRequest
+    }
+}
+
+// MARK: - Convenience
+
+func URLRequest(
+    method: Method,
+    _ URLString: URLStringConvertible,
+    headers: [String: String]? = nil)
+    -> NSMutableURLRequest
+{
+    let mutableURLRequest = NSMutableURLRequest(URL: NSURL(string: URLString.URLString)!)
+    mutableURLRequest.HTTPMethod = method.rawValue
+
+    if let headers = headers {
+        for (headerField, headerValue) in headers {
+            mutableURLRequest.setValue(headerValue, forHTTPHeaderField: headerField)
+        }
+    }
+
+    return mutableURLRequest
+}
+
+// MARK: - Request Methods
+
+/**
+    Creates a request using the shared manager instance for the specified method, URL string, parameters, and
+    parameter encoding.
+
+    - parameter method:     The HTTP method.
+    - parameter URLString:  The URL string.
+    - parameter parameters: The parameters. `nil` by default.
+    - parameter encoding:   The parameter encoding. `.URL` by default.
+    - parameter headers:    The HTTP headers. `nil` by default.
+
+    - returns: The created request.
+*/
+public func request(
+    method: Method,
+    _ URLString: URLStringConvertible,
+    parameters: [String: AnyObject]? = nil,
+    encoding: ParameterEncoding = .URL,
+    headers: [String: String]? = nil)
+    -> Request
+{
+    return Manager.sharedInstance.request(
+        method,
+        URLString,
+        parameters: parameters,
+        encoding: encoding,
+        headers: headers
+    )
+}
+
+/**
+    Creates a request using the shared manager instance for the specified URL request.
+
+    If `startRequestsImmediately` is `true`, the request will have `resume()` called before being returned.
+
+    - parameter URLRequest: The URL request
+
+    - returns: The created request.
+*/
+public func request(URLRequest: URLRequestConvertible) -> Request {
+    return Manager.sharedInstance.request(URLRequest.URLRequest)
+}
+
+// MARK: - Upload Methods
+
+// MARK: File
+
+/**
+    Creates an upload request using the shared manager instance for the specified method, URL string, and file.
+
+    - parameter method:    The HTTP method.
+    - parameter URLString: The URL string.
+    - parameter headers:   The HTTP headers. `nil` by default.
+    - parameter file:      The file to upload.
+
+    - returns: The created upload request.
+*/
+public func upload(
+    method: Method,
+    _ URLString: URLStringConvertible,
+    headers: [String: String]? = nil,
+    file: NSURL)
+    -> Request
+{
+    return Manager.sharedInstance.upload(method, URLString, headers: headers, file: file)
+}
+
+/**
+    Creates an upload request using the shared manager instance for the specified URL request and file.
+
+    - parameter URLRequest: The URL request.
+    - parameter file:       The file to upload.
+
+    - returns: The created upload request.
+*/
+public func upload(URLRequest: URLRequestConvertible, file: NSURL) -> Request {
+    return Manager.sharedInstance.upload(URLRequest, file: file)
+}
+
+// MARK: Data
+
+/**
+    Creates an upload request using the shared manager instance for the specified method, URL string, and data.
+
+    - parameter method:    The HTTP method.
+    - parameter URLString: The URL string.
+    - parameter headers:   The HTTP headers. `nil` by default.
+    - parameter data:      The data to upload.
+
+    - returns: The created upload request.
+*/
+public func upload(
+    method: Method,
+    _ URLString: URLStringConvertible,
+    headers: [String: String]? = nil,
+    data: NSData)
+    -> Request
+{
+    return Manager.sharedInstance.upload(method, URLString, headers: headers, data: data)
+}
+
+/**
+    Creates an upload request using the shared manager instance for the specified URL request and data.
+
+    - parameter URLRequest: The URL request.
+    - parameter data:       The data to upload.
+
+    - returns: The created upload request.
+*/
+public func upload(URLRequest: URLRequestConvertible, data: NSData) -> Request {
+    return Manager.sharedInstance.upload(URLRequest, data: data)
+}
+
+// MARK: Stream
+
+/**
+    Creates an upload request using the shared manager instance for the specified method, URL string, and stream.
+
+    - parameter method:    The HTTP method.
+    - parameter URLString: The URL string.
+    - parameter headers:   The HTTP headers. `nil` by default.
+    - parameter stream:    The stream to upload.
+
+    - returns: The created upload request.
+*/
+public func upload(
+    method: Method,
+    _ URLString: URLStringConvertible,
+    headers: [String: String]? = nil,
+    stream: NSInputStream)
+    -> Request
+{
+    return Manager.sharedInstance.upload(method, URLString, headers: headers, stream: stream)
+}
+
+/**
+    Creates an upload request using the shared manager instance for the specified URL request and stream.
+
+    - parameter URLRequest: The URL request.
+    - parameter stream:     The stream to upload.
+
+    - returns: The created upload request.
+*/
+public func upload(URLRequest: URLRequestConvertible, stream: NSInputStream) -> Request {
+    return Manager.sharedInstance.upload(URLRequest, stream: stream)
+}
+
+// MARK: MultipartFormData
+
+/**
+    Creates an upload request using the shared manager instance for the specified method and URL string.
+
+    - parameter method:                  The HTTP method.
+    - parameter URLString:               The URL string.
+    - parameter headers:                 The HTTP headers. `nil` by default.
+    - parameter multipartFormData:       The closure used to append body parts to the `MultipartFormData`.
+    - parameter encodingMemoryThreshold: The encoding memory threshold in bytes.
+                                         `MultipartFormDataEncodingMemoryThreshold` by default.
+    - parameter encodingCompletion:      The closure called when the `MultipartFormData` encoding is complete.
+*/
+public func upload(
+    method: Method,
+    _ URLString: URLStringConvertible,
+    headers: [String: String]? = nil,
+    multipartFormData: MultipartFormData -> Void,
+    encodingMemoryThreshold: UInt64 = Manager.MultipartFormDataEncodingMemoryThreshold,
+    encodingCompletion: (Manager.MultipartFormDataEncodingResult -> Void)?)
+{
+    return Manager.sharedInstance.upload(
+        method,
+        URLString,
+        headers: headers,
+        multipartFormData: multipartFormData,
+        encodingMemoryThreshold: encodingMemoryThreshold,
+        encodingCompletion: encodingCompletion
+    )
+}
+
+/**
+    Creates an upload request using the shared manager instance for the specified method and URL string.
+
+    - parameter URLRequest:              The URL request.
+    - parameter multipartFormData:       The closure used to append body parts to the `MultipartFormData`.
+    - parameter encodingMemoryThreshold: The encoding memory threshold in bytes.
+                                         `MultipartFormDataEncodingMemoryThreshold` by default.
+    - parameter encodingCompletion:      The closure called when the `MultipartFormData` encoding is complete.
+*/
+public func upload(
+    URLRequest: URLRequestConvertible,
+    multipartFormData: MultipartFormData -> Void,
+    encodingMemoryThreshold: UInt64 = Manager.MultipartFormDataEncodingMemoryThreshold,
+    encodingCompletion: (Manager.MultipartFormDataEncodingResult -> Void)?)
+{
+    return Manager.sharedInstance.upload(
+        URLRequest,
+        multipartFormData: multipartFormData,
+        encodingMemoryThreshold: encodingMemoryThreshold,
+        encodingCompletion: encodingCompletion
+    )
+}
+
+// MARK: - Download Methods
+
+// MARK: URL Request
+
+/**
+    Creates a download request using the shared manager instance for the specified method and URL string.
+
+    - parameter method:      The HTTP method.
+    - parameter URLString:   The URL string.
+    - parameter parameters:  The parameters. `nil` by default.
+    - parameter encoding:    The parameter encoding. `.URL` by default.
+    - parameter headers:     The HTTP headers. `nil` by default.
+    - parameter destination: The closure used to determine the destination of the downloaded file.
+
+    - returns: The created download request.
+*/
+public func download(
+    method: Method,
+    _ URLString: URLStringConvertible,
+    parameters: [String: AnyObject]? = nil,
+    encoding: ParameterEncoding = .URL,
+    headers: [String: String]? = nil,
+    destination: Request.DownloadFileDestination)
+    -> Request
+{
+    return Manager.sharedInstance.download(
+        method,
+        URLString,
+        parameters: parameters,
+        encoding: encoding,
+        headers: headers,
+        destination: destination
+    )
+}
+
+/**
+    Creates a download request using the shared manager instance for the specified URL request.
+
+    - parameter URLRequest:  The URL request.
+    - parameter destination: The closure used to determine the destination of the downloaded file.
+
+    - returns: The created download request.
+*/
+public func download(URLRequest: URLRequestConvertible, destination: Request.DownloadFileDestination) -> Request {
+    return Manager.sharedInstance.download(URLRequest, destination: destination)
+}
+
+// MARK: Resume Data
+
+/**
+    Creates a request using the shared manager instance for downloading from the resume data produced from a 
+    previous request cancellation.
+
+    - parameter resumeData:  The resume data. This is an opaque data blob produced by `NSURLSessionDownloadTask`
+                             when a task is cancelled. See `NSURLSession -downloadTaskWithResumeData:` for additional 
+                             information.
+    - parameter destination: The closure used to determine the destination of the downloaded file.
+
+    - returns: The created download request.
+*/
+public func download(resumeData data: NSData, destination: Request.DownloadFileDestination) -> Request {
+    return Manager.sharedInstance.download(data, destination: destination)
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Download.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Download.swift
new file mode 100644
index 00000000000..b9a043cb8e3
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Download.swift
@@ -0,0 +1,244 @@
+// Download.swift
+//
+// Copyright (c) 2014–2016 Alamofire Software Foundation (http://alamofire.org/)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+
+extension Manager {
+    private enum Downloadable {
+        case Request(NSURLRequest)
+        case ResumeData(NSData)
+    }
+
+    private func download(downloadable: Downloadable, destination: Request.DownloadFileDestination) -> Request {
+        var downloadTask: NSURLSessionDownloadTask!
+
+        switch downloadable {
+        case .Request(let request):
+            dispatch_sync(queue) {
+                downloadTask = self.session.downloadTaskWithRequest(request)
+            }
+        case .ResumeData(let resumeData):
+            dispatch_sync(queue) {
+                downloadTask = self.session.downloadTaskWithResumeData(resumeData)
+            }
+        }
+
+        let request = Request(session: session, task: downloadTask)
+
+        if let downloadDelegate = request.delegate as? Request.DownloadTaskDelegate {
+            downloadDelegate.downloadTaskDidFinishDownloadingToURL = { session, downloadTask, URL in
+                return destination(URL, downloadTask.response as! NSHTTPURLResponse)
+            }
+        }
+
+        delegate[request.delegate.task] = request.delegate
+
+        if startRequestsImmediately {
+            request.resume()
+        }
+
+        return request
+    }
+
+    // MARK: Request
+
+    /**
+        Creates a download request for the specified method, URL string, parameters, parameter encoding, headers
+        and destination.
+
+        If `startRequestsImmediately` is `true`, the request will have `resume()` called before being returned.
+
+        - parameter method:      The HTTP method.
+        - parameter URLString:   The URL string.
+        - parameter parameters:  The parameters. `nil` by default.
+        - parameter encoding:    The parameter encoding. `.URL` by default.
+        - parameter headers:     The HTTP headers. `nil` by default.
+        - parameter destination: The closure used to determine the destination of the downloaded file.
+
+        - returns: The created download request.
+    */
+    public func download(
+        method: Method,
+        _ URLString: URLStringConvertible,
+        parameters: [String: AnyObject]? = nil,
+        encoding: ParameterEncoding = .URL,
+        headers: [String: String]? = nil,
+        destination: Request.DownloadFileDestination)
+        -> Request
+    {
+        let mutableURLRequest = URLRequest(method, URLString, headers: headers)
+        let encodedURLRequest = encoding.encode(mutableURLRequest, parameters: parameters).0
+
+        return download(encodedURLRequest, destination: destination)
+    }
+
+    /**
+        Creates a request for downloading from the specified URL request.
+
+        If `startRequestsImmediately` is `true`, the request will have `resume()` called before being returned.
+
+        - parameter URLRequest:  The URL request
+        - parameter destination: The closure used to determine the destination of the downloaded file.
+
+        - returns: The created download request.
+    */
+    public func download(URLRequest: URLRequestConvertible, destination: Request.DownloadFileDestination) -> Request {
+        return download(.Request(URLRequest.URLRequest), destination: destination)
+    }
+
+    // MARK: Resume Data
+
+    /**
+        Creates a request for downloading from the resume data produced from a previous request cancellation.
+
+        If `startRequestsImmediately` is `true`, the request will have `resume()` called before being returned.
+
+        - parameter resumeData:  The resume data. This is an opaque data blob produced by `NSURLSessionDownloadTask` 
+                                 when a task is cancelled. See `NSURLSession -downloadTaskWithResumeData:` for 
+                                 additional information.
+        - parameter destination: The closure used to determine the destination of the downloaded file.
+
+        - returns: The created download request.
+    */
+    public func download(resumeData: NSData, destination: Request.DownloadFileDestination) -> Request {
+        return download(.ResumeData(resumeData), destination: destination)
+    }
+}
+
+// MARK: -
+
+extension Request {
+    /**
+        A closure executed once a request has successfully completed in order to determine where to move the temporary 
+        file written to during the download process. The closure takes two arguments: the temporary file URL and the URL 
+        response, and returns a single argument: the file URL where the temporary file should be moved.
+    */
+    public typealias DownloadFileDestination = (NSURL, NSHTTPURLResponse) -> NSURL
+
+    /**
+        Creates a download file destination closure which uses the default file manager to move the temporary file to a 
+        file URL in the first available directory with the specified search path directory and search path domain mask.
+
+        - parameter directory: The search path directory. `.DocumentDirectory` by default.
+        - parameter domain:    The search path domain mask. `.UserDomainMask` by default.
+
+        - returns: A download file destination closure.
+    */
+    public class func suggestedDownloadDestination(
+        directory directory: NSSearchPathDirectory = .DocumentDirectory,
+        domain: NSSearchPathDomainMask = .UserDomainMask)
+        -> DownloadFileDestination
+    {
+        return { temporaryURL, response -> NSURL in
+            let directoryURLs = NSFileManager.defaultManager().URLsForDirectory(directory, inDomains: domain)
+
+            if !directoryURLs.isEmpty {
+                return directoryURLs[0].URLByAppendingPathComponent(response.suggestedFilename!)
+            }
+
+            return temporaryURL
+        }
+    }
+
+    /// The resume data of the underlying download task if available after a failure.
+    public var resumeData: NSData? {
+        var data: NSData?
+
+        if let delegate = delegate as? DownloadTaskDelegate {
+            data = delegate.resumeData
+        }
+
+        return data
+    }
+
+    // MARK: - DownloadTaskDelegate
+
+    class DownloadTaskDelegate: TaskDelegate, NSURLSessionDownloadDelegate {
+        var downloadTask: NSURLSessionDownloadTask? { return task as? NSURLSessionDownloadTask }
+        var downloadProgress: ((Int64, Int64, Int64) -> Void)?
+
+        var resumeData: NSData?
+        override var data: NSData? { return resumeData }
+
+        // MARK: - NSURLSessionDownloadDelegate
+
+        // MARK: Override Closures
+
+        var downloadTaskDidFinishDownloadingToURL: ((NSURLSession, NSURLSessionDownloadTask, NSURL) -> NSURL)?
+        var downloadTaskDidWriteData: ((NSURLSession, NSURLSessionDownloadTask, Int64, Int64, Int64) -> Void)?
+        var downloadTaskDidResumeAtOffset: ((NSURLSession, NSURLSessionDownloadTask, Int64, Int64) -> Void)?
+
+        // MARK: Delegate Methods
+
+        func URLSession(
+            session: NSURLSession,
+            downloadTask: NSURLSessionDownloadTask,
+            didFinishDownloadingToURL location: NSURL)
+        {
+            if let downloadTaskDidFinishDownloadingToURL = downloadTaskDidFinishDownloadingToURL {
+                do {
+                    let destination = downloadTaskDidFinishDownloadingToURL(session, downloadTask, location)
+                    try NSFileManager.defaultManager().moveItemAtURL(location, toURL: destination)
+                } catch {
+                    self.error = error as NSError
+                }
+            }
+        }
+
+        func URLSession(
+            session: NSURLSession,
+            downloadTask: NSURLSessionDownloadTask,
+            didWriteData bytesWritten: Int64,
+            totalBytesWritten: Int64,
+            totalBytesExpectedToWrite: Int64)
+        {
+            if let downloadTaskDidWriteData = downloadTaskDidWriteData {
+                downloadTaskDidWriteData(
+                    session,
+                    downloadTask,
+                    bytesWritten,
+                    totalBytesWritten, 
+                    totalBytesExpectedToWrite
+                )
+            } else {
+                progress.totalUnitCount = totalBytesExpectedToWrite
+                progress.completedUnitCount = totalBytesWritten
+
+                downloadProgress?(bytesWritten, totalBytesWritten, totalBytesExpectedToWrite)
+            }
+        }
+
+        func URLSession(
+            session: NSURLSession,
+            downloadTask: NSURLSessionDownloadTask,
+            didResumeAtOffset fileOffset: Int64,
+            expectedTotalBytes: Int64)
+        {
+            if let downloadTaskDidResumeAtOffset = downloadTaskDidResumeAtOffset {
+                downloadTaskDidResumeAtOffset(session, downloadTask, fileOffset, expectedTotalBytes)
+            } else {
+                progress.totalUnitCount = expectedTotalBytes
+                progress.completedUnitCount = fileOffset
+            }
+        }
+    }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Error.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Error.swift
new file mode 100644
index 00000000000..7a813f1b813
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Error.swift
@@ -0,0 +1,66 @@
+// Error.swift
+//
+// Copyright (c) 2014–2016 Alamofire Software Foundation (http://alamofire.org/)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+
+/// The `Error` struct provides a convenience for creating custom Alamofire NSErrors.
+public struct Error {
+    /// The domain used for creating all Alamofire errors.
+    public static let Domain = "com.alamofire.error"
+
+    /// The custom error codes generated by Alamofire.
+    public enum Code: Int {
+        case InputStreamReadFailed           = -6000
+        case OutputStreamWriteFailed         = -6001
+        case ContentTypeValidationFailed     = -6002
+        case StatusCodeValidationFailed      = -6003
+        case DataSerializationFailed         = -6004
+        case StringSerializationFailed       = -6005
+        case JSONSerializationFailed         = -6006
+        case PropertyListSerializationFailed = -6007
+    }
+
+    /**
+        Creates an `NSError` with the given error code and failure reason.
+
+        - parameter code:          The error code.
+        - parameter failureReason: The failure reason.
+
+        - returns: An `NSError` with the given error code and failure reason.
+    */
+    public static func errorWithCode(code: Code, failureReason: String) -> NSError {
+        return errorWithCode(code.rawValue, failureReason: failureReason)
+    }
+
+    /**
+        Creates an `NSError` with the given error code and failure reason.
+
+        - parameter code:          The error code.
+        - parameter failureReason: The failure reason.
+
+        - returns: An `NSError` with the given error code and failure reason.
+    */
+    public static func errorWithCode(code: Int, failureReason: String) -> NSError {
+        let userInfo = [NSLocalizedFailureReasonErrorKey: failureReason]
+        return NSError(domain: Domain, code: code, userInfo: userInfo)
+    }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Manager.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Manager.swift
new file mode 100644
index 00000000000..d81c7380fa8
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Manager.swift
@@ -0,0 +1,693 @@
+// Manager.swift
+//
+// Copyright (c) 2014–2016 Alamofire Software Foundation (http://alamofire.org/)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+
+/**
+    Responsible for creating and managing `Request` objects, as well as their underlying `NSURLSession`.
+*/
+public class Manager {
+
+    // MARK: - Properties
+
+    /**
+        A shared instance of `Manager`, used by top-level Alamofire request methods, and suitable for use directly 
+        for any ad hoc requests.
+    */
+    public static let sharedInstance: Manager = {
+        let configuration = NSURLSessionConfiguration.defaultSessionConfiguration()
+        configuration.HTTPAdditionalHeaders = Manager.defaultHTTPHeaders
+
+        return Manager(configuration: configuration)
+    }()
+
+    /**
+        Creates default values for the "Accept-Encoding", "Accept-Language" and "User-Agent" headers.
+    */
+    public static let defaultHTTPHeaders: [String: String] = {
+        // Accept-Encoding HTTP Header; see https://tools.ietf.org/html/rfc7230#section-4.2.3
+        let acceptEncoding: String = "gzip;q=1.0, compress;q=0.5"
+
+        // Accept-Language HTTP Header; see https://tools.ietf.org/html/rfc7231#section-5.3.5
+        let acceptLanguage = NSLocale.preferredLanguages().prefix(6).enumerate().map { index, languageCode in
+            let quality = 1.0 - (Double(index) * 0.1)
+            return "\(languageCode);q=\(quality)"
+        }.joinWithSeparator(", ")
+
+        // User-Agent Header; see https://tools.ietf.org/html/rfc7231#section-5.5.3
+        let userAgent: String = {
+            if let info = NSBundle.mainBundle().infoDictionary {
+                let executable: AnyObject = info[kCFBundleExecutableKey as String] ?? "Unknown"
+                let bundle: AnyObject = info[kCFBundleIdentifierKey as String] ?? "Unknown"
+                let version: AnyObject = info[kCFBundleVersionKey as String] ?? "Unknown"
+                let os: AnyObject = NSProcessInfo.processInfo().operatingSystemVersionString ?? "Unknown"
+
+                var mutableUserAgent = NSMutableString(string: "\(executable)/\(bundle) (\(version); OS \(os))") as CFMutableString
+                let transform = NSString(string: "Any-Latin; Latin-ASCII; [:^ASCII:] Remove") as CFString
+
+                if CFStringTransform(mutableUserAgent, UnsafeMutablePointer<CFRange>(nil), transform, false) {
+                    return mutableUserAgent as String
+                }
+            }
+
+            return "Alamofire"
+        }()
+
+        return [
+            "Accept-Encoding": acceptEncoding,
+            "Accept-Language": acceptLanguage,
+            "User-Agent": userAgent
+        ]
+    }()
+
+    let queue = dispatch_queue_create(nil, DISPATCH_QUEUE_SERIAL)
+
+    /// The underlying session.
+    public let session: NSURLSession
+
+    /// The session delegate handling all the task and session delegate callbacks.
+    public let delegate: SessionDelegate
+
+    /// Whether to start requests immediately after being constructed. `true` by default.
+    public var startRequestsImmediately: Bool = true
+
+    /**
+        The background completion handler closure provided by the UIApplicationDelegate 
+        `application:handleEventsForBackgroundURLSession:completionHandler:` method. By setting the background 
+        completion handler, the SessionDelegate `sessionDidFinishEventsForBackgroundURLSession` closure implementation 
+        will automatically call the handler.
+    
+        If you need to handle your own events before the handler is called, then you need to override the 
+        SessionDelegate `sessionDidFinishEventsForBackgroundURLSession` and manually call the handler when finished.
+    
+        `nil` by default.
+    */
+    public var backgroundCompletionHandler: (() -> Void)?
+
+    // MARK: - Lifecycle
+
+    /**
+        Initializes the `Manager` instance with the specified configuration, delegate and server trust policy.
+
+        - parameter configuration:            The configuration used to construct the managed session. 
+                                              `NSURLSessionConfiguration.defaultSessionConfiguration()` by default.
+        - parameter delegate:                 The delegate used when initializing the session. `SessionDelegate()` by
+                                              default.
+        - parameter serverTrustPolicyManager: The server trust policy manager to use for evaluating all server trust 
+                                              challenges. `nil` by default.
+
+        - returns: The new `Manager` instance.
+    */
+    public init(
+        configuration: NSURLSessionConfiguration = NSURLSessionConfiguration.defaultSessionConfiguration(),
+        delegate: SessionDelegate = SessionDelegate(),
+        serverTrustPolicyManager: ServerTrustPolicyManager? = nil)
+    {
+        self.delegate = delegate
+        self.session = NSURLSession(configuration: configuration, delegate: delegate, delegateQueue: nil)
+
+        commonInit(serverTrustPolicyManager: serverTrustPolicyManager)
+    }
+
+    /**
+        Initializes the `Manager` instance with the specified session, delegate and server trust policy.
+
+        - parameter session:                  The URL session.
+        - parameter delegate:                 The delegate of the URL session. Must equal the URL session's delegate.
+        - parameter serverTrustPolicyManager: The server trust policy manager to use for evaluating all server trust
+                                              challenges. `nil` by default.
+
+        - returns: The new `Manager` instance if the URL session's delegate matches the delegate parameter.
+    */
+    public init?(
+        session: NSURLSession,
+        delegate: SessionDelegate,
+        serverTrustPolicyManager: ServerTrustPolicyManager? = nil)
+    {
+        self.delegate = delegate
+        self.session = session
+
+        guard delegate === session.delegate else { return nil }
+
+        commonInit(serverTrustPolicyManager: serverTrustPolicyManager)
+    }
+
+    private func commonInit(serverTrustPolicyManager serverTrustPolicyManager: ServerTrustPolicyManager?) {
+        session.serverTrustPolicyManager = serverTrustPolicyManager
+
+        delegate.sessionDidFinishEventsForBackgroundURLSession = { [weak self] session in
+            guard let strongSelf = self else { return }
+            dispatch_async(dispatch_get_main_queue()) { strongSelf.backgroundCompletionHandler?() }
+        }
+    }
+
+    deinit {
+        session.invalidateAndCancel()
+    }
+
+    // MARK: - Request
+
+    /**
+        Creates a request for the specified method, URL string, parameters, parameter encoding and headers.
+
+        - parameter method:     The HTTP method.
+        - parameter URLString:  The URL string.
+        - parameter parameters: The parameters. `nil` by default.
+        - parameter encoding:   The parameter encoding. `.URL` by default.
+        - parameter headers:    The HTTP headers. `nil` by default.
+
+        - returns: The created request.
+    */
+    public func request(
+        method: Method,
+        _ URLString: URLStringConvertible,
+        parameters: [String: AnyObject]? = nil,
+        encoding: ParameterEncoding = .URL,
+        headers: [String: String]? = nil)
+        -> Request
+    {
+        let mutableURLRequest = URLRequest(method, URLString, headers: headers)
+        let encodedURLRequest = encoding.encode(mutableURLRequest, parameters: parameters).0
+        return request(encodedURLRequest)
+    }
+
+    /**
+        Creates a request for the specified URL request.
+
+        If `startRequestsImmediately` is `true`, the request will have `resume()` called before being returned.
+
+        - parameter URLRequest: The URL request
+
+        - returns: The created request.
+    */
+    public func request(URLRequest: URLRequestConvertible) -> Request {
+        var dataTask: NSURLSessionDataTask!
+        dispatch_sync(queue) { dataTask = self.session.dataTaskWithRequest(URLRequest.URLRequest) }
+
+        let request = Request(session: session, task: dataTask)
+        delegate[request.delegate.task] = request.delegate
+
+        if startRequestsImmediately {
+            request.resume()
+        }
+
+        return request
+    }
+
+    // MARK: - SessionDelegate
+
+    /**
+        Responsible for handling all delegate callbacks for the underlying session.
+    */
+    public final class SessionDelegate: NSObject, NSURLSessionDelegate, NSURLSessionTaskDelegate, NSURLSessionDataDelegate, NSURLSessionDownloadDelegate {
+        private var subdelegates: [Int: Request.TaskDelegate] = [:]
+        private let subdelegateQueue = dispatch_queue_create(nil, DISPATCH_QUEUE_CONCURRENT)
+
+        subscript(task: NSURLSessionTask) -> Request.TaskDelegate? {
+            get {
+                var subdelegate: Request.TaskDelegate?
+                dispatch_sync(subdelegateQueue) { subdelegate = self.subdelegates[task.taskIdentifier] }
+
+                return subdelegate
+            }
+
+            set {
+                dispatch_barrier_async(subdelegateQueue) { self.subdelegates[task.taskIdentifier] = newValue }
+            }
+        }
+
+        /**
+            Initializes the `SessionDelegate` instance.
+
+            - returns: The new `SessionDelegate` instance.
+        */
+        public override init() {
+            super.init()
+        }
+
+        // MARK: - NSURLSessionDelegate
+
+        // MARK: Override Closures
+
+        /// Overrides default behavior for NSURLSessionDelegate method `URLSession:didBecomeInvalidWithError:`.
+        public var sessionDidBecomeInvalidWithError: ((NSURLSession, NSError?) -> Void)?
+
+        /// Overrides default behavior for NSURLSessionDelegate method `URLSession:didReceiveChallenge:completionHandler:`.
+        public var sessionDidReceiveChallenge: ((NSURLSession, NSURLAuthenticationChallenge) -> (NSURLSessionAuthChallengeDisposition, NSURLCredential?))?
+
+        /// Overrides default behavior for NSURLSessionDelegate method `URLSessionDidFinishEventsForBackgroundURLSession:`.
+        public var sessionDidFinishEventsForBackgroundURLSession: ((NSURLSession) -> Void)?
+
+        // MARK: Delegate Methods
+
+        /**
+            Tells the delegate that the session has been invalidated.
+
+            - parameter session: The session object that was invalidated.
+            - parameter error:   The error that caused invalidation, or nil if the invalidation was explicit.
+        */
+        public func URLSession(session: NSURLSession, didBecomeInvalidWithError error: NSError?) {
+            sessionDidBecomeInvalidWithError?(session, error)
+        }
+
+        /**
+            Requests credentials from the delegate in response to a session-level authentication request from the remote server.
+
+            - parameter session:           The session containing the task that requested authentication.
+            - parameter challenge:         An object that contains the request for authentication.
+            - parameter completionHandler: A handler that your delegate method must call providing the disposition and credential.
+        */
+        public func URLSession(
+            session: NSURLSession,
+            didReceiveChallenge challenge: NSURLAuthenticationChallenge,
+            completionHandler: ((NSURLSessionAuthChallengeDisposition, NSURLCredential?) -> Void))
+        {
+            var disposition: NSURLSessionAuthChallengeDisposition = .PerformDefaultHandling
+            var credential: NSURLCredential?
+
+            if let sessionDidReceiveChallenge = sessionDidReceiveChallenge {
+                (disposition, credential) = sessionDidReceiveChallenge(session, challenge)
+            } else if challenge.protectionSpace.authenticationMethod == NSURLAuthenticationMethodServerTrust {
+                let host = challenge.protectionSpace.host
+
+                if let
+                    serverTrustPolicy = session.serverTrustPolicyManager?.serverTrustPolicyForHost(host),
+                    serverTrust = challenge.protectionSpace.serverTrust
+                {
+                    if serverTrustPolicy.evaluateServerTrust(serverTrust, isValidForHost: host) {
+                        disposition = .UseCredential
+                        credential = NSURLCredential(forTrust: serverTrust)
+                    } else {
+                        disposition = .CancelAuthenticationChallenge
+                    }
+                }
+            }
+
+            completionHandler(disposition, credential)
+        }
+
+        /**
+            Tells the delegate that all messages enqueued for a session have been delivered.
+
+            - parameter session: The session that no longer has any outstanding requests.
+        */
+        public func URLSessionDidFinishEventsForBackgroundURLSession(session: NSURLSession) {
+            sessionDidFinishEventsForBackgroundURLSession?(session)
+        }
+
+        // MARK: - NSURLSessionTaskDelegate
+
+        // MARK: Override Closures
+
+        /// Overrides default behavior for NSURLSessionTaskDelegate method `URLSession:task:willPerformHTTPRedirection:newRequest:completionHandler:`.
+        public var taskWillPerformHTTPRedirection: ((NSURLSession, NSURLSessionTask, NSHTTPURLResponse, NSURLRequest) -> NSURLRequest?)?
+
+        /// Overrides default behavior for NSURLSessionTaskDelegate method `URLSession:task:didReceiveChallenge:completionHandler:`.
+        public var taskDidReceiveChallenge: ((NSURLSession, NSURLSessionTask, NSURLAuthenticationChallenge) -> (NSURLSessionAuthChallengeDisposition, NSURLCredential?))?
+
+        /// Overrides default behavior for NSURLSessionTaskDelegate method `URLSession:session:task:needNewBodyStream:`.
+        public var taskNeedNewBodyStream: ((NSURLSession, NSURLSessionTask) -> NSInputStream!)?
+
+        /// Overrides default behavior for NSURLSessionTaskDelegate method `URLSession:task:didSendBodyData:totalBytesSent:totalBytesExpectedToSend:`.
+        public var taskDidSendBodyData: ((NSURLSession, NSURLSessionTask, Int64, Int64, Int64) -> Void)?
+
+        /// Overrides default behavior for NSURLSessionTaskDelegate method `URLSession:task:didCompleteWithError:`.
+        public var taskDidComplete: ((NSURLSession, NSURLSessionTask, NSError?) -> Void)?
+
+        // MARK: Delegate Methods
+
+        /**
+            Tells the delegate that the remote server requested an HTTP redirect.
+
+            - parameter session:           The session containing the task whose request resulted in a redirect.
+            - parameter task:              The task whose request resulted in a redirect.
+            - parameter response:          An object containing the server’s response to the original request.
+            - parameter request:           A URL request object filled out with the new location.
+            - parameter completionHandler: A closure that your handler should call with either the value of the request 
+                                           parameter, a modified URL request object, or NULL to refuse the redirect and 
+                                           return the body of the redirect response.
+        */
+        public func URLSession(
+            session: NSURLSession,
+            task: NSURLSessionTask,
+            willPerformHTTPRedirection response: NSHTTPURLResponse,
+            newRequest request: NSURLRequest,
+            completionHandler: ((NSURLRequest?) -> Void))
+        {
+            var redirectRequest: NSURLRequest? = request
+
+            if let taskWillPerformHTTPRedirection = taskWillPerformHTTPRedirection {
+                redirectRequest = taskWillPerformHTTPRedirection(session, task, response, request)
+            }
+
+            completionHandler(redirectRequest)
+        }
+
+        /**
+            Requests credentials from the delegate in response to an authentication request from the remote server.
+
+            - parameter session:           The session containing the task whose request requires authentication.
+            - parameter task:              The task whose request requires authentication.
+            - parameter challenge:         An object that contains the request for authentication.
+            - parameter completionHandler: A handler that your delegate method must call providing the disposition and credential.
+        */
+        public func URLSession(
+            session: NSURLSession,
+            task: NSURLSessionTask,
+            didReceiveChallenge challenge: NSURLAuthenticationChallenge,
+            completionHandler: ((NSURLSessionAuthChallengeDisposition, NSURLCredential?) -> Void))
+        {
+            if let taskDidReceiveChallenge = taskDidReceiveChallenge {
+                completionHandler(taskDidReceiveChallenge(session, task, challenge))
+            } else if let delegate = self[task] {
+                delegate.URLSession(
+                    session,
+                    task: task,
+                    didReceiveChallenge: challenge,
+                    completionHandler: completionHandler
+                )
+            } else {
+                URLSession(session, didReceiveChallenge: challenge, completionHandler: completionHandler)
+            }
+        }
+
+        /**
+            Tells the delegate when a task requires a new request body stream to send to the remote server.
+
+            - parameter session:           The session containing the task that needs a new body stream.
+            - parameter task:              The task that needs a new body stream.
+            - parameter completionHandler: A completion handler that your delegate method should call with the new body stream.
+        */
+        public func URLSession(
+            session: NSURLSession,
+            task: NSURLSessionTask,
+            needNewBodyStream completionHandler: ((NSInputStream?) -> Void))
+        {
+            if let taskNeedNewBodyStream = taskNeedNewBodyStream {
+                completionHandler(taskNeedNewBodyStream(session, task))
+            } else if let delegate = self[task] {
+                delegate.URLSession(session, task: task, needNewBodyStream: completionHandler)
+            }
+        }
+
+        /**
+            Periodically informs the delegate of the progress of sending body content to the server.
+
+            - parameter session:                  The session containing the data task.
+            - parameter task:                     The data task.
+            - parameter bytesSent:                The number of bytes sent since the last time this delegate method was called.
+            - parameter totalBytesSent:           The total number of bytes sent so far.
+            - parameter totalBytesExpectedToSend: The expected length of the body data.
+        */
+        public func URLSession(
+            session: NSURLSession,
+            task: NSURLSessionTask,
+            didSendBodyData bytesSent: Int64,
+            totalBytesSent: Int64,
+            totalBytesExpectedToSend: Int64)
+        {
+            if let taskDidSendBodyData = taskDidSendBodyData {
+                taskDidSendBodyData(session, task, bytesSent, totalBytesSent, totalBytesExpectedToSend)
+            } else if let delegate = self[task] as? Request.UploadTaskDelegate {
+                delegate.URLSession(
+                    session,
+                    task: task,
+                    didSendBodyData: bytesSent,
+                    totalBytesSent: totalBytesSent,
+                    totalBytesExpectedToSend: totalBytesExpectedToSend
+                )
+            }
+        }
+
+        /**
+            Tells the delegate that the task finished transferring data.
+
+            - parameter session: The session containing the task whose request finished transferring data.
+            - parameter task:    The task whose request finished transferring data.
+            - parameter error:   If an error occurred, an error object indicating how the transfer failed, otherwise nil.
+        */
+        public func URLSession(session: NSURLSession, task: NSURLSessionTask, didCompleteWithError error: NSError?) {
+            if let taskDidComplete = taskDidComplete {
+                taskDidComplete(session, task, error)
+            } else if let delegate = self[task] {
+                delegate.URLSession(session, task: task, didCompleteWithError: error)
+            }
+
+            self[task] = nil
+        }
+
+        // MARK: - NSURLSessionDataDelegate
+
+        // MARK: Override Closures
+
+        /// Overrides default behavior for NSURLSessionDataDelegate method `URLSession:dataTask:didReceiveResponse:completionHandler:`.
+        public var dataTaskDidReceiveResponse: ((NSURLSession, NSURLSessionDataTask, NSURLResponse) -> NSURLSessionResponseDisposition)?
+
+        /// Overrides default behavior for NSURLSessionDataDelegate method `URLSession:dataTask:didBecomeDownloadTask:`.
+        public var dataTaskDidBecomeDownloadTask: ((NSURLSession, NSURLSessionDataTask, NSURLSessionDownloadTask) -> Void)?
+
+        /// Overrides default behavior for NSURLSessionDataDelegate method `URLSession:dataTask:didReceiveData:`.
+        public var dataTaskDidReceiveData: ((NSURLSession, NSURLSessionDataTask, NSData) -> Void)?
+
+        /// Overrides default behavior for NSURLSessionDataDelegate method `URLSession:dataTask:willCacheResponse:completionHandler:`.
+        public var dataTaskWillCacheResponse: ((NSURLSession, NSURLSessionDataTask, NSCachedURLResponse) -> NSCachedURLResponse!)?
+
+        // MARK: Delegate Methods
+
+        /**
+            Tells the delegate that the data task received the initial reply (headers) from the server.
+
+            - parameter session:           The session containing the data task that received an initial reply.
+            - parameter dataTask:          The data task that received an initial reply.
+            - parameter response:          A URL response object populated with headers.
+            - parameter completionHandler: A completion handler that your code calls to continue the transfer, passing a 
+                                           constant to indicate whether the transfer should continue as a data task or 
+                                           should become a download task.
+        */
+        public func URLSession(
+            session: NSURLSession,
+            dataTask: NSURLSessionDataTask,
+            didReceiveResponse response: NSURLResponse,
+            completionHandler: ((NSURLSessionResponseDisposition) -> Void))
+        {
+            var disposition: NSURLSessionResponseDisposition = .Allow
+
+            if let dataTaskDidReceiveResponse = dataTaskDidReceiveResponse {
+                disposition = dataTaskDidReceiveResponse(session, dataTask, response)
+            }
+
+            completionHandler(disposition)
+        }
+
+        /**
+            Tells the delegate that the data task was changed to a download task.
+
+            - parameter session:      The session containing the task that was replaced by a download task.
+            - parameter dataTask:     The data task that was replaced by a download task.
+            - parameter downloadTask: The new download task that replaced the data task.
+        */
+        public func URLSession(
+            session: NSURLSession,
+            dataTask: NSURLSessionDataTask,
+            didBecomeDownloadTask downloadTask: NSURLSessionDownloadTask)
+        {
+            if let dataTaskDidBecomeDownloadTask = dataTaskDidBecomeDownloadTask {
+                dataTaskDidBecomeDownloadTask(session, dataTask, downloadTask)
+            } else {
+                let downloadDelegate = Request.DownloadTaskDelegate(task: downloadTask)
+                self[downloadTask] = downloadDelegate
+            }
+        }
+
+        /**
+            Tells the delegate that the data task has received some of the expected data.
+
+            - parameter session:  The session containing the data task that provided data.
+            - parameter dataTask: The data task that provided data.
+            - parameter data:     A data object containing the transferred data.
+        */
+        public func URLSession(session: NSURLSession, dataTask: NSURLSessionDataTask, didReceiveData data: NSData) {
+            if let dataTaskDidReceiveData = dataTaskDidReceiveData {
+                dataTaskDidReceiveData(session, dataTask, data)
+            } else if let delegate = self[dataTask] as? Request.DataTaskDelegate {
+                delegate.URLSession(session, dataTask: dataTask, didReceiveData: data)
+            }
+        }
+
+        /**
+            Asks the delegate whether the data (or upload) task should store the response in the cache.
+
+            - parameter session:           The session containing the data (or upload) task.
+            - parameter dataTask:          The data (or upload) task.
+            - parameter proposedResponse:  The default caching behavior. This behavior is determined based on the current 
+                                           caching policy and the values of certain received headers, such as the Pragma 
+                                           and Cache-Control headers.
+            - parameter completionHandler: A block that your handler must call, providing either the original proposed 
+                                           response, a modified version of that response, or NULL to prevent caching the 
+                                           response. If your delegate implements this method, it must call this completion 
+                                           handler; otherwise, your app leaks memory.
+        */
+        public func URLSession(
+            session: NSURLSession,
+            dataTask: NSURLSessionDataTask,
+            willCacheResponse proposedResponse: NSCachedURLResponse,
+            completionHandler: ((NSCachedURLResponse?) -> Void))
+        {
+            if let dataTaskWillCacheResponse = dataTaskWillCacheResponse {
+                completionHandler(dataTaskWillCacheResponse(session, dataTask, proposedResponse))
+            } else if let delegate = self[dataTask] as? Request.DataTaskDelegate {
+                delegate.URLSession(
+                    session,
+                    dataTask: dataTask,
+                    willCacheResponse: proposedResponse,
+                    completionHandler: completionHandler
+                )
+            } else {
+                completionHandler(proposedResponse)
+            }
+        }
+
+        // MARK: - NSURLSessionDownloadDelegate
+
+        // MARK: Override Closures
+
+        /// Overrides default behavior for NSURLSessionDownloadDelegate method `URLSession:downloadTask:didFinishDownloadingToURL:`.
+        public var downloadTaskDidFinishDownloadingToURL: ((NSURLSession, NSURLSessionDownloadTask, NSURL) -> Void)?
+
+        /// Overrides default behavior for NSURLSessionDownloadDelegate method `URLSession:downloadTask:didWriteData:totalBytesWritten:totalBytesExpectedToWrite:`.
+        public var downloadTaskDidWriteData: ((NSURLSession, NSURLSessionDownloadTask, Int64, Int64, Int64) -> Void)?
+
+        /// Overrides default behavior for NSURLSessionDownloadDelegate method `URLSession:downloadTask:didResumeAtOffset:expectedTotalBytes:`.
+        public var downloadTaskDidResumeAtOffset: ((NSURLSession, NSURLSessionDownloadTask, Int64, Int64) -> Void)?
+
+        // MARK: Delegate Methods
+
+        /**
+            Tells the delegate that a download task has finished downloading.
+
+            - parameter session:      The session containing the download task that finished.
+            - parameter downloadTask: The download task that finished.
+            - parameter location:     A file URL for the temporary file. Because the file is temporary, you must either 
+                                      open the file for reading or move it to a permanent location in your app’s sandbox 
+                                      container directory before returning from this delegate method.
+        */
+        public func URLSession(
+            session: NSURLSession,
+            downloadTask: NSURLSessionDownloadTask,
+            didFinishDownloadingToURL location: NSURL)
+        {
+            if let downloadTaskDidFinishDownloadingToURL = downloadTaskDidFinishDownloadingToURL {
+                downloadTaskDidFinishDownloadingToURL(session, downloadTask, location)
+            } else if let delegate = self[downloadTask] as? Request.DownloadTaskDelegate {
+                delegate.URLSession(session, downloadTask: downloadTask, didFinishDownloadingToURL: location)
+            }
+        }
+
+        /**
+            Periodically informs the delegate about the download’s progress.
+
+            - parameter session:                   The session containing the download task.
+            - parameter downloadTask:              The download task.
+            - parameter bytesWritten:              The number of bytes transferred since the last time this delegate 
+                                                   method was called.
+            - parameter totalBytesWritten:         The total number of bytes transferred so far.
+            - parameter totalBytesExpectedToWrite: The expected length of the file, as provided by the Content-Length 
+                                                   header. If this header was not provided, the value is 
+                                                   `NSURLSessionTransferSizeUnknown`.
+        */
+        public func URLSession(
+            session: NSURLSession,
+            downloadTask: NSURLSessionDownloadTask,
+            didWriteData bytesWritten: Int64,
+            totalBytesWritten: Int64,
+            totalBytesExpectedToWrite: Int64)
+        {
+            if let downloadTaskDidWriteData = downloadTaskDidWriteData {
+                downloadTaskDidWriteData(session, downloadTask, bytesWritten, totalBytesWritten, totalBytesExpectedToWrite)
+            } else if let delegate = self[downloadTask] as? Request.DownloadTaskDelegate {
+                delegate.URLSession(
+                    session,
+                    downloadTask: downloadTask,
+                    didWriteData: bytesWritten,
+                    totalBytesWritten: totalBytesWritten,
+                    totalBytesExpectedToWrite: totalBytesExpectedToWrite
+                )
+            }
+        }
+
+        /**
+            Tells the delegate that the download task has resumed downloading.
+
+            - parameter session:            The session containing the download task that finished.
+            - parameter downloadTask:       The download task that resumed. See explanation in the discussion.
+            - parameter fileOffset:         If the file's cache policy or last modified date prevents reuse of the 
+                                            existing content, then this value is zero. Otherwise, this value is an 
+                                            integer representing the number of bytes on disk that do not need to be 
+                                            retrieved again.
+            - parameter expectedTotalBytes: The expected length of the file, as provided by the Content-Length header. 
+                                            If this header was not provided, the value is NSURLSessionTransferSizeUnknown.
+        */
+        public func URLSession(
+            session: NSURLSession,
+            downloadTask: NSURLSessionDownloadTask,
+            didResumeAtOffset fileOffset: Int64,
+            expectedTotalBytes: Int64)
+        {
+            if let downloadTaskDidResumeAtOffset = downloadTaskDidResumeAtOffset {
+                downloadTaskDidResumeAtOffset(session, downloadTask, fileOffset, expectedTotalBytes)
+            } else if let delegate = self[downloadTask] as? Request.DownloadTaskDelegate {
+                delegate.URLSession(
+                    session,
+                    downloadTask: downloadTask,
+                    didResumeAtOffset: fileOffset,
+                    expectedTotalBytes: expectedTotalBytes
+                )
+            }
+        }
+
+        // MARK: - NSURLSessionStreamDelegate
+
+        var _streamTaskReadClosed: Any?
+        var _streamTaskWriteClosed: Any?
+        var _streamTaskBetterRouteDiscovered: Any?
+        var _streamTaskDidBecomeInputStream: Any?
+
+        // MARK: - NSObject
+
+        public override func respondsToSelector(selector: Selector) -> Bool {
+            switch selector {
+            case "URLSession:didBecomeInvalidWithError:":
+                return sessionDidBecomeInvalidWithError != nil
+            case "URLSession:didReceiveChallenge:completionHandler:":
+                return sessionDidReceiveChallenge != nil
+            case "URLSessionDidFinishEventsForBackgroundURLSession:":
+                return sessionDidFinishEventsForBackgroundURLSession != nil
+            case "URLSession:task:willPerformHTTPRedirection:newRequest:completionHandler:":
+                return taskWillPerformHTTPRedirection != nil
+            case "URLSession:dataTask:didReceiveResponse:completionHandler:":
+                return dataTaskDidReceiveResponse != nil
+            default:
+                return self.dynamicType.instancesRespondToSelector(selector)
+            }
+        }
+    }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/MultipartFormData.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/MultipartFormData.swift
new file mode 100644
index 00000000000..8c37f164e7e
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/MultipartFormData.swift
@@ -0,0 +1,669 @@
+// MultipartFormData.swift
+//
+// Copyright (c) 2014–2016 Alamofire Software Foundation (http://alamofire.org/)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+
+#if os(iOS) || os(watchOS) || os(tvOS)
+import MobileCoreServices
+#elseif os(OSX)
+import CoreServices
+#endif
+
+/**
+    Constructs `multipart/form-data` for uploads within an HTTP or HTTPS body. There are currently two ways to encode 
+    multipart form data. The first way is to encode the data directly in memory. This is very efficient, but can lead 
+    to memory issues if the dataset is too large. The second way is designed for larger datasets and will write all the 
+    data to a single file on disk with all the proper boundary segmentation. The second approach MUST be used for 
+    larger datasets such as video content, otherwise your app may run out of memory when trying to encode the dataset.
+
+    For more information on `multipart/form-data` in general, please refer to the RFC-2388 and RFC-2045 specs as well
+    and the w3 form documentation.
+
+    - https://www.ietf.org/rfc/rfc2388.txt
+    - https://www.ietf.org/rfc/rfc2045.txt
+    - https://www.w3.org/TR/html401/interact/forms.html#h-17.13
+*/
+public class MultipartFormData {
+
+    // MARK: - Helper Types
+
+    struct EncodingCharacters {
+        static let CRLF = "\r\n"
+    }
+
+    struct BoundaryGenerator {
+        enum BoundaryType {
+            case Initial, Encapsulated, Final
+        }
+
+        static func randomBoundary() -> String {
+            return String(format: "alamofire.boundary.%08x%08x", arc4random(), arc4random())
+        }
+
+        static func boundaryData(boundaryType boundaryType: BoundaryType, boundary: String) -> NSData {
+            let boundaryText: String
+
+            switch boundaryType {
+            case .Initial:
+                boundaryText = "--\(boundary)\(EncodingCharacters.CRLF)"
+            case .Encapsulated:
+                boundaryText = "\(EncodingCharacters.CRLF)--\(boundary)\(EncodingCharacters.CRLF)"
+            case .Final:
+                boundaryText = "\(EncodingCharacters.CRLF)--\(boundary)--\(EncodingCharacters.CRLF)"
+            }
+
+            return boundaryText.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)!
+        }
+    }
+
+    class BodyPart {
+        let headers: [String: String]
+        let bodyStream: NSInputStream
+        let bodyContentLength: UInt64
+        var hasInitialBoundary = false
+        var hasFinalBoundary = false
+
+        init(headers: [String: String], bodyStream: NSInputStream, bodyContentLength: UInt64) {
+            self.headers = headers
+            self.bodyStream = bodyStream
+            self.bodyContentLength = bodyContentLength
+        }
+    }
+
+    // MARK: - Properties
+
+    /// The `Content-Type` header value containing the boundary used to generate the `multipart/form-data`.
+    public var contentType: String { return "multipart/form-data; boundary=\(boundary)" }
+
+    /// The content length of all body parts used to generate the `multipart/form-data` not including the boundaries.
+    public var contentLength: UInt64 { return bodyParts.reduce(0) { $0 + $1.bodyContentLength } }
+
+    /// The boundary used to separate the body parts in the encoded form data.
+    public let boundary: String
+
+    private var bodyParts: [BodyPart]
+    private var bodyPartError: NSError?
+    private let streamBufferSize: Int
+
+    // MARK: - Lifecycle
+
+    /**
+        Creates a multipart form data object.
+
+        - returns: The multipart form data object.
+    */
+    public init() {
+        self.boundary = BoundaryGenerator.randomBoundary()
+        self.bodyParts = []
+
+        /**
+         *  The optimal read/write buffer size in bytes for input and output streams is 1024 (1KB). For more 
+         *  information, please refer to the following article:
+         *    - https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/Streams/Articles/ReadingInputStreams.html
+         */
+
+        self.streamBufferSize = 1024
+    }
+
+    // MARK: - Body Parts
+
+    /**
+        Creates a body part from the data and appends it to the multipart form data object.
+
+        The body part data will be encoded using the following format:
+
+        - `Content-Disposition: form-data; name=#{name}` (HTTP Header)
+        - Encoded data
+        - Multipart form boundary
+
+        - parameter data: The data to encode into the multipart form data.
+        - parameter name: The name to associate with the data in the `Content-Disposition` HTTP header.
+    */
+    public func appendBodyPart(data data: NSData, name: String) {
+        let headers = contentHeaders(name: name)
+        let stream = NSInputStream(data: data)
+        let length = UInt64(data.length)
+
+        appendBodyPart(stream: stream, length: length, headers: headers)
+    }
+
+    /**
+        Creates a body part from the data and appends it to the multipart form data object.
+
+        The body part data will be encoded using the following format:
+
+        - `Content-Disposition: form-data; name=#{name}` (HTTP Header)
+        - `Content-Type: #{generated mimeType}` (HTTP Header)
+        - Encoded data
+        - Multipart form boundary
+
+        - parameter data:     The data to encode into the multipart form data.
+        - parameter name:     The name to associate with the data in the `Content-Disposition` HTTP header.
+        - parameter mimeType: The MIME type to associate with the data content type in the `Content-Type` HTTP header.
+    */
+    public func appendBodyPart(data data: NSData, name: String, mimeType: String) {
+        let headers = contentHeaders(name: name, mimeType: mimeType)
+        let stream = NSInputStream(data: data)
+        let length = UInt64(data.length)
+
+        appendBodyPart(stream: stream, length: length, headers: headers)
+    }
+
+    /**
+        Creates a body part from the data and appends it to the multipart form data object.
+
+        The body part data will be encoded using the following format:
+
+        - `Content-Disposition: form-data; name=#{name}; filename=#{filename}` (HTTP Header)
+        - `Content-Type: #{mimeType}` (HTTP Header)
+        - Encoded file data
+        - Multipart form boundary
+
+        - parameter data:     The data to encode into the multipart form data.
+        - parameter name:     The name to associate with the data in the `Content-Disposition` HTTP header.
+        - parameter fileName: The filename to associate with the data in the `Content-Disposition` HTTP header.
+        - parameter mimeType: The MIME type to associate with the data in the `Content-Type` HTTP header.
+    */
+    public func appendBodyPart(data data: NSData, name: String, fileName: String, mimeType: String) {
+        let headers = contentHeaders(name: name, fileName: fileName, mimeType: mimeType)
+        let stream = NSInputStream(data: data)
+        let length = UInt64(data.length)
+
+        appendBodyPart(stream: stream, length: length, headers: headers)
+    }
+
+    /**
+        Creates a body part from the file and appends it to the multipart form data object.
+
+        The body part data will be encoded using the following format:
+
+        - `Content-Disposition: form-data; name=#{name}; filename=#{generated filename}` (HTTP Header)
+        - `Content-Type: #{generated mimeType}` (HTTP Header)
+        - Encoded file data
+        - Multipart form boundary
+
+        The filename in the `Content-Disposition` HTTP header is generated from the last path component of the
+        `fileURL`. The `Content-Type` HTTP header MIME type is generated by mapping the `fileURL` extension to the
+        system associated MIME type.
+
+        - parameter fileURL: The URL of the file whose content will be encoded into the multipart form data.
+        - parameter name:    The name to associate with the file content in the `Content-Disposition` HTTP header.
+    */
+    public func appendBodyPart(fileURL fileURL: NSURL, name: String) {
+        if let
+            fileName = fileURL.lastPathComponent,
+            pathExtension = fileURL.pathExtension
+        {
+            let mimeType = mimeTypeForPathExtension(pathExtension)
+            appendBodyPart(fileURL: fileURL, name: name, fileName: fileName, mimeType: mimeType)
+        } else {
+            let failureReason = "Failed to extract the fileName of the provided URL: \(fileURL)"
+            setBodyPartError(Error.errorWithCode(NSURLErrorBadURL, failureReason: failureReason))
+        }
+    }
+
+    /**
+        Creates a body part from the file and appends it to the multipart form data object.
+
+        The body part data will be encoded using the following format:
+
+        - Content-Disposition: form-data; name=#{name}; filename=#{filename} (HTTP Header)
+        - Content-Type: #{mimeType} (HTTP Header)
+        - Encoded file data
+        - Multipart form boundary
+
+        - parameter fileURL:  The URL of the file whose content will be encoded into the multipart form data.
+        - parameter name:     The name to associate with the file content in the `Content-Disposition` HTTP header.
+        - parameter fileName: The filename to associate with the file content in the `Content-Disposition` HTTP header.
+        - parameter mimeType: The MIME type to associate with the file content in the `Content-Type` HTTP header.
+    */
+    public func appendBodyPart(fileURL fileURL: NSURL, name: String, fileName: String, mimeType: String) {
+        let headers = contentHeaders(name: name, fileName: fileName, mimeType: mimeType)
+
+        //============================================================
+        //                 Check 1 - is file URL?
+        //============================================================
+
+        guard fileURL.fileURL else {
+            let failureReason = "The file URL does not point to a file URL: \(fileURL)"
+            let error = Error.errorWithCode(NSURLErrorBadURL, failureReason: failureReason)
+            setBodyPartError(error)
+            return
+        }
+
+        //============================================================
+        //              Check 2 - is file URL reachable?
+        //============================================================
+
+        var isReachable = true
+
+        if #available(OSX 10.10, *) {
+            isReachable = fileURL.checkPromisedItemIsReachableAndReturnError(nil)
+        }
+
+        guard isReachable else {
+            let error = Error.errorWithCode(NSURLErrorBadURL, failureReason: "The file URL is not reachable: \(fileURL)")
+            setBodyPartError(error)
+            return
+        }
+
+        //============================================================
+        //            Check 3 - is file URL a directory?
+        //============================================================
+
+        var isDirectory: ObjCBool = false
+
+        guard let
+            path = fileURL.path
+            where NSFileManager.defaultManager().fileExistsAtPath(path, isDirectory: &isDirectory) && !isDirectory else
+        {
+            let failureReason = "The file URL is a directory, not a file: \(fileURL)"
+            let error = Error.errorWithCode(NSURLErrorBadURL, failureReason: failureReason)
+            setBodyPartError(error)
+            return
+        }
+
+        //============================================================
+        //          Check 4 - can the file size be extracted?
+        //============================================================
+
+        var bodyContentLength: UInt64?
+
+        do {
+            if let
+                path = fileURL.path,
+                fileSize = try NSFileManager.defaultManager().attributesOfItemAtPath(path)[NSFileSize] as? NSNumber
+            {
+                bodyContentLength = fileSize.unsignedLongLongValue
+            }
+        } catch {
+            // No-op
+        }
+
+        guard let length = bodyContentLength else {
+            let failureReason = "Could not fetch attributes from the file URL: \(fileURL)"
+            let error = Error.errorWithCode(NSURLErrorBadURL, failureReason: failureReason)
+            setBodyPartError(error)
+            return
+        }
+
+        //============================================================
+        //       Check 5 - can a stream be created from file URL?
+        //============================================================
+
+        guard let stream = NSInputStream(URL: fileURL) else {
+            let failureReason = "Failed to create an input stream from the file URL: \(fileURL)"
+            let error = Error.errorWithCode(NSURLErrorCannotOpenFile, failureReason: failureReason)
+            setBodyPartError(error)
+            return
+        }
+
+        appendBodyPart(stream: stream, length: length, headers: headers)
+    }
+
+    /**
+        Creates a body part from the stream and appends it to the multipart form data object.
+
+        The body part data will be encoded using the following format:
+
+        - `Content-Disposition: form-data; name=#{name}; filename=#{filename}` (HTTP Header)
+        - `Content-Type: #{mimeType}` (HTTP Header)
+        - Encoded stream data
+        - Multipart form boundary
+
+        - parameter stream:   The input stream to encode in the multipart form data.
+        - parameter length:   The content length of the stream.
+        - parameter name:     The name to associate with the stream content in the `Content-Disposition` HTTP header.
+        - parameter fileName: The filename to associate with the stream content in the `Content-Disposition` HTTP header.
+        - parameter mimeType: The MIME type to associate with the stream content in the `Content-Type` HTTP header.
+    */
+    public func appendBodyPart(
+        stream stream: NSInputStream,
+        length: UInt64,
+        name: String,
+        fileName: String,
+        mimeType: String)
+    {
+        let headers = contentHeaders(name: name, fileName: fileName, mimeType: mimeType)
+        appendBodyPart(stream: stream, length: length, headers: headers)
+    }
+
+    /**
+        Creates a body part with the headers, stream and length and appends it to the multipart form data object.
+
+        The body part data will be encoded using the following format:
+
+        - HTTP headers
+        - Encoded stream data
+        - Multipart form boundary
+
+        - parameter stream:  The input stream to encode in the multipart form data.
+        - parameter length:  The content length of the stream.
+        - parameter headers: The HTTP headers for the body part.
+    */
+    public func appendBodyPart(stream stream: NSInputStream, length: UInt64, headers: [String: String]) {
+        let bodyPart = BodyPart(headers: headers, bodyStream: stream, bodyContentLength: length)
+        bodyParts.append(bodyPart)
+    }
+
+    // MARK: - Data Encoding
+
+    /**
+        Encodes all the appended body parts into a single `NSData` object.
+
+        It is important to note that this method will load all the appended body parts into memory all at the same 
+        time. This method should only be used when the encoded data will have a small memory footprint. For large data 
+        cases, please use the `writeEncodedDataToDisk(fileURL:completionHandler:)` method.
+
+        - throws: An `NSError` if encoding encounters an error.
+
+        - returns: The encoded `NSData` if encoding is successful.
+    */
+    public func encode() throws -> NSData {
+        if let bodyPartError = bodyPartError {
+            throw bodyPartError
+        }
+
+        let encoded = NSMutableData()
+
+        bodyParts.first?.hasInitialBoundary = true
+        bodyParts.last?.hasFinalBoundary = true
+
+        for bodyPart in bodyParts {
+            let encodedData = try encodeBodyPart(bodyPart)
+            encoded.appendData(encodedData)
+        }
+
+        return encoded
+    }
+
+    /**
+        Writes the appended body parts into the given file URL.
+
+        This process is facilitated by reading and writing with input and output streams, respectively. Thus,
+        this approach is very memory efficient and should be used for large body part data.
+
+        - parameter fileURL: The file URL to write the multipart form data into.
+
+        - throws: An `NSError` if encoding encounters an error.
+    */
+    public func writeEncodedDataToDisk(fileURL: NSURL) throws {
+        if let bodyPartError = bodyPartError {
+            throw bodyPartError
+        }
+
+        if let path = fileURL.path where NSFileManager.defaultManager().fileExistsAtPath(path) {
+            let failureReason = "A file already exists at the given file URL: \(fileURL)"
+            throw Error.errorWithCode(NSURLErrorBadURL, failureReason: failureReason)
+        } else if !fileURL.fileURL {
+            let failureReason = "The URL does not point to a valid file: \(fileURL)"
+            throw Error.errorWithCode(NSURLErrorBadURL, failureReason: failureReason)
+        }
+
+        let outputStream: NSOutputStream
+
+        if let possibleOutputStream = NSOutputStream(URL: fileURL, append: false) {
+            outputStream = possibleOutputStream
+        } else {
+            let failureReason = "Failed to create an output stream with the given URL: \(fileURL)"
+            throw Error.errorWithCode(NSURLErrorCannotOpenFile, failureReason: failureReason)
+        }
+
+        outputStream.scheduleInRunLoop(NSRunLoop.currentRunLoop(), forMode: NSDefaultRunLoopMode)
+        outputStream.open()
+
+        self.bodyParts.first?.hasInitialBoundary = true
+        self.bodyParts.last?.hasFinalBoundary = true
+
+        for bodyPart in self.bodyParts {
+            try writeBodyPart(bodyPart, toOutputStream: outputStream)
+        }
+
+        outputStream.close()
+        outputStream.removeFromRunLoop(NSRunLoop.currentRunLoop(), forMode: NSDefaultRunLoopMode)
+    }
+
+    // MARK: - Private - Body Part Encoding
+
+    private func encodeBodyPart(bodyPart: BodyPart) throws -> NSData {
+        let encoded = NSMutableData()
+
+        let initialData = bodyPart.hasInitialBoundary ? initialBoundaryData() : encapsulatedBoundaryData()
+        encoded.appendData(initialData)
+
+        let headerData = encodeHeaderDataForBodyPart(bodyPart)
+        encoded.appendData(headerData)
+
+        let bodyStreamData = try encodeBodyStreamDataForBodyPart(bodyPart)
+        encoded.appendData(bodyStreamData)
+
+        if bodyPart.hasFinalBoundary {
+            encoded.appendData(finalBoundaryData())
+        }
+
+        return encoded
+    }
+
+    private func encodeHeaderDataForBodyPart(bodyPart: BodyPart) -> NSData {
+        var headerText = ""
+
+        for (key, value) in bodyPart.headers {
+            headerText += "\(key): \(value)\(EncodingCharacters.CRLF)"
+        }
+        headerText += EncodingCharacters.CRLF
+
+        return headerText.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)!
+    }
+
+    private func encodeBodyStreamDataForBodyPart(bodyPart: BodyPart) throws -> NSData {
+        let inputStream = bodyPart.bodyStream
+        inputStream.scheduleInRunLoop(NSRunLoop.currentRunLoop(), forMode: NSDefaultRunLoopMode)
+        inputStream.open()
+
+        var error: NSError?
+        let encoded = NSMutableData()
+
+        while inputStream.hasBytesAvailable {
+            var buffer = [UInt8](count: streamBufferSize, repeatedValue: 0)
+            let bytesRead = inputStream.read(&buffer, maxLength: streamBufferSize)
+
+            if inputStream.streamError != nil {
+                error = inputStream.streamError
+                break
+            }
+
+            if bytesRead > 0 {
+                encoded.appendBytes(buffer, length: bytesRead)
+            } else if bytesRead < 0 {
+                let failureReason = "Failed to read from input stream: \(inputStream)"
+                error = Error.errorWithCode(.InputStreamReadFailed, failureReason: failureReason)
+                break
+            } else {
+                break
+            }
+        }
+
+        inputStream.close()
+        inputStream.removeFromRunLoop(NSRunLoop.currentRunLoop(), forMode: NSDefaultRunLoopMode)
+
+        if let error = error {
+            throw error
+        }
+
+        return encoded
+    }
+
+    // MARK: - Private - Writing Body Part to Output Stream
+
+    private func writeBodyPart(bodyPart: BodyPart, toOutputStream outputStream: NSOutputStream) throws {
+        try writeInitialBoundaryDataForBodyPart(bodyPart, toOutputStream: outputStream)
+        try writeHeaderDataForBodyPart(bodyPart, toOutputStream: outputStream)
+        try writeBodyStreamForBodyPart(bodyPart, toOutputStream: outputStream)
+        try writeFinalBoundaryDataForBodyPart(bodyPart, toOutputStream: outputStream)
+    }
+
+    private func writeInitialBoundaryDataForBodyPart(
+        bodyPart: BodyPart,
+        toOutputStream outputStream: NSOutputStream)
+        throws
+    {
+        let initialData = bodyPart.hasInitialBoundary ? initialBoundaryData() : encapsulatedBoundaryData()
+        return try writeData(initialData, toOutputStream: outputStream)
+    }
+
+    private func writeHeaderDataForBodyPart(bodyPart: BodyPart, toOutputStream outputStream: NSOutputStream) throws {
+        let headerData = encodeHeaderDataForBodyPart(bodyPart)
+        return try writeData(headerData, toOutputStream: outputStream)
+    }
+
+    private func writeBodyStreamForBodyPart(bodyPart: BodyPart, toOutputStream outputStream: NSOutputStream) throws {
+        let inputStream = bodyPart.bodyStream
+        inputStream.scheduleInRunLoop(NSRunLoop.currentRunLoop(), forMode: NSDefaultRunLoopMode)
+        inputStream.open()
+
+        while inputStream.hasBytesAvailable {
+            var buffer = [UInt8](count: streamBufferSize, repeatedValue: 0)
+            let bytesRead = inputStream.read(&buffer, maxLength: streamBufferSize)
+
+            if let streamError = inputStream.streamError {
+                throw streamError
+            }
+
+            if bytesRead > 0 {
+                if buffer.count != bytesRead {
+                    buffer = Array(buffer[0..<bytesRead])
+                }
+
+                try writeBuffer(&buffer, toOutputStream: outputStream)
+            } else if bytesRead < 0 {
+                let failureReason = "Failed to read from input stream: \(inputStream)"
+                throw Error.errorWithCode(.InputStreamReadFailed, failureReason: failureReason)
+            } else {
+                break
+            }
+        }
+
+        inputStream.close()
+        inputStream.removeFromRunLoop(NSRunLoop.currentRunLoop(), forMode: NSDefaultRunLoopMode)
+    }
+
+    private func writeFinalBoundaryDataForBodyPart(
+        bodyPart: BodyPart,
+        toOutputStream outputStream: NSOutputStream)
+        throws
+    {
+        if bodyPart.hasFinalBoundary {
+            return try writeData(finalBoundaryData(), toOutputStream: outputStream)
+        }
+    }
+
+    // MARK: - Private - Writing Buffered Data to Output Stream
+
+    private func writeData(data: NSData, toOutputStream outputStream: NSOutputStream) throws {
+        var buffer = [UInt8](count: data.length, repeatedValue: 0)
+        data.getBytes(&buffer, length: data.length)
+
+        return try writeBuffer(&buffer, toOutputStream: outputStream)
+    }
+
+    private func writeBuffer(inout buffer: [UInt8], toOutputStream outputStream: NSOutputStream) throws {
+        var bytesToWrite = buffer.count
+
+        while bytesToWrite > 0 {
+            if outputStream.hasSpaceAvailable {
+                let bytesWritten = outputStream.write(buffer, maxLength: bytesToWrite)
+
+                if let streamError = outputStream.streamError {
+                    throw streamError
+                }
+
+                if bytesWritten < 0 {
+                    let failureReason = "Failed to write to output stream: \(outputStream)"
+                    throw Error.errorWithCode(.OutputStreamWriteFailed, failureReason: failureReason)
+                }
+
+                bytesToWrite -= bytesWritten
+
+                if bytesToWrite > 0 {
+                    buffer = Array(buffer[bytesWritten..<buffer.count])
+                }
+            } else if let streamError = outputStream.streamError {
+                throw streamError
+            }
+        }
+    }
+
+    // MARK: - Private - Mime Type
+
+    private func mimeTypeForPathExtension(pathExtension: String) -> String {
+        if let
+            id = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, pathExtension, nil)?.takeRetainedValue(),
+            contentType = UTTypeCopyPreferredTagWithClass(id, kUTTagClassMIMEType)?.takeRetainedValue()
+        {
+            return contentType as String
+        }
+
+        return "application/octet-stream"
+    }
+
+    // MARK: - Private - Content Headers
+
+    private func contentHeaders(name name: String) -> [String: String] {
+        return ["Content-Disposition": "form-data; name=\"\(name)\""]
+    }
+
+    private func contentHeaders(name name: String, mimeType: String) -> [String: String] {
+        return [
+            "Content-Disposition": "form-data; name=\"\(name)\"",
+            "Content-Type": "\(mimeType)"
+        ]
+    }
+
+    private func contentHeaders(name name: String, fileName: String, mimeType: String) -> [String: String] {
+        return [
+            "Content-Disposition": "form-data; name=\"\(name)\"; filename=\"\(fileName)\"",
+            "Content-Type": "\(mimeType)"
+        ]
+    }
+
+    // MARK: - Private - Boundary Encoding
+
+    private func initialBoundaryData() -> NSData {
+        return BoundaryGenerator.boundaryData(boundaryType: .Initial, boundary: boundary)
+    }
+
+    private func encapsulatedBoundaryData() -> NSData {
+        return BoundaryGenerator.boundaryData(boundaryType: .Encapsulated, boundary: boundary)
+    }
+
+    private func finalBoundaryData() -> NSData {
+        return BoundaryGenerator.boundaryData(boundaryType: .Final, boundary: boundary)
+    }
+
+    // MARK: - Private - Errors
+
+    private func setBodyPartError(error: NSError) {
+        if bodyPartError == nil {
+            bodyPartError = error
+        }
+    }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/ParameterEncoding.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/ParameterEncoding.swift
new file mode 100644
index 00000000000..d56d2d6c3a7
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/ParameterEncoding.swift
@@ -0,0 +1,251 @@
+// ParameterEncoding.swift
+//
+// Copyright (c) 2014–2016 Alamofire Software Foundation (http://alamofire.org/)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+
+/**
+    HTTP method definitions.
+
+    See https://tools.ietf.org/html/rfc7231#section-4.3
+*/
+public enum Method: String {
+    case OPTIONS, GET, HEAD, POST, PUT, PATCH, DELETE, TRACE, CONNECT
+}
+
+// MARK: ParameterEncoding
+
+/**
+    Used to specify the way in which a set of parameters are applied to a URL request.
+
+    - `URL`:             Creates a query string to be set as or appended to any existing URL query for `GET`, `HEAD`, 
+                         and `DELETE` requests, or set as the body for requests with any other HTTP method. The 
+                         `Content-Type` HTTP header field of an encoded request with HTTP body is set to
+                         `application/x-www-form-urlencoded; charset=utf-8`. Since there is no published specification
+                         for how to encode collection types, the convention of appending `[]` to the key for array
+                         values (`foo[]=1&foo[]=2`), and appending the key surrounded by square brackets for nested
+                         dictionary values (`foo[bar]=baz`).
+
+    - `URLEncodedInURL`: Creates query string to be set as or appended to any existing URL query. Uses the same
+                         implementation as the `.URL` case, but always applies the encoded result to the URL.
+
+    - `JSON`:            Uses `NSJSONSerialization` to create a JSON representation of the parameters object, which is 
+                         set as the body of the request. The `Content-Type` HTTP header field of an encoded request is 
+                         set to `application/json`.
+
+    - `PropertyList`:    Uses `NSPropertyListSerialization` to create a plist representation of the parameters object,
+                         according to the associated format and write options values, which is set as the body of the
+                         request. The `Content-Type` HTTP header field of an encoded request is set to
+                         `application/x-plist`.
+
+    - `Custom`:          Uses the associated closure value to construct a new request given an existing request and
+                         parameters.
+*/
+public enum ParameterEncoding {
+    case URL
+    case URLEncodedInURL
+    case JSON
+    case PropertyList(NSPropertyListFormat, NSPropertyListWriteOptions)
+    case Custom((URLRequestConvertible, [String: AnyObject]?) -> (NSMutableURLRequest, NSError?))
+
+    /**
+        Creates a URL request by encoding parameters and applying them onto an existing request.
+
+        - parameter URLRequest: The request to have parameters applied
+        - parameter parameters: The parameters to apply
+
+        - returns: A tuple containing the constructed request and the error that occurred during parameter encoding, 
+                   if any.
+    */
+    public func encode(
+        URLRequest: URLRequestConvertible,
+        parameters: [String: AnyObject]?)
+        -> (NSMutableURLRequest, NSError?)
+    {
+        var mutableURLRequest = URLRequest.URLRequest
+
+        guard let parameters = parameters where !parameters.isEmpty else {
+            return (mutableURLRequest, nil)
+        }
+
+        var encodingError: NSError? = nil
+
+        switch self {
+        case .URL, .URLEncodedInURL:
+            func query(parameters: [String: AnyObject]) -> String {
+                var components: [(String, String)] = []
+
+                for key in parameters.keys.sort(<) {
+                    let value = parameters[key]!
+                    components += queryComponents(key, value)
+                }
+
+                return (components.map { "\($0)=\($1)" } as [String]).joinWithSeparator("&")
+            }
+
+            func encodesParametersInURL(method: Method) -> Bool {
+                switch self {
+                case .URLEncodedInURL:
+                    return true
+                default:
+                    break
+                }
+
+                switch method {
+                case .GET, .HEAD, .DELETE:
+                    return true
+                default:
+                    return false
+                }
+            }
+
+            if let method = Method(rawValue: mutableURLRequest.HTTPMethod) where encodesParametersInURL(method) {
+                if let URLComponents = NSURLComponents(URL: mutableURLRequest.URL!, resolvingAgainstBaseURL: false) {
+                    let percentEncodedQuery = (URLComponents.percentEncodedQuery.map { $0 + "&" } ?? "") + query(parameters)
+                    URLComponents.percentEncodedQuery = percentEncodedQuery
+                    mutableURLRequest.URL = URLComponents.URL
+                }
+            } else {
+                if mutableURLRequest.valueForHTTPHeaderField("Content-Type") == nil {
+                    mutableURLRequest.setValue(
+                        "application/x-www-form-urlencoded; charset=utf-8",
+                        forHTTPHeaderField: "Content-Type"
+                    )
+                }
+
+                mutableURLRequest.HTTPBody = query(parameters).dataUsingEncoding(
+                    NSUTF8StringEncoding,
+                    allowLossyConversion: false
+                )
+            }
+        case .JSON:
+            do {
+                let options = NSJSONWritingOptions()
+                let data = try NSJSONSerialization.dataWithJSONObject(parameters, options: options)
+
+                mutableURLRequest.setValue("application/json", forHTTPHeaderField: "Content-Type")
+                mutableURLRequest.HTTPBody = data
+            } catch {
+                encodingError = error as NSError
+            }
+        case .PropertyList(let format, let options):
+            do {
+                let data = try NSPropertyListSerialization.dataWithPropertyList(
+                    parameters,
+                    format: format,
+                    options: options
+                )
+                mutableURLRequest.setValue("application/x-plist", forHTTPHeaderField: "Content-Type")
+                mutableURLRequest.HTTPBody = data
+            } catch {
+                encodingError = error as NSError
+            }
+        case .Custom(let closure):
+            (mutableURLRequest, encodingError) = closure(mutableURLRequest, parameters)
+        }
+
+        return (mutableURLRequest, encodingError)
+    }
+
+    /**
+        Creates percent-escaped, URL encoded query string components from the given key-value pair using recursion.
+
+        - parameter key:   The key of the query component.
+        - parameter value: The value of the query component.
+
+        - returns: The percent-escaped, URL encoded query string components.
+    */
+    public func queryComponents(key: String, _ value: AnyObject) -> [(String, String)] {
+        var components: [(String, String)] = []
+
+        if let dictionary = value as? [String: AnyObject] {
+            for (nestedKey, value) in dictionary {
+                components += queryComponents("\(key)[\(nestedKey)]", value)
+            }
+        } else if let array = value as? [AnyObject] {
+            for value in array {
+                components += queryComponents("\(key)[]", value)
+            }
+        } else {
+            components.append((escape(key), escape("\(value)")))
+        }
+
+        return components
+    }
+
+    /**
+        Returns a percent-escaped string following RFC 3986 for a query string key or value.
+
+        RFC 3986 states that the following characters are "reserved" characters.
+
+        - General Delimiters: ":", "#", "[", "]", "@", "?", "/"
+        - Sub-Delimiters: "!", "$", "&", "'", "(", ")", "*", "+", ",", ";", "="
+
+        In RFC 3986 - Section 3.4, it states that the "?" and "/" characters should not be escaped to allow
+        query strings to include a URL. Therefore, all "reserved" characters with the exception of "?" and "/"
+        should be percent-escaped in the query string.
+
+        - parameter string: The string to be percent-escaped.
+
+        - returns: The percent-escaped string.
+    */
+    public func escape(string: String) -> String {
+        let generalDelimitersToEncode = ":#[]@" // does not include "?" or "/" due to RFC 3986 - Section 3.4
+        let subDelimitersToEncode = "!$&'()*+,;="
+
+        let allowedCharacterSet = NSCharacterSet.URLQueryAllowedCharacterSet().mutableCopy() as! NSMutableCharacterSet
+        allowedCharacterSet.removeCharactersInString(generalDelimitersToEncode + subDelimitersToEncode)
+
+        var escaped = ""
+
+        //==========================================================================================================
+        //
+        //  Batching is required for escaping due to an internal bug in iOS 8.1 and 8.2. Encoding more than a few
+        //  hundred Chinense characters causes various malloc error crashes. To avoid this issue until iOS 8 is no
+        //  longer supported, batching MUST be used for encoding. This introduces roughly a 20% overhead. For more
+        //  info, please refer to:
+        //
+        //      - https://github.com/Alamofire/Alamofire/issues/206
+        //
+        //==========================================================================================================
+
+        if #available(iOS 8.3, OSX 10.10, *) {
+            escaped = string.stringByAddingPercentEncodingWithAllowedCharacters(allowedCharacterSet) ?? string
+        } else {
+            let batchSize = 50
+            var index = string.startIndex
+
+            while index != string.endIndex {
+                let startIndex = index
+                let endIndex = index.advancedBy(batchSize, limit: string.endIndex)
+                let range = Range(start: startIndex, end: endIndex)
+
+                let substring = string.substringWithRange(range)
+
+                escaped += substring.stringByAddingPercentEncodingWithAllowedCharacters(allowedCharacterSet) ?? substring
+
+                index = endIndex
+            }
+        }
+
+        return escaped
+    }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Request.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Request.swift
new file mode 100644
index 00000000000..3e242e7ea72
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Request.swift
@@ -0,0 +1,538 @@
+// Request.swift
+//
+// Copyright (c) 2014–2016 Alamofire Software Foundation (http://alamofire.org/)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+
+/**
+    Responsible for sending a request and receiving the response and associated data from the server, as well as 
+    managing its underlying `NSURLSessionTask`.
+*/
+public class Request {
+
+    // MARK: - Properties
+
+    /// The delegate for the underlying task.
+    public let delegate: TaskDelegate
+
+    /// The underlying task.
+    public var task: NSURLSessionTask { return delegate.task }
+
+    /// The session belonging to the underlying task.
+    public let session: NSURLSession
+
+    /// The request sent or to be sent to the server.
+    public var request: NSURLRequest? { return task.originalRequest }
+
+    /// The response received from the server, if any.
+    public var response: NSHTTPURLResponse? { return task.response as? NSHTTPURLResponse }
+
+    /// The progress of the request lifecycle.
+    public var progress: NSProgress { return delegate.progress }
+
+    // MARK: - Lifecycle
+
+    init(session: NSURLSession, task: NSURLSessionTask) {
+        self.session = session
+
+        switch task {
+        case is NSURLSessionUploadTask:
+            self.delegate = UploadTaskDelegate(task: task)
+        case is NSURLSessionDataTask:
+            self.delegate = DataTaskDelegate(task: task)
+        case is NSURLSessionDownloadTask:
+            self.delegate = DownloadTaskDelegate(task: task)
+        default:
+            self.delegate = TaskDelegate(task: task)
+        }
+    }
+
+    // MARK: - Authentication
+
+    /**
+        Associates an HTTP Basic credential with the request.
+
+        - parameter user:        The user.
+        - parameter password:    The password.
+        - parameter persistence: The URL credential persistence. `.ForSession` by default.
+
+        - returns: The request.
+    */
+    public func authenticate(
+        user user: String,
+        password: String,
+        persistence: NSURLCredentialPersistence = .ForSession)
+        -> Self
+    {
+        let credential = NSURLCredential(user: user, password: password, persistence: persistence)
+
+        return authenticate(usingCredential: credential)
+    }
+
+    /**
+        Associates a specified credential with the request.
+
+        - parameter credential: The credential.
+
+        - returns: The request.
+    */
+    public func authenticate(usingCredential credential: NSURLCredential) -> Self {
+        delegate.credential = credential
+
+        return self
+    }
+
+    // MARK: - Progress
+
+    /**
+        Sets a closure to be called periodically during the lifecycle of the request as data is written to or read 
+        from the server.
+
+        - For uploads, the progress closure returns the bytes written, total bytes written, and total bytes expected 
+          to write.
+        - For downloads and data tasks, the progress closure returns the bytes read, total bytes read, and total bytes 
+          expected to read.
+
+        - parameter closure: The code to be executed periodically during the lifecycle of the request.
+
+        - returns: The request.
+    */
+    public func progress(closure: ((Int64, Int64, Int64) -> Void)? = nil) -> Self {
+        if let uploadDelegate = delegate as? UploadTaskDelegate {
+            uploadDelegate.uploadProgress = closure
+        } else if let dataDelegate = delegate as? DataTaskDelegate {
+            dataDelegate.dataProgress = closure
+        } else if let downloadDelegate = delegate as? DownloadTaskDelegate {
+            downloadDelegate.downloadProgress = closure
+        }
+
+        return self
+    }
+
+    /**
+        Sets a closure to be called periodically during the lifecycle of the request as data is read from the server.
+
+        This closure returns the bytes most recently received from the server, not including data from previous calls. 
+        If this closure is set, data will only be available within this closure, and will not be saved elsewhere. It is 
+        also important to note that the `response` closure will be called with nil `responseData`.
+
+        - parameter closure: The code to be executed periodically during the lifecycle of the request.
+
+        - returns: The request.
+    */
+    public func stream(closure: (NSData -> Void)? = nil) -> Self {
+        if let dataDelegate = delegate as? DataTaskDelegate {
+            dataDelegate.dataStream = closure
+        }
+
+        return self
+    }
+
+    // MARK: - State
+
+    /**
+        Suspends the request.
+    */
+    public func suspend() {
+        task.suspend()
+    }
+
+    /**
+        Resumes the request.
+    */
+    public func resume() {
+        task.resume()
+    }
+
+    /**
+        Cancels the request.
+    */
+    public func cancel() {
+        if let
+            downloadDelegate = delegate as? DownloadTaskDelegate,
+            downloadTask = downloadDelegate.downloadTask
+        {
+            downloadTask.cancelByProducingResumeData { data in
+                downloadDelegate.resumeData = data
+            }
+        } else {
+            task.cancel()
+        }
+    }
+
+    // MARK: - TaskDelegate
+
+    /**
+        The task delegate is responsible for handling all delegate callbacks for the underlying task as well as 
+        executing all operations attached to the serial operation queue upon task completion.
+    */
+    public class TaskDelegate: NSObject {
+
+        /// The serial operation queue used to execute all operations after the task completes.
+        public let queue: NSOperationQueue
+
+        let task: NSURLSessionTask
+        let progress: NSProgress
+
+        var data: NSData? { return nil }
+        var error: NSError?
+
+        var credential: NSURLCredential?
+
+        init(task: NSURLSessionTask) {
+            self.task = task
+            self.progress = NSProgress(totalUnitCount: 0)
+            self.queue = {
+                let operationQueue = NSOperationQueue()
+                operationQueue.maxConcurrentOperationCount = 1
+                operationQueue.suspended = true
+
+                if #available(OSX 10.10, *) {
+                    operationQueue.qualityOfService = NSQualityOfService.Utility
+                }
+
+                return operationQueue
+            }()
+        }
+
+        deinit {
+            queue.cancelAllOperations()
+            queue.suspended = false
+        }
+
+        // MARK: - NSURLSessionTaskDelegate
+
+        // MARK: Override Closures
+
+        var taskWillPerformHTTPRedirection: ((NSURLSession, NSURLSessionTask, NSHTTPURLResponse, NSURLRequest) -> NSURLRequest?)?
+        var taskDidReceiveChallenge: ((NSURLSession, NSURLSessionTask, NSURLAuthenticationChallenge) -> (NSURLSessionAuthChallengeDisposition, NSURLCredential?))?
+        var taskNeedNewBodyStream: ((NSURLSession, NSURLSessionTask) -> NSInputStream?)?
+        var taskDidCompleteWithError: ((NSURLSession, NSURLSessionTask, NSError?) -> Void)?
+
+        // MARK: Delegate Methods
+
+        func URLSession(
+            session: NSURLSession,
+            task: NSURLSessionTask,
+            willPerformHTTPRedirection response: NSHTTPURLResponse,
+            newRequest request: NSURLRequest,
+            completionHandler: ((NSURLRequest?) -> Void))
+        {
+            var redirectRequest: NSURLRequest? = request
+
+            if let taskWillPerformHTTPRedirection = taskWillPerformHTTPRedirection {
+                redirectRequest = taskWillPerformHTTPRedirection(session, task, response, request)
+            }
+
+            completionHandler(redirectRequest)
+        }
+
+        func URLSession(
+            session: NSURLSession,
+            task: NSURLSessionTask,
+            didReceiveChallenge challenge: NSURLAuthenticationChallenge,
+            completionHandler: ((NSURLSessionAuthChallengeDisposition, NSURLCredential?) -> Void))
+        {
+            var disposition: NSURLSessionAuthChallengeDisposition = .PerformDefaultHandling
+            var credential: NSURLCredential?
+
+            if let taskDidReceiveChallenge = taskDidReceiveChallenge {
+                (disposition, credential) = taskDidReceiveChallenge(session, task, challenge)
+            } else if challenge.protectionSpace.authenticationMethod == NSURLAuthenticationMethodServerTrust {
+                let host = challenge.protectionSpace.host
+
+                if let
+                    serverTrustPolicy = session.serverTrustPolicyManager?.serverTrustPolicyForHost(host),
+                    serverTrust = challenge.protectionSpace.serverTrust
+                {
+                    if serverTrustPolicy.evaluateServerTrust(serverTrust, isValidForHost: host) {
+                        disposition = .UseCredential
+                        credential = NSURLCredential(forTrust: serverTrust)
+                    } else {
+                        disposition = .CancelAuthenticationChallenge
+                    }
+                }
+            } else {
+                if challenge.previousFailureCount > 0 {
+                    disposition = .CancelAuthenticationChallenge
+                } else {
+                    credential = self.credential ?? session.configuration.URLCredentialStorage?.defaultCredentialForProtectionSpace(challenge.protectionSpace)
+
+                    if credential != nil {
+                        disposition = .UseCredential
+                    }
+                }
+            }
+
+            completionHandler(disposition, credential)
+        }
+
+        func URLSession(
+            session: NSURLSession,
+            task: NSURLSessionTask,
+            needNewBodyStream completionHandler: ((NSInputStream?) -> Void))
+        {
+            var bodyStream: NSInputStream?
+
+            if let taskNeedNewBodyStream = taskNeedNewBodyStream {
+                bodyStream = taskNeedNewBodyStream(session, task)
+            }
+
+            completionHandler(bodyStream)
+        }
+
+        func URLSession(session: NSURLSession, task: NSURLSessionTask, didCompleteWithError error: NSError?) {
+            if let taskDidCompleteWithError = taskDidCompleteWithError {
+                taskDidCompleteWithError(session, task, error)
+            } else {
+                if let error = error {
+                    self.error = error
+
+                    if let
+                        downloadDelegate = self as? DownloadTaskDelegate,
+                        userInfo = error.userInfo as? [String: AnyObject],
+                        resumeData = userInfo[NSURLSessionDownloadTaskResumeData] as? NSData
+                    {
+                        downloadDelegate.resumeData = resumeData
+                    }
+                }
+
+                queue.suspended = false
+            }
+        }
+    }
+
+    // MARK: - DataTaskDelegate
+
+    class DataTaskDelegate: TaskDelegate, NSURLSessionDataDelegate {
+        var dataTask: NSURLSessionDataTask? { return task as? NSURLSessionDataTask }
+
+        private var totalBytesReceived: Int64 = 0
+        private var mutableData: NSMutableData
+        override var data: NSData? {
+            if dataStream != nil {
+                return nil
+            } else {
+                return mutableData
+            }
+        }
+
+        private var expectedContentLength: Int64?
+        private var dataProgress: ((bytesReceived: Int64, totalBytesReceived: Int64, totalBytesExpectedToReceive: Int64) -> Void)?
+        private var dataStream: ((data: NSData) -> Void)?
+
+        override init(task: NSURLSessionTask) {
+            mutableData = NSMutableData()
+            super.init(task: task)
+        }
+
+        // MARK: - NSURLSessionDataDelegate
+
+        // MARK: Override Closures
+
+        var dataTaskDidReceiveResponse: ((NSURLSession, NSURLSessionDataTask, NSURLResponse) -> NSURLSessionResponseDisposition)?
+        var dataTaskDidBecomeDownloadTask: ((NSURLSession, NSURLSessionDataTask, NSURLSessionDownloadTask) -> Void)?
+        var dataTaskDidReceiveData: ((NSURLSession, NSURLSessionDataTask, NSData) -> Void)?
+        var dataTaskWillCacheResponse: ((NSURLSession, NSURLSessionDataTask, NSCachedURLResponse) -> NSCachedURLResponse?)?
+
+        // MARK: Delegate Methods
+
+        func URLSession(
+            session: NSURLSession,
+            dataTask: NSURLSessionDataTask,
+            didReceiveResponse response: NSURLResponse,
+            completionHandler: (NSURLSessionResponseDisposition -> Void))
+        {
+            var disposition: NSURLSessionResponseDisposition = .Allow
+
+            expectedContentLength = response.expectedContentLength
+
+            if let dataTaskDidReceiveResponse = dataTaskDidReceiveResponse {
+                disposition = dataTaskDidReceiveResponse(session, dataTask, response)
+            }
+
+            completionHandler(disposition)
+        }
+
+        func URLSession(
+            session: NSURLSession,
+            dataTask: NSURLSessionDataTask,
+            didBecomeDownloadTask downloadTask: NSURLSessionDownloadTask)
+        {
+            dataTaskDidBecomeDownloadTask?(session, dataTask, downloadTask)
+        }
+
+        func URLSession(session: NSURLSession, dataTask: NSURLSessionDataTask, didReceiveData data: NSData) {
+            if let dataTaskDidReceiveData = dataTaskDidReceiveData {
+                dataTaskDidReceiveData(session, dataTask, data)
+            } else {
+                if let dataStream = dataStream {
+                    dataStream(data: data)
+                } else {
+                    mutableData.appendData(data)
+                }
+
+                totalBytesReceived += data.length
+                let totalBytesExpected = dataTask.response?.expectedContentLength ?? NSURLSessionTransferSizeUnknown
+
+                progress.totalUnitCount = totalBytesExpected
+                progress.completedUnitCount = totalBytesReceived
+
+                dataProgress?(
+                    bytesReceived: Int64(data.length),
+                    totalBytesReceived: totalBytesReceived,
+                    totalBytesExpectedToReceive: totalBytesExpected
+                )
+            }
+        }
+
+        func URLSession(
+            session: NSURLSession,
+            dataTask: NSURLSessionDataTask,
+            willCacheResponse proposedResponse: NSCachedURLResponse,
+            completionHandler: ((NSCachedURLResponse?) -> Void))
+        {
+            var cachedResponse: NSCachedURLResponse? = proposedResponse
+
+            if let dataTaskWillCacheResponse = dataTaskWillCacheResponse {
+                cachedResponse = dataTaskWillCacheResponse(session, dataTask, proposedResponse)
+            }
+
+            completionHandler(cachedResponse)
+        }
+    }
+}
+
+// MARK: - CustomStringConvertible
+
+extension Request: CustomStringConvertible {
+
+    /**
+        The textual representation used when written to an output stream, which includes the HTTP method and URL, as 
+        well as the response status code if a response has been received.
+    */
+    public var description: String {
+        var components: [String] = []
+
+        if let HTTPMethod = request?.HTTPMethod {
+            components.append(HTTPMethod)
+        }
+
+        if let URLString = request?.URL?.absoluteString {
+            components.append(URLString)
+        }
+
+        if let response = response {
+            components.append("(\(response.statusCode))")
+        }
+
+        return components.joinWithSeparator(" ")
+    }
+}
+
+// MARK: - CustomDebugStringConvertible
+
+extension Request: CustomDebugStringConvertible {
+    func cURLRepresentation() -> String {
+        var components = ["$ curl -i"]
+
+        guard let
+            request = self.request,
+            URL = request.URL,
+            host = URL.host
+        else {
+            return "$ curl command could not be created"
+        }
+
+        if let HTTPMethod = request.HTTPMethod where HTTPMethod != "GET" {
+            components.append("-X \(HTTPMethod)")
+        }
+
+        if let credentialStorage = self.session.configuration.URLCredentialStorage {
+            let protectionSpace = NSURLProtectionSpace(
+                host: host,
+                port: URL.port?.integerValue ?? 0,
+                `protocol`: URL.scheme,
+                realm: host,
+                authenticationMethod: NSURLAuthenticationMethodHTTPBasic
+            )
+
+            if let credentials = credentialStorage.credentialsForProtectionSpace(protectionSpace)?.values {
+                for credential in credentials {
+                    components.append("-u \(credential.user!):\(credential.password!)")
+                }
+            } else {
+                if let credential = delegate.credential {
+                    components.append("-u \(credential.user!):\(credential.password!)")
+                }
+            }
+        }
+
+        if session.configuration.HTTPShouldSetCookies {
+            if let
+                cookieStorage = session.configuration.HTTPCookieStorage,
+                cookies = cookieStorage.cookiesForURL(URL) where !cookies.isEmpty
+            {
+                let string = cookies.reduce("") { $0 + "\($1.name)=\($1.value ?? String());" }
+                components.append("-b \"\(string.substringToIndex(string.endIndex.predecessor()))\"")
+            }
+        }
+
+        if let headerFields = request.allHTTPHeaderFields {
+            for (field, value) in headerFields {
+                switch field {
+                case "Cookie":
+                    continue
+                default:
+                    components.append("-H \"\(field): \(value)\"")
+                }
+            }
+        }
+
+        if let additionalHeaders = session.configuration.HTTPAdditionalHeaders {
+            for (field, value) in additionalHeaders {
+                switch field {
+                case "Cookie":
+                    continue
+                default:
+                    components.append("-H \"\(field): \(value)\"")
+                }
+            }
+        }
+
+        if let
+            HTTPBodyData = request.HTTPBody,
+            HTTPBody = String(data: HTTPBodyData, encoding: NSUTF8StringEncoding)
+        {
+            let escapedBody = HTTPBody.stringByReplacingOccurrencesOfString("\"", withString: "\\\"")
+            components.append("-d \"\(escapedBody)\"")
+        }
+
+        components.append("\"\(URL.absoluteString)\"")
+
+        return components.joinWithSeparator(" \\\n\t")
+    }
+
+    /// The textual representation used when written to an output stream, in the form of a cURL command.
+    public var debugDescription: String {
+        return cURLRepresentation()
+    }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Response.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Response.swift
new file mode 100644
index 00000000000..fa2fffb3dea
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Response.swift
@@ -0,0 +1,83 @@
+// Response.swift
+//
+// Copyright (c) 2014–2016 Alamofire Software Foundation (http://alamofire.org/)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+
+/// Used to store all response data returned from a completed `Request`.
+public struct Response<Value, Error: ErrorType> {
+    /// The URL request sent to the server.
+    public let request: NSURLRequest?
+
+    /// The server's response to the URL request.
+    public let response: NSHTTPURLResponse?
+
+    /// The data returned by the server.
+    public let data: NSData?
+
+    /// The result of response serialization.
+    public let result: Result<Value, Error>
+
+    /**
+        Initializes the `Response` instance with the specified URL request, URL response, server data and response
+        serialization result.
+    
+        - parameter request:  The URL request sent to the server.
+        - parameter response: The server's response to the URL request.
+        - parameter data:     The data returned by the server.
+        - parameter result:   The result of response serialization.
+    
+        - returns: the new `Response` instance.
+    */
+    public init(request: NSURLRequest?, response: NSHTTPURLResponse?, data: NSData?, result: Result<Value, Error>) {
+        self.request = request
+        self.response = response
+        self.data = data
+        self.result = result
+    }
+}
+
+// MARK: - CustomStringConvertible
+
+extension Response: CustomStringConvertible {
+    /// The textual representation used when written to an output stream, which includes whether the result was a
+    /// success or failure.
+    public var description: String {
+        return result.debugDescription
+    }
+}
+
+// MARK: - CustomDebugStringConvertible
+
+extension Response: CustomDebugStringConvertible {
+    /// The debug textual representation used when written to an output stream, which includes the URL request, the URL
+    /// response, the server data and the response serialization result.
+    public var debugDescription: String {
+        var output: [String] = []
+
+        output.append(request != nil ? "[Request]: \(request!)" : "[Request]: nil")
+        output.append(response != nil ? "[Response]: \(response!)" : "[Response]: nil")
+        output.append("[Data]: \(data?.length ?? 0) bytes")
+        output.append("[Result]: \(result.debugDescription)")
+
+        return output.joinWithSeparator("\n")
+    }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/ResponseSerialization.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/ResponseSerialization.swift
new file mode 100644
index 00000000000..4aaacf61e31
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/ResponseSerialization.swift
@@ -0,0 +1,355 @@
+// ResponseSerialization.swift
+//
+// Copyright (c) 2014–2016 Alamofire Software Foundation (http://alamofire.org/)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+
+// MARK: ResponseSerializer
+
+/**
+    The type in which all response serializers must conform to in order to serialize a response.
+*/
+public protocol ResponseSerializerType {
+    /// The type of serialized object to be created by this `ResponseSerializerType`.
+    typealias SerializedObject
+
+    /// The type of error to be created by this `ResponseSerializer` if serialization fails.
+    typealias ErrorObject: ErrorType
+
+    /**
+        A closure used by response handlers that takes a request, response, data and error and returns a result.
+    */
+    var serializeResponse: (NSURLRequest?, NSHTTPURLResponse?, NSData?, NSError?) -> Result<SerializedObject, ErrorObject> { get }
+}
+
+// MARK: -
+
+/**
+    A generic `ResponseSerializerType` used to serialize a request, response, and data into a serialized object.
+*/
+public struct ResponseSerializer<Value, Error: ErrorType>: ResponseSerializerType {
+    /// The type of serialized object to be created by this `ResponseSerializer`.
+    public typealias SerializedObject = Value
+
+    /// The type of error to be created by this `ResponseSerializer` if serialization fails.
+    public typealias ErrorObject = Error
+
+    /**
+        A closure used by response handlers that takes a request, response, data and error and returns a result.
+    */
+    public var serializeResponse: (NSURLRequest?, NSHTTPURLResponse?, NSData?, NSError?) -> Result<Value, Error>
+
+    /**
+        Initializes the `ResponseSerializer` instance with the given serialize response closure.
+
+        - parameter serializeResponse: The closure used to serialize the response.
+
+        - returns: The new generic response serializer instance.
+    */
+    public init(serializeResponse: (NSURLRequest?, NSHTTPURLResponse?, NSData?, NSError?) -> Result<Value, Error>) {
+        self.serializeResponse = serializeResponse
+    }
+}
+
+// MARK: - Default
+
+extension Request {
+
+    /**
+        Adds a handler to be called once the request has finished.
+
+        - parameter queue:             The queue on which the completion handler is dispatched.
+        - parameter completionHandler: The code to be executed once the request has finished.
+
+        - returns: The request.
+    */
+    public func response(
+        queue queue: dispatch_queue_t? = nil,
+        completionHandler: (NSURLRequest?, NSHTTPURLResponse?, NSData?, NSError?) -> Void)
+        -> Self
+    {
+        delegate.queue.addOperationWithBlock {
+            dispatch_async(queue ?? dispatch_get_main_queue()) {
+                completionHandler(self.request, self.response, self.delegate.data, self.delegate.error)
+            }
+        }
+
+        return self
+    }
+
+    /**
+        Adds a handler to be called once the request has finished.
+
+        - parameter queue:              The queue on which the completion handler is dispatched.
+        - parameter responseSerializer: The response serializer responsible for serializing the request, response, 
+                                        and data.
+        - parameter completionHandler:  The code to be executed once the request has finished.
+
+        - returns: The request.
+    */
+    public func response<T: ResponseSerializerType>(
+        queue queue: dispatch_queue_t? = nil,
+        responseSerializer: T,
+        completionHandler: Response<T.SerializedObject, T.ErrorObject> -> Void)
+        -> Self
+    {
+        delegate.queue.addOperationWithBlock {
+            let result = responseSerializer.serializeResponse(
+                self.request,
+                self.response,
+                self.delegate.data,
+                self.delegate.error
+            )
+
+            dispatch_async(queue ?? dispatch_get_main_queue()) {
+                let response = Response<T.SerializedObject, T.ErrorObject>(
+                    request: self.request,
+                    response: self.response,
+                    data: self.delegate.data,
+                    result: result
+                )
+
+                completionHandler(response)
+            }
+        }
+
+        return self
+    }
+}
+
+// MARK: - Data
+
+extension Request {
+
+    /**
+        Creates a response serializer that returns the associated data as-is.
+
+        - returns: A data response serializer.
+    */
+    public static func dataResponseSerializer() -> ResponseSerializer<NSData, NSError> {
+        return ResponseSerializer { _, response, data, error in
+            guard error == nil else { return .Failure(error!) }
+
+            if let response = response where response.statusCode == 204 { return .Success(NSData()) }
+
+            guard let validData = data else {
+                let failureReason = "Data could not be serialized. Input data was nil."
+                let error = Error.errorWithCode(.DataSerializationFailed, failureReason: failureReason)
+                return .Failure(error)
+            }
+
+            return .Success(validData)
+        }
+    }
+
+    /**
+        Adds a handler to be called once the request has finished.
+
+        - parameter completionHandler: The code to be executed once the request has finished.
+
+        - returns: The request.
+    */
+    public func responseData(completionHandler: Response<NSData, NSError> -> Void) -> Self {
+        return response(responseSerializer: Request.dataResponseSerializer(), completionHandler: completionHandler)
+    }
+}
+
+// MARK: - String
+
+extension Request {
+
+    /**
+        Creates a response serializer that returns a string initialized from the response data with the specified 
+        string encoding.
+
+        - parameter encoding: The string encoding. If `nil`, the string encoding will be determined from the server 
+                              response, falling back to the default HTTP default character set, ISO-8859-1.
+
+        - returns: A string response serializer.
+    */
+    public static func stringResponseSerializer(
+        var encoding encoding: NSStringEncoding? = nil)
+        -> ResponseSerializer<String, NSError>
+    {
+        return ResponseSerializer { _, response, data, error in
+            guard error == nil else { return .Failure(error!) }
+
+            if let response = response where response.statusCode == 204 { return .Success("") }
+
+            guard let validData = data else {
+                let failureReason = "String could not be serialized. Input data was nil."
+                let error = Error.errorWithCode(.StringSerializationFailed, failureReason: failureReason)
+                return .Failure(error)
+            }
+
+            if let encodingName = response?.textEncodingName where encoding == nil {
+                encoding = CFStringConvertEncodingToNSStringEncoding(
+                    CFStringConvertIANACharSetNameToEncoding(encodingName)
+                )
+            }
+
+            let actualEncoding = encoding ?? NSISOLatin1StringEncoding
+
+            if let string = String(data: validData, encoding: actualEncoding) {
+                return .Success(string)
+            } else {
+                let failureReason = "String could not be serialized with encoding: \(actualEncoding)"
+                let error = Error.errorWithCode(.StringSerializationFailed, failureReason: failureReason)
+                return .Failure(error)
+            }
+        }
+    }
+
+    /**
+        Adds a handler to be called once the request has finished.
+
+        - parameter encoding:          The string encoding. If `nil`, the string encoding will be determined from the 
+                                       server response, falling back to the default HTTP default character set, 
+                                       ISO-8859-1.
+        - parameter completionHandler: A closure to be executed once the request has finished.
+
+        - returns: The request.
+    */
+    public func responseString(
+        encoding encoding: NSStringEncoding? = nil,
+        completionHandler: Response<String, NSError> -> Void)
+        -> Self
+    {
+        return response(
+            responseSerializer: Request.stringResponseSerializer(encoding: encoding),
+            completionHandler: completionHandler
+        )
+    }
+}
+
+// MARK: - JSON
+
+extension Request {
+
+    /**
+        Creates a response serializer that returns a JSON object constructed from the response data using 
+        `NSJSONSerialization` with the specified reading options.
+
+        - parameter options: The JSON serialization reading options. `.AllowFragments` by default.
+
+        - returns: A JSON object response serializer.
+    */
+    public static func JSONResponseSerializer(
+        options options: NSJSONReadingOptions = .AllowFragments)
+        -> ResponseSerializer<AnyObject, NSError>
+    {
+        return ResponseSerializer { _, response, data, error in
+            guard error == nil else { return .Failure(error!) }
+
+            if let response = response where response.statusCode == 204 { return .Success(NSNull()) }
+
+            guard let validData = data where validData.length > 0 else {
+                let failureReason = "JSON could not be serialized. Input data was nil or zero length."
+                let error = Error.errorWithCode(.JSONSerializationFailed, failureReason: failureReason)
+                return .Failure(error)
+            }
+
+            do {
+                let JSON = try NSJSONSerialization.JSONObjectWithData(validData, options: options)
+                return .Success(JSON)
+            } catch {
+                return .Failure(error as NSError)
+            }
+        }
+    }
+
+    /**
+        Adds a handler to be called once the request has finished.
+
+        - parameter options:           The JSON serialization reading options. `.AllowFragments` by default.
+        - parameter completionHandler: A closure to be executed once the request has finished.
+
+        - returns: The request.
+    */
+    public func responseJSON(
+        options options: NSJSONReadingOptions = .AllowFragments,
+        completionHandler: Response<AnyObject, NSError> -> Void)
+        -> Self
+    {
+        return response(
+            responseSerializer: Request.JSONResponseSerializer(options: options),
+            completionHandler: completionHandler
+        )
+    }
+}
+
+// MARK: - Property List
+
+extension Request {
+
+    /**
+        Creates a response serializer that returns an object constructed from the response data using 
+        `NSPropertyListSerialization` with the specified reading options.
+
+        - parameter options: The property list reading options. `NSPropertyListReadOptions()` by default.
+
+        - returns: A property list object response serializer.
+    */
+    public static func propertyListResponseSerializer(
+        options options: NSPropertyListReadOptions = NSPropertyListReadOptions())
+        -> ResponseSerializer<AnyObject, NSError>
+    {
+        return ResponseSerializer { _, response, data, error in
+            guard error == nil else { return .Failure(error!) }
+
+            if let response = response where response.statusCode == 204 { return .Success(NSNull()) }
+
+            guard let validData = data where validData.length > 0 else {
+                let failureReason = "Property list could not be serialized. Input data was nil or zero length."
+                let error = Error.errorWithCode(.PropertyListSerializationFailed, failureReason: failureReason)
+                return .Failure(error)
+            }
+
+            do {
+                let plist = try NSPropertyListSerialization.propertyListWithData(validData, options: options, format: nil)
+                return .Success(plist)
+            } catch {
+                return .Failure(error as NSError)
+            }
+        }
+    }
+
+    /**
+        Adds a handler to be called once the request has finished.
+
+        - parameter options:           The property list reading options. `0` by default.
+        - parameter completionHandler: A closure to be executed once the request has finished. The closure takes 3
+                                       arguments: the URL request, the URL response, the server data and the result 
+                                       produced while creating the property list.
+
+        - returns: The request.
+    */
+    public func responsePropertyList(
+        options options: NSPropertyListReadOptions = NSPropertyListReadOptions(),
+        completionHandler: Response<AnyObject, NSError> -> Void)
+        -> Self
+    {
+        return response(
+            responseSerializer: Request.propertyListResponseSerializer(options: options),
+            completionHandler: completionHandler
+        )
+    }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Result.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Result.swift
new file mode 100644
index 00000000000..a8557cabb42
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Result.swift
@@ -0,0 +1,101 @@
+// Result.swift
+//
+// Copyright (c) 2014–2016 Alamofire Software Foundation (http://alamofire.org/)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+
+/**
+    Used to represent whether a request was successful or encountered an error.
+
+    - Success: The request and all post processing operations were successful resulting in the serialization of the 
+               provided associated value.
+    - Failure: The request encountered an error resulting in a failure. The associated values are the original data 
+               provided by the server as well as the error that caused the failure.
+*/
+public enum Result<Value, Error: ErrorType> {
+    case Success(Value)
+    case Failure(Error)
+
+    /// Returns `true` if the result is a success, `false` otherwise.
+    public var isSuccess: Bool {
+        switch self {
+        case .Success:
+            return true
+        case .Failure:
+            return false
+        }
+    }
+
+    /// Returns `true` if the result is a failure, `false` otherwise.
+    public var isFailure: Bool {
+        return !isSuccess
+    }
+
+    /// Returns the associated value if the result is a success, `nil` otherwise.
+    public var value: Value? {
+        switch self {
+        case .Success(let value):
+            return value
+        case .Failure:
+            return nil
+        }
+    }
+
+    /// Returns the associated error value if the result is a failure, `nil` otherwise.
+    public var error: Error? {
+        switch self {
+        case .Success:
+            return nil
+        case .Failure(let error):
+            return error
+        }
+    }
+}
+
+// MARK: - CustomStringConvertible
+
+extension Result: CustomStringConvertible {
+    /// The textual representation used when written to an output stream, which includes whether the result was a 
+    /// success or failure.
+    public var description: String {
+        switch self {
+        case .Success:
+            return "SUCCESS"
+        case .Failure:
+            return "FAILURE"
+        }
+    }
+}
+
+// MARK: - CustomDebugStringConvertible
+
+extension Result: CustomDebugStringConvertible {
+    /// The debug textual representation used when written to an output stream, which includes whether the result was a
+    /// success or failure in addition to the value or error.
+    public var debugDescription: String {
+        switch self {
+        case .Success(let value):
+            return "SUCCESS: \(value)"
+        case .Failure(let error):
+            return "FAILURE: \(error)"
+        }
+    }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/ServerTrustPolicy.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/ServerTrustPolicy.swift
new file mode 100644
index 00000000000..07cd848a606
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/ServerTrustPolicy.swift
@@ -0,0 +1,302 @@
+// ServerTrustPolicy.swift
+//
+// Copyright (c) 2014–2016 Alamofire Software Foundation (http://alamofire.org/)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+
+/// Responsible for managing the mapping of `ServerTrustPolicy` objects to a given host.
+public class ServerTrustPolicyManager {
+    /// The dictionary of policies mapped to a particular host.
+    public let policies: [String: ServerTrustPolicy]
+
+    /**
+        Initializes the `ServerTrustPolicyManager` instance with the given policies.
+
+        Since different servers and web services can have different leaf certificates, intermediate and even root 
+        certficates, it is important to have the flexibility to specify evaluation policies on a per host basis. This 
+        allows for scenarios such as using default evaluation for host1, certificate pinning for host2, public key 
+        pinning for host3 and disabling evaluation for host4.
+
+        - parameter policies: A dictionary of all policies mapped to a particular host.
+
+        - returns: The new `ServerTrustPolicyManager` instance.
+    */
+    public init(policies: [String: ServerTrustPolicy]) {
+        self.policies = policies
+    }
+
+    /**
+        Returns the `ServerTrustPolicy` for the given host if applicable.
+
+        By default, this method will return the policy that perfectly matches the given host. Subclasses could override
+        this method and implement more complex mapping implementations such as wildcards.
+
+        - parameter host: The host to use when searching for a matching policy.
+
+        - returns: The server trust policy for the given host if found.
+    */
+    public func serverTrustPolicyForHost(host: String) -> ServerTrustPolicy? {
+        return policies[host]
+    }
+}
+
+// MARK: -
+
+extension NSURLSession {
+    private struct AssociatedKeys {
+        static var ManagerKey = "NSURLSession.ServerTrustPolicyManager"
+    }
+
+    var serverTrustPolicyManager: ServerTrustPolicyManager? {
+        get {
+            return objc_getAssociatedObject(self, &AssociatedKeys.ManagerKey) as? ServerTrustPolicyManager
+        }
+        set (manager) {
+            objc_setAssociatedObject(self, &AssociatedKeys.ManagerKey, manager, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+        }
+    }
+}
+
+// MARK: - ServerTrustPolicy
+
+/**
+    The `ServerTrustPolicy` evaluates the server trust generally provided by an `NSURLAuthenticationChallenge` when 
+    connecting to a server over a secure HTTPS connection. The policy configuration then evaluates the server trust 
+    with a given set of criteria to determine whether the server trust is valid and the connection should be made.
+
+    Using pinned certificates or public keys for evaluation helps prevent man-in-the-middle (MITM) attacks and other 
+    vulnerabilities. Applications dealing with sensitive customer data or financial information are strongly encouraged 
+    to route all communication over an HTTPS connection with pinning enabled.
+
+    - PerformDefaultEvaluation: Uses the default server trust evaluation while allowing you to control whether to 
+                                validate the host provided by the challenge. Applications are encouraged to always 
+                                validate the host in production environments to guarantee the validity of the server's 
+                                certificate chain.
+
+    - PinCertificates:          Uses the pinned certificates to validate the server trust. The server trust is
+                                considered valid if one of the pinned certificates match one of the server certificates. 
+                                By validating both the certificate chain and host, certificate pinning provides a very 
+                                secure form of server trust validation mitigating most, if not all, MITM attacks. 
+                                Applications are encouraged to always validate the host and require a valid certificate 
+                                chain in production environments.
+
+    - PinPublicKeys:            Uses the pinned public keys to validate the server trust. The server trust is considered
+                                valid if one of the pinned public keys match one of the server certificate public keys. 
+                                By validating both the certificate chain and host, public key pinning provides a very 
+                                secure form of server trust validation mitigating most, if not all, MITM attacks. 
+                                Applications are encouraged to always validate the host and require a valid certificate 
+                                chain in production environments.
+
+    - DisableEvaluation:        Disables all evaluation which in turn will always consider any server trust as valid.
+
+    - CustomEvaluation:         Uses the associated closure to evaluate the validity of the server trust.
+*/
+public enum ServerTrustPolicy {
+    case PerformDefaultEvaluation(validateHost: Bool)
+    case PinCertificates(certificates: [SecCertificate], validateCertificateChain: Bool, validateHost: Bool)
+    case PinPublicKeys(publicKeys: [SecKey], validateCertificateChain: Bool, validateHost: Bool)
+    case DisableEvaluation
+    case CustomEvaluation((serverTrust: SecTrust, host: String) -> Bool)
+
+    // MARK: - Bundle Location
+
+    /**
+        Returns all certificates within the given bundle with a `.cer` file extension.
+
+        - parameter bundle: The bundle to search for all `.cer` files.
+
+        - returns: All certificates within the given bundle.
+    */
+    public static func certificatesInBundle(bundle: NSBundle = NSBundle.mainBundle()) -> [SecCertificate] {
+        var certificates: [SecCertificate] = []
+
+        let paths = Set([".cer", ".CER", ".crt", ".CRT", ".der", ".DER"].map { fileExtension in
+            bundle.pathsForResourcesOfType(fileExtension, inDirectory: nil)
+        }.flatten())
+
+        for path in paths {
+            if let
+                certificateData = NSData(contentsOfFile: path),
+                certificate = SecCertificateCreateWithData(nil, certificateData)
+            {
+                certificates.append(certificate)
+            }
+        }
+
+        return certificates
+    }
+
+    /**
+        Returns all public keys within the given bundle with a `.cer` file extension.
+
+        - parameter bundle: The bundle to search for all `*.cer` files.
+
+        - returns: All public keys within the given bundle.
+    */
+    public static func publicKeysInBundle(bundle: NSBundle = NSBundle.mainBundle()) -> [SecKey] {
+        var publicKeys: [SecKey] = []
+
+        for certificate in certificatesInBundle(bundle) {
+            if let publicKey = publicKeyForCertificate(certificate) {
+                publicKeys.append(publicKey)
+            }
+        }
+
+        return publicKeys
+    }
+
+    // MARK: - Evaluation
+
+    /**
+        Evaluates whether the server trust is valid for the given host.
+
+        - parameter serverTrust: The server trust to evaluate.
+        - parameter host:        The host of the challenge protection space.
+
+        - returns: Whether the server trust is valid.
+    */
+    public func evaluateServerTrust(serverTrust: SecTrust, isValidForHost host: String) -> Bool {
+        var serverTrustIsValid = false
+
+        switch self {
+        case let .PerformDefaultEvaluation(validateHost):
+            let policy = SecPolicyCreateSSL(true, validateHost ? host as CFString : nil)
+            SecTrustSetPolicies(serverTrust, [policy])
+
+            serverTrustIsValid = trustIsValid(serverTrust)
+        case let .PinCertificates(pinnedCertificates, validateCertificateChain, validateHost):
+            if validateCertificateChain {
+                let policy = SecPolicyCreateSSL(true, validateHost ? host as CFString : nil)
+                SecTrustSetPolicies(serverTrust, [policy])
+
+                SecTrustSetAnchorCertificates(serverTrust, pinnedCertificates)
+                SecTrustSetAnchorCertificatesOnly(serverTrust, true)
+
+                serverTrustIsValid = trustIsValid(serverTrust)
+            } else {
+                let serverCertificatesDataArray = certificateDataForTrust(serverTrust)
+                let pinnedCertificatesDataArray = certificateDataForCertificates(pinnedCertificates)
+
+                outerLoop: for serverCertificateData in serverCertificatesDataArray {
+                    for pinnedCertificateData in pinnedCertificatesDataArray {
+                        if serverCertificateData.isEqualToData(pinnedCertificateData) {
+                            serverTrustIsValid = true
+                            break outerLoop
+                        }
+                    }
+                }
+            }
+        case let .PinPublicKeys(pinnedPublicKeys, validateCertificateChain, validateHost):
+            var certificateChainEvaluationPassed = true
+
+            if validateCertificateChain {
+                let policy = SecPolicyCreateSSL(true, validateHost ? host as CFString : nil)
+                SecTrustSetPolicies(serverTrust, [policy])
+
+                certificateChainEvaluationPassed = trustIsValid(serverTrust)
+            }
+
+            if certificateChainEvaluationPassed {
+                outerLoop: for serverPublicKey in ServerTrustPolicy.publicKeysForTrust(serverTrust) as [AnyObject] {
+                    for pinnedPublicKey in pinnedPublicKeys as [AnyObject] {
+                        if serverPublicKey.isEqual(pinnedPublicKey) {
+                            serverTrustIsValid = true
+                            break outerLoop
+                        }
+                    }
+                }
+            }
+        case .DisableEvaluation:
+            serverTrustIsValid = true
+        case let .CustomEvaluation(closure):
+            serverTrustIsValid = closure(serverTrust: serverTrust, host: host)
+        }
+
+        return serverTrustIsValid
+    }
+
+    // MARK: - Private - Trust Validation
+
+    private func trustIsValid(trust: SecTrust) -> Bool {
+        var isValid = false
+
+        var result = SecTrustResultType(kSecTrustResultInvalid)
+        let status = SecTrustEvaluate(trust, &result)
+
+        if status == errSecSuccess {
+            let unspecified = SecTrustResultType(kSecTrustResultUnspecified)
+            let proceed = SecTrustResultType(kSecTrustResultProceed)
+
+            isValid = result == unspecified || result == proceed
+        }
+
+        return isValid
+    }
+
+    // MARK: - Private - Certificate Data
+
+    private func certificateDataForTrust(trust: SecTrust) -> [NSData] {
+        var certificates: [SecCertificate] = []
+
+        for index in 0..<SecTrustGetCertificateCount(trust) {
+            if let certificate = SecTrustGetCertificateAtIndex(trust, index) {
+                certificates.append(certificate)
+            }
+        }
+
+        return certificateDataForCertificates(certificates)
+    }
+
+    private func certificateDataForCertificates(certificates: [SecCertificate]) -> [NSData] {
+        return certificates.map { SecCertificateCopyData($0) as NSData }
+    }
+
+    // MARK: - Private - Public Key Extraction
+
+    private static func publicKeysForTrust(trust: SecTrust) -> [SecKey] {
+        var publicKeys: [SecKey] = []
+
+        for index in 0..<SecTrustGetCertificateCount(trust) {
+            if let
+                certificate = SecTrustGetCertificateAtIndex(trust, index),
+                publicKey = publicKeyForCertificate(certificate)
+            {
+                publicKeys.append(publicKey)
+            }
+        }
+
+        return publicKeys
+    }
+
+    private static func publicKeyForCertificate(certificate: SecCertificate) -> SecKey? {
+        var publicKey: SecKey?
+
+        let policy = SecPolicyCreateBasicX509()
+        var trust: SecTrust?
+        let trustCreationStatus = SecTrustCreateWithCertificates(certificate, policy, &trust)
+
+        if let trust = trust where trustCreationStatus == errSecSuccess {
+            publicKey = SecTrustCopyPublicKey(trust)
+        }
+
+        return publicKey
+    }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Stream.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Stream.swift
new file mode 100644
index 00000000000..bc9ee450c5a
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Stream.swift
@@ -0,0 +1,180 @@
+// Stream.swift
+//
+// Copyright (c) 2014–2016 Alamofire Software Foundation (http://alamofire.org/)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+
+#if !os(watchOS)
+
+@available(iOS 9.0, OSX 10.11, *)
+extension Manager {
+    private enum Streamable {
+        case Stream(String, Int)
+        case NetService(NSNetService)
+    }
+
+    private func stream(streamable: Streamable) -> Request {
+        var streamTask: NSURLSessionStreamTask!
+
+        switch streamable {
+        case .Stream(let hostName, let port):
+            dispatch_sync(queue) {
+                streamTask = self.session.streamTaskWithHostName(hostName, port: port)
+            }
+        case .NetService(let netService):
+            dispatch_sync(queue) {
+                streamTask = self.session.streamTaskWithNetService(netService)
+            }
+        }
+
+        let request = Request(session: session, task: streamTask)
+
+        delegate[request.delegate.task] = request.delegate
+
+        if startRequestsImmediately {
+            request.resume()
+        }
+
+        return request
+    }
+
+    /**
+        Creates a request for bidirectional streaming with the given hostname and port.
+
+        - parameter hostName: The hostname of the server to connect to.
+        - parameter port:     The port of the server to connect to.
+
+        :returns: The created stream request.
+    */
+    public func stream(hostName hostName: String, port: Int) -> Request {
+        return stream(.Stream(hostName, port))
+    }
+
+    /**
+        Creates a request for bidirectional streaming with the given `NSNetService`.
+
+        - parameter netService: The net service used to identify the endpoint.
+
+        - returns: The created stream request.
+    */
+    public func stream(netService netService: NSNetService) -> Request {
+        return stream(.NetService(netService))
+    }
+}
+
+// MARK: -
+
+@available(iOS 9.0, OSX 10.11, *)
+extension Manager.SessionDelegate: NSURLSessionStreamDelegate {
+
+    // MARK: Override Closures
+
+    /// Overrides default behavior for NSURLSessionStreamDelegate method `URLSession:readClosedForStreamTask:`.
+    public var streamTaskReadClosed: ((NSURLSession, NSURLSessionStreamTask) -> Void)? {
+        get {
+            return _streamTaskReadClosed as? (NSURLSession, NSURLSessionStreamTask) -> Void
+        }
+        set {
+            _streamTaskReadClosed = newValue
+        }
+    }
+
+    /// Overrides default behavior for NSURLSessionStreamDelegate method `URLSession:writeClosedForStreamTask:`.
+    public var streamTaskWriteClosed: ((NSURLSession, NSURLSessionStreamTask) -> Void)? {
+        get {
+            return _streamTaskWriteClosed as? (NSURLSession, NSURLSessionStreamTask) -> Void
+        }
+        set {
+            _streamTaskWriteClosed = newValue
+        }
+    }
+
+    /// Overrides default behavior for NSURLSessionStreamDelegate method `URLSession:betterRouteDiscoveredForStreamTask:`.
+    public var streamTaskBetterRouteDiscovered: ((NSURLSession, NSURLSessionStreamTask) -> Void)? {
+        get {
+            return _streamTaskBetterRouteDiscovered as? (NSURLSession, NSURLSessionStreamTask) -> Void
+        }
+        set {
+            _streamTaskBetterRouteDiscovered = newValue
+        }
+    }
+
+    /// Overrides default behavior for NSURLSessionStreamDelegate method `URLSession:streamTask:didBecomeInputStream:outputStream:`.
+    public var streamTaskDidBecomeInputStream: ((NSURLSession, NSURLSessionStreamTask, NSInputStream, NSOutputStream) -> Void)? {
+        get {
+            return _streamTaskDidBecomeInputStream as? (NSURLSession, NSURLSessionStreamTask, NSInputStream, NSOutputStream) -> Void
+        }
+        set {
+            _streamTaskDidBecomeInputStream = newValue
+        }
+    }
+
+    // MARK: Delegate Methods
+
+    /**
+        Tells the delegate that the read side of the connection has been closed.
+
+        - parameter session:    The session.
+        - parameter streamTask: The stream task.
+    */
+    public func URLSession(session: NSURLSession, readClosedForStreamTask streamTask: NSURLSessionStreamTask) {
+        streamTaskReadClosed?(session, streamTask)
+    }
+
+    /**
+        Tells the delegate that the write side of the connection has been closed.
+
+        - parameter session:    The session.
+        - parameter streamTask: The stream task.
+    */
+    public func URLSession(session: NSURLSession, writeClosedForStreamTask streamTask: NSURLSessionStreamTask) {
+        streamTaskWriteClosed?(session, streamTask)
+    }
+
+    /**
+        Tells the delegate that the system has determined that a better route to the host is available.
+
+        - parameter session:    The session.
+        - parameter streamTask: The stream task.
+    */
+    public func URLSession(session: NSURLSession, betterRouteDiscoveredForStreamTask streamTask: NSURLSessionStreamTask) {
+        streamTaskBetterRouteDiscovered?(session, streamTask)
+    }
+
+    /**
+        Tells the delegate that the stream task has been completed and provides the unopened stream objects.
+
+        - parameter session:      The session.
+        - parameter streamTask:   The stream task.
+        - parameter inputStream:  The new input stream.
+        - parameter outputStream: The new output stream.
+    */
+    public func URLSession(
+        session: NSURLSession,
+        streamTask: NSURLSessionStreamTask,
+        didBecomeInputStream inputStream: NSInputStream,
+        outputStream: NSOutputStream)
+    {
+        streamTaskDidBecomeInputStream?(session, streamTask, inputStream, outputStream)
+    }
+}
+
+#endif
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Upload.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Upload.swift
new file mode 100644
index 00000000000..ee6b34ced5b
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Upload.swift
@@ -0,0 +1,372 @@
+// Upload.swift
+//
+// Copyright (c) 2014–2016 Alamofire Software Foundation (http://alamofire.org/)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+
+extension Manager {
+    private enum Uploadable {
+        case Data(NSURLRequest, NSData)
+        case File(NSURLRequest, NSURL)
+        case Stream(NSURLRequest, NSInputStream)
+    }
+
+    private func upload(uploadable: Uploadable) -> Request {
+        var uploadTask: NSURLSessionUploadTask!
+        var HTTPBodyStream: NSInputStream?
+
+        switch uploadable {
+        case .Data(let request, let data):
+            dispatch_sync(queue) {
+                uploadTask = self.session.uploadTaskWithRequest(request, fromData: data)
+            }
+        case .File(let request, let fileURL):
+            dispatch_sync(queue) {
+                uploadTask = self.session.uploadTaskWithRequest(request, fromFile: fileURL)
+            }
+        case .Stream(let request, let stream):
+            dispatch_sync(queue) {
+                uploadTask = self.session.uploadTaskWithStreamedRequest(request)
+            }
+
+            HTTPBodyStream = stream
+        }
+
+        let request = Request(session: session, task: uploadTask)
+
+        if HTTPBodyStream != nil {
+            request.delegate.taskNeedNewBodyStream = { _, _ in
+                return HTTPBodyStream
+            }
+        }
+
+        delegate[request.delegate.task] = request.delegate
+
+        if startRequestsImmediately {
+            request.resume()
+        }
+
+        return request
+    }
+
+    // MARK: File
+
+    /**
+        Creates a request for uploading a file to the specified URL request.
+
+        If `startRequestsImmediately` is `true`, the request will have `resume()` called before being returned.
+
+        - parameter URLRequest: The URL request
+        - parameter file:       The file to upload
+
+        - returns: The created upload request.
+    */
+    public func upload(URLRequest: URLRequestConvertible, file: NSURL) -> Request {
+        return upload(.File(URLRequest.URLRequest, file))
+    }
+
+    /**
+        Creates a request for uploading a file to the specified URL request.
+
+        If `startRequestsImmediately` is `true`, the request will have `resume()` called before being returned.
+
+        - parameter method:    The HTTP method.
+        - parameter URLString: The URL string.
+        - parameter headers:   The HTTP headers. `nil` by default.
+        - parameter file:      The file to upload
+
+        - returns: The created upload request.
+    */
+    public func upload(
+        method: Method,
+        _ URLString: URLStringConvertible,
+        headers: [String: String]? = nil,
+        file: NSURL)
+        -> Request
+    {
+        let mutableURLRequest = URLRequest(method, URLString, headers: headers)
+        return upload(mutableURLRequest, file: file)
+    }
+
+    // MARK: Data
+
+    /**
+        Creates a request for uploading data to the specified URL request.
+
+        If `startRequestsImmediately` is `true`, the request will have `resume()` called before being returned.
+
+        - parameter URLRequest: The URL request.
+        - parameter data:       The data to upload.
+
+        - returns: The created upload request.
+    */
+    public func upload(URLRequest: URLRequestConvertible, data: NSData) -> Request {
+        return upload(.Data(URLRequest.URLRequest, data))
+    }
+
+    /**
+        Creates a request for uploading data to the specified URL request.
+
+        If `startRequestsImmediately` is `true`, the request will have `resume()` called before being returned.
+
+        - parameter method:    The HTTP method.
+        - parameter URLString: The URL string.
+        - parameter headers:   The HTTP headers. `nil` by default.
+        - parameter data:      The data to upload
+
+        - returns: The created upload request.
+    */
+    public func upload(
+        method: Method,
+        _ URLString: URLStringConvertible,
+        headers: [String: String]? = nil,
+        data: NSData)
+        -> Request
+    {
+        let mutableURLRequest = URLRequest(method, URLString, headers: headers)
+
+        return upload(mutableURLRequest, data: data)
+    }
+
+    // MARK: Stream
+
+    /**
+        Creates a request for uploading a stream to the specified URL request.
+
+        If `startRequestsImmediately` is `true`, the request will have `resume()` called before being returned.
+
+        - parameter URLRequest: The URL request.
+        - parameter stream:     The stream to upload.
+
+        - returns: The created upload request.
+    */
+    public func upload(URLRequest: URLRequestConvertible, stream: NSInputStream) -> Request {
+        return upload(.Stream(URLRequest.URLRequest, stream))
+    }
+
+    /**
+        Creates a request for uploading a stream to the specified URL request.
+
+        If `startRequestsImmediately` is `true`, the request will have `resume()` called before being returned.
+
+        - parameter method:    The HTTP method.
+        - parameter URLString: The URL string.
+        - parameter headers:   The HTTP headers. `nil` by default.
+        - parameter stream:    The stream to upload.
+
+        - returns: The created upload request.
+    */
+    public func upload(
+        method: Method,
+        _ URLString: URLStringConvertible,
+        headers: [String: String]? = nil,
+        stream: NSInputStream)
+        -> Request
+    {
+        let mutableURLRequest = URLRequest(method, URLString, headers: headers)
+
+        return upload(mutableURLRequest, stream: stream)
+    }
+
+    // MARK: MultipartFormData
+
+    /// Default memory threshold used when encoding `MultipartFormData`.
+    public static let MultipartFormDataEncodingMemoryThreshold: UInt64 = 10 * 1024 * 1024
+
+    /**
+        Defines whether the `MultipartFormData` encoding was successful and contains result of the encoding as 
+        associated values.
+
+        - Success: Represents a successful `MultipartFormData` encoding and contains the new `Request` along with 
+                   streaming information.
+        - Failure: Used to represent a failure in the `MultipartFormData` encoding and also contains the encoding 
+                   error.
+    */
+    public enum MultipartFormDataEncodingResult {
+        case Success(request: Request, streamingFromDisk: Bool, streamFileURL: NSURL?)
+        case Failure(ErrorType)
+    }
+
+    /**
+        Encodes the `MultipartFormData` and creates a request to upload the result to the specified URL request.
+
+        It is important to understand the memory implications of uploading `MultipartFormData`. If the cummulative 
+        payload is small, encoding the data in-memory and directly uploading to a server is the by far the most 
+        efficient approach. However, if the payload is too large, encoding the data in-memory could cause your app to 
+        be terminated. Larger payloads must first be written to disk using input and output streams to keep the memory 
+        footprint low, then the data can be uploaded as a stream from the resulting file. Streaming from disk MUST be 
+        used for larger payloads such as video content.
+
+        The `encodingMemoryThreshold` parameter allows Alamofire to automatically determine whether to encode in-memory 
+        or stream from disk. If the content length of the `MultipartFormData` is below the `encodingMemoryThreshold`,
+        encoding takes place in-memory. If the content length exceeds the threshold, the data is streamed to disk 
+        during the encoding process. Then the result is uploaded as data or as a stream depending on which encoding 
+        technique was used.
+
+        If `startRequestsImmediately` is `true`, the request will have `resume()` called before being returned.
+
+        - parameter method:                  The HTTP method.
+        - parameter URLString:               The URL string.
+        - parameter headers:                 The HTTP headers. `nil` by default.
+        - parameter multipartFormData:       The closure used to append body parts to the `MultipartFormData`.
+        - parameter encodingMemoryThreshold: The encoding memory threshold in bytes.
+                                             `MultipartFormDataEncodingMemoryThreshold` by default.
+        - parameter encodingCompletion:      The closure called when the `MultipartFormData` encoding is complete.
+    */
+    public func upload(
+        method: Method,
+        _ URLString: URLStringConvertible,
+        headers: [String: String]? = nil,
+        multipartFormData: MultipartFormData -> Void,
+        encodingMemoryThreshold: UInt64 = Manager.MultipartFormDataEncodingMemoryThreshold,
+        encodingCompletion: (MultipartFormDataEncodingResult -> Void)?)
+    {
+        let mutableURLRequest = URLRequest(method, URLString, headers: headers)
+
+        return upload(
+            mutableURLRequest,
+            multipartFormData: multipartFormData,
+            encodingMemoryThreshold: encodingMemoryThreshold,
+            encodingCompletion: encodingCompletion
+        )
+    }
+
+    /**
+        Encodes the `MultipartFormData` and creates a request to upload the result to the specified URL request.
+
+        It is important to understand the memory implications of uploading `MultipartFormData`. If the cummulative
+        payload is small, encoding the data in-memory and directly uploading to a server is the by far the most
+        efficient approach. However, if the payload is too large, encoding the data in-memory could cause your app to
+        be terminated. Larger payloads must first be written to disk using input and output streams to keep the memory
+        footprint low, then the data can be uploaded as a stream from the resulting file. Streaming from disk MUST be
+        used for larger payloads such as video content.
+
+        The `encodingMemoryThreshold` parameter allows Alamofire to automatically determine whether to encode in-memory
+        or stream from disk. If the content length of the `MultipartFormData` is below the `encodingMemoryThreshold`,
+        encoding takes place in-memory. If the content length exceeds the threshold, the data is streamed to disk
+        during the encoding process. Then the result is uploaded as data or as a stream depending on which encoding
+        technique was used.
+
+        If `startRequestsImmediately` is `true`, the request will have `resume()` called before being returned.
+
+        - parameter URLRequest:              The URL request.
+        - parameter multipartFormData:       The closure used to append body parts to the `MultipartFormData`.
+        - parameter encodingMemoryThreshold: The encoding memory threshold in bytes.
+                                             `MultipartFormDataEncodingMemoryThreshold` by default.
+        - parameter encodingCompletion:      The closure called when the `MultipartFormData` encoding is complete.
+    */
+    public func upload(
+        URLRequest: URLRequestConvertible,
+        multipartFormData: MultipartFormData -> Void,
+        encodingMemoryThreshold: UInt64 = Manager.MultipartFormDataEncodingMemoryThreshold,
+        encodingCompletion: (MultipartFormDataEncodingResult -> Void)?)
+    {
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0)) {
+            let formData = MultipartFormData()
+            multipartFormData(formData)
+
+            let URLRequestWithContentType = URLRequest.URLRequest
+            URLRequestWithContentType.setValue(formData.contentType, forHTTPHeaderField: "Content-Type")
+
+            let isBackgroundSession = self.session.configuration.identifier != nil
+
+            if formData.contentLength < encodingMemoryThreshold && !isBackgroundSession {
+                do {
+                    let data = try formData.encode()
+                    let encodingResult = MultipartFormDataEncodingResult.Success(
+                        request: self.upload(URLRequestWithContentType, data: data),
+                        streamingFromDisk: false,
+                        streamFileURL: nil
+                    )
+
+                    dispatch_async(dispatch_get_main_queue()) {
+                        encodingCompletion?(encodingResult)
+                    }
+                } catch {
+                    dispatch_async(dispatch_get_main_queue()) {
+                        encodingCompletion?(.Failure(error as NSError))
+                    }
+                }
+            } else {
+                let fileManager = NSFileManager.defaultManager()
+                let tempDirectoryURL = NSURL(fileURLWithPath: NSTemporaryDirectory())
+                let directoryURL = tempDirectoryURL.URLByAppendingPathComponent("com.alamofire.manager/multipart.form.data")
+                let fileName = NSUUID().UUIDString
+                let fileURL = directoryURL.URLByAppendingPathComponent(fileName)
+
+                do {
+                    try fileManager.createDirectoryAtURL(directoryURL, withIntermediateDirectories: true, attributes: nil)
+                    try formData.writeEncodedDataToDisk(fileURL)
+
+                    dispatch_async(dispatch_get_main_queue()) {
+                        let encodingResult = MultipartFormDataEncodingResult.Success(
+                            request: self.upload(URLRequestWithContentType, file: fileURL),
+                            streamingFromDisk: true,
+                            streamFileURL: fileURL
+                        )
+                        encodingCompletion?(encodingResult)
+                    }
+                } catch {
+                    dispatch_async(dispatch_get_main_queue()) {
+                        encodingCompletion?(.Failure(error as NSError))
+                    }
+                }
+            }
+        }
+    }
+}
+
+// MARK: -
+
+extension Request {
+
+    // MARK: - UploadTaskDelegate
+
+    class UploadTaskDelegate: DataTaskDelegate {
+        var uploadTask: NSURLSessionUploadTask? { return task as? NSURLSessionUploadTask }
+        var uploadProgress: ((Int64, Int64, Int64) -> Void)!
+
+        // MARK: - NSURLSessionTaskDelegate
+
+        // MARK: Override Closures
+
+        var taskDidSendBodyData: ((NSURLSession, NSURLSessionTask, Int64, Int64, Int64) -> Void)?
+
+        // MARK: Delegate Methods
+
+        func URLSession(
+            session: NSURLSession,
+            task: NSURLSessionTask,
+            didSendBodyData bytesSent: Int64,
+            totalBytesSent: Int64,
+            totalBytesExpectedToSend: Int64)
+        {
+            if let taskDidSendBodyData = taskDidSendBodyData {
+                taskDidSendBodyData(session, task, bytesSent, totalBytesSent, totalBytesExpectedToSend)
+            } else {
+                progress.totalUnitCount = totalBytesExpectedToSend
+                progress.completedUnitCount = totalBytesSent
+
+                uploadProgress?(bytesSent, totalBytesSent, totalBytesExpectedToSend)
+            }
+        }
+    }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Validation.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Validation.swift
new file mode 100644
index 00000000000..71d21e1afa6
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Validation.swift
@@ -0,0 +1,189 @@
+// Validation.swift
+//
+// Copyright (c) 2014–2016 Alamofire Software Foundation (http://alamofire.org/)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+
+extension Request {
+
+    /**
+        Used to represent whether validation was successful or encountered an error resulting in a failure.
+
+        - Success: The validation was successful.
+        - Failure: The validation failed encountering the provided error.
+    */
+    public enum ValidationResult {
+        case Success
+        case Failure(NSError)
+    }
+
+    /**
+        A closure used to validate a request that takes a URL request and URL response, and returns whether the 
+        request was valid.
+    */
+    public typealias Validation = (NSURLRequest?, NSHTTPURLResponse) -> ValidationResult
+
+    /**
+        Validates the request, using the specified closure.
+
+        If validation fails, subsequent calls to response handlers will have an associated error.
+
+        - parameter validation: A closure to validate the request.
+
+        - returns: The request.
+    */
+    public func validate(validation: Validation) -> Self {
+        delegate.queue.addOperationWithBlock {
+            if let
+                response = self.response where self.delegate.error == nil,
+                case let .Failure(error) = validation(self.request, response)
+            {
+                self.delegate.error = error
+            }
+        }
+
+        return self
+    }
+
+    // MARK: - Status Code
+
+    /**
+        Validates that the response has a status code in the specified range.
+
+        If validation fails, subsequent calls to response handlers will have an associated error.
+
+        - parameter range: The range of acceptable status codes.
+
+        - returns: The request.
+    */
+    public func validate<S: SequenceType where S.Generator.Element == Int>(statusCode acceptableStatusCode: S) -> Self {
+        return validate { _, response in
+            if acceptableStatusCode.contains(response.statusCode) {
+                return .Success
+            } else {
+                let failureReason = "Response status code was unacceptable: \(response.statusCode)"
+                return .Failure(Error.errorWithCode(.StatusCodeValidationFailed, failureReason: failureReason))
+            }
+        }
+    }
+
+    // MARK: - Content-Type
+
+    private struct MIMEType {
+        let type: String
+        let subtype: String
+
+        init?(_ string: String) {
+            let components: [String] = {
+                let stripped = string.stringByTrimmingCharactersInSet(NSCharacterSet.whitespaceAndNewlineCharacterSet())
+                let split = stripped.substringToIndex(stripped.rangeOfString(";")?.startIndex ?? stripped.endIndex)
+                return split.componentsSeparatedByString("/")
+            }()
+
+            if let
+                type = components.first,
+                subtype = components.last
+            {
+                self.type = type
+                self.subtype = subtype
+            } else {
+                return nil
+            }
+        }
+
+        func matches(MIME: MIMEType) -> Bool {
+            switch (type, subtype) {
+            case (MIME.type, MIME.subtype), (MIME.type, "*"), ("*", MIME.subtype), ("*", "*"):
+                return true
+            default:
+                return false
+            }
+        }
+    }
+
+    /**
+        Validates that the response has a content type in the specified array.
+
+        If validation fails, subsequent calls to response handlers will have an associated error.
+
+        - parameter contentType: The acceptable content types, which may specify wildcard types and/or subtypes.
+
+        - returns: The request.
+    */
+    public func validate<S : SequenceType where S.Generator.Element == String>(contentType acceptableContentTypes: S) -> Self {
+        return validate { _, response in
+            guard let validData = self.delegate.data where validData.length > 0 else { return .Success }
+
+            if let
+                responseContentType = response.MIMEType,
+                responseMIMEType = MIMEType(responseContentType)
+            {
+                for contentType in acceptableContentTypes {
+                    if let acceptableMIMEType = MIMEType(contentType) where acceptableMIMEType.matches(responseMIMEType) {
+                        return .Success
+                    }
+                }
+            } else {
+                for contentType in acceptableContentTypes {
+                    if let MIMEType = MIMEType(contentType) where MIMEType.type == "*" && MIMEType.subtype == "*" {
+                        return .Success
+                    }
+                }
+            }
+
+            let failureReason: String
+
+            if let responseContentType = response.MIMEType {
+                failureReason = (
+                    "Response content type \"\(responseContentType)\" does not match any acceptable " +
+                    "content types: \(acceptableContentTypes)"
+                )
+            } else {
+                failureReason = "Response content type was missing and acceptable content type does not match \"*/*\""
+            }
+
+            return .Failure(Error.errorWithCode(.ContentTypeValidationFailed, failureReason: failureReason))
+        }
+    }
+
+    // MARK: - Automatic
+
+    /**
+        Validates that the response has a status code in the default acceptable range of 200...299, and that the content 
+        type matches any specified in the Accept HTTP header field.
+
+        If validation fails, subsequent calls to response handlers will have an associated error.
+
+        - returns: The request.
+    */
+    public func validate() -> Self {
+        let acceptableStatusCodes: Range<Int> = 200..<300
+        let acceptableContentTypes: [String] = {
+            if let accept = request?.valueForHTTPHeaderField("Accept") {
+                return accept.componentsSeparatedByString(",")
+            }
+
+            return ["*/*"]
+        }()
+
+        return validate(statusCode: acceptableStatusCodes).validate(contentType: acceptableContentTypes)
+    }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/OMGHTTPURLRQ/OMGFormURLEncode.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/OMGHTTPURLRQ/OMGFormURLEncode.h
new file mode 120000
index 00000000000..8271dc48ed5
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/OMGHTTPURLRQ/OMGFormURLEncode.h
@@ -0,0 +1 @@
+../../../OMGHTTPURLRQ/Sources/OMGFormURLEncode.h
\ No newline at end of file
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/OMGHTTPURLRQ/OMGHTTPURLRQ.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/OMGHTTPURLRQ/OMGHTTPURLRQ.h
new file mode 120000
index 00000000000..e0cf7ca4e47
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/OMGHTTPURLRQ/OMGHTTPURLRQ.h
@@ -0,0 +1 @@
+../../../OMGHTTPURLRQ/Sources/OMGHTTPURLRQ.h
\ No newline at end of file
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/OMGHTTPURLRQ/OMGUserAgent.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/OMGHTTPURLRQ/OMGUserAgent.h
new file mode 120000
index 00000000000..682de9a9e3e
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/OMGHTTPURLRQ/OMGUserAgent.h
@@ -0,0 +1 @@
+../../../OMGHTTPURLRQ/Sources/OMGUserAgent.h
\ No newline at end of file
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/AnyPromise.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/AnyPromise.h
new file mode 120000
index 00000000000..61ce91eb094
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/AnyPromise.h
@@ -0,0 +1 @@
+../../../PromiseKit/Sources/AnyPromise.h
\ No newline at end of file
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/CALayer+AnyPromise.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/CALayer+AnyPromise.h
new file mode 120000
index 00000000000..831485ea1ce
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/CALayer+AnyPromise.h
@@ -0,0 +1 @@
+../../../PromiseKit/Categories/QuartzCore/CALayer+AnyPromise.h
\ No newline at end of file
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/NSError+Cancellation.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/NSError+Cancellation.h
new file mode 120000
index 00000000000..7312b04bea2
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/NSError+Cancellation.h
@@ -0,0 +1 @@
+../../../PromiseKit/Sources/NSError+Cancellation.h
\ No newline at end of file
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/NSNotificationCenter+AnyPromise.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/NSNotificationCenter+AnyPromise.h
new file mode 120000
index 00000000000..2890a33e083
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/NSNotificationCenter+AnyPromise.h
@@ -0,0 +1 @@
+../../../PromiseKit/Categories/Foundation/NSNotificationCenter+AnyPromise.h
\ No newline at end of file
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/NSURLConnection+AnyPromise.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/NSURLConnection+AnyPromise.h
new file mode 120000
index 00000000000..fd8271b3404
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/NSURLConnection+AnyPromise.h
@@ -0,0 +1 @@
+../../../PromiseKit/Categories/Foundation/NSURLConnection+AnyPromise.h
\ No newline at end of file
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/PromiseKit.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/PromiseKit.h
new file mode 120000
index 00000000000..c941a074e11
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/PromiseKit.h
@@ -0,0 +1 @@
+../../../PromiseKit/Sources/PromiseKit.h
\ No newline at end of file
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/UIActionSheet+AnyPromise.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/UIActionSheet+AnyPromise.h
new file mode 120000
index 00000000000..981d4adb5e6
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/UIActionSheet+AnyPromise.h
@@ -0,0 +1 @@
+../../../PromiseKit/Categories/UIKit/UIActionSheet+AnyPromise.h
\ No newline at end of file
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/UIAlertView+AnyPromise.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/UIAlertView+AnyPromise.h
new file mode 120000
index 00000000000..01b78aa08ab
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/UIAlertView+AnyPromise.h
@@ -0,0 +1 @@
+../../../PromiseKit/Categories/UIKit/UIAlertView+AnyPromise.h
\ No newline at end of file
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/UIView+AnyPromise.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/UIView+AnyPromise.h
new file mode 120000
index 00000000000..98b020ac2c9
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/UIView+AnyPromise.h
@@ -0,0 +1 @@
+../../../PromiseKit/Categories/UIKit/UIView+AnyPromise.h
\ No newline at end of file
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/UIViewController+AnyPromise.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/UIViewController+AnyPromise.h
new file mode 120000
index 00000000000..3414608e9be
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/UIViewController+AnyPromise.h
@@ -0,0 +1 @@
+../../../PromiseKit/Categories/UIKit/UIViewController+AnyPromise.h
\ No newline at end of file
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/Umbrella.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/Umbrella.h
new file mode 120000
index 00000000000..ac976191660
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Headers/Private/PromiseKit/Umbrella.h
@@ -0,0 +1 @@
+../../../PromiseKit/Sources/Umbrella.h
\ No newline at end of file
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json b/samples/client/petstore/swift/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json
new file mode 100644
index 00000000000..fd3d9ad5511
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json	
@@ -0,0 +1,22 @@
+{
+  "name": "PetstoreClient",
+  "platforms": {
+    "ios": "8.0",
+    "osx": "10.9"
+  },
+  "version": "0.0.1",
+  "source": {
+    "git": "git@github.com:swagger-api/swagger-mustache.git",
+    "tag": "v1.0.0"
+  },
+  "license": "Apache License, Version 2.0",
+  "source_files": "PetstoreClient/Classes/Swaggers/**/*.swift",
+  "dependencies": {
+    "PromiseKit": [
+      "~> 3.0.0"
+    ],
+    "Alamofire": [
+      "~> 3.1.4"
+    ]
+  }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Manifest.lock b/samples/client/petstore/swift/SwaggerClientTests/Pods/Manifest.lock
new file mode 100644
index 00000000000..76889714e21
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Manifest.lock
@@ -0,0 +1,39 @@
+PODS:
+  - Alamofire (3.1.5)
+  - OMGHTTPURLRQ (3.1.1):
+    - OMGHTTPURLRQ/RQ (= 3.1.1)
+  - OMGHTTPURLRQ/FormURLEncode (3.1.1)
+  - OMGHTTPURLRQ/RQ (3.1.1):
+    - OMGHTTPURLRQ/FormURLEncode
+    - OMGHTTPURLRQ/UserAgent
+  - OMGHTTPURLRQ/UserAgent (3.1.1)
+  - PetstoreClient (0.0.1):
+    - Alamofire (~> 3.1.4)
+    - PromiseKit (~> 3.0.0)
+  - PromiseKit (3.0.3):
+    - PromiseKit/Foundation (= 3.0.3)
+    - PromiseKit/QuartzCore (= 3.0.3)
+    - PromiseKit/UIKit (= 3.0.3)
+  - PromiseKit/CorePromise (3.0.3)
+  - PromiseKit/Foundation (3.0.3):
+    - OMGHTTPURLRQ (~> 3.1.0)
+    - PromiseKit/CorePromise
+  - PromiseKit/QuartzCore (3.0.3):
+    - PromiseKit/CorePromise
+  - PromiseKit/UIKit (3.0.3):
+    - PromiseKit/CorePromise
+
+DEPENDENCIES:
+  - PetstoreClient (from `../`)
+
+EXTERNAL SOURCES:
+  PetstoreClient:
+    :path: ../
+
+SPEC CHECKSUMS:
+  Alamofire: 5f730ba29fd113b7ddd71c1e65d0c630acf5d7b0
+  OMGHTTPURLRQ: 633f98ee745aeda02345935a52eec1784cddb589
+  PetstoreClient: c9a3d06cf7954479a767135676406c4922cd3c4a
+  PromiseKit: 00ec2a219bf5ad2833f95977698e921932b8dfd3
+
+COCOAPODS: 0.39.0
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/OMGHTTPURLRQ/README.markdown b/samples/client/petstore/swift/SwaggerClientTests/Pods/OMGHTTPURLRQ/README.markdown
new file mode 100644
index 00000000000..ff905517872
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/OMGHTTPURLRQ/README.markdown
@@ -0,0 +1,145 @@
+# OMGHTTPURLRQ
+
+Vital extensions to `NSURLRequest` that Apple left out for some reason.
+
+```objc
+NSMutableURLRequest *rq = [OMGHTTPURLRQ GET:@"http://api.com":@{@"key": @"value"}];
+
+// application/x-www-form-urlencoded
+NSMutableURLRequest *rq = [OMGHTTPURLRQ POST:@"http://api.com":@{@"key": @"value"}];
+
+// application/json
+NSMutableURLRequest *rq = [OMGHTTPURLRQ POST:@"http://api.com" JSON:@{@"key": @"value"}];
+
+// PUT
+NSMutableURLRequest *rq = [OMGHTTPURLRQ PUT:@"http://api.com":@{@"key": @"value"}];
+
+// DELETE
+NSMutableURLRequest *rq = [OMGHTTPURLRQ DELETE:@"http://api.com":@{@"key": @"value"}];
+```
+
+You can then pass these to an `NSURLConnection` or `NSURLSession`.
+
+
+## `multipart/form-data`
+
+OMG! Constructing multipart/form-data for POST requests is complicated, let us do it for you:
+
+```objc
+
+OMGMultipartFormData *multipartFormData = [OMGMultipartFormData new];
+
+NSData *data1 = [NSData dataWithContentsOfFile:@"myimage1.png"];
+[multipartFormData addFile:data1 parameterName:@"file1" filename:@"myimage1.png" contentType:@"image/png"];
+
+// Ideally you would not want to re-encode the PNG, but often it is
+// tricky to avoid it.
+UIImage *image2 = [UIImage imageNamed:@"image2"];
+NSData *data2 = UIImagePNGRepresentation(image2);
+[multipartFormData addFile:data2 parameterName:@"file2" filename:@"myimage2.png" contentType:@"image/png"];
+
+// SUPER Ideally you would not want to re-encode the JPEG as the process
+// is lossy. If you image comes from the AssetLibrary you *CAN* get the
+// original `NSData`. See stackoverflow.com.
+UIImage *image3 = [UIImage imageNamed:@"image3"];
+NSData *data3 = UIImageJPEGRepresentation(image3);
+[multipartFormData addFile:data3 parameterName:@"file2" filename:@"myimage3.jpeg" contentType:@"image/jpeg"];
+
+NSMutableURLRequest *rq = [OMGHTTPURLRQ POST:url:multipartFormData];
+```
+
+Now feed `rq` to `[NSURLConnection sendSynchronousRequest:returningResponse:error:`.
+
+
+## Configuring an `NSURLSessionUploadTask`
+
+If you need to use `NSURLSession`’s `uploadTask:` but you have become frustrated  because your endpoint expects a multipart/form-data POST request and `NSURLSession` sends the data *raw*, use this:
+
+```objc
+id config = [NSURLSessionConfiguration backgroundSessionConfigurationWithIdentifier:someID];
+id session = [NSURLSession sessionWithConfiguration:config delegate:someObject delegateQueue:[NSOperationQueue new]];
+
+OMGMultipartFormData *multipartFormData = [OMGMultipartFormData new];
+[multipartFormData addFile:data parameterName:@"file" filename:nil contentType:nil];
+
+NSURLRequest *rq = [OMGHTTPURLRQ POST:urlString:multipartFormData];
+
+id path = [[NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) lastObject] stringByAppendingPathComponent:@"upload.NSData"];
+[rq.HTTPBody writeToFile:path atomically:YES];
+
+[[session uploadTaskWithRequest:rq fromFile:[NSURL fileURLWithPath:path]] resume];
+```
+
+
+## OMGUserAgent
+
+If you just need a sensible UserAgent string for your application you can `pod OMGHTTPURLRQ/UserAgent` and then:
+
+```objc
+#import <OMGHTTPURLRQ/OMGUserAgent.h>
+
+NSString *userAgent = OMGUserAgent();
+```
+
+OMGHTTPURLRQ adds this User-Agent to all requests it generates automatically.
+
+So for URLRequests generated **other** than by OMGHTTPURLRQ you would do:
+
+```objc
+[someURLRequest addValue:OMGUserAgent() forHTTPHeaderField:@"User-Agent"];
+```
+
+
+# Twitter Reverse Auth
+
+You need an OAuth library, here we use the [TDOAuth](https://github.com/tweetdeck/TDOAuth) pod. You also need
+your API keys that registering at https://dev.twitter.com will provide
+you.
+
+```objc
+NSMutableURLRequest *rq = [TDOAuth URLRequestForPath:@"/oauth/request_token" POSTParameters:@{@"x_auth_mode" : @"reverse_auth"} host:@"api.twitter.com"consumerKey:APIKey consumerSecret:APISecret accessToken:nil tokenSecret:nil];
+[rq addValue:OMGUserAgent() forHTTPHeaderField:@"User-Agent"];
+
+[NSURLConnection sendAsynchronousRequest:rq queue:nil completionHandler:^(NSURLResponse *response, NSData *data, NSError *connectionError) {
+    id oauth = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+    SLRequest *reverseAuth = [SLRequest requestForServiceType:SLServiceTypeTwitter requestMethod:SLRequestMethodPOST URL:[NSURL URLWithString:@"https://api.twitter.com/oauth/access_token"] parameters:@{
+        @"x_reverse_auth_target": APIKey,
+        @"x_reverse_auth_parameters": oauth
+    }];
+    reverseAuth.account = account;
+    [reverseAuth performRequestWithHandler:^(NSData *data, NSHTTPURLResponse *urlResponse, NSError *error) {
+        id creds = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+        id credsDict = [NSMutableDictionary new];
+        for (__strong id pair in [creds componentsSeparatedByString:@"&"]) {
+            pair = [pair componentsSeparatedByString:@"="];
+            credsDict[pair[0]] = pair[1];
+        }
+        NSLog(@"%@", credsDict);
+    }];
+}];
+```
+
+
+# License
+
+```
+Copyright 2014 Max Howell <mxcl@me.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+```
\ No newline at end of file
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGFormURLEncode.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGFormURLEncode.h
new file mode 100644
index 00000000000..994c56494eb
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGFormURLEncode.h
@@ -0,0 +1,22 @@
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSObjCRuntime.h>
+#import <Foundation/NSString.h>
+
+#if __has_feature(nullability) && defined(NS_ASSUME_NONNULL_BEGIN)
+NS_ASSUME_NONNULL_BEGIN
+#endif
+
+/**
+ Express this dictionary as a `application/x-www-form-urlencoded` string.
+
+ Most users would recognize the result of this transformation as the query
+ string in a browser bar. For our purposes it is the query string in a GET
+ request and the HTTP body for POST, PUT and DELETE requests.
+
+ If the parameters dictionary is nil or empty, returns nil.
+*/
+NSString *OMGFormURLEncode(NSDictionary *parameters);
+
+#if __has_feature(nullability) && defined(NS_ASSUME_NONNULL_END)
+NS_ASSUME_NONNULL_END
+#endif
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGFormURLEncode.m b/samples/client/petstore/swift/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGFormURLEncode.m
new file mode 100644
index 00000000000..1014543c1a0
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGFormURLEncode.m
@@ -0,0 +1,56 @@
+#import <Foundation/Foundation.h>
+#import "OMGFormURLEncode.h"
+
+static inline NSString *enc(id in, NSString *ignore) {
+	NSMutableCharacterSet *allowedSet = [NSMutableCharacterSet characterSetWithCharactersInString:ignore];
+	[allowedSet formUnionWithCharacterSet:[NSCharacterSet URLQueryAllowedCharacterSet]];
+	[allowedSet removeCharactersInString:@":/?&=;+!@#$()',*"];
+
+	return [[in description] stringByAddingPercentEncodingWithAllowedCharacters:allowedSet];
+}
+
+#define enckey(in) enc(in, @"[]")
+#define encval(in) enc(in, @"")
+
+static NSArray *DoQueryMagic(NSString *key, id value) {
+    NSMutableArray *parts = [NSMutableArray new];
+
+    // Sort dictionary keys to ensure consistent ordering in query string,
+    // which is important when deserializing potentially ambiguous sequences,
+    // such as an array of dictionaries
+    #define sortDescriptor [NSSortDescriptor sortDescriptorWithKey:@"description" ascending:YES selector:@selector(compare:)]
+
+    if ([value isKindOfClass:[NSDictionary class]]) {
+        NSDictionary *dictionary = value;
+        for (id nestedKey in [dictionary.allKeys sortedArrayUsingDescriptors:@[sortDescriptor]]) {
+            id recursiveKey = key ? [NSString stringWithFormat:@"%@[%@]", key, nestedKey] : nestedKey;
+            [parts addObjectsFromArray:DoQueryMagic(recursiveKey, dictionary[nestedKey])];
+        }
+    } else if ([value isKindOfClass:[NSArray class]]) {
+        for (id nestedValue in value)
+            [parts addObjectsFromArray:DoQueryMagic([NSString stringWithFormat:@"%@[]", key], nestedValue)];
+    } else if ([value isKindOfClass:[NSSet class]]) {
+        for (id obj in [value sortedArrayUsingDescriptors:@[sortDescriptor]])
+            [parts addObjectsFromArray:DoQueryMagic(key, obj)];
+    } else {
+        [parts addObjectsFromArray:[NSArray arrayWithObjects:key, value, nil]];
+    }
+
+    return parts;
+
+    #undef sortDescriptor
+}
+
+NSString *OMGFormURLEncode(NSDictionary *parameters) {
+    if (parameters.count == 0)
+        return @"";
+    NSMutableString *queryString = [NSMutableString new];
+    NSEnumerator *e = DoQueryMagic(nil, parameters).objectEnumerator;
+    for (;;) {
+        id const obj = e.nextObject;
+        if (!obj) break;
+        [queryString appendFormat:@"%@=%@&", enckey(obj), encval(e.nextObject)];
+    }
+    [queryString deleteCharactersInRange:NSMakeRange(queryString.length - 1, 1)];
+    return queryString;
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGHTTPURLRQ.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGHTTPURLRQ.h
new file mode 100644
index 00000000000..1eb04b1ab43
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGHTTPURLRQ.h
@@ -0,0 +1,64 @@
+#import <Foundation/NSObjCRuntime.h>
+
+FOUNDATION_EXPORT double OMGHTTPURLRQVersionNumber;
+FOUNDATION_EXPORT const unsigned char OMGHTTPURLRQVersionString[];
+
+#import <Foundation/NSData.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSURLRequest.h>
+#import <Foundation/NSString.h>
+#import "OMGFormURLEncode.h"
+#import "OMGUserAgent.h"
+
+
+#if __has_feature(nullability) && defined(NS_ASSUME_NONNULL_BEGIN)
+NS_ASSUME_NONNULL_BEGIN
+#else
+#define nullable
+#endif
+
+/**
+ The error will either be a JSON error (NSCocoaDomain :/) or in the NSURLErrorDomain
+ with code: NSURLErrorUnsupportedURL.
+*/
+@interface OMGHTTPURLRQ : NSObject
+
++ (nullable NSMutableURLRequest *)GET:(NSString *)url :(nullable NSDictionary *)parameters error:(NSError **)error;
++ (nullable NSMutableURLRequest *)POST:(NSString *)url :(nullable id)parametersOrMultipartFormData error:(NSError **)error;
++ (nullable NSMutableURLRequest *)POST:(NSString *)url JSON:(nullable id)JSONObject error:(NSError **)error;
++ (nullable NSMutableURLRequest *)PUT:(NSString *)url :(nullable NSDictionary *)parameters error:(NSError **)error;
++ (nullable NSMutableURLRequest *)PUT:(NSString *)url JSON:(nullable id)JSONObject error:(NSError **)error;
++ (nullable NSMutableURLRequest *)DELETE:(NSString *)url :(nullable NSDictionary *)parameters error:(NSError **)error;
+
+@end
+
+
+/**
+ POST this with `OMGHTTPURLRQ`’s `-POST::` class method.
+*/
+@interface OMGMultipartFormData : NSObject
+
+/**
+ The `filename` parameter is optional. The content-type is optional, and 
+ if left `nil` will default to *octet-stream*.
+*/
+- (void)addFile:(NSData *)data parameterName:(NSString *)parameterName filename:(nullable NSString *)filename contentType:(nullable NSString *)contentType;
+
+- (void)addText:(NSString *)text parameterName:(NSString *)parameterName;
+
+/**
+ Technically adding parameters to a multipart/form-data request is abusing
+ the specification. What we do is add each parameter as a text-item. Any
+ API that expects parameters in a multipart/form-data request will expect
+ the parameters to be encoded in this way.
+*/
+- (void)addParameters:(NSDictionary *)parameters;
+
+@end
+
+
+#if __has_feature(nullability) && defined(NS_ASSUME_NONNULL_END)
+NS_ASSUME_NONNULL_END
+#else
+#undef nullable
+#endif
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGHTTPURLRQ.m b/samples/client/petstore/swift/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGHTTPURLRQ.m
new file mode 100644
index 00000000000..0854acd0eb7
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGHTTPURLRQ.m
@@ -0,0 +1,172 @@
+#import <CoreFoundation/CFURL.h>
+#import <Foundation/NSError.h>
+#import <Foundation/NSJSONSerialization.h>
+#import <Foundation/NSURL.h>
+#import <Foundation/NSURLError.h>
+#import "OMGHTTPURLRQ.h"
+#import "OMGUserAgent.h"
+#import "OMGFormURLEncode.h"
+#import <stdlib.h>
+
+static inline NSMutableURLRequest *OMGMutableURLRequest() {
+    NSMutableURLRequest *rq = [NSMutableURLRequest new];
+    [rq setValue:OMGUserAgent() forHTTPHeaderField:@"User-Agent"];
+    return rq;
+}
+
+#define OMGInvalidURLErrorMake() \
+    [NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorUnsupportedURL userInfo:@{NSLocalizedDescriptionKey: @"The provided URL was invalid."}]
+
+
+@implementation OMGMultipartFormData {
+@public
+    NSString *boundary;
+    NSMutableData *body;
+}
+
+- (instancetype)init {
+    body = [NSMutableData data];
+    boundary = [NSString stringWithFormat:@"------------------------%08X%08X", arc4random(), arc4random()];
+    return self;
+}
+
+- (void)add:(NSData *)payload :(NSString *)name :(NSString *)filename :(NSString *)contentType {
+    id ln1 = [NSString stringWithFormat:@"--%@\r\n", boundary];
+    id ln2 = ({
+        id s = [NSMutableString stringWithString:@"Content-Disposition: form-data; "];
+        [s appendFormat:@"name=\"%@\"", name];
+        if (filename.length)
+            [s appendFormat:@"; filename=\"%@\"", filename];
+        [s appendString:@"\r\n"];
+        if (contentType.length)
+            [s appendFormat:@"Content-Type: %@\r\n", contentType];
+        [s appendString:@"\r\n"];
+        s;
+    });
+
+    [body appendData:[ln1 dataUsingEncoding:NSUTF8StringEncoding]];
+    [body appendData:[ln2 dataUsingEncoding:NSUTF8StringEncoding]];
+    [body appendData:payload];
+    [body appendData:[@"\r\n" dataUsingEncoding:NSUTF8StringEncoding]];
+}
+
+- (void)addFile:(NSData *)payload parameterName:(NSString *)name filename:(NSString *)filename contentType:(NSString *)contentType
+{
+    [self add:payload:name:filename:(contentType ?: @"application/octet-stream")];
+}
+
+- (void)addText:(NSString *)text parameterName:(NSString *)parameterName {
+    [self add:[text dataUsingEncoding:NSUTF8StringEncoding]:parameterName:nil:nil];
+}
+
+- (void)addParameters:(NSDictionary *)parameters {
+    for (id key in parameters)
+        [self addText:[parameters[key] description] parameterName:key];
+}
+
+@end
+
+
+
+@implementation OMGHTTPURLRQ
+
++ (NSMutableURLRequest *)GET:(NSString *)urlString :(NSDictionary *)params error:(NSError **)error {
+    id queryString = OMGFormURLEncode(params);
+    if (queryString) urlString = [urlString stringByAppendingFormat:@"?%@", queryString];
+
+    id url = [NSURL URLWithString:urlString];
+    if (!url) {
+        if (error) *error = OMGInvalidURLErrorMake();
+        return nil;
+    }
+
+    NSMutableURLRequest *rq = OMGMutableURLRequest();
+    rq.HTTPMethod = @"GET";
+    rq.URL = url;
+    return rq;
+}
+
+static NSMutableURLRequest *OMGFormURLEncodedRequest(NSString *urlString, NSString *method, NSDictionary *parameters, NSError **error) {
+    id url = [NSURL URLWithString:urlString];
+    if (!url) {
+        if (error) *error = OMGInvalidURLErrorMake();
+        return nil;
+    }
+
+    NSMutableURLRequest *rq = OMGMutableURLRequest();
+    rq.URL = url;
+    rq.HTTPMethod = method;
+    
+    id queryString = OMGFormURLEncode(parameters);
+    NSData *data = [queryString dataUsingEncoding:NSUTF8StringEncoding];
+    [rq addValue:@"8bit" forHTTPHeaderField:@"Content-Transfer-Encoding"];
+    [rq addValue:@"application/x-www-form-urlencoded" forHTTPHeaderField:@"Content-Type"];
+    [rq addValue:@(data.length).description forHTTPHeaderField:@"Content-Length"];
+    [rq setHTTPBody:data];
+    
+    return rq;
+}
+
++ (NSMutableURLRequest *)POST:(NSString *)urlString :(id)body error:(NSError **)error {
+    if (![body isKindOfClass:[OMGMultipartFormData class]]) {
+        return OMGFormURLEncodedRequest(urlString, @"POST", body, error);
+    } else {
+        id url = [NSURL URLWithString:urlString];
+        if (!url) {
+            if (error) *error = OMGInvalidURLErrorMake();
+            return nil;
+        }
+
+        OMGMultipartFormData *multipartFormData = (id)body;
+        id const charset = (NSString *)CFStringConvertEncodingToIANACharSetName(CFStringConvertNSStringEncodingToEncoding(NSUTF8StringEncoding));
+        id const contentType = [NSString stringWithFormat:@"multipart/form-data; charset=%@; boundary=%@", charset, multipartFormData->boundary];
+
+        NSMutableData *data = [multipartFormData->body mutableCopy];
+        id lastLine = [NSString stringWithFormat:@"\r\n--%@--\r\n", multipartFormData->boundary];
+        [data appendData:[lastLine dataUsingEncoding:NSUTF8StringEncoding]];
+
+        NSMutableURLRequest *rq = OMGMutableURLRequest();
+        [rq setURL:url];
+        [rq setHTTPMethod:@"POST"];
+        [rq addValue:contentType forHTTPHeaderField:@"Content-Type"];
+        [rq setHTTPBody:data];
+        return rq;
+    }
+}
+
++ (NSMutableURLRequest *)POST:(NSString *)urlString JSON:(id)params error:(NSError **)error {
+    if (error) *error = nil;
+
+    id url = [NSURL URLWithString:urlString];
+    if (!url) {
+        if (error) *error = OMGInvalidURLErrorMake();
+        return nil;
+    }
+
+    id JSONData = [NSJSONSerialization dataWithJSONObject:params options:(NSJSONWritingOptions)0 error:error];
+    if (error && *error) return nil;
+
+    NSMutableURLRequest *rq = OMGMutableURLRequest();
+    [rq setURL:url];
+    [rq setHTTPMethod:@"POST"];
+    [rq setHTTPBody:JSONData];
+    [rq setValue:@"application/json; charset=utf-8" forHTTPHeaderField:@"Content-Type"];
+    [rq setValue:@"json" forHTTPHeaderField:@"Data-Type"];
+    return rq;
+}
+
++ (NSMutableURLRequest *)PUT:(NSString *)url :(NSDictionary *)parameters error:(NSError **)error {
+    return OMGFormURLEncodedRequest(url, @"PUT", parameters, error);
+}
+
++ (NSMutableURLRequest *)PUT:(NSString *)url JSON:(id)params error:(NSError **)error {
+    NSMutableURLRequest *rq = [OMGHTTPURLRQ POST:url JSON:params error:error];
+    rq.HTTPMethod = @"PUT";
+    return rq;
+}
+
++ (NSMutableURLRequest *)DELETE:(NSString *)url :(NSDictionary *)parameters error:(NSError **)error {
+    return OMGFormURLEncodedRequest(url, @"DELETE", parameters, error);
+}
+
+@end
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGUserAgent.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGUserAgent.h
new file mode 100644
index 00000000000..75dacf4e4f5
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGUserAgent.h
@@ -0,0 +1,12 @@
+#import <Foundation/NSObjCRuntime.h>
+@class NSString;
+
+#if __has_feature(nullability) && defined(NS_ASSUME_NONNULL_BEGIN)
+NS_ASSUME_NONNULL_BEGIN
+#endif
+
+NSString *OMGUserAgent();
+
+#if __has_feature(nullability) && defined(NS_ASSUME_NONNULL_END)
+NS_ASSUME_NONNULL_END
+#endif
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGUserAgent.m b/samples/client/petstore/swift/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGUserAgent.m
new file mode 100644
index 00000000000..1d083117b31
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGUserAgent.m
@@ -0,0 +1,19 @@
+#import <Foundation/Foundation.h>
+#import "OMGUserAgent.h"
+
+NSString *OMGUserAgent() {
+    static NSString *ua;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        id info = [NSBundle mainBundle].infoDictionary;
+        id name = info[@"CFBundleDisplayName"] ?: info[(__bridge NSString *)kCFBundleIdentifierKey];
+        id vers = (__bridge id)CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle(), kCFBundleVersionKey) ?: info[(__bridge NSString *)kCFBundleVersionKey];
+      #ifdef UIKIT_EXTERN
+        float scale = ([[UIScreen mainScreen] respondsToSelector:@selector(scale)] ? [UIScreen mainScreen].scale : 1.0f);
+        ua = [NSString stringWithFormat:@"%@/%@ (%@; iOS %@; Scale/%0.2f)", name, vers, [UIDevice currentDevice].model, [UIDevice currentDevice].systemVersion, scale];
+      #else
+        ua = [NSString stringWithFormat:@"%@/%@", name, vers];
+      #endif
+    });
+    return ua;
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj b/samples/client/petstore/swift/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
new file mode 100644
index 00000000000..0e841d33df3
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
@@ -0,0 +1,1458 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		0290D4A3795396ABBB81E632E5AADE3A /* UIActionSheet+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD570E28B63274E742E7D1FBBD55BB41 /* UIActionSheet+Promise.swift */; };
+		02D0672068E53F2D98CC67FBA5278022 /* UIView+AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDD82DB3E6D43BA9769FCA9B744CB5E /* UIView+AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		03790817CF6E76959C0F7E2D0734E9F6 /* after.swift in Sources */ = {isa = PBXBuildFile; fileRef = 275DA9A664C70DD40A4059090D1A00D4 /* after.swift */; };
+		03F494989CC1A8857B68A317D5D6860F /* Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DF5FC3AF99846209C5FCE55A2E12D9A /* Response.swift */; };
+		0681ADC8BAE2C3185F13487BAAB4D9DD /* Upload.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCE38472832BBCC541E646DA6C18EF9C /* Upload.swift */; };
+		08B247165C2A091EE24F79D73F8ABEC9 /* UIAlertView+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA854180C132DB5511D64C82535C5FDE /* UIAlertView+Promise.swift */; };
+		09C9710BEE85A253331C8E0994FBB2BF /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FC4BF94DC4B3D8B88FC160B00931B0EC /* QuartzCore.framework */; };
+		0B34EB4425C08BB021C2D09F75C9C146 /* OMGHTTPURLRQ.h in Headers */ = {isa = PBXBuildFile; fileRef = 450166FEA2155A5821D97744A0127DF8 /* OMGHTTPURLRQ.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		0BA72DC6AB26C72EE080F8A08CE41643 /* NSNotificationCenter+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = B93FB4BB16CFB41DCA35A8CFAD7A7FEF /* NSNotificationCenter+Promise.swift */; };
+		0D6DCC756D1B0B68ADB5F805D575BAB6 /* NSError+Cancellation.h in Headers */ = {isa = PBXBuildFile; fileRef = 045C1F608ADE57757E6732D721779F22 /* NSError+Cancellation.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		0F816E94051557A7BA9BFA5B6B4A32A5 /* Order.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE5E0F8BA6AB1430D31588F5EB170889 /* Order.swift */; };
+		0FFA3D017278D8EB24A9AC4780E3AFEC /* OMGHTTPURLRQ.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3530BF15E14D1F6D7134EE67377D5C8C /* OMGHTTPURLRQ.framework */; };
+		1372840E154B63D17AACD1257C3E0520 /* NSNotificationCenter+AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = 3616971BAEF40302B7F2F8B1007C0B2B /* NSNotificationCenter+AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		167B939D70FE9AADBA03ABBBBA588B4B /* SpecialModelName.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7F371E5E2A26613C4DE253F4D7A3F56 /* SpecialModelName.swift */; };
+		19DAC977B6B3CBDC69EE2150BD0C1EF6 /* UIView+AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = 2F0F4EDC2236E1C270DC2014181D6506 /* UIView+AnyPromise.m */; };
+		1B099FB3AA9A6794A3039899A6734205 /* Name.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F98C30F79A0AB5920FB4CDBB7413E5C /* Name.swift */; };
+		222C92305B7AC5BB8E2ABAD182F50026 /* Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D23C407A7CDBFD244D6115899F9D45D /* Promise.swift */; };
+		2676E85B9644D55E25A31D3CE61A5726 /* CALayer+AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = 27E0FE41D771BE8BE3F0D4F1DAD0B179 /* CALayer+AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		291E2518A9E470C2E9CE1B69C088C16F /* State.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DC63EB77B3791891517B98CAA115DE8 /* State.swift */; };
+		2C5450AC69398958CF6F7539EF7D99E5 /* Alamofire-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 30CE7341A995EF6812D71771E74CF7F7 /* Alamofire-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		335F10113F178E8D2984BE0602A0DEED /* Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 780827122613E6D246695ADFAA7B28B6 /* Tag.swift */; };
+		35F6B35131F89EA23246C6508199FB05 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB15A61DB7ABCB74565286162157C5A0 /* Foundation.framework */; };
+		36CDD7A6638E10B9107C74D9B75079F1 /* NSURLConnection+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 412985229DA7A4DF9E129B7E8F0C09BB /* NSURLConnection+Promise.swift */; };
+		37027676CEABF1BF753684A06C2DCDDB /* URLDataPromise.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7CE161ED0CF68954A63F30528ACAD9B /* URLDataPromise.swift */; };
+		3A8D316D4266A3309D0A98ED74F8A13A /* OMGUserAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 87BC7910B8D7D31310A07C32438A8C67 /* OMGUserAgent.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		3D2B170AA3737444F26B0E07E1F5FEF1 /* Category.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D0925CA00A7877078F60FAD44E2DD0F /* Category.swift */; };
+		405F6EBE4BBAAC270AF1B97AFC5B0C16 /* NSURLConnection+AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = A7F0DAACAC89A93B940BBE54E6A87E9F /* NSURLConnection+AnyPromise.m */; };
+		42A66FBE567A7F5B2136FC56BFF4874A /* UIAlertView+AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = F075F63EFE77F7B59FF77CBA95B9AADF /* UIAlertView+AnyPromise.m */; };
+		435BD7136E0E174C6A8811D6C88DEAF2 /* NSObject+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6EB54C331FED437583A5F01EB2757D1 /* NSObject+Promise.swift */; };
+		48CB8E7E16443CA771E4DCFB3E0709A2 /* OMGHTTPURLRQ.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D579267FC1F163C8F04B444DAEFED0D /* OMGHTTPURLRQ.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		4CE2B026C746F263F6B95534A35E76C0 /* afterlife.swift in Sources */ = {isa = PBXBuildFile; fileRef = C476B916B763E55E4161F0B30760C4E8 /* afterlife.swift */; };
+		4DE5FCC41D100B113B6645EA64410F16 /* ParameterEncoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FBD351D007CF4095C98C9DFD9D83D61 /* ParameterEncoding.swift */; };
+		4EAB3713B40959FB2E0CDEAC8BDE1116 /* when.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16730DAF3E51C161D8247E473F069E71 /* when.swift */; };
+		5192A7466019F9B3D7F1E987124E96BC /* OMGHTTPURLRQ-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = F7EBDD2EEED520E06ACB3538B3832049 /* OMGHTTPURLRQ-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		53FBECFDFCA1B755F2754C4DBC65E3D5 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A1DC80A0773C5A569348DC442EAFD1D /* UIKit.framework */; };
+		5480169E42C456C49BE59E273D7E0115 /* OMGFormURLEncode.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ADA0B6B6B00CB0E818AA8CBC311677 /* OMGFormURLEncode.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		57FB6BF21435F091D48B97DBD36E8C7B /* InlineResponse200.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94FB3F3CEFBA56B306D034B69144C68E /* InlineResponse200.swift */; };
+		5849F4EAAAD24A116F0E0E948623AEC0 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB15A61DB7ABCB74565286162157C5A0 /* Foundation.framework */; };
+		5EADA3CE22BF3B74E759F948DE7A66F1 /* UIViewController+AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = AA24C5EC82CF437D8D1FFFAB68975408 /* UIViewController+AnyPromise.m */; };
+		63F6FFAB2BCCD07FD3DF44086E11C8B0 /* ObjectReturn.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58E34C4DDB909B2CA900747C6691A5A /* ObjectReturn.swift */; };
+		64739E341A52DFA48F4169E4322E7486 /* PetstoreClient-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 9F681D2C508D1BA8F62893120D9343A4 /* PetstoreClient-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6CB84A616D7B4D189A4E94BD37621575 /* OMGUserAgent.m in Sources */ = {isa = PBXBuildFile; fileRef = E11BFB27B43B742CB5D6086C4233A909 /* OMGUserAgent.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		6D264CCBD7DAC0A530076FB1A847EEC7 /* Pods-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 894E5DA93A9F359521A89826BE6DA777 /* Pods-dummy.m */; };
+		6EA827E0ECB8F7CC49F8B4C92A1D93FA /* CALayer+AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = 04A22F2595054D39018E03961CA7283A /* CALayer+AnyPromise.m */; };
+		6F63943B0E954F701F32BC7A1F4C2FEC /* OMGFormURLEncode.m in Sources */ = {isa = PBXBuildFile; fileRef = 25614E715DDC170DAFB0DF50C5503E33 /* OMGFormURLEncode.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
+		76171B607A443BE97E1DBBF6575CD558 /* after.m in Sources */ = {isa = PBXBuildFile; fileRef = B868468092D7B2489B889A50981C9247 /* after.m */; };
+		76FAA23C0A28ECF0BBF6A5C14203F414 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = A360D2EE0575D36C8C8459BCB8325D9A /* Models.swift */; };
+		77F020B749274FC61FD1D5EA3FBBBE18 /* PromiseKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A112EF8BB3933C1C1E42F11B3DD3B02A /* PromiseKit.framework */; };
+		80F496237530D382A045A29654D8C11C /* ServerTrustPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 400A6910E83F606BCD67DC11FA706697 /* ServerTrustPolicy.swift */; };
+		82971968CBDAB224212EEB4607C9FB8D /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53F8B2513042BD6DB957E8063EF895BD /* Result.swift */; };
+		82B5B0FF21A9A28284AE7F1124199D3F /* UIActionSheet+AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = 9774D31336C85248A115B569E7D95283 /* UIActionSheet+AnyPromise.m */; };
+		8399DBEE3E2D98EB1F466132E476F4D9 /* MultipartFormData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F14E17B4D6BDF8BD3E384BE6528F744 /* MultipartFormData.swift */; };
+		886AC602EE7FCFDCD2DCD470CCB41721 /* PetstoreClient-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 46A8E0328DC896E0893B565FE8742167 /* PetstoreClient-dummy.m */; };
+		8ABFD5E4F7621D554DBB12C6472A8313 /* PetAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A44CBCE721F71F03C7758DB3F36CDFF /* PetAPI.swift */; };
+		91DF85663A3771DCD35D0FF07135959B /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84A386C655413763AEE8133A102DF2C8 /* Extensions.swift */; };
+		9254814FE352958B5270E874E5CCD394 /* NSURLSession+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 535DF88FC12304114DEF55E4003421B2 /* NSURLSession+Promise.swift */; };
+		964EA2E9AA68D7D587ED15143FEC4BE5 /* Promise+Properties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E0DBDE561A6C2E7AC7A24160F8A5F28 /* Promise+Properties.swift */; };
+		96D99D0C2472535A169DED65CB231CD7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB15A61DB7ABCB74565286162157C5A0 /* Foundation.framework */; };
+		97A9635E99E7EB0F33260600E1AC82F6 /* StoreAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = A27DF5A602B1BB474A141C895934F712 /* StoreAPI.swift */; };
+		99710CDCDDFF9ED74B8E01EB8E4BF563 /* UIView+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3CDA0958D6247505ECD9098D662EA74 /* UIView+Promise.swift */; };
+		9DA852770BE32039F2C21096F27872A0 /* ModelReturn.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEA71A34D3031D95E61F1082A5BEEB7A /* ModelReturn.swift */; };
+		A2A8512E15D1A4B6DBD515D6144EC083 /* Error.swift in Sources */ = {isa = PBXBuildFile; fileRef = 558DFECE2C740177CA6357DA71A1DFBB /* Error.swift */; };
+		A2C172FE407C0BC3478ADCA91A6C9CEC /* Manager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D51C929AC51E34493AA757180C09C3B /* Manager.swift */; };
+		A3505FA2FB3067D53847AD288AC04F03 /* Download.swift in Sources */ = {isa = PBXBuildFile; fileRef = A04177B09D9596450D827FE49A36C4C4 /* Download.swift */; };
+		AB06DA1AC0FA3BDF50BAAEBBD06AB46E /* Model200Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = A02D16E80C10DF32F2A88A66B83D7DD9 /* Model200Response.swift */; };
+		AC30241BA84931703B312A09DD64C648 /* Umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A8906F6D6920DF197965D1740A7E283 /* Umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		B0FB4B01682814B9E3D32F9DC4A5E762 /* Alamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B476A57549D7994745E17A6DE5BE745 /* Alamofire.swift */; };
+		B0FB5055748E072728CA7129C3CAA3C6 /* APIs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7220AB25575F15EB89521DFE33F4B764 /* APIs.swift */; };
+		B4FAA3F0ED04F0506E66FCD7141AD989 /* APIHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4B4E403BC5209472D6DA0EEF82A8BD9 /* APIHelper.swift */; };
+		B6D2DC3E3DA44CD382B9B425F40E11C1 /* Alamofire-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 139346EB669CBE2DE8FE506E14A2BA9C /* Alamofire-dummy.m */; };
+		B72EE02E33CE31F594630D54EEEF9A15 /* hang.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B6A98D6DAF474045210F5A74FF1C3C /* hang.m */; };
+		B908D3F77F293FC72B20EEB48208F5C6 /* race.swift in Sources */ = {isa = PBXBuildFile; fileRef = 980FD13F87B44BFD90F8AC129BEB2E61 /* race.swift */; };
+		BF2A197091B6FC0646CFA61A5FBE66AF /* when.m in Sources */ = {isa = PBXBuildFile; fileRef = 143BC30E5DDAF52A3D9578F507EC6A41 /* when.m */; };
+		BFA18BBF784D749FE8BFA654088F3630 /* join.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84319E048FE6DD89B905FA3A81005C5F /* join.swift */; };
+		C04283A3B7479C8EDE2B95F4DDEE2C2C /* UIViewController+AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BA017E288BB42E06EBEE9C6E6993EAF /* UIViewController+AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		C4688FFE2C4E161516878B521EF54FBE /* AlamofireImplementations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B25BD9A4F08A3124D223BDB55576886 /* AlamofireImplementations.swift */; };
+		C75519F0450166A6F28126ECC7664E9C /* Validation.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA1AD92813B887E2D017D051B8C0E3D2 /* Validation.swift */; };
+		C95D8B9276E75DA8F6DECCDCE147C781 /* join.m in Sources */ = {isa = PBXBuildFile; fileRef = 6AD59903FAA8315AD0036AC459FFB97F /* join.m */; };
+		C96CB79BD56A7931541FC22617A2D613 /* UIAlertView+AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = 92D340D66F03F31237B70F23FE9B00D0 /* UIAlertView+AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		CCA3921F36A6B36DC1F993112BEF0602 /* NSURLConnection+AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = BAE48ACA10E8895BB8BF5CE8C0846B4B /* NSURLConnection+AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		D1E8B31EFCBDE00F108E739AD69425C0 /* Pods-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BCC458FDD5F692BBB2BFC64BB5701FC /* Pods-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		D21B7325B3642887BFBE977E021F2D26 /* ResponseSerialization.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD558DDCDDA1B46951548B02C34277EF /* ResponseSerialization.swift */; };
+		D358A828E68E152D06FC8E35533BF00B /* OMGHTTPURLRQ-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F36B65CF990C57DC527824ED0BA1915 /* OMGHTTPURLRQ-dummy.m */; };
+		D46A1F4211ACD4C9EF7726AFAD2609EA /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 71972929AF72164C887BB8F5F1059089 /* User.swift */; };
+		D55A97CF31106A21298F731FC890BCA1 /* UIActionSheet+AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = 6846D22C9F0CCBC48DF833E309A8E84F /* UIActionSheet+AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		D75CA395D510E08C404E55F5BDAE55CE /* Error.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A9CB35983E4859DFFBAD8840196A094 /* Error.swift */; };
+		D78AD94D0DBA6A1CC4E6673D2F14C832 /* NSNotificationCenter+AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = 4798BAC01B0E3F07E3BBBB07BA57F2D7 /* NSNotificationCenter+AnyPromise.m */; };
+		D854F67FD7486C6D25CA841C7D2D5030 /* AnyPromise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5973BC143AE488C12FFB1E83E71F0C45 /* AnyPromise.swift */; };
+		DD8D067A7F742F39B87FA04CE12DD118 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB15A61DB7ABCB74565286162157C5A0 /* Foundation.framework */; };
+		DF8DB782B7C2F5EEC7F29E2E2A5F8154 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB15A61DB7ABCB74565286162157C5A0 /* Foundation.framework */; };
+		E6810077387057466534FD27AA294211 /* UIViewController+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D459D0AB2361B48F81C4D14C6D0DAA /* UIViewController+Promise.swift */; };
+		E6B182F5E233FB9F529BEFEAD3D02ACF /* AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F19945EE403F7B29D8B1939EA6D579A /* AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		E6FDE3505ED7CEF6B87500A5C52B7938 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1D1571AB15108DF6F9C4FE2064E3C43 /* Alamofire.framework */; };
+		E8DDC87F287107068FF40443CF059433 /* dispatch_promise.m in Sources */ = {isa = PBXBuildFile; fileRef = A92242715FB4C0608F8DCEBF8F3791E2 /* dispatch_promise.m */; };
+		E93C3C3AABF32094F0D673E3EC3B2C20 /* dispatch_promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 392FA21A33296B88F790D62A4FAA4E4E /* dispatch_promise.swift */; };
+		EC5B36837863572EC400633CD2FFAF94 /* PromiseKit-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 9042667D08D783E45394FE8B97EE6468 /* PromiseKit-dummy.m */; };
+		F049FFBDC929BB045C2AEDF0ECABE513 /* AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B7E90A568681E000EF3CB0917584F3C /* AnyPromise.m */; };
+		F70B5EF0A4B94F8FF906073882DCDB78 /* UserAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 094C870CE73CCEC940F4DA86D7FE0C30 /* UserAPI.swift */; };
+		F8C6EBC22D97E301AA4EA4D04B3FC860 /* Pet.swift in Sources */ = {isa = PBXBuildFile; fileRef = C909E10C22B35220020268EF2BF27E18 /* Pet.swift */; };
+		F8DAC10D25E6E36B83261AC032A77F1A /* PromiseKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BFFA6FD621E9ED341AA89AEAC1604D7 /* PromiseKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		FA78EA5177275F71FD7F2C52F6B7518D /* PMKAlertController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C731FBFCC690050C6C08E5AC9D9DC724 /* PMKAlertController.swift */; };
+		FC14480CECE872865A9C6E584F886DA3 /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 133C5287CFDCB3B67578A7B1221E132C /* Request.swift */; };
+		FEF0D7653948988B804226129471C1EC /* Stream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A8F373B23E0F7FB68B0BA71D92D1C60 /* Stream.swift */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		014385BD85FA83B60A03ADE9E8844F33 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = E1B34E9A45508C6EDDA7F25D88C85434;
+			remoteInfo = PetstoreClient;
+		};
+		098BDC6B6850C9E726FB5016BB254FC7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 432ECC54282C84882B482CCB4CF227FC;
+			remoteInfo = Alamofire;
+		};
+		11BAC0C3DDD46F7C7EA2DE10681BBE09 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A348BE32D0894EA7204BDCB3F0DF636F;
+			remoteInfo = PromiseKit;
+		};
+		769630CDAAA8C24AA5B4C81A85C45AC8 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 432ECC54282C84882B482CCB4CF227FC;
+			remoteInfo = Alamofire;
+		};
+		9AD20158D23CE70A2A91E5B7859090C3 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 190ACD3A51BC90B85EADB13E9CDD207B;
+			remoteInfo = OMGHTTPURLRQ;
+		};
+		B5FB8931CDF8801206EDD2FEF94793BF /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A348BE32D0894EA7204BDCB3F0DF636F;
+			remoteInfo = PromiseKit;
+		};
+		BAB3DC0D4AB6EA5B20F7BA63A3F779EC /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 190ACD3A51BC90B85EADB13E9CDD207B;
+			remoteInfo = OMGHTTPURLRQ;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXFileReference section */
+		045C1F608ADE57757E6732D721779F22 /* NSError+Cancellation.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSError+Cancellation.h"; path = "Sources/NSError+Cancellation.h"; sourceTree = "<group>"; };
+		04A22F2595054D39018E03961CA7283A /* CALayer+AnyPromise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "CALayer+AnyPromise.m"; path = "Categories/QuartzCore/CALayer+AnyPromise.m"; sourceTree = "<group>"; };
+		094C870CE73CCEC940F4DA86D7FE0C30 /* UserAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UserAPI.swift; sourceTree = "<group>"; };
+		0A8906F6D6920DF197965D1740A7E283 /* Umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Umbrella.h; path = Sources/Umbrella.h; sourceTree = "<group>"; };
+		0BA017E288BB42E06EBEE9C6E6993EAF /* UIViewController+AnyPromise.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIViewController+AnyPromise.h"; path = "Categories/UIKit/UIViewController+AnyPromise.h"; sourceTree = "<group>"; };
+		0F36B65CF990C57DC527824ED0BA1915 /* OMGHTTPURLRQ-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "OMGHTTPURLRQ-dummy.m"; sourceTree = "<group>"; };
+		122D5005A81832479161CD1D223C573A /* PromiseKit-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PromiseKit-prefix.pch"; sourceTree = "<group>"; };
+		133C5287CFDCB3B67578A7B1221E132C /* Request.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Request.swift; path = Source/Request.swift; sourceTree = "<group>"; };
+		139346EB669CBE2DE8FE506E14A2BA9C /* Alamofire-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Alamofire-dummy.m"; sourceTree = "<group>"; };
+		141F0B43C42CE92856BBA8F8D98481DB /* Alamofire.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Alamofire.xcconfig; sourceTree = "<group>"; };
+		143BC30E5DDAF52A3D9578F507EC6A41 /* when.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = when.m; path = Sources/when.m; sourceTree = "<group>"; };
+		16730DAF3E51C161D8247E473F069E71 /* when.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = when.swift; path = Sources/when.swift; sourceTree = "<group>"; };
+		16D7C901D915C251DEBA27AC1EF57E34 /* OMGHTTPURLRQ.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = OMGHTTPURLRQ.xcconfig; sourceTree = "<group>"; };
+		1A44CBCE721F71F03C7758DB3F36CDFF /* PetAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PetAPI.swift; sourceTree = "<group>"; };
+		1B7E90A568681E000EF3CB0917584F3C /* AnyPromise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AnyPromise.m; path = Sources/AnyPromise.m; sourceTree = "<group>"; };
+		1F19945EE403F7B29D8B1939EA6D579A /* AnyPromise.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AnyPromise.h; path = Sources/AnyPromise.h; sourceTree = "<group>"; };
+		1FBD351D007CF4095C98C9DFD9D83D61 /* ParameterEncoding.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ParameterEncoding.swift; path = Source/ParameterEncoding.swift; sourceTree = "<group>"; };
+		24C79ED4B5226F263307B22E96E88F9F /* OMGHTTPURLRQ.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = OMGHTTPURLRQ.modulemap; sourceTree = "<group>"; };
+		25614E715DDC170DAFB0DF50C5503E33 /* OMGFormURLEncode.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = OMGFormURLEncode.m; path = Sources/OMGFormURLEncode.m; sourceTree = "<group>"; };
+		275DA9A664C70DD40A4059090D1A00D4 /* after.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = after.swift; path = Sources/after.swift; sourceTree = "<group>"; };
+		27E0FE41D771BE8BE3F0D4F1DAD0B179 /* CALayer+AnyPromise.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "CALayer+AnyPromise.h"; path = "Categories/QuartzCore/CALayer+AnyPromise.h"; sourceTree = "<group>"; };
+		2B25BD9A4F08A3124D223BDB55576886 /* AlamofireImplementations.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AlamofireImplementations.swift; sourceTree = "<group>"; };
+		2BCC458FDD5F692BBB2BFC64BB5701FC /* Pods-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-umbrella.h"; sourceTree = "<group>"; };
+		2D51C929AC51E34493AA757180C09C3B /* Manager.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Manager.swift; path = Source/Manager.swift; sourceTree = "<group>"; };
+		2F0F4EDC2236E1C270DC2014181D6506 /* UIView+AnyPromise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIView+AnyPromise.m"; path = "Categories/UIKit/UIView+AnyPromise.m"; sourceTree = "<group>"; };
+		2F98C30F79A0AB5920FB4CDBB7413E5C /* Name.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Name.swift; sourceTree = "<group>"; };
+		30CE7341A995EF6812D71771E74CF7F7 /* Alamofire-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Alamofire-umbrella.h"; sourceTree = "<group>"; };
+		3530BF15E14D1F6D7134EE67377D5C8C /* OMGHTTPURLRQ.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OMGHTTPURLRQ.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		3616971BAEF40302B7F2F8B1007C0B2B /* NSNotificationCenter+AnyPromise.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSNotificationCenter+AnyPromise.h"; path = "Categories/Foundation/NSNotificationCenter+AnyPromise.h"; sourceTree = "<group>"; };
+		392FA21A33296B88F790D62A4FAA4E4E /* dispatch_promise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = dispatch_promise.swift; path = Sources/dispatch_promise.swift; sourceTree = "<group>"; };
+		3950B63B8EB1B9CD8FC31CDA8CC2E7C7 /* Alamofire-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Alamofire-prefix.pch"; sourceTree = "<group>"; };
+		3BFFA6FD621E9ED341AA89AEAC1604D7 /* PromiseKit.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = PromiseKit.h; path = Sources/PromiseKit.h; sourceTree = "<group>"; };
+		3CE589B7B1FE57084403D25DC49528B5 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		3D23C407A7CDBFD244D6115899F9D45D /* Promise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Promise.swift; path = Sources/Promise.swift; sourceTree = "<group>"; };
+		400A6910E83F606BCD67DC11FA706697 /* ServerTrustPolicy.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ServerTrustPolicy.swift; path = Source/ServerTrustPolicy.swift; sourceTree = "<group>"; };
+		412985229DA7A4DF9E129B7E8F0C09BB /* NSURLConnection+Promise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "NSURLConnection+Promise.swift"; path = "Categories/Foundation/NSURLConnection+Promise.swift"; sourceTree = "<group>"; };
+		450166FEA2155A5821D97744A0127DF8 /* OMGHTTPURLRQ.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = OMGHTTPURLRQ.h; path = Sources/OMGHTTPURLRQ.h; sourceTree = "<group>"; };
+		46A8E0328DC896E0893B565FE8742167 /* PetstoreClient-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "PetstoreClient-dummy.m"; sourceTree = "<group>"; };
+		4798BAC01B0E3F07E3BBBB07BA57F2D7 /* NSNotificationCenter+AnyPromise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSNotificationCenter+AnyPromise.m"; path = "Categories/Foundation/NSNotificationCenter+AnyPromise.m"; sourceTree = "<group>"; };
+		51ADA0B6B6B00CB0E818AA8CBC311677 /* OMGFormURLEncode.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = OMGFormURLEncode.h; path = Sources/OMGFormURLEncode.h; sourceTree = "<group>"; };
+		535DF88FC12304114DEF55E4003421B2 /* NSURLSession+Promise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "NSURLSession+Promise.swift"; path = "Categories/Foundation/NSURLSession+Promise.swift"; sourceTree = "<group>"; };
+		53F8B2513042BD6DB957E8063EF895BD /* Result.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Result.swift; path = Source/Result.swift; sourceTree = "<group>"; };
+		558DFECE2C740177CA6357DA71A1DFBB /* Error.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Error.swift; path = Sources/Error.swift; sourceTree = "<group>"; };
+		5973BC143AE488C12FFB1E83E71F0C45 /* AnyPromise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnyPromise.swift; path = Sources/AnyPromise.swift; sourceTree = "<group>"; };
+		5A1DC80A0773C5A569348DC442EAFD1D /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
+		5CA1C154DFC54DFFB12A754B9A0BBDFC /* OMGHTTPURLRQ.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OMGHTTPURLRQ.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		5DF5FC3AF99846209C5FCE55A2E12D9A /* Response.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Response.swift; path = Source/Response.swift; sourceTree = "<group>"; };
+		5F14E17B4D6BDF8BD3E384BE6528F744 /* MultipartFormData.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MultipartFormData.swift; path = Source/MultipartFormData.swift; sourceTree = "<group>"; };
+		6846D22C9F0CCBC48DF833E309A8E84F /* UIActionSheet+AnyPromise.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIActionSheet+AnyPromise.h"; path = "Categories/UIKit/UIActionSheet+AnyPromise.h"; sourceTree = "<group>"; };
+		6AD59903FAA8315AD0036AC459FFB97F /* join.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = join.m; path = Sources/join.m; sourceTree = "<group>"; };
+		6D0925CA00A7877078F60FAD44E2DD0F /* Category.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Category.swift; sourceTree = "<group>"; };
+		71972929AF72164C887BB8F5F1059089 /* User.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
+		7220AB25575F15EB89521DFE33F4B764 /* APIs.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = APIs.swift; sourceTree = "<group>"; };
+		780827122613E6D246695ADFAA7B28B6 /* Tag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Tag.swift; sourceTree = "<group>"; };
+		792D14AC86CD98AA9C31373287E0F353 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		79A9DEDC89FE8336BF5FEDAAF75BF7FC /* Pods.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = Pods.modulemap; sourceTree = "<group>"; };
+		7E0DBDE561A6C2E7AC7A24160F8A5F28 /* Promise+Properties.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Promise+Properties.swift"; path = "Sources/Promise+Properties.swift"; sourceTree = "<group>"; };
+		84319E048FE6DD89B905FA3A81005C5F /* join.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = join.swift; path = Sources/join.swift; sourceTree = "<group>"; };
+		84A386C655413763AEE8133A102DF2C8 /* Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
+		8749F40CC17CE0C26C36B0F431A9C8F0 /* Alamofire.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = Alamofire.modulemap; sourceTree = "<group>"; };
+		87B213035BAC5F75386F62D3C75D2342 /* Pods-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-acknowledgements.plist"; sourceTree = "<group>"; };
+		87BC7910B8D7D31310A07C32438A8C67 /* OMGUserAgent.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = OMGUserAgent.h; path = Sources/OMGUserAgent.h; sourceTree = "<group>"; };
+		894E5DA93A9F359521A89826BE6DA777 /* Pods-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-dummy.m"; sourceTree = "<group>"; };
+		8A8F373B23E0F7FB68B0BA71D92D1C60 /* Stream.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Stream.swift; path = Source/Stream.swift; sourceTree = "<group>"; };
+		8A9CB35983E4859DFFBAD8840196A094 /* Error.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Error.swift; path = Source/Error.swift; sourceTree = "<group>"; };
+		8B476A57549D7994745E17A6DE5BE745 /* Alamofire.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Alamofire.swift; path = Source/Alamofire.swift; sourceTree = "<group>"; };
+		8DC63EB77B3791891517B98CAA115DE8 /* State.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = State.swift; path = Sources/State.swift; sourceTree = "<group>"; };
+		9042667D08D783E45394FE8B97EE6468 /* PromiseKit-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "PromiseKit-dummy.m"; sourceTree = "<group>"; };
+		92D340D66F03F31237B70F23FE9B00D0 /* UIAlertView+AnyPromise.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIAlertView+AnyPromise.h"; path = "Categories/UIKit/UIAlertView+AnyPromise.h"; sourceTree = "<group>"; };
+		94FB3F3CEFBA56B306D034B69144C68E /* InlineResponse200.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = InlineResponse200.swift; sourceTree = "<group>"; };
+		9774D31336C85248A115B569E7D95283 /* UIActionSheet+AnyPromise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIActionSheet+AnyPromise.m"; path = "Categories/UIKit/UIActionSheet+AnyPromise.m"; sourceTree = "<group>"; };
+		977577C045EDA9D9D1F46E2598D19FC7 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Pods.debug.xcconfig; sourceTree = "<group>"; };
+		980FD13F87B44BFD90F8AC129BEB2E61 /* race.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = race.swift; path = Sources/race.swift; sourceTree = "<group>"; };
+		9D579267FC1F163C8F04B444DAEFED0D /* OMGHTTPURLRQ.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = OMGHTTPURLRQ.m; path = Sources/OMGHTTPURLRQ.m; sourceTree = "<group>"; };
+		9F681D2C508D1BA8F62893120D9343A4 /* PetstoreClient-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-umbrella.h"; sourceTree = "<group>"; };
+		A02D16E80C10DF32F2A88A66B83D7DD9 /* Model200Response.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Model200Response.swift; sourceTree = "<group>"; };
+		A04177B09D9596450D827FE49A36C4C4 /* Download.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Download.swift; path = Source/Download.swift; sourceTree = "<group>"; };
+		A112EF8BB3933C1C1E42F11B3DD3B02A /* PromiseKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PromiseKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		A1D1571AB15108DF6F9C4FE2064E3C43 /* Alamofire.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Alamofire.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		A27DF5A602B1BB474A141C895934F712 /* StoreAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = StoreAPI.swift; sourceTree = "<group>"; };
+		A360D2EE0575D36C8C8459BCB8325D9A /* Models.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Models.swift; sourceTree = "<group>"; };
+		A4B4E403BC5209472D6DA0EEF82A8BD9 /* APIHelper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = APIHelper.swift; sourceTree = "<group>"; };
+		A58E34C4DDB909B2CA900747C6691A5A /* ObjectReturn.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ObjectReturn.swift; sourceTree = "<group>"; };
+		A7F0DAACAC89A93B940BBE54E6A87E9F /* NSURLConnection+AnyPromise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSURLConnection+AnyPromise.m"; path = "Categories/Foundation/NSURLConnection+AnyPromise.m"; sourceTree = "<group>"; };
+		A92242715FB4C0608F8DCEBF8F3791E2 /* dispatch_promise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = dispatch_promise.m; path = Sources/dispatch_promise.m; sourceTree = "<group>"; };
+		AA24C5EC82CF437D8D1FFFAB68975408 /* UIViewController+AnyPromise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIViewController+AnyPromise.m"; path = "Categories/UIKit/UIViewController+AnyPromise.m"; sourceTree = "<group>"; };
+		AB4DA378490493502B34B20D4B12325B /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		B3A144887C8B13FD888B76AB096B0CA1 /* PetstoreClient-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-prefix.pch"; sourceTree = "<group>"; };
+		B868468092D7B2489B889A50981C9247 /* after.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = after.m; path = Sources/after.m; sourceTree = "<group>"; };
+		B93FB4BB16CFB41DCA35A8CFAD7A7FEF /* NSNotificationCenter+Promise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "NSNotificationCenter+Promise.swift"; path = "Categories/Foundation/NSNotificationCenter+Promise.swift"; sourceTree = "<group>"; };
+		B9E21DC1171D712B2D2307EE5034D99E /* OMGHTTPURLRQ-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "OMGHTTPURLRQ-prefix.pch"; sourceTree = "<group>"; };
+		BA6428E9F66FD5A23C0A2E06ED26CD2F /* Podfile */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
+		BAE48ACA10E8895BB8BF5CE8C0846B4B /* NSURLConnection+AnyPromise.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSURLConnection+AnyPromise.h"; path = "Categories/Foundation/NSURLConnection+AnyPromise.h"; sourceTree = "<group>"; };
+		BCDD82DB3E6D43BA9769FCA9B744CB5E /* UIView+AnyPromise.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIView+AnyPromise.h"; path = "Categories/UIKit/UIView+AnyPromise.h"; sourceTree = "<group>"; };
+		BEA71A34D3031D95E61F1082A5BEEB7A /* ModelReturn.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ModelReturn.swift; sourceTree = "<group>"; };
+		C476B916B763E55E4161F0B30760C4E8 /* afterlife.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = afterlife.swift; path = Categories/Foundation/afterlife.swift; sourceTree = "<group>"; };
+		C731FBFCC690050C6C08E5AC9D9DC724 /* PMKAlertController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PMKAlertController.swift; path = Categories/UIKit/PMKAlertController.swift; sourceTree = "<group>"; };
+		C909E10C22B35220020268EF2BF27E18 /* Pet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Pet.swift; sourceTree = "<group>"; };
+		CA1AD92813B887E2D017D051B8C0E3D2 /* Validation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Validation.swift; path = Source/Validation.swift; sourceTree = "<group>"; };
+		CA854180C132DB5511D64C82535C5FDE /* UIAlertView+Promise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "UIAlertView+Promise.swift"; path = "Categories/UIKit/UIAlertView+Promise.swift"; sourceTree = "<group>"; };
+		CBC0F7C552B739C909B650A0F42F7F38 /* Pods-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-resources.sh"; sourceTree = "<group>"; };
+		CC49FF2A84C0E0E9349747D94036B728 /* PromiseKit.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = PromiseKit.xcconfig; sourceTree = "<group>"; };
+		CCE38472832BBCC541E646DA6C18EF9C /* Upload.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Upload.swift; path = Source/Upload.swift; sourceTree = "<group>"; };
+		CDC4DD7DB9F4C34A288BECA73BC13B57 /* PromiseKit.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = PromiseKit.modulemap; sourceTree = "<group>"; };
+		D0405803033A2A777B8E4DFA0C1800ED /* Pods-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-acknowledgements.markdown"; sourceTree = "<group>"; };
+		D4248CF20178C57CEFEFAAF453C0DC75 /* PromiseKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PromiseKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		D6D459D0AB2361B48F81C4D14C6D0DAA /* UIViewController+Promise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "UIViewController+Promise.swift"; path = "Categories/UIKit/UIViewController+Promise.swift"; sourceTree = "<group>"; };
+		D6EB54C331FED437583A5F01EB2757D1 /* NSObject+Promise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "NSObject+Promise.swift"; path = "Categories/Foundation/NSObject+Promise.swift"; sourceTree = "<group>"; };
+		D931A99C6B5A8E0F69C818C6ECC3C44F /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		DA312349A49333542E6F4B36B329960E /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Pods.release.xcconfig; sourceTree = "<group>"; };
+		DADAB10704E49D6B9E18F59F995BB88F /* PetstoreClient.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = PetstoreClient.xcconfig; sourceTree = "<group>"; };
+		E11BFB27B43B742CB5D6086C4233A909 /* OMGUserAgent.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = OMGUserAgent.m; path = Sources/OMGUserAgent.m; sourceTree = "<group>"; };
+		E160B50E4D11692AA38E74C897D69C61 /* PetstoreClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PetstoreClient.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		E3CDA0958D6247505ECD9098D662EA74 /* UIView+Promise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "UIView+Promise.swift"; path = "Categories/UIKit/UIView+Promise.swift"; sourceTree = "<group>"; };
+		E3D1141B63DF38660CD6F3AC588A782B /* PetstoreClient.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = PetstoreClient.modulemap; sourceTree = "<group>"; };
+		E7CE161ED0CF68954A63F30528ACAD9B /* URLDataPromise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = URLDataPromise.swift; path = Sources/URLDataPromise.swift; sourceTree = "<group>"; };
+		E7F21354943D9F42A70697D5A5EF72E9 /* Pods-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-frameworks.sh"; sourceTree = "<group>"; };
+		E8446514FBAD26C0E18F24A5715AEF67 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		EBC4140FCBB5B4D3A955B1608C165C04 /* Alamofire.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Alamofire.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		EE5E0F8BA6AB1430D31588F5EB170889 /* Order.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Order.swift; sourceTree = "<group>"; };
+		F075F63EFE77F7B59FF77CBA95B9AADF /* UIAlertView+AnyPromise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIAlertView+AnyPromise.m"; path = "Categories/UIKit/UIAlertView+AnyPromise.m"; sourceTree = "<group>"; };
+		F0D4E00A8974E74325E9E53D456F9AD4 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		F4B6A98D6DAF474045210F5A74FF1C3C /* hang.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = hang.m; path = Sources/hang.m; sourceTree = "<group>"; };
+		F7EBDD2EEED520E06ACB3538B3832049 /* OMGHTTPURLRQ-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "OMGHTTPURLRQ-umbrella.h"; sourceTree = "<group>"; };
+		F7F371E5E2A26613C4DE253F4D7A3F56 /* SpecialModelName.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SpecialModelName.swift; sourceTree = "<group>"; };
+		FB15A61DB7ABCB74565286162157C5A0 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
+		FC4BF94DC4B3D8B88FC160B00931B0EC /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/System/Library/Frameworks/QuartzCore.framework; sourceTree = DEVELOPER_DIR; };
+		FD558DDCDDA1B46951548B02C34277EF /* ResponseSerialization.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ResponseSerialization.swift; path = Source/ResponseSerialization.swift; sourceTree = "<group>"; };
+		FD570E28B63274E742E7D1FBBD55BB41 /* UIActionSheet+Promise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "UIActionSheet+Promise.swift"; path = "Categories/UIKit/UIActionSheet+Promise.swift"; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		4B81AD7DF193F182592D3F3510F50796 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				E6FDE3505ED7CEF6B87500A5C52B7938 /* Alamofire.framework in Frameworks */,
+				DF8DB782B7C2F5EEC7F29E2E2A5F8154 /* Foundation.framework in Frameworks */,
+				77F020B749274FC61FD1D5EA3FBBBE18 /* PromiseKit.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		9792A6BDBB07FB15453527B4370E3086 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				35F6B35131F89EA23246C6508199FB05 /* Foundation.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A5AE1D340C4A0691EC28EEA8241C9FCD /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				96D99D0C2472535A169DED65CB231CD7 /* Foundation.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C5452032741F5F809522C754A4393C4A /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				5849F4EAAAD24A116F0E0E948623AEC0 /* Foundation.framework in Frameworks */,
+				0FFA3D017278D8EB24A9AC4780E3AFEC /* OMGHTTPURLRQ.framework in Frameworks */,
+				09C9710BEE85A253331C8E0994FBB2BF /* QuartzCore.framework in Frameworks */,
+				53FBECFDFCA1B755F2754C4DBC65E3D5 /* UIKit.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FA26D2C7E461A1BBD50054579AFE2F7C /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				DD8D067A7F742F39B87FA04CE12DD118 /* Foundation.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		07467E828160702D1DB7EC2F492C337C /* UserAgent */ = {
+			isa = PBXGroup;
+			children = (
+				87BC7910B8D7D31310A07C32438A8C67 /* OMGUserAgent.h */,
+				E11BFB27B43B742CB5D6086C4233A909 /* OMGUserAgent.m */,
+			);
+			name = UserAgent;
+			sourceTree = "<group>";
+		};
+		1D2330E920AD5F6E4655BE449D006A77 /* Support Files */ = {
+			isa = PBXGroup;
+			children = (
+				AB4DA378490493502B34B20D4B12325B /* Info.plist */,
+				24C79ED4B5226F263307B22E96E88F9F /* OMGHTTPURLRQ.modulemap */,
+				16D7C901D915C251DEBA27AC1EF57E34 /* OMGHTTPURLRQ.xcconfig */,
+				0F36B65CF990C57DC527824ED0BA1915 /* OMGHTTPURLRQ-dummy.m */,
+				B9E21DC1171D712B2D2307EE5034D99E /* OMGHTTPURLRQ-prefix.pch */,
+				F7EBDD2EEED520E06ACB3538B3832049 /* OMGHTTPURLRQ-umbrella.h */,
+			);
+			name = "Support Files";
+			path = "../Target Support Files/OMGHTTPURLRQ";
+			sourceTree = "<group>";
+		};
+		22F52349E1BE90FC6E064DAAC9EA9612 /* Development Pods */ = {
+			isa = PBXGroup;
+			children = (
+				E9F8459055B900A58FB97600A53E5D1C /* PetstoreClient */,
+			);
+			name = "Development Pods";
+			sourceTree = "<group>";
+		};
+		2B28CE488E7531BE86FAB354C15AD30E /* Swaggers */ = {
+			isa = PBXGroup;
+			children = (
+				2B25BD9A4F08A3124D223BDB55576886 /* AlamofireImplementations.swift */,
+				A4B4E403BC5209472D6DA0EEF82A8BD9 /* APIHelper.swift */,
+				7220AB25575F15EB89521DFE33F4B764 /* APIs.swift */,
+				84A386C655413763AEE8133A102DF2C8 /* Extensions.swift */,
+				A360D2EE0575D36C8C8459BCB8325D9A /* Models.swift */,
+				ADCA66FBD4BDE0A0E2B51D3E13DCA949 /* APIs */,
+				8781DE8648430F3693508310D0B40CA0 /* Models */,
+			);
+			path = Swaggers;
+			sourceTree = "<group>";
+		};
+		75D98FF52E597A11900E131B6C4E1ADA /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				E8446514FBAD26C0E18F24A5715AEF67 /* Info.plist */,
+				79A9DEDC89FE8336BF5FEDAAF75BF7FC /* Pods.modulemap */,
+				D0405803033A2A777B8E4DFA0C1800ED /* Pods-acknowledgements.markdown */,
+				87B213035BAC5F75386F62D3C75D2342 /* Pods-acknowledgements.plist */,
+				894E5DA93A9F359521A89826BE6DA777 /* Pods-dummy.m */,
+				E7F21354943D9F42A70697D5A5EF72E9 /* Pods-frameworks.sh */,
+				CBC0F7C552B739C909B650A0F42F7F38 /* Pods-resources.sh */,
+				2BCC458FDD5F692BBB2BFC64BB5701FC /* Pods-umbrella.h */,
+				977577C045EDA9D9D1F46E2598D19FC7 /* Pods.debug.xcconfig */,
+				DA312349A49333542E6F4B36B329960E /* Pods.release.xcconfig */,
+			);
+			name = Pods;
+			path = "Target Support Files/Pods";
+			sourceTree = "<group>";
+		};
+		76DC20E0A9F8CDC0E47176B58A9C5BD5 /* Foundation */ = {
+			isa = PBXGroup;
+			children = (
+				C476B916B763E55E4161F0B30760C4E8 /* afterlife.swift */,
+				3616971BAEF40302B7F2F8B1007C0B2B /* NSNotificationCenter+AnyPromise.h */,
+				4798BAC01B0E3F07E3BBBB07BA57F2D7 /* NSNotificationCenter+AnyPromise.m */,
+				B93FB4BB16CFB41DCA35A8CFAD7A7FEF /* NSNotificationCenter+Promise.swift */,
+				D6EB54C331FED437583A5F01EB2757D1 /* NSObject+Promise.swift */,
+				BAE48ACA10E8895BB8BF5CE8C0846B4B /* NSURLConnection+AnyPromise.h */,
+				A7F0DAACAC89A93B940BBE54E6A87E9F /* NSURLConnection+AnyPromise.m */,
+				412985229DA7A4DF9E129B7E8F0C09BB /* NSURLConnection+Promise.swift */,
+				535DF88FC12304114DEF55E4003421B2 /* NSURLSession+Promise.swift */,
+			);
+			name = Foundation;
+			sourceTree = "<group>";
+		};
+		7DB346D0F39D3F0E887471402A8071AB = {
+			isa = PBXGroup;
+			children = (
+				BA6428E9F66FD5A23C0A2E06ED26CD2F /* Podfile */,
+				22F52349E1BE90FC6E064DAAC9EA9612 /* Development Pods */,
+				E85F5154C248966A1EC7B7B6EACB20CF /* Frameworks */,
+				CF22FA3EE19C3EC42FEBA1247EB70D85 /* Pods */,
+				D6592B983C64CE2427DF9CF38F4BD1C1 /* Products */,
+				B7B80995527643776607AFFA75B91E24 /* Targets Support Files */,
+			);
+			sourceTree = "<group>";
+		};
+		7DFF028D9F7D443B2361EBEDACC99624 /* OMGHTTPURLRQ */ = {
+			isa = PBXGroup;
+			children = (
+				8FCF5C41226503429E7875DF4CA4D36E /* FormURLEncode */,
+				A00A425F2E132E8FF4DE929E7DF9CC1E /* RQ */,
+				1D2330E920AD5F6E4655BE449D006A77 /* Support Files */,
+				07467E828160702D1DB7EC2F492C337C /* UserAgent */,
+			);
+			path = OMGHTTPURLRQ;
+			sourceTree = "<group>";
+		};
+		81B1E3A8E00502B38EACDE3617A7A73B /* Support Files */ = {
+			isa = PBXGroup;
+			children = (
+				792D14AC86CD98AA9C31373287E0F353 /* Info.plist */,
+				CDC4DD7DB9F4C34A288BECA73BC13B57 /* PromiseKit.modulemap */,
+				CC49FF2A84C0E0E9349747D94036B728 /* PromiseKit.xcconfig */,
+				9042667D08D783E45394FE8B97EE6468 /* PromiseKit-dummy.m */,
+				122D5005A81832479161CD1D223C573A /* PromiseKit-prefix.pch */,
+			);
+			name = "Support Files";
+			path = "../Target Support Files/PromiseKit";
+			sourceTree = "<group>";
+		};
+		83C3888E1F7B1FC86D9CBF3B74DC2896 /* QuartzCore */ = {
+			isa = PBXGroup;
+			children = (
+				27E0FE41D771BE8BE3F0D4F1DAD0B179 /* CALayer+AnyPromise.h */,
+				04A22F2595054D39018E03961CA7283A /* CALayer+AnyPromise.m */,
+			);
+			name = QuartzCore;
+			sourceTree = "<group>";
+		};
+		8781DE8648430F3693508310D0B40CA0 /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				6D0925CA00A7877078F60FAD44E2DD0F /* Category.swift */,
+				94FB3F3CEFBA56B306D034B69144C68E /* InlineResponse200.swift */,
+				A02D16E80C10DF32F2A88A66B83D7DD9 /* Model200Response.swift */,
+				BEA71A34D3031D95E61F1082A5BEEB7A /* ModelReturn.swift */,
+				2F98C30F79A0AB5920FB4CDBB7413E5C /* Name.swift */,
+				A58E34C4DDB909B2CA900747C6691A5A /* ObjectReturn.swift */,
+				EE5E0F8BA6AB1430D31588F5EB170889 /* Order.swift */,
+				C909E10C22B35220020268EF2BF27E18 /* Pet.swift */,
+				F7F371E5E2A26613C4DE253F4D7A3F56 /* SpecialModelName.swift */,
+				780827122613E6D246695ADFAA7B28B6 /* Tag.swift */,
+				71972929AF72164C887BB8F5F1059089 /* User.swift */,
+			);
+			path = Models;
+			sourceTree = "<group>";
+		};
+		8EA2A359F1831ACBB15BAAEA04D6FB95 /* UIKit */ = {
+			isa = PBXGroup;
+			children = (
+				C731FBFCC690050C6C08E5AC9D9DC724 /* PMKAlertController.swift */,
+				6846D22C9F0CCBC48DF833E309A8E84F /* UIActionSheet+AnyPromise.h */,
+				9774D31336C85248A115B569E7D95283 /* UIActionSheet+AnyPromise.m */,
+				FD570E28B63274E742E7D1FBBD55BB41 /* UIActionSheet+Promise.swift */,
+				92D340D66F03F31237B70F23FE9B00D0 /* UIAlertView+AnyPromise.h */,
+				F075F63EFE77F7B59FF77CBA95B9AADF /* UIAlertView+AnyPromise.m */,
+				CA854180C132DB5511D64C82535C5FDE /* UIAlertView+Promise.swift */,
+				BCDD82DB3E6D43BA9769FCA9B744CB5E /* UIView+AnyPromise.h */,
+				2F0F4EDC2236E1C270DC2014181D6506 /* UIView+AnyPromise.m */,
+				E3CDA0958D6247505ECD9098D662EA74 /* UIView+Promise.swift */,
+				0BA017E288BB42E06EBEE9C6E6993EAF /* UIViewController+AnyPromise.h */,
+				AA24C5EC82CF437D8D1FFFAB68975408 /* UIViewController+AnyPromise.m */,
+				D6D459D0AB2361B48F81C4D14C6D0DAA /* UIViewController+Promise.swift */,
+			);
+			name = UIKit;
+			sourceTree = "<group>";
+		};
+		8F6D133867EE63820DFB7E83F4C51252 /* Support Files */ = {
+			isa = PBXGroup;
+			children = (
+				F0D4E00A8974E74325E9E53D456F9AD4 /* Info.plist */,
+				E3D1141B63DF38660CD6F3AC588A782B /* PetstoreClient.modulemap */,
+				DADAB10704E49D6B9E18F59F995BB88F /* PetstoreClient.xcconfig */,
+				46A8E0328DC896E0893B565FE8742167 /* PetstoreClient-dummy.m */,
+				B3A144887C8B13FD888B76AB096B0CA1 /* PetstoreClient-prefix.pch */,
+				9F681D2C508D1BA8F62893120D9343A4 /* PetstoreClient-umbrella.h */,
+			);
+			name = "Support Files";
+			path = "SwaggerClientTests/Pods/Target Support Files/PetstoreClient";
+			sourceTree = "<group>";
+		};
+		8FCF5C41226503429E7875DF4CA4D36E /* FormURLEncode */ = {
+			isa = PBXGroup;
+			children = (
+				51ADA0B6B6B00CB0E818AA8CBC311677 /* OMGFormURLEncode.h */,
+				25614E715DDC170DAFB0DF50C5503E33 /* OMGFormURLEncode.m */,
+			);
+			name = FormURLEncode;
+			sourceTree = "<group>";
+		};
+		99640BFBD45FFAD70A89B868F85EFA36 /* Alamofire */ = {
+			isa = PBXGroup;
+			children = (
+				8B476A57549D7994745E17A6DE5BE745 /* Alamofire.swift */,
+				A04177B09D9596450D827FE49A36C4C4 /* Download.swift */,
+				8A9CB35983E4859DFFBAD8840196A094 /* Error.swift */,
+				2D51C929AC51E34493AA757180C09C3B /* Manager.swift */,
+				5F14E17B4D6BDF8BD3E384BE6528F744 /* MultipartFormData.swift */,
+				1FBD351D007CF4095C98C9DFD9D83D61 /* ParameterEncoding.swift */,
+				133C5287CFDCB3B67578A7B1221E132C /* Request.swift */,
+				5DF5FC3AF99846209C5FCE55A2E12D9A /* Response.swift */,
+				FD558DDCDDA1B46951548B02C34277EF /* ResponseSerialization.swift */,
+				53F8B2513042BD6DB957E8063EF895BD /* Result.swift */,
+				400A6910E83F606BCD67DC11FA706697 /* ServerTrustPolicy.swift */,
+				8A8F373B23E0F7FB68B0BA71D92D1C60 /* Stream.swift */,
+				CCE38472832BBCC541E646DA6C18EF9C /* Upload.swift */,
+				CA1AD92813B887E2D017D051B8C0E3D2 /* Validation.swift */,
+				9E101A4CE6D982647EED5C067C563BED /* Support Files */,
+			);
+			path = Alamofire;
+			sourceTree = "<group>";
+		};
+		9E101A4CE6D982647EED5C067C563BED /* Support Files */ = {
+			isa = PBXGroup;
+			children = (
+				8749F40CC17CE0C26C36B0F431A9C8F0 /* Alamofire.modulemap */,
+				141F0B43C42CE92856BBA8F8D98481DB /* Alamofire.xcconfig */,
+				139346EB669CBE2DE8FE506E14A2BA9C /* Alamofire-dummy.m */,
+				3950B63B8EB1B9CD8FC31CDA8CC2E7C7 /* Alamofire-prefix.pch */,
+				30CE7341A995EF6812D71771E74CF7F7 /* Alamofire-umbrella.h */,
+				3CE589B7B1FE57084403D25DC49528B5 /* Info.plist */,
+			);
+			name = "Support Files";
+			path = "../Target Support Files/Alamofire";
+			sourceTree = "<group>";
+		};
+		A00A425F2E132E8FF4DE929E7DF9CC1E /* RQ */ = {
+			isa = PBXGroup;
+			children = (
+				450166FEA2155A5821D97744A0127DF8 /* OMGHTTPURLRQ.h */,
+				9D579267FC1F163C8F04B444DAEFED0D /* OMGHTTPURLRQ.m */,
+			);
+			name = RQ;
+			sourceTree = "<group>";
+		};
+		AD94092456F8ABCB18F74CAC75AD85DE /* Classes */ = {
+			isa = PBXGroup;
+			children = (
+				2B28CE488E7531BE86FAB354C15AD30E /* Swaggers */,
+			);
+			path = Classes;
+			sourceTree = "<group>";
+		};
+		ADCA66FBD4BDE0A0E2B51D3E13DCA949 /* APIs */ = {
+			isa = PBXGroup;
+			children = (
+				1A44CBCE721F71F03C7758DB3F36CDFF /* PetAPI.swift */,
+				A27DF5A602B1BB474A141C895934F712 /* StoreAPI.swift */,
+				094C870CE73CCEC940F4DA86D7FE0C30 /* UserAPI.swift */,
+			);
+			path = APIs;
+			sourceTree = "<group>";
+		};
+		B7B80995527643776607AFFA75B91E24 /* Targets Support Files */ = {
+			isa = PBXGroup;
+			children = (
+				75D98FF52E597A11900E131B6C4E1ADA /* Pods */,
+			);
+			name = "Targets Support Files";
+			sourceTree = "<group>";
+		};
+		BEACE1971060500B96701CBC3F667BAE /* CorePromise */ = {
+			isa = PBXGroup;
+			children = (
+				B868468092D7B2489B889A50981C9247 /* after.m */,
+				275DA9A664C70DD40A4059090D1A00D4 /* after.swift */,
+				1F19945EE403F7B29D8B1939EA6D579A /* AnyPromise.h */,
+				1B7E90A568681E000EF3CB0917584F3C /* AnyPromise.m */,
+				5973BC143AE488C12FFB1E83E71F0C45 /* AnyPromise.swift */,
+				A92242715FB4C0608F8DCEBF8F3791E2 /* dispatch_promise.m */,
+				392FA21A33296B88F790D62A4FAA4E4E /* dispatch_promise.swift */,
+				558DFECE2C740177CA6357DA71A1DFBB /* Error.swift */,
+				F4B6A98D6DAF474045210F5A74FF1C3C /* hang.m */,
+				6AD59903FAA8315AD0036AC459FFB97F /* join.m */,
+				84319E048FE6DD89B905FA3A81005C5F /* join.swift */,
+				045C1F608ADE57757E6732D721779F22 /* NSError+Cancellation.h */,
+				3D23C407A7CDBFD244D6115899F9D45D /* Promise.swift */,
+				7E0DBDE561A6C2E7AC7A24160F8A5F28 /* Promise+Properties.swift */,
+				3BFFA6FD621E9ED341AA89AEAC1604D7 /* PromiseKit.h */,
+				980FD13F87B44BFD90F8AC129BEB2E61 /* race.swift */,
+				8DC63EB77B3791891517B98CAA115DE8 /* State.swift */,
+				0A8906F6D6920DF197965D1740A7E283 /* Umbrella.h */,
+				E7CE161ED0CF68954A63F30528ACAD9B /* URLDataPromise.swift */,
+				143BC30E5DDAF52A3D9578F507EC6A41 /* when.m */,
+				16730DAF3E51C161D8247E473F069E71 /* when.swift */,
+			);
+			name = CorePromise;
+			sourceTree = "<group>";
+		};
+		CF22FA3EE19C3EC42FEBA1247EB70D85 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				99640BFBD45FFAD70A89B868F85EFA36 /* Alamofire */,
+				7DFF028D9F7D443B2361EBEDACC99624 /* OMGHTTPURLRQ */,
+				D9FC474F1DB94FC75B3AAC120F0D4AB7 /* PromiseKit */,
+			);
+			name = Pods;
+			sourceTree = "<group>";
+		};
+		D6592B983C64CE2427DF9CF38F4BD1C1 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				EBC4140FCBB5B4D3A955B1608C165C04 /* Alamofire.framework */,
+				5CA1C154DFC54DFFB12A754B9A0BBDFC /* OMGHTTPURLRQ.framework */,
+				E160B50E4D11692AA38E74C897D69C61 /* PetstoreClient.framework */,
+				D931A99C6B5A8E0F69C818C6ECC3C44F /* Pods.framework */,
+				D4248CF20178C57CEFEFAAF453C0DC75 /* PromiseKit.framework */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		D9FC474F1DB94FC75B3AAC120F0D4AB7 /* PromiseKit */ = {
+			isa = PBXGroup;
+			children = (
+				BEACE1971060500B96701CBC3F667BAE /* CorePromise */,
+				76DC20E0A9F8CDC0E47176B58A9C5BD5 /* Foundation */,
+				83C3888E1F7B1FC86D9CBF3B74DC2896 /* QuartzCore */,
+				81B1E3A8E00502B38EACDE3617A7A73B /* Support Files */,
+				8EA2A359F1831ACBB15BAAEA04D6FB95 /* UIKit */,
+			);
+			path = PromiseKit;
+			sourceTree = "<group>";
+		};
+		E73D9BF152C59F341559DE62A3143721 /* PetstoreClient */ = {
+			isa = PBXGroup;
+			children = (
+				AD94092456F8ABCB18F74CAC75AD85DE /* Classes */,
+			);
+			path = PetstoreClient;
+			sourceTree = "<group>";
+		};
+		E85F5154C248966A1EC7B7B6EACB20CF /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				A1D1571AB15108DF6F9C4FE2064E3C43 /* Alamofire.framework */,
+				3530BF15E14D1F6D7134EE67377D5C8C /* OMGHTTPURLRQ.framework */,
+				A112EF8BB3933C1C1E42F11B3DD3B02A /* PromiseKit.framework */,
+				E8D8DAC96ED2B9203F380FB45F6DBE39 /* iOS */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		E8D8DAC96ED2B9203F380FB45F6DBE39 /* iOS */ = {
+			isa = PBXGroup;
+			children = (
+				FB15A61DB7ABCB74565286162157C5A0 /* Foundation.framework */,
+				FC4BF94DC4B3D8B88FC160B00931B0EC /* QuartzCore.framework */,
+				5A1DC80A0773C5A569348DC442EAFD1D /* UIKit.framework */,
+			);
+			name = iOS;
+			sourceTree = "<group>";
+		};
+		E9F8459055B900A58FB97600A53E5D1C /* PetstoreClient */ = {
+			isa = PBXGroup;
+			children = (
+				E73D9BF152C59F341559DE62A3143721 /* PetstoreClient */,
+				8F6D133867EE63820DFB7E83F4C51252 /* Support Files */,
+			);
+			name = PetstoreClient;
+			path = ../..;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		5F7B61281F714E2A64A51E80A2C9C062 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2C5450AC69398958CF6F7539EF7D99E5 /* Alamofire-umbrella.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		7E1332ABD911123D7A873D6D87E2F182 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				D1E8B31EFCBDE00F108E739AD69425C0 /* Pods-umbrella.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		8EC2461DE4442A7991319873E6012164 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				5480169E42C456C49BE59E273D7E0115 /* OMGFormURLEncode.h in Headers */,
+				5192A7466019F9B3D7F1E987124E96BC /* OMGHTTPURLRQ-umbrella.h in Headers */,
+				0B34EB4425C08BB021C2D09F75C9C146 /* OMGHTTPURLRQ.h in Headers */,
+				3A8D316D4266A3309D0A98ED74F8A13A /* OMGUserAgent.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A11C62D33B885E6DA9FECD0493A47746 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				E6B182F5E233FB9F529BEFEAD3D02ACF /* AnyPromise.h in Headers */,
+				2676E85B9644D55E25A31D3CE61A5726 /* CALayer+AnyPromise.h in Headers */,
+				0D6DCC756D1B0B68ADB5F805D575BAB6 /* NSError+Cancellation.h in Headers */,
+				1372840E154B63D17AACD1257C3E0520 /* NSNotificationCenter+AnyPromise.h in Headers */,
+				CCA3921F36A6B36DC1F993112BEF0602 /* NSURLConnection+AnyPromise.h in Headers */,
+				F8DAC10D25E6E36B83261AC032A77F1A /* PromiseKit.h in Headers */,
+				D55A97CF31106A21298F731FC890BCA1 /* UIActionSheet+AnyPromise.h in Headers */,
+				C96CB79BD56A7931541FC22617A2D613 /* UIAlertView+AnyPromise.h in Headers */,
+				02D0672068E53F2D98CC67FBA5278022 /* UIView+AnyPromise.h in Headers */,
+				C04283A3B7479C8EDE2B95F4DDEE2C2C /* UIViewController+AnyPromise.h in Headers */,
+				AC30241BA84931703B312A09DD64C648 /* Umbrella.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		BE7D2FA2E9F1656CC6B0266B63C0D938 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				64739E341A52DFA48F4169E4322E7486 /* PetstoreClient-umbrella.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		190ACD3A51BC90B85EADB13E9CDD207B /* OMGHTTPURLRQ */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 620A8F6BEDF449F55F08EDB4CDBF60A2 /* Build configuration list for PBXNativeTarget "OMGHTTPURLRQ" */;
+			buildPhases = (
+				44321F32F148EB47FF23494889576DF5 /* Sources */,
+				9792A6BDBB07FB15453527B4370E3086 /* Frameworks */,
+				8EC2461DE4442A7991319873E6012164 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = OMGHTTPURLRQ;
+			productName = OMGHTTPURLRQ;
+			productReference = 5CA1C154DFC54DFFB12A754B9A0BBDFC /* OMGHTTPURLRQ.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+		432ECC54282C84882B482CCB4CF227FC /* Alamofire */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 8B2B2DA2F7F80D41B1FDB5FACFA4B3DE /* Build configuration list for PBXNativeTarget "Alamofire" */;
+			buildPhases = (
+				EF659EFF40D426A3A32A82CDB98CC6EE /* Sources */,
+				A5AE1D340C4A0691EC28EEA8241C9FCD /* Frameworks */,
+				5F7B61281F714E2A64A51E80A2C9C062 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = Alamofire;
+			productName = Alamofire;
+			productReference = EBC4140FCBB5B4D3A955B1608C165C04 /* Alamofire.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+		7A5DBD588D2CC1C0CB1C42D4ED613FE4 /* Pods */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 8CB3C5DF3F4B6413A6F2D003B58CCF32 /* Build configuration list for PBXNativeTarget "Pods" */;
+			buildPhases = (
+				91F4D6732A1613C9660866E34445A67B /* Sources */,
+				FA26D2C7E461A1BBD50054579AFE2F7C /* Frameworks */,
+				7E1332ABD911123D7A873D6D87E2F182 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				64142DAEC5D96F7E876BBE00917C0E9D /* PBXTargetDependency */,
+				F74DEE1C89F05CC835997330B0E3B7C1 /* PBXTargetDependency */,
+				2673248EF608AB8375FABCFDA8141072 /* PBXTargetDependency */,
+				5433AD51A3DC696530C96B8A7D78ED7D /* PBXTargetDependency */,
+			);
+			name = Pods;
+			productName = Pods;
+			productReference = D931A99C6B5A8E0F69C818C6ECC3C44F /* Pods.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+		A348BE32D0894EA7204BDCB3F0DF636F /* PromiseKit */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 8567709BC3BD98E81A0E9B5AD85D011F /* Build configuration list for PBXNativeTarget "PromiseKit" */;
+			buildPhases = (
+				FCE6B9AB03DB341C5159F1510AAA9722 /* Sources */,
+				C5452032741F5F809522C754A4393C4A /* Frameworks */,
+				A11C62D33B885E6DA9FECD0493A47746 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				DDA10AB05EE4CD847D1133226B79818E /* PBXTargetDependency */,
+			);
+			name = PromiseKit;
+			productName = PromiseKit;
+			productReference = D4248CF20178C57CEFEFAAF453C0DC75 /* PromiseKit.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+		E1B34E9A45508C6EDDA7F25D88C85434 /* PetstoreClient */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 715B91C131A5E33AED9768BD75742013 /* Build configuration list for PBXNativeTarget "PetstoreClient" */;
+			buildPhases = (
+				A6723A33627D0A815D42193CACD7E74A /* Sources */,
+				4B81AD7DF193F182592D3F3510F50796 /* Frameworks */,
+				BE7D2FA2E9F1656CC6B0266B63C0D938 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				0D6B2D0CAE4FAFE97E7D7D0EC2C6DCE0 /* PBXTargetDependency */,
+				A102D2D546E8C75239F44407687481EE /* PBXTargetDependency */,
+			);
+			name = PetstoreClient;
+			productName = PetstoreClient;
+			productReference = E160B50E4D11692AA38E74C897D69C61 /* PetstoreClient.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		D41D8CD98F00B204E9800998ECF8427E /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastSwiftUpdateCheck = 0700;
+				LastUpgradeCheck = 0700;
+			};
+			buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 7DB346D0F39D3F0E887471402A8071AB;
+			productRefGroup = D6592B983C64CE2427DF9CF38F4BD1C1 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				432ECC54282C84882B482CCB4CF227FC /* Alamofire */,
+				190ACD3A51BC90B85EADB13E9CDD207B /* OMGHTTPURLRQ */,
+				E1B34E9A45508C6EDDA7F25D88C85434 /* PetstoreClient */,
+				7A5DBD588D2CC1C0CB1C42D4ED613FE4 /* Pods */,
+				A348BE32D0894EA7204BDCB3F0DF636F /* PromiseKit */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		44321F32F148EB47FF23494889576DF5 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				6F63943B0E954F701F32BC7A1F4C2FEC /* OMGFormURLEncode.m in Sources */,
+				D358A828E68E152D06FC8E35533BF00B /* OMGHTTPURLRQ-dummy.m in Sources */,
+				48CB8E7E16443CA771E4DCFB3E0709A2 /* OMGHTTPURLRQ.m in Sources */,
+				6CB84A616D7B4D189A4E94BD37621575 /* OMGUserAgent.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		91F4D6732A1613C9660866E34445A67B /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				6D264CCBD7DAC0A530076FB1A847EEC7 /* Pods-dummy.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A6723A33627D0A815D42193CACD7E74A /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				C4688FFE2C4E161516878B521EF54FBE /* AlamofireImplementations.swift in Sources */,
+				B4FAA3F0ED04F0506E66FCD7141AD989 /* APIHelper.swift in Sources */,
+				B0FB5055748E072728CA7129C3CAA3C6 /* APIs.swift in Sources */,
+				3D2B170AA3737444F26B0E07E1F5FEF1 /* Category.swift in Sources */,
+				91DF85663A3771DCD35D0FF07135959B /* Extensions.swift in Sources */,
+				57FB6BF21435F091D48B97DBD36E8C7B /* InlineResponse200.swift in Sources */,
+				AB06DA1AC0FA3BDF50BAAEBBD06AB46E /* Model200Response.swift in Sources */,
+				9DA852770BE32039F2C21096F27872A0 /* ModelReturn.swift in Sources */,
+				76FAA23C0A28ECF0BBF6A5C14203F414 /* Models.swift in Sources */,
+				1B099FB3AA9A6794A3039899A6734205 /* Name.swift in Sources */,
+				63F6FFAB2BCCD07FD3DF44086E11C8B0 /* ObjectReturn.swift in Sources */,
+				0F816E94051557A7BA9BFA5B6B4A32A5 /* Order.swift in Sources */,
+				F8C6EBC22D97E301AA4EA4D04B3FC860 /* Pet.swift in Sources */,
+				8ABFD5E4F7621D554DBB12C6472A8313 /* PetAPI.swift in Sources */,
+				886AC602EE7FCFDCD2DCD470CCB41721 /* PetstoreClient-dummy.m in Sources */,
+				167B939D70FE9AADBA03ABBBBA588B4B /* SpecialModelName.swift in Sources */,
+				97A9635E99E7EB0F33260600E1AC82F6 /* StoreAPI.swift in Sources */,
+				335F10113F178E8D2984BE0602A0DEED /* Tag.swift in Sources */,
+				D46A1F4211ACD4C9EF7726AFAD2609EA /* User.swift in Sources */,
+				F70B5EF0A4B94F8FF906073882DCDB78 /* UserAPI.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		EF659EFF40D426A3A32A82CDB98CC6EE /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				B6D2DC3E3DA44CD382B9B425F40E11C1 /* Alamofire-dummy.m in Sources */,
+				B0FB4B01682814B9E3D32F9DC4A5E762 /* Alamofire.swift in Sources */,
+				A3505FA2FB3067D53847AD288AC04F03 /* Download.swift in Sources */,
+				D75CA395D510E08C404E55F5BDAE55CE /* Error.swift in Sources */,
+				A2C172FE407C0BC3478ADCA91A6C9CEC /* Manager.swift in Sources */,
+				8399DBEE3E2D98EB1F466132E476F4D9 /* MultipartFormData.swift in Sources */,
+				4DE5FCC41D100B113B6645EA64410F16 /* ParameterEncoding.swift in Sources */,
+				FC14480CECE872865A9C6E584F886DA3 /* Request.swift in Sources */,
+				03F494989CC1A8857B68A317D5D6860F /* Response.swift in Sources */,
+				D21B7325B3642887BFBE977E021F2D26 /* ResponseSerialization.swift in Sources */,
+				82971968CBDAB224212EEB4607C9FB8D /* Result.swift in Sources */,
+				80F496237530D382A045A29654D8C11C /* ServerTrustPolicy.swift in Sources */,
+				FEF0D7653948988B804226129471C1EC /* Stream.swift in Sources */,
+				0681ADC8BAE2C3185F13487BAAB4D9DD /* Upload.swift in Sources */,
+				C75519F0450166A6F28126ECC7664E9C /* Validation.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FCE6B9AB03DB341C5159F1510AAA9722 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				76171B607A443BE97E1DBBF6575CD558 /* after.m in Sources */,
+				03790817CF6E76959C0F7E2D0734E9F6 /* after.swift in Sources */,
+				4CE2B026C746F263F6B95534A35E76C0 /* afterlife.swift in Sources */,
+				F049FFBDC929BB045C2AEDF0ECABE513 /* AnyPromise.m in Sources */,
+				D854F67FD7486C6D25CA841C7D2D5030 /* AnyPromise.swift in Sources */,
+				6EA827E0ECB8F7CC49F8B4C92A1D93FA /* CALayer+AnyPromise.m in Sources */,
+				E8DDC87F287107068FF40443CF059433 /* dispatch_promise.m in Sources */,
+				E93C3C3AABF32094F0D673E3EC3B2C20 /* dispatch_promise.swift in Sources */,
+				A2A8512E15D1A4B6DBD515D6144EC083 /* Error.swift in Sources */,
+				B72EE02E33CE31F594630D54EEEF9A15 /* hang.m in Sources */,
+				C95D8B9276E75DA8F6DECCDCE147C781 /* join.m in Sources */,
+				BFA18BBF784D749FE8BFA654088F3630 /* join.swift in Sources */,
+				D78AD94D0DBA6A1CC4E6673D2F14C832 /* NSNotificationCenter+AnyPromise.m in Sources */,
+				0BA72DC6AB26C72EE080F8A08CE41643 /* NSNotificationCenter+Promise.swift in Sources */,
+				435BD7136E0E174C6A8811D6C88DEAF2 /* NSObject+Promise.swift in Sources */,
+				405F6EBE4BBAAC270AF1B97AFC5B0C16 /* NSURLConnection+AnyPromise.m in Sources */,
+				36CDD7A6638E10B9107C74D9B75079F1 /* NSURLConnection+Promise.swift in Sources */,
+				9254814FE352958B5270E874E5CCD394 /* NSURLSession+Promise.swift in Sources */,
+				FA78EA5177275F71FD7F2C52F6B7518D /* PMKAlertController.swift in Sources */,
+				964EA2E9AA68D7D587ED15143FEC4BE5 /* Promise+Properties.swift in Sources */,
+				222C92305B7AC5BB8E2ABAD182F50026 /* Promise.swift in Sources */,
+				EC5B36837863572EC400633CD2FFAF94 /* PromiseKit-dummy.m in Sources */,
+				B908D3F77F293FC72B20EEB48208F5C6 /* race.swift in Sources */,
+				291E2518A9E470C2E9CE1B69C088C16F /* State.swift in Sources */,
+				82B5B0FF21A9A28284AE7F1124199D3F /* UIActionSheet+AnyPromise.m in Sources */,
+				0290D4A3795396ABBB81E632E5AADE3A /* UIActionSheet+Promise.swift in Sources */,
+				42A66FBE567A7F5B2136FC56BFF4874A /* UIAlertView+AnyPromise.m in Sources */,
+				08B247165C2A091EE24F79D73F8ABEC9 /* UIAlertView+Promise.swift in Sources */,
+				19DAC977B6B3CBDC69EE2150BD0C1EF6 /* UIView+AnyPromise.m in Sources */,
+				99710CDCDDFF9ED74B8E01EB8E4BF563 /* UIView+Promise.swift in Sources */,
+				5EADA3CE22BF3B74E759F948DE7A66F1 /* UIViewController+AnyPromise.m in Sources */,
+				E6810077387057466534FD27AA294211 /* UIViewController+Promise.swift in Sources */,
+				37027676CEABF1BF753684A06C2DCDDB /* URLDataPromise.swift in Sources */,
+				BF2A197091B6FC0646CFA61A5FBE66AF /* when.m in Sources */,
+				4EAB3713B40959FB2E0CDEAC8BDE1116 /* when.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		0D6B2D0CAE4FAFE97E7D7D0EC2C6DCE0 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = Alamofire;
+			target = 432ECC54282C84882B482CCB4CF227FC /* Alamofire */;
+			targetProxy = 098BDC6B6850C9E726FB5016BB254FC7 /* PBXContainerItemProxy */;
+		};
+		2673248EF608AB8375FABCFDA8141072 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = PetstoreClient;
+			target = E1B34E9A45508C6EDDA7F25D88C85434 /* PetstoreClient */;
+			targetProxy = 014385BD85FA83B60A03ADE9E8844F33 /* PBXContainerItemProxy */;
+		};
+		5433AD51A3DC696530C96B8A7D78ED7D /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = PromiseKit;
+			target = A348BE32D0894EA7204BDCB3F0DF636F /* PromiseKit */;
+			targetProxy = B5FB8931CDF8801206EDD2FEF94793BF /* PBXContainerItemProxy */;
+		};
+		64142DAEC5D96F7E876BBE00917C0E9D /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = Alamofire;
+			target = 432ECC54282C84882B482CCB4CF227FC /* Alamofire */;
+			targetProxy = 769630CDAAA8C24AA5B4C81A85C45AC8 /* PBXContainerItemProxy */;
+		};
+		A102D2D546E8C75239F44407687481EE /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = PromiseKit;
+			target = A348BE32D0894EA7204BDCB3F0DF636F /* PromiseKit */;
+			targetProxy = 11BAC0C3DDD46F7C7EA2DE10681BBE09 /* PBXContainerItemProxy */;
+		};
+		DDA10AB05EE4CD847D1133226B79818E /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = OMGHTTPURLRQ;
+			target = 190ACD3A51BC90B85EADB13E9CDD207B /* OMGHTTPURLRQ */;
+			targetProxy = BAB3DC0D4AB6EA5B20F7BA63A3F779EC /* PBXContainerItemProxy */;
+		};
+		F74DEE1C89F05CC835997330B0E3B7C1 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = OMGHTTPURLRQ;
+			target = 190ACD3A51BC90B85EADB13E9CDD207B /* OMGHTTPURLRQ */;
+			targetProxy = 9AD20158D23CE70A2A91E5B7859090C3 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin XCBuildConfiguration section */
+		0D12EBEB35AC8FA740B275C8105F9152 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 141F0B43C42CE92856BBA8F8D98481DB /* Alamofire.xcconfig */;
+			buildSettings = {
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_PREFIX_HEADER = "Target Support Files/Alamofire/Alamofire-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/Alamofire/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/Alamofire/Alamofire.modulemap";
+				MTL_ENABLE_DEBUG_INFO = NO;
+				PRODUCT_NAME = Alamofire;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		1361791756A3908370041AE99E5CF772 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 977577C045EDA9D9D1F46E2598D19FC7 /* Pods.debug.xcconfig */;
+			buildSettings = {
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				INFOPLIST_FILE = "Target Support Files/Pods/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MACH_O_TYPE = staticlib;
+				MODULEMAP_FILE = "Target Support Files/Pods/Pods.modulemap";
+				MTL_ENABLE_DEBUG_INFO = YES;
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PODS_ROOT = "$(SRCROOT)";
+				PRODUCT_NAME = Pods;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		28973E73A6075E48EBE277098505D118 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 141F0B43C42CE92856BBA8F8D98481DB /* Alamofire.xcconfig */;
+			buildSettings = {
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_PREFIX_HEADER = "Target Support Files/Alamofire/Alamofire-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/Alamofire/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/Alamofire/Alamofire.modulemap";
+				MTL_ENABLE_DEBUG_INFO = YES;
+				PRODUCT_NAME = Alamofire;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		3BDAD538EAD1230A7FDC1A3BD8F3005E /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DADAB10704E49D6B9E18F59F995BB88F /* PetstoreClient.xcconfig */;
+			buildSettings = {
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_PREFIX_HEADER = "Target Support Files/PetstoreClient/PetstoreClient-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/PetstoreClient/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/PetstoreClient/PetstoreClient.modulemap";
+				MTL_ENABLE_DEBUG_INFO = NO;
+				PRODUCT_NAME = PetstoreClient;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		4D5CD4E08FD8D405881C59A5535E6CE8 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 16D7C901D915C251DEBA27AC1EF57E34 /* OMGHTTPURLRQ.xcconfig */;
+			buildSettings = {
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_PREFIX_HEADER = "Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/OMGHTTPURLRQ/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ.modulemap";
+				MTL_ENABLE_DEBUG_INFO = NO;
+				PRODUCT_NAME = OMGHTTPURLRQ;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		79AE81D89452EFFAB0143A9C7CD108DC /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = CC49FF2A84C0E0E9349747D94036B728 /* PromiseKit.xcconfig */;
+			buildSettings = {
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_PREFIX_HEADER = "Target Support Files/PromiseKit/PromiseKit-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/PromiseKit/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/PromiseKit/PromiseKit.modulemap";
+				MTL_ENABLE_DEBUG_INFO = NO;
+				PRODUCT_NAME = PromiseKit;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		819D3D3D508154D9CFF3CE30C13E000E /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 16D7C901D915C251DEBA27AC1EF57E34 /* OMGHTTPURLRQ.xcconfig */;
+			buildSettings = {
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_PREFIX_HEADER = "Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/OMGHTTPURLRQ/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ.modulemap";
+				MTL_ENABLE_DEBUG_INFO = YES;
+				PRODUCT_NAME = OMGHTTPURLRQ;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		8D1534490D941DCA47C62AC4314182AF /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				ONLY_ACTIVE_ARCH = YES;
+				STRIP_INSTALLED_PRODUCT = NO;
+				SYMROOT = "${SRCROOT}/../build";
+			};
+			name = Debug;
+		};
+		B11D8789540F26AC42B990A7825BC01A /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DADAB10704E49D6B9E18F59F995BB88F /* PetstoreClient.xcconfig */;
+			buildSettings = {
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_PREFIX_HEADER = "Target Support Files/PetstoreClient/PetstoreClient-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/PetstoreClient/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/PetstoreClient/PetstoreClient.modulemap";
+				MTL_ENABLE_DEBUG_INFO = YES;
+				PRODUCT_NAME = PetstoreClient;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		BBB0CFD9A19744A94202BA4ADC92A507 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = CC49FF2A84C0E0E9349747D94036B728 /* PromiseKit.xcconfig */;
+			buildSettings = {
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_PREFIX_HEADER = "Target Support Files/PromiseKit/PromiseKit-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/PromiseKit/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/PromiseKit/PromiseKit.modulemap";
+				MTL_ENABLE_DEBUG_INFO = YES;
+				PRODUCT_NAME = PromiseKit;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		C5A18280E9321A9268D1C80B7DA43967 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = YES;
+				ENABLE_NS_ASSERTIONS = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_PREPROCESSOR_DEFINITIONS = "RELEASE=1";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				STRIP_INSTALLED_PRODUCT = NO;
+				SYMROOT = "${SRCROOT}/../build";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		D3F110D6C2483BBC023DA8D6DFC525C3 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DA312349A49333542E6F4B36B329960E /* Pods.release.xcconfig */;
+			buildSettings = {
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				INFOPLIST_FILE = "Target Support Files/Pods/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MACH_O_TYPE = staticlib;
+				MODULEMAP_FILE = "Target Support Files/Pods/Pods.modulemap";
+				MTL_ENABLE_DEBUG_INFO = NO;
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PODS_ROOT = "$(SRCROOT)";
+				PRODUCT_NAME = Pods;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				8D1534490D941DCA47C62AC4314182AF /* Debug */,
+				C5A18280E9321A9268D1C80B7DA43967 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		620A8F6BEDF449F55F08EDB4CDBF60A2 /* Build configuration list for PBXNativeTarget "OMGHTTPURLRQ" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				819D3D3D508154D9CFF3CE30C13E000E /* Debug */,
+				4D5CD4E08FD8D405881C59A5535E6CE8 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		715B91C131A5E33AED9768BD75742013 /* Build configuration list for PBXNativeTarget "PetstoreClient" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				B11D8789540F26AC42B990A7825BC01A /* Debug */,
+				3BDAD538EAD1230A7FDC1A3BD8F3005E /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		8567709BC3BD98E81A0E9B5AD85D011F /* Build configuration list for PBXNativeTarget "PromiseKit" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				BBB0CFD9A19744A94202BA4ADC92A507 /* Debug */,
+				79AE81D89452EFFAB0143A9C7CD108DC /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		8B2B2DA2F7F80D41B1FDB5FACFA4B3DE /* Build configuration list for PBXNativeTarget "Alamofire" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				28973E73A6075E48EBE277098505D118 /* Debug */,
+				0D12EBEB35AC8FA740B275C8105F9152 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		8CB3C5DF3F4B6413A6F2D003B58CCF32 /* Build configuration list for PBXNativeTarget "Pods" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				1361791756A3908370041AE99E5CF772 /* Debug */,
+				D3F110D6C2483BBC023DA8D6DFC525C3 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSNotificationCenter+AnyPromise.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSNotificationCenter+AnyPromise.h
new file mode 100644
index 00000000000..8eb38bd815e
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSNotificationCenter+AnyPromise.h
@@ -0,0 +1,43 @@
+#import <Foundation/NSNotification.h>
+#import <PromiseKit/AnyPromise.h>
+
+
+/**
+ To import the `NSNotificationCenter` category:
+
+    use_frameworks!
+    pod "PromiseKit/Foundation"
+
+ Or `NSNotificationCenter` is one of the categories imported by the umbrella pod:
+
+    use_frameworks!
+    pod "PromiseKit"
+
+ And then in your sources:
+
+    #import <PromiseKit/PromiseKit.h>
+*/
+@interface NSNotificationCenter (PromiseKit)
+/**
+ Observe the named notification once.
+
+    [NSNotificationCenter once:UIKeyboardWillShowNotification].then(^(id note, id userInfo){
+        UIViewAnimationCurve curve = [userInfo[UIKeyboardAnimationCurveUserInfoKey] integerValue];
+        CGFloat duration = [userInfo[UIKeyboardAnimationDurationUserInfoKey] floatValue];
+
+        return [UIView promiseWithDuration:duration delay:0.0 options:(curve << 16) animations:^{
+
+        }];
+    });
+
+ @warning *Important* Promises only resolve once. If you need your block to execute more than once then use `-addObserverForName:object:queue:usingBlock:`.
+
+ @param notificationName The name of the notification for which to register the observer.
+ 
+ @return A promise that fulfills with two parameters:
+
+   1. The NSNotification object.
+   2. The NSNotification’s userInfo property.
+*/
++ (AnyPromise *)once:(NSString *)notificationName;
+@end
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSNotificationCenter+AnyPromise.m b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSNotificationCenter+AnyPromise.m
new file mode 100644
index 00000000000..642d966eaa3
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSNotificationCenter+AnyPromise.m
@@ -0,0 +1,18 @@
+#import <assert.h>
+#import <Foundation/NSThread.h>
+#import <Foundation/NSOperation.h>
+#import "NSNotificationCenter+AnyPromise.h"
+
+
+@implementation NSNotificationCenter (PromiseKit)
+
++ (AnyPromise *)once:(NSString *)name {
+    return [AnyPromise promiseWithResolverBlock:^(PMKResolver resolve) {
+        __block id identifier = [[NSNotificationCenter defaultCenter] addObserverForName:name object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
+            [[NSNotificationCenter defaultCenter] removeObserver:identifier name:name object:nil];
+            resolve(PMKManifold(note, note.userInfo));
+        }];
+    }];
+}
+
+@end
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSNotificationCenter+Promise.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSNotificationCenter+Promise.swift
new file mode 100644
index 00000000000..578dce008c2
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSNotificationCenter+Promise.swift
@@ -0,0 +1,51 @@
+import Foundation.NSNotification
+#if !COCOAPODS
+import PromiseKit
+#endif
+
+/**
+ To import the `NSNotificationCenter` category:
+
+    use_frameworks!
+    pod "PromiseKit/Foundation"
+
+ Or `NSNotificationCenter` is one of the categories imported by the umbrella pod:
+
+    use_frameworks!
+    pod "PromiseKit"
+
+ And then in your sources:
+
+    import PromiseKit
+*/
+extension NSNotificationCenter {
+    public class func once(name: String) -> NotificationPromise {
+        return NSNotificationCenter.defaultCenter().once(name)
+    }
+
+    public func once(name: String) -> NotificationPromise {
+        let (promise, fulfill) = NotificationPromise.go()
+        let id = addObserverForName(name, object: nil, queue: nil, usingBlock: fulfill)
+        promise.then(on: zalgo) { _ in self.removeObserver(id) }
+        return promise
+    }
+}
+
+public class NotificationPromise: Promise<[NSObject: AnyObject]> {
+    private let (parentPromise, parentFulfill, _) = Promise<NSNotification>.pendingPromise()
+
+    public func asNotification() -> Promise<NSNotification> {
+        return parentPromise
+    }
+
+    private class func go() -> (NotificationPromise, (NSNotification) -> Void) {
+        var fulfill: (([NSObject: AnyObject]) -> Void)!
+        let promise = NotificationPromise { f, _ in fulfill = f }
+        promise.parentPromise.then { fulfill($0.userInfo ?? [:]) }
+        return (promise, promise.parentFulfill)
+    }
+
+    private override init(@noescape resolvers: (fulfill: ([NSObject: AnyObject]) -> Void, reject: (ErrorType) -> Void) throws -> Void) {
+        super.init(resolvers: resolvers)
+    }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSObject+Promise.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSObject+Promise.swift
new file mode 100644
index 00000000000..4d5d35db4ab
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSObject+Promise.swift
@@ -0,0 +1,67 @@
+import Foundation
+#if !COCOAPODS
+import PromiseKit
+#endif
+
+/**
+ To import the `NSObject` category:
+
+    use_frameworks!
+    pod "PromiseKit/Foundation"
+
+ Or `NSObject` is one of the categories imported by the umbrella pod:
+
+    use_frameworks!
+    pod "PromiseKit"
+ 
+ And then in your sources:
+
+    import PromiseKit
+*/
+extension NSObject {
+    /**
+      @return A promise that resolves when the provided keyPath changes.
+
+      @warning *Important* The promise must not outlive the object under observation.
+
+      @see Apple’s KVO documentation.
+    */
+    public func observe<T>(keyPath: String) -> Promise<T> {
+        let (promise, fulfill, reject) = Promise<T>.pendingPromise()
+        let proxy = KVOProxy(observee: self, keyPath: keyPath) { obj in
+            if let obj = obj as? T {
+                fulfill(obj)
+            } else {
+                let info = [NSLocalizedDescriptionKey: "The observed property was not of the requested type."]
+                reject(NSError(domain: PMKErrorDomain, code: PMKInvalidUsageError, userInfo: info))
+            }
+        }
+        proxy.retainCycle = proxy
+        return promise
+    }
+}
+
+private class KVOProxy: NSObject {
+    var retainCycle: KVOProxy?
+    let fulfill: (AnyObject?) -> Void
+
+    init(observee: NSObject, keyPath: String, resolve: (AnyObject?) -> Void) {
+        fulfill = resolve
+        super.init()
+        observee.addObserver(self, forKeyPath: keyPath, options: NSKeyValueObservingOptions.New, context: pointer)
+    }
+
+    override func observeValueForKeyPath(keyPath: String?, ofObject object: AnyObject?, change: [String : AnyObject]?, context: UnsafeMutablePointer<Void>) {
+        if let change = change where context == pointer {
+            defer { retainCycle = nil }
+            fulfill(change[NSKeyValueChangeNewKey])
+            if let object = object, keyPath = keyPath {
+                object.removeObserver(self, forKeyPath: keyPath)
+            }
+        }
+    }
+
+    private lazy var pointer: UnsafeMutablePointer<Void> = {
+        return UnsafeMutablePointer<Void>(Unmanaged<KVOProxy>.passUnretained(self).toOpaque())
+    }()
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLConnection+AnyPromise.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLConnection+AnyPromise.h
new file mode 100644
index 00000000000..986431f31a9
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLConnection+AnyPromise.h
@@ -0,0 +1,215 @@
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSURLConnection.h>
+#import <Foundation/NSURLRequest.h>
+#import <PromiseKit/AnyPromise.h>
+
+/**
+ To import the `NSURLConnection` category:
+
+    use_frameworks!
+    pod "PromiseKit/Foundation"
+
+ Or `NSURLConnection` is one of the categories imported by the umbrella pod:
+
+    use_frameworks!
+    pod "PromiseKit"
+ 
+ And then in your sources:
+
+    #import <PromiseKit/PromiseKit.h>
+
+ PromiseKit automatically deserializes the raw HTTP data response into the
+ appropriate rich data type based on the mime type the server provides.
+ Thus if the response is JSON you will get the deserialized JSON response.
+ PromiseKit supports decoding into strings, JSON and UIImages.
+
+ However if your server does not provide a rich content-type, you will
+ just get `NSData`. This is rare, but a good example we came across was
+ downloading files from Dropbox.
+
+ PromiseKit goes to quite some lengths to provide good `NSError` objects
+ for error conditions at all stages of the HTTP to rich-data type
+ pipeline. We provide the following additional `userInfo` keys as
+ appropriate:
+
+   - `PMKURLErrorFailingDataKey`
+   - `PMKURLErrorFailingStringKey`
+   - `PMKURLErrorFailingURLResponseKey`
+
+ PromiseKit uses [OMGHTTPURLRQ](https://github.com/mxcl/OMGHTTPURLRQ) to
+ make its HTTP requests. PromiseKit only provides a convenience layer
+ above OMGHTTPURLRQ, thus if you need more power (eg. a multipartFormData
+ POST), use OMGHTTPURLRQ to generate the `NSURLRequest` and then pass
+ that request to `+promise:`.
+
+ @see https://github.com/mxcl/OMGHTTPURLRQ
+*/
+@interface NSURLConnection (PromiseKit)
+
+/**
+ Makes a GET request to the provided URL.
+
+     [NSURLConnection GET:@"http://placekitten.com/320/320"].then(^(UIImage *img){
+         // PromiseKit decodes the image (if it’s an image)
+     });
+
+ @param urlStringFormatOrURL The `NSURL` or string format to request.
+
+ @return A promise that fulfills with three parameters:
+
+   1) The deserialized data response.
+   2) The `NSHTTPURLResponse`.
+   3) The raw `NSData` response.
+*/
++ (AnyPromise *)GET:(id)urlStringFormatOrURL, ...;
+
+/**
+ Makes a GET request with the provided query parameters.
+
+     id url = @"http://jsonplaceholder.typicode.com/comments";
+     id params = @{@"postId": @1};
+     [NSURLConnection GET:url query:params].then(^(NSDictionary *jsonResponse){
+         // PromiseKit decodes the JSON dictionary (if it’s JSON)
+     });
+
+ @param urlString The `NSURL` or URL string format to request.
+
+ @param parameters The parameters to be encoded as the query string for the GET request.
+
+ @return A promise that fulfills with three parameters:
+
+   1) The deserialized data response.
+   2) The `NSHTTPURLResponse`.
+   3) The raw `NSData` response.
+*/
++ (AnyPromise *)GET:(NSString *)urlString query:(NSDictionary *)parameters;
+
+/**
+ Makes a POST request to the provided URL passing form URL encoded
+ parameters.
+
+ Form URL-encoding is the standard way to POST on the Internet, so
+ probably this is what you want. If it doesn’t work, try the `+POST:JSON`
+ variant.
+
+     id url = @"http://jsonplaceholder.typicode.com/posts";
+     id params = @{@"title": @"foo", @"body": @"bar", @"userId": @1};
+     [NSURLConnection POST:url formURLEncodedParameters:params].then(^(NSDictionary *jsonResponse){
+         // PromiseKit decodes the JSON dictionary (if it’s JSON)
+     });
+
+ @param urlString The URL to request.
+
+ @param parameters The parameters to be form URL-encoded and passed as the POST body.
+
+ @return A promise that fulfills with three parameters:
+
+   1) The deserialized data response.
+   2) The `NSHTTPURLResponse`.
+   3) The raw `NSData` response.
+*/
++ (AnyPromise *)POST:(NSString *)urlString formURLEncodedParameters:(NSDictionary *)parameters;
+
+/**
+ Makes a POST request to the provided URL passing JSON encoded parameters.
+
+ Most web servers nowadays support POST with either JSON or form
+ URL-encoding. If in doubt try form URL-encoded parameters first.
+
+     id url = @"http://jsonplaceholder.typicode.com/posts";
+     id params = @{@"title": @"foo", @"body": @"bar", @"userId": @1};
+     [NSURLConnection POST:url JSON:params].then(^(NSDictionary *jsonResponse){
+         // PromiseKit decodes the JSON dictionary (if it’s JSON)
+     });
+
+ @param urlString The URL to request.
+
+ @param JSONParameters The parameters to be JSON encoded and passed as the POST body.
+
+ @return A promise that fulfills with three parameters:
+
+   1) The deserialized data response.
+   2) The `NSHTTPURLResponse`.
+   3) The raw `NSData` response.
+*/
++ (AnyPromise *)POST:(NSString *)urlString JSON:(NSDictionary *)JSONParameters;
+
+/**
+ Makes a PUT request to the provided URL passing form URL-encoded
+ parameters.
+
+     id url = @"http://jsonplaceholder.typicode.com/posts/1";
+     id params = @{@"id": @1, @"title": @"foo", @"body": @"bar", @"userId": @1};
+     [NSURLConnection PUT:url formURLEncodedParameters:params].then(^(NSDictionary *jsonResponse){
+         // PromiseKit decodes the JSON dictionary (if it’s JSON)
+     });
+
+ @param urlString The URL to request.
+
+ @param parameters The parameters to be form URL-encoded and passed as the HTTP body.
+
+ @return A promise that fulfills with three parameters:
+
+   1) The deserialized data response.
+   2) The `NSHTTPURLResponse`.
+   3) The raw `NSData` response.
+*/
++ (AnyPromise *)PUT:(NSString *)urlString formURLEncodedParameters:(NSDictionary *)params;
+
+/**
+ Makes a DELETE request to the provided URL passing form URL-encoded
+ parameters.
+
+     id url = @"http://jsonplaceholder.typicode.com/posts/1";
+     id params = nil;
+     [NSURLConnection DELETE:url formURLEncodedParameters:params].then(^(NSDictionary *jsonResponse){
+         // PromiseKit decodes the JSON dictionary (if it’s JSON)
+     });
+
+ @param urlString The URL to request.
+
+ @param parameters The parameters to be form URL-encoded and passed as the HTTP body.
+
+ @return A promise that fulfills with three parameters:
+
+   1) The deserialized data response.
+   2) The `NSHTTPURLResponse`.
+   3) The raw `NSData` response.
+*/
++ (AnyPromise *)DELETE:(NSString *)urlString formURLEncodedParameters:(NSDictionary *)params;
+
+/**
+ Makes an HTTP request using the parameters specified by the provided URL
+ request.
+
+ This variant is less convenient, but provides you complete control over
+ your `NSURLRequest`. Often this is necessary if your API requires
+ authentication in the HTTP headers.
+
+ Also, for example, if you need to send a multipart form request then
+ PromiseKit provides no convenience method for this, however using
+ OMGHTTPURLRQ (a dependency of this category), we can accomplish our
+ requirements:
+
+    OMGMultipartFormData *multipartFormData = [OMGMultipartFormData new];
+
+    NSData *data1 = [NSData dataWithContentsOfFile:@"myimage1.png"];
+    [multipartFormData addFile:data1 parameterName:@"file1" filename:@"myimage1.png" contentType:@"image/png"];
+
+    NSMutableURLRequest *rq = [OMGHTTPURLRQ POST:url:multipartFormData];
+
+    [NSURLConnection promise:rq].then(^(id response){
+        //…
+    });
+
+ @param request The URL request.
+
+ @return A promise that fulfills with three parameters:
+
+   1) The deserialized data response.
+   2) The `NSHTTPURLResponse`.
+   3) The raw `NSData` response.
+*/
++ (AnyPromise *)promise:(NSURLRequest *)request;
+
+@end
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLConnection+AnyPromise.m b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLConnection+AnyPromise.m
new file mode 100644
index 00000000000..862ef0fbfde
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLConnection+AnyPromise.m
@@ -0,0 +1,178 @@
+#import <CoreFoundation/CFString.h>
+#import <CoreFoundation/CFURL.h>
+#import <Foundation/NSArray.h>
+#import <Foundation/NSError.h>
+#import <Foundation/NSJSONSerialization.h>
+#import <Foundation/NSOperation.h>
+#import <Foundation/NSThread.h>
+#import <Foundation/NSURLError.h>
+#import <Foundation/NSURL.h>
+#import <Foundation/NSURLResponse.h>
+#import "NSURLConnection+AnyPromise.h"
+#import <PromiseKit/PromiseKit.h>
+#import <OMGHTTPURLRQ/OMGHTTPURLRQ.h>
+#import <OMGHTTPURLRQ/OMGUserAgent.h>
+
+
+@implementation NSURLConnection (PromiseKit)
+
++ (AnyPromise *)GET:(id)urlFormat, ... {
+    if ([urlFormat isKindOfClass:[NSString class]]) {
+        va_list arguments;
+        va_start(arguments, urlFormat);
+        urlFormat = [[NSString alloc] initWithFormat:urlFormat arguments:arguments];
+        va_end(arguments);
+    } else if ([urlFormat isKindOfClass:[NSURL class]]) {
+        NSMutableURLRequest *rq = [[NSMutableURLRequest alloc] initWithURL:urlFormat];
+        [rq setValue:OMGUserAgent() forHTTPHeaderField:@"User-Agent"];
+        return [self promise:rq];
+    } else {
+        urlFormat = [urlFormat description];
+    }
+    id err;
+    id rq = [OMGHTTPURLRQ GET:urlFormat:nil error:&err];
+    if (err) return [AnyPromise promiseWithValue:err];
+    return [self promise:rq];
+}
+
++ (AnyPromise *)GET:(NSString *)url query:(NSDictionary *)params {
+    id err;
+    id rq = [OMGHTTPURLRQ GET:url:params error:&err];
+    if (err) return [AnyPromise promiseWithValue:err];
+    return [self promise:rq];
+}
+
++ (AnyPromise *)POST:(NSString *)url formURLEncodedParameters:(NSDictionary *)params {
+    id err;
+    id rq = [OMGHTTPURLRQ POST:url:params error:&err];
+    if (err) return [AnyPromise promiseWithValue:err];
+    return [self promise:rq];
+}
+
++ (AnyPromise *)POST:(NSString *)urlString JSON:(NSDictionary *)params {
+    id err;
+    id rq = [OMGHTTPURLRQ POST:urlString JSON:params error:&err];
+    if (err) [AnyPromise promiseWithValue:err];
+    return [self promise:rq];
+}
+
++ (AnyPromise *)PUT:(NSString *)url formURLEncodedParameters:(NSDictionary *)params {
+    id err;
+    id rq = [OMGHTTPURLRQ PUT:url:params error:&err];
+    if (err) [AnyPromise promiseWithValue:err];
+    return [self promise:rq];
+
+}
+
++ (AnyPromise *)DELETE:(NSString *)url formURLEncodedParameters:(NSDictionary *)params {
+    id err;
+    id rq = [OMGHTTPURLRQ DELETE:url :params error:&err];
+    if (err) [AnyPromise promiseWithValue:err];
+    return [self promise:rq];
+}
+
++ (AnyPromise *)promise:(NSURLRequest *)rq {
+    static id q = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        q = [NSOperationQueue new];
+    });
+
+    return [AnyPromise promiseWithResolverBlock:^(PMKResolver resolve) {
+        [NSURLConnection sendAsynchronousRequest:rq queue:q completionHandler:^(id rsp, id data, id urlError) {
+            assert(![NSThread isMainThread]);
+
+            PMKResolver fulfiller = ^(id responseObject){
+                resolve(PMKManifold(responseObject, rsp, data));
+            };
+            PMKResolver rejecter = ^(NSError *error){
+                id userInfo = error.userInfo.mutableCopy ?: [NSMutableDictionary new];
+                if (data) userInfo[PMKURLErrorFailingDataKey] = data;
+                if (rsp) userInfo[PMKURLErrorFailingURLResponseKey] = rsp;
+                error = [NSError errorWithDomain:error.domain code:error.code userInfo:userInfo];
+                resolve(error);
+            };
+
+            NSStringEncoding (^stringEncoding)() = ^NSStringEncoding{
+                id encodingName = [rsp textEncodingName];
+                if (encodingName) {
+                    CFStringEncoding encoding = CFStringConvertIANACharSetNameToEncoding((CFStringRef)encodingName);
+                    if (encoding != kCFStringEncodingInvalidId)
+                        return CFStringConvertEncodingToNSStringEncoding(encoding);
+                }
+                return NSUTF8StringEncoding;
+            };
+
+            if (urlError) {
+                rejecter(urlError);
+            } else if (![rsp isKindOfClass:[NSHTTPURLResponse class]]) {
+                fulfiller(data);
+            } else if ([rsp statusCode] < 200 || [rsp statusCode] >= 300) {
+                id info = @{
+                    NSLocalizedDescriptionKey: @"The server returned a bad HTTP response code",
+                    NSURLErrorFailingURLStringErrorKey: rq.URL.absoluteString,
+                    NSURLErrorFailingURLErrorKey: rq.URL
+                };
+                id err = [NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorBadServerResponse userInfo:info];
+                rejecter(err);
+            } else if (PMKHTTPURLResponseIsJSON(rsp)) {
+                // work around ever-so-common Rails workaround: https://github.com/rails/rails/issues/1742
+                if ([rsp expectedContentLength] == 1 && [data isEqualToData:[NSData dataWithBytes:" " length:1]])
+                    return fulfiller(nil);
+
+                NSError *err = nil;
+                id json = [NSJSONSerialization JSONObjectWithData:data options:PMKJSONDeserializationOptions error:&err];
+                if (!err) {
+                    fulfiller(json);
+                } else {
+                    id userInfo = err.userInfo.mutableCopy;
+                    if (data) {
+                        NSString *string = [[NSString alloc] initWithData:data encoding:stringEncoding()];
+                        if (string)
+                            userInfo[PMKURLErrorFailingStringKey] = string;
+                    }
+                    long long length = [rsp expectedContentLength];
+                    id bytes = length <= 0 ? @"" : [NSString stringWithFormat:@"%lld bytes", length];
+                    id fmt = @"The server claimed a %@ JSON response, but decoding failed with: %@";
+                    userInfo[NSLocalizedDescriptionKey] = [NSString stringWithFormat:fmt, bytes, userInfo[NSLocalizedDescriptionKey]];
+                    err = [NSError errorWithDomain:err.domain code:err.code userInfo:userInfo];
+                    rejecter(err);
+                }
+          #ifdef UIKIT_EXTERN
+            } else if (PMKHTTPURLResponseIsImage(rsp)) {
+                UIImage *image = [[UIImage alloc] initWithData:data];
+                image = [[UIImage alloc] initWithCGImage:[image CGImage] scale:image.scale orientation:image.imageOrientation];
+                if (image)
+                    fulfiller(image);
+                else {
+                    id info = @{
+                        NSLocalizedDescriptionKey: @"The server returned invalid image data",
+                        NSURLErrorFailingURLStringErrorKey: rq.URL.absoluteString,
+                        NSURLErrorFailingURLErrorKey: rq.URL
+                    };
+                    id err = [NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorCannotDecodeContentData userInfo:info];
+                    rejecter(err);
+                }
+          #endif
+            } else if (PMKHTTPURLResponseIsText(rsp)) {
+                id str = [[NSString alloc] initWithData:data encoding:stringEncoding()];
+                if (str)
+                    fulfiller(str);
+                else {
+                    id info = @{
+                        NSLocalizedDescriptionKey: @"The server returned invalid string data",
+                        NSURLErrorFailingURLStringErrorKey: rq.URL.absoluteString,
+                        NSURLErrorFailingURLErrorKey: rq.URL
+                    };
+                    id err = [NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorCannotDecodeContentData userInfo:info];
+                    rejecter(err);
+                }
+            } else
+                fulfiller(data);
+        }];
+    }];
+
+    #undef fulfiller
+}
+
+@end
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLConnection+Promise.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLConnection+Promise.swift
new file mode 100644
index 00000000000..dc1fe39eacb
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLConnection+Promise.swift
@@ -0,0 +1,74 @@
+import Foundation
+import OMGHTTPURLRQ
+#if !COCOAPODS
+import PromiseKit
+#endif
+
+/**
+ To import the `NSURLConnection` category:
+
+    use_frameworks!
+    pod "PromiseKit/Foundation"
+
+ Or `NSURLConnection` is one of the categories imported by the umbrella pod:
+
+    use_frameworks!
+    pod "PromiseKit"
+
+ And then in your sources:
+
+    import PromiseKit
+*/
+extension NSURLConnection {
+    public class func GET(URL: String, query: [NSObject:AnyObject]? = nil) -> URLDataPromise {
+        return go(try OMGHTTPURLRQ.GET(URL, query))
+    }
+
+    public class func POST(URL: String, formData: [NSObject:AnyObject]? = nil) -> URLDataPromise {
+        return go(try OMGHTTPURLRQ.POST(URL, formData))
+    }
+
+    public class func POST(URL: String, JSON: [NSObject:AnyObject]) -> URLDataPromise {
+        return go(try OMGHTTPURLRQ.POST(URL, JSON: JSON))
+    }
+
+    public class func POST(URL: String, multipartFormData: OMGMultipartFormData) -> URLDataPromise {
+        return go(try OMGHTTPURLRQ.POST(URL, multipartFormData))
+    }
+
+    public class func PUT(URL: String, formData: [NSObject:AnyObject]? = nil) -> URLDataPromise {
+        return go(try OMGHTTPURLRQ.PUT(URL, formData))
+    }
+
+    public class func PUT(URL: String, JSON: [NSObject:AnyObject]) -> URLDataPromise {
+        return go(try OMGHTTPURLRQ.PUT(URL, JSON: JSON))
+    }
+
+    public class func DELETE(URL: String) -> URLDataPromise {
+        return go(try OMGHTTPURLRQ.DELETE(URL, nil))
+    }
+
+    public class func promise(request: NSURLRequest) -> URLDataPromise {
+        return go(request)
+    }
+}
+
+private func go(@autoclosure body: () throws -> NSURLRequest) -> URLDataPromise {
+    do {
+        var request = try body()
+
+        if request.valueForHTTPHeaderField("User-Agent") == nil {
+            let rq = request.mutableCopy() as! NSMutableURLRequest
+            rq.setValue(OMGUserAgent(), forHTTPHeaderField: "User-Agent")
+            request = rq
+        }
+
+        return URLDataPromise.go(request) { completionHandler in
+            NSURLConnection.sendAsynchronousRequest(request, queue: Q, completionHandler: { completionHandler($1, $0, $2) })
+        }
+    } catch {
+        return URLDataPromise(error: error)
+    }
+}
+
+private let Q = NSOperationQueue()
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLSession+Promise.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLSession+Promise.swift
new file mode 100644
index 00000000000..4da6c2867af
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLSession+Promise.swift
@@ -0,0 +1,71 @@
+import Foundation
+import OMGHTTPURLRQ
+#if !COCOAPODS
+import PromiseKit
+#endif
+
+//TODO cancellation
+
+/**
+ To import the `NSURLConnection` category:
+
+    use_frameworks!
+    pod "PromiseKit/Foundation"
+
+ Or `NSURLConnection` is one of the categories imported by the umbrella pod:
+
+    use_frameworks!
+    pod "PromiseKit"
+
+ And then in your sources:
+
+    import PromiseKit
+
+ We provide convenience categories for the `sharedSession`, or 
+ an instance method `promise`. If you need more complicated behavior
+ we recommend wrapping that usage in a Promise initializer.
+*/
+extension NSURLSession {
+    public class func GET(URL: String, query: [NSObject: AnyObject]? = nil) -> URLDataPromise {
+        return start(try OMGHTTPURLRQ.GET(URL, query))
+    }
+
+    public class func POST(URL: String, formData: [NSObject: AnyObject]? = nil) -> URLDataPromise {
+        return start(try OMGHTTPURLRQ.POST(URL, formData))
+    }
+
+    public class func POST(URL: String, multipartFormData: OMGMultipartFormData) -> URLDataPromise {
+        return start(try OMGHTTPURLRQ.POST(URL, multipartFormData))
+    }
+
+    public class func PUT(URL: String) -> URLDataPromise {
+        return start(try OMGHTTPURLRQ.PUT(URL, nil))
+    }
+
+    public class func DELETE(URL: String) -> URLDataPromise {
+        return start(try OMGHTTPURLRQ.DELETE(URL, nil))
+    }
+
+    public func promise(request: NSURLRequest) -> URLDataPromise {
+        return start(request, session: self)
+    }
+}
+
+private func start(@autoclosure body: () throws -> NSURLRequest, session: NSURLSession = NSURLSession.sharedSession()) -> URLDataPromise {
+    do {
+        var request = try body()
+
+        if request.valueForHTTPHeaderField("User-Agent") == nil {
+            let rq = request.mutableCopy() as! NSMutableURLRequest
+            rq.setValue(OMGUserAgent(), forHTTPHeaderField: "User-Agent")
+            request = rq
+        }
+
+        return URLDataPromise.go(request) { completionHandler in
+            let task = session.dataTaskWithRequest(request, completionHandler: completionHandler)
+            task.resume()
+        }
+    } catch {
+        return URLDataPromise(error: error)
+    }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/afterlife.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/afterlife.swift
new file mode 100644
index 00000000000..06d5aa5c825
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/afterlife.swift
@@ -0,0 +1,29 @@
+import Foundation
+#if !COCOAPODS
+import PromiseKit
+#endif
+
+/**
+ @return A promise that resolves when the provided object deallocates
+
+ @warning *Important* The promise is not guarenteed to resolve immediately
+ when the provided object is deallocated. So you cannot write code that
+ depends on exact timing.
+*/
+public func after(life object: NSObject) -> Promise<Void> {
+    var reaper = objc_getAssociatedObject(object, &handle) as? GrimReaper
+    if reaper == nil {
+        reaper = GrimReaper()
+        objc_setAssociatedObject(object, &handle, reaper, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+    }
+    return reaper!.promise
+}
+
+private var handle: UInt8 = 0
+
+private class GrimReaper: NSObject {
+    deinit {
+        fulfill()
+    }
+    let (promise, fulfill, _) = Promise<Void>.pendingPromise()
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/QuartzCore/CALayer+AnyPromise.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/QuartzCore/CALayer+AnyPromise.h
new file mode 100644
index 00000000000..184d559cf59
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/QuartzCore/CALayer+AnyPromise.h
@@ -0,0 +1,40 @@
+//
+//  CALayer+AnyPromise.h
+//
+//  Created by María Patricia Montalvo Dzib on 24/11/14.
+//  Copyright (c) 2014 Aluxoft SCP. All rights reserved.
+//
+
+#import <QuartzCore/QuartzCore.h>
+#import <PromiseKit/AnyPromise.h>
+
+/**
+ To import the `CALayer` category:
+
+    use_frameworks!
+    pod "PromiseKit/QuartzCore"
+
+ Or `CALayer` is one of the categories imported by the umbrella pod:
+
+    use_frameworks!
+    pod "PromiseKit"
+
+ And then in your sources:
+
+    #import <PromiseKit/PromiseKit.h>
+*/
+@interface CALayer (PromiseKit)
+
+/**
+ Add the specified animation object to the layer’s render tree.
+
+ @return A promise that thens two parameters:
+
+  1. `@YES` if the animation progressed entirely to completion.
+  2. The `CAAnimation` object.
+
+ @see addAnimation:forKey
+*/
+- (AnyPromise *)promiseAnimation:(CAAnimation *)animation forKey:(NSString *)key;
+
+@end
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/QuartzCore/CALayer+AnyPromise.m b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/QuartzCore/CALayer+AnyPromise.m
new file mode 100644
index 00000000000..2a0d6aae60f
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/QuartzCore/CALayer+AnyPromise.m
@@ -0,0 +1,39 @@
+//
+//  CALayer+PromiseKit.m
+//
+//  Created by María Patricia Montalvo Dzib on 24/11/14.
+//  Copyright (c) 2014 Aluxoft SCP. All rights reserved.
+//
+
+#import <QuartzCore/CAAnimation.h>
+#import "CALayer+AnyPromise.h"
+
+
+@interface PMKCAAnimationDelegate : NSObject {
+@public
+    PMKResolver resolve;
+    CAAnimation *animation;
+}
+@end
+
+@implementation PMKCAAnimationDelegate
+
+- (void)animationDidStop:(CAAnimation *)ignoreOrRetainCycleHappens finished:(BOOL)flag {
+    resolve(PMKManifold(@(flag), animation));
+    animation.delegate = nil;
+}
+
+@end
+
+
+
+@implementation CALayer (PromiseKit)
+
+- (AnyPromise *)promiseAnimation:(CAAnimation *)animation forKey:(NSString *)key {
+    PMKCAAnimationDelegate *d = animation.delegate = [PMKCAAnimationDelegate new];
+    d->animation = animation;
+    [self addAnimation:animation forKey:key];
+    return [[AnyPromise alloc] initWithResolver:&d->resolve];
+}
+
+@end
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/PMKAlertController.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/PMKAlertController.swift
new file mode 100644
index 00000000000..835b3633c48
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/PMKAlertController.swift
@@ -0,0 +1,75 @@
+import UIKit
+#if !COCOAPODS
+import PromiseKit
+#endif
+
+//TODO tests
+//TODO NSCoding
+
+/**
+ A “promisable” UIAlertController.
+
+ UIAlertController is not a suitable API for an extension; it has closure
+ handlers on its main API for each button and an extension would have to
+ either replace all these when the controller is presented or force you to
+ use an extended addAction method, which would be easy to forget part of
+ the time. Hence we provide a facade pattern that can be promised.
+
+    let alert = PMKAlertController("OHAI")
+    let sup = alert.addActionWithTitle("SUP")
+    let bye = alert.addActionWithTitle("BYE")
+    promiseViewController(alert).then { action in
+        switch action {
+        case is sup:
+            //…
+        case is bye:
+            //…
+        }
+    }
+*/
+public class PMKAlertController {
+    public var title: String? { return UIAlertController.title }
+    public var message: String? { return UIAlertController.message }
+    public var preferredStyle: UIAlertControllerStyle { return UIAlertController.preferredStyle }
+    public var actions: [UIAlertAction] { return UIAlertController.actions }
+    public var textFields: [UITextField]? { return UIAlertController.textFields }
+
+    public required init(title: String?, message: String?  = nil, preferredStyle: UIAlertControllerStyle = .Alert) {
+        UIAlertController = UIKit.UIAlertController(title: title, message: message, preferredStyle: preferredStyle)
+    }
+
+    public func addActionWithTitle(title: String, style: UIAlertActionStyle = .Default) -> UIAlertAction {
+        let action = UIAlertAction(title: title, style: style) { action in
+            if style != UIAlertActionStyle.Cancel {
+                self.fulfill(action)
+            } else {
+                self.reject(Error.Cancelled)
+            }
+        }
+        UIAlertController.addAction(action)
+        return action
+    }
+
+    public func addTextFieldWithConfigurationHandler(configurationHandler: ((UITextField) -> Void)?) {
+        UIAlertController.addTextFieldWithConfigurationHandler(configurationHandler)
+    }
+
+    private let UIAlertController: UIKit.UIAlertController
+    private let (promise, fulfill, reject) = Promise<UIAlertAction>.pendingPromise()
+    private var retainCycle: PMKAlertController?
+
+    public enum Error: ErrorType {
+        case Cancelled
+    }
+}
+
+extension UIViewController {
+    public func promiseViewController(vc: PMKAlertController, animated: Bool = true, completion: (() -> Void)? = nil) -> Promise<UIAlertAction> {
+        vc.retainCycle = vc
+        presentViewController(vc.UIAlertController, animated: true, completion: nil)
+        vc.promise.always { _ -> Void in
+            vc.retainCycle = nil
+        }
+        return vc.promise
+    }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIActionSheet+AnyPromise.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIActionSheet+AnyPromise.h
new file mode 100644
index 00000000000..d7739fe9adf
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIActionSheet+AnyPromise.h
@@ -0,0 +1,42 @@
+#import <PromiseKit/AnyPromise.h>
+#import <UIKit/UIActionSheet.h>
+
+/**
+ To import the `UIActionSheet` category:
+
+    use_frameworks!
+    pod "PromiseKit/UIKit"
+
+ Or `UIKit` is one of the categories imported by the umbrella pod:
+
+    use_frameworks!
+    pod "PromiseKit"
+
+ And then in your sources:
+
+    #import <PromiseKit/PromiseKit.h>
+*/
+@interface UIActionSheet (PromiseKit)
+
+/**
+ Displays the action sheet originating from the specified view.
+
+    UIActionSheet *sheet = [UIActionSheet new];
+    sheet.title = @"OHAI";
+    [sheet addButtonWithTitle:@"OK"];
+    [sheet promiseInView:nil].then(^(NSNumber *dismissedButtonIndex){
+        //…
+    });
+
+ @param view The view from which the action sheet originates.
+
+ @warning *Important* If a cancelButtonIndex is set the promise will be *cancelled* if that button is pressed. Cancellation in PromiseKit has special behavior, see the relevant documentation for more details.
+ 
+ @return A promise that fulfills with two parameters:
+
+  1) The index (NSNumber) of the button that was tapped to dismiss the sheet.
+  2) This action sheet.
+*/
+- (AnyPromise *)promiseInView:(UIView *)view;
+
+@end
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIActionSheet+AnyPromise.m b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIActionSheet+AnyPromise.m
new file mode 100644
index 00000000000..5c8751ae47c
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIActionSheet+AnyPromise.m
@@ -0,0 +1,41 @@
+#import <PromiseKit/PromiseKit.h>
+#import "UIActionSheet+AnyPromise.h"
+
+
+@interface PMKActionSheetDelegate : NSObject <UIActionSheetDelegate> {
+@public
+    id retainCycle;
+    PMKResolver resolve;
+}
+@end
+
+
+@implementation PMKActionSheetDelegate
+
+- (void)actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger)buttonIndex {
+    if (buttonIndex == actionSheet.cancelButtonIndex) {
+        resolve([NSError cancelledError]);
+    } else {
+        resolve(PMKManifold(@(buttonIndex), actionSheet));
+    }
+    retainCycle = nil;
+}
+
+@end
+
+
+@implementation UIActionSheet (PromiseKit)
+
+- (AnyPromise *)promiseInView:(UIView *)view {
+    PMKActionSheetDelegate *d = [PMKActionSheetDelegate new];
+    d->retainCycle = self.delegate = d;
+    [self showInView:view];
+
+    if (self.numberOfButtons == 1 && self.cancelButtonIndex == 0) {
+        NSLog(@"PromiseKit: An action sheet is being promised with a single button that is set as the cancelButtonIndex. The promise *will* be cancelled which may result in unexpected behavior. See http://promisekit.org/PromiseKit-2.0-Released/ for cancellation documentation.");
+    }
+
+    return [[AnyPromise alloc] initWithResolver:&d->resolve];
+}
+
+@end
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIActionSheet+Promise.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIActionSheet+Promise.swift
new file mode 100644
index 00000000000..3b4bf6b9b68
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIActionSheet+Promise.swift
@@ -0,0 +1,59 @@
+import UIKit.UIActionSheet
+#if !COCOAPODS
+import PromiseKit
+#endif
+
+/**
+ To import the `UIActionSheet` category:
+
+    use_frameworks!
+    pod "PromiseKit/UIKit"
+
+ Or `UIKit` is one of the categories imported by the umbrella pod:
+
+    use_frameworks!
+    pod "PromiseKit"
+
+ And then in your sources:
+
+    import PromiseKit
+*/
+extension UIActionSheet {
+    public func promiseInView(view: UIView) -> Promise<Int> {
+        let proxy = PMKActionSheetDelegate()
+        delegate = proxy
+        proxy.retainCycle = proxy
+        showInView(view)
+
+        if numberOfButtons == 1 && cancelButtonIndex == 0 {
+            NSLog("PromiseKit: An action sheet is being promised with a single button that is set as the cancelButtonIndex. The promise *will* be cancelled which may result in unexpected behavior. See http://promisekit.org/PromiseKit-2.0-Released/ for cancellation documentation.")
+        }
+
+        return proxy.promise
+    }
+
+    public enum Error: CancellableErrorType {
+        case Cancelled
+
+        public var cancelled: Bool {
+            switch self {
+                case .Cancelled: return true
+            }
+        }
+    }
+}
+
+private class PMKActionSheetDelegate: NSObject, UIActionSheetDelegate {
+    let (promise, fulfill, reject) = Promise<Int>.pendingPromise()
+    var retainCycle: NSObject?
+
+    @objc func actionSheet(actionSheet: UIActionSheet, didDismissWithButtonIndex buttonIndex: Int) {
+        defer { retainCycle = nil }
+
+        if buttonIndex != actionSheet.cancelButtonIndex {
+            fulfill(buttonIndex)
+        } else {
+            reject(UIActionSheet.Error.Cancelled)
+        }
+    }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIAlertView+AnyPromise.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIAlertView+AnyPromise.h
new file mode 100644
index 00000000000..744e8e25bec
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIAlertView+AnyPromise.h
@@ -0,0 +1,40 @@
+#import <PromiseKit/AnyPromise.h>
+#import <UIKit/UIAlertView.h>
+
+/**
+ To import the `UIAlertView` category:
+
+    use_frameworks!
+    pod "PromiseKit/UIKit"
+
+ Or `UIKit` is one of the categories imported by the umbrella pod:
+
+    use_frameworks!
+    pod "PromiseKit"
+
+ And then in your sources:
+
+    #import <PromiseKit/PromiseKit.h>
+*/
+@interface UIAlertView (PromiseKit)
+
+/**
+ Displays the alert view.
+
+    UIAlertView *alert = [UIAlertView new];
+    alert.title = @"OHAI";
+    [alert addButtonWithTitle:@"OK"];
+    [alert promise].then(^(NSNumber *dismissedButtonIndex){
+        //…
+    });
+
+ @warning *Important* If a cancelButtonIndex is set the promise will be *cancelled* if that button is pressed. Cancellation in PromiseKit has special behavior, see the relevant documentation for more details.
+
+ @return A promise the fulfills with two parameters:
+
+  1) The index of the button that was tapped to dismiss the alert.
+  2) This alert view.
+*/
+- (AnyPromise *)promise;
+
+@end
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIAlertView+AnyPromise.m b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIAlertView+AnyPromise.m
new file mode 100644
index 00000000000..ea77443b900
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIAlertView+AnyPromise.m
@@ -0,0 +1,41 @@
+#import <PromiseKit/PromiseKit.h>
+#import "UIAlertView+AnyPromise.h"
+
+
+@interface PMKAlertViewDelegate : NSObject <UIAlertViewDelegate> {
+@public
+    PMKResolver resolve;
+    id retainCycle;
+}
+@end
+
+
+@implementation PMKAlertViewDelegate
+
+- (void)alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger)buttonIndex {
+    if (buttonIndex != alertView.cancelButtonIndex) {
+        resolve(PMKManifold(@(buttonIndex), alertView));
+    } else {
+        resolve([NSError cancelledError]);
+    }
+    retainCycle = nil;
+}
+
+@end
+
+
+@implementation UIAlertView (PromiseKit)
+
+- (AnyPromise *)promise {
+    PMKAlertViewDelegate *d = [PMKAlertViewDelegate new];
+    d->retainCycle = self.delegate = d;
+    [self show];
+
+    if (self.numberOfButtons == 1 && self.cancelButtonIndex == 0) {
+        NSLog(@"PromiseKit: An alert view is being promised with a single button that is set as the cancelButtonIndex. The promise *will* be cancelled which may result in unexpected behavior. See http://promisekit.org/PromiseKit-2.0-Released/ for cancellation documentation.");
+    }
+
+    return [[AnyPromise alloc] initWithResolver:&d->resolve];
+}
+
+@end
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIAlertView+Promise.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIAlertView+Promise.swift
new file mode 100644
index 00000000000..1af023c4b0a
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIAlertView+Promise.swift
@@ -0,0 +1,58 @@
+import Foundation
+import UIKit.UIAlertView
+#if !COCOAPODS
+import PromiseKit
+#endif
+
+/**
+ To import the `UIActionSheet` category:
+
+    use_frameworks!
+    pod "PromiseKit/UIKit"
+
+ Or `UIKit` is one of the categories imported by the umbrella pod:
+
+    use_frameworks!
+    pod "PromiseKit"
+
+ And then in your sources:
+
+    import PromiseKit
+*/
+extension UIAlertView {
+    public func promise() -> Promise<Int> {
+        let proxy = PMKAlertViewDelegate()
+        delegate = proxy
+        proxy.retainCycle = proxy
+        show()
+        
+        if numberOfButtons == 1 && cancelButtonIndex == 0 {
+            NSLog("PromiseKit: An alert view is being promised with a single button that is set as the cancelButtonIndex. The promise *will* be cancelled which may result in unexpected behavior. See http://promisekit.org/PromiseKit-2.0-Released/ for cancellation documentation.")
+        }
+        
+        return proxy.promise
+    }
+
+    public enum Error: CancellableErrorType {
+        case Cancelled
+
+        public var cancelled: Bool {
+            switch self {
+                case .Cancelled: return true
+            }
+        }
+    }
+}
+
+private class PMKAlertViewDelegate: NSObject, UIAlertViewDelegate {
+    let (promise, fulfill, reject) = Promise<Int>.pendingPromise()
+    var retainCycle: NSObject?
+
+    @objc func alertView(alertView: UIAlertView, didDismissWithButtonIndex buttonIndex: Int) {
+        if buttonIndex != alertView.cancelButtonIndex {
+            fulfill(buttonIndex)
+        } else {
+            reject(UIAlertView.Error.Cancelled)
+        }
+    }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIView+AnyPromise.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIView+AnyPromise.h
new file mode 100644
index 00000000000..5f019c78fb9
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIView+AnyPromise.h
@@ -0,0 +1,80 @@
+#import <PromiseKit/AnyPromise.h>
+#import <UIKit/UIView.h>
+
+//  Created by Masafumi Yoshida on 2014/07/11.
+//  Copyright (c) 2014年 DeNA. All rights reserved.
+
+/**
+ To import the `UIView` category:
+
+    use_frameworks!
+    pod "PromiseKit/UIKit"
+
+ Or `UIKit` is one of the categories imported by the umbrella pod:
+
+    use_frameworks!
+    pod "PromiseKit"
+ 
+ And then in your sources:
+
+    #import <PromiseKit/PromiseKit.h>
+*/
+@interface UIView (PromiseKit)
+
+/**
+ Animate changes to one or more views using the specified duration.
+
+ @param duration The total duration of the animations, measured in 
+ seconds. If you specify a negative value or 0, the changes are made
+ without animating them.
+
+ @param animations A block object containing the changes to commit to the
+ views.
+
+ @return A promise that fulfills with a boolean NSNumber indicating
+ whether or not the animations actually finished.
+*/
++ (AnyPromise *)promiseWithDuration:(NSTimeInterval)duration animations:(void (^)(void))animations;
+
+/**
+ Animate changes to one or more views using the specified duration, delay,
+ options, and completion handler.
+ 
+ @param duration The total duration of the animations, measured in
+ seconds. If you specify a negative value or 0, the changes are made
+ without animating them.
+
+ @param delay The amount of time (measured in seconds) to wait before
+ beginning the animations. Specify a value of 0 to begin the animations
+ immediately.
+ 
+ @param options A mask of options indicating how you want to perform the
+ animations. For a list of valid constants, see UIViewAnimationOptions.
+
+ @param animations A block object containing the changes to commit to the
+ views.
+
+ @return A promise that fulfills with a boolean NSNumber indicating
+ whether or not the animations actually finished.
+*/
++ (AnyPromise *)promiseWithDuration:(NSTimeInterval)duration delay:(NSTimeInterval)delay options:(UIViewAnimationOptions)options animations:(void (^)(void))animations;
+
+/**
+ Performs a view animation using a timing curve corresponding to the
+ motion of a physical spring.
+
+ @return A promise that fulfills with a boolean NSNumber indicating
+ whether or not the animations actually finished.
+*/
++ (AnyPromise *)promiseWithDuration:(NSTimeInterval)duration delay:(NSTimeInterval)delay usingSpringWithDamping:(CGFloat)dampingRatio initialSpringVelocity:(CGFloat)velocity options:(UIViewAnimationOptions)options animations:(void (^)(void))animations;
+
+/**
+ Creates an animation block object that can be used to set up
+ keyframe-based animations for the current view.
+
+ @return A promise that fulfills with a boolean NSNumber indicating
+ whether or not the animations actually finished.
+*/
++ (AnyPromise *)promiseWithDuration:(NSTimeInterval)duration delay:(NSTimeInterval)delay options:(UIViewKeyframeAnimationOptions)options keyframeAnimations:(void (^)(void))animations;
+
+@end
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIView+AnyPromise.m b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIView+AnyPromise.m
new file mode 100644
index 00000000000..04ee940358c
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIView+AnyPromise.m
@@ -0,0 +1,64 @@
+//
+//  UIView+PromiseKit_UIAnimation.m
+//  YahooDenaStudy
+//
+//  Created by Masafumi Yoshida on 2014/07/11.
+//  Copyright (c) 2014年 DeNA. All rights reserved.
+//
+
+#import <PromiseKit/PromiseKit.h>
+#import "UIView+AnyPromise.h"
+
+
+#define CopyPasta \
+    NSAssert([NSThread isMainThread], @"UIKit animation must be performed on the main thread"); \
+    \
+    if (![NSThread isMainThread]) { \
+        id error = [NSError errorWithDomain:PMKErrorDomain code:PMKInvalidUsageError userInfo:@{NSLocalizedDescriptionKey: @"Animation was attempted on a background thread"}]; \
+        return [AnyPromise promiseWithValue:error]; \
+    } \
+    \
+    PMKResolver resolve = nil; \
+    AnyPromise *promise = [[AnyPromise alloc] initWithResolver:&resolve];
+
+
+@implementation UIView (PromiseKit)
+
++ (AnyPromise *)promiseWithDuration:(NSTimeInterval)duration animations:(void (^)(void))animations {
+    return [self promiseWithDuration:duration delay:0 options:0 animations:animations];
+}
+
++ (AnyPromise *)promiseWithDuration:(NSTimeInterval)duration delay:(NSTimeInterval)delay options:(UIViewAnimationOptions)options animations:(void(^)(void))animations
+{
+    CopyPasta;
+
+    [UIView animateWithDuration:duration delay:delay options:options animations:animations completion:^(BOOL finished) {
+        resolve(@(finished));
+    }];
+
+    return promise;
+}
+
++ (AnyPromise *)promiseWithDuration:(NSTimeInterval)duration delay:(NSTimeInterval)delay usingSpringWithDamping:(CGFloat)dampingRatio initialSpringVelocity:(CGFloat)velocity options:(UIViewAnimationOptions)options animations:(void(^)(void))animations
+{
+    CopyPasta;
+
+    [UIView animateWithDuration:duration delay:delay usingSpringWithDamping:dampingRatio initialSpringVelocity:velocity options:options animations:animations completion:^(BOOL finished) {
+        resolve(@(finished));
+    }];
+
+    return promise;
+}
+
++ (AnyPromise *)promiseWithDuration:(NSTimeInterval)duration delay:(NSTimeInterval)delay options:(UIViewKeyframeAnimationOptions)options keyframeAnimations:(void(^)(void))animations
+{
+    CopyPasta;
+
+    [UIView animateKeyframesWithDuration:duration delay:delay options:options animations:animations completion:^(BOOL finished) {
+        resolve(@(finished));
+    }];
+
+    return promise;
+}
+
+@end
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIView+Promise.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIView+Promise.swift
new file mode 100644
index 00000000000..387fe61978a
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIView+Promise.swift
@@ -0,0 +1,48 @@
+import UIKit.UIView
+#if !COCOAPODS
+import PromiseKit
+#endif
+
+/**
+ To import the `UIView` category:
+
+    use_frameworks!
+    pod "PromiseKit/UIKit"
+
+ Or `UIKit` is one of the categories imported by the umbrella pod:
+
+    use_frameworks!
+    pod "PromiseKit"
+
+ And then in your sources:
+
+    import PromiseKit
+*/
+extension UIView {
+    /**
+     Animate changes to one or more views using the specified duration, delay,
+     options, and completion handler.
+     
+     @param duration The total duration of the animations, measured in
+     seconds. If you specify a negative value or 0, the changes are made
+     without animating them.
+
+     @param delay The amount of time (measured in seconds) to wait before
+     beginning the animations. Specify a value of 0 to begin the animations
+     immediately.
+     
+     @param options A mask of options indicating how you want to perform the
+     animations. For a list of valid constants, see UIViewAnimationOptions.
+
+     @param animations A block object containing the changes to commit to the
+     views.
+
+     @return A promise that fulfills with a boolean NSNumber indicating
+     whether or not the animations actually finished.
+    */
+    public class func animate(duration duration: NSTimeInterval = 0.3, delay: NSTimeInterval = 0, options: UIViewAnimationOptions = UIViewAnimationOptions(), animations: () -> Void) -> Promise<Bool> {
+        return Promise { fulfill, _ in
+            self.animateWithDuration(duration, delay: delay, options: options, animations: animations, completion: fulfill)
+        }
+    }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIViewController+AnyPromise.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIViewController+AnyPromise.h
new file mode 100644
index 00000000000..b131488df70
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIViewController+AnyPromise.h
@@ -0,0 +1,90 @@
+#import <PromiseKit/AnyPromise.h>
+#import <UIKit/UIViewController.h>
+
+/**
+ To import the `UIViewController` category:
+
+    use_frameworks!
+    pod "PromiseKit/UIKit"
+
+ Or `UIKit` is one of the categories imported by the umbrella pod:
+
+    use_frameworks!
+    pod "PromiseKit"
+ 
+ And then in your sources:
+
+    #import <PromiseKit/PromiseKit.h>
+*/
+@interface UIViewController (PromiseKit)
+
+/**
+ Presents a view controller modally.
+
+ If the view controller is one of the following:
+
+  - MFMailComposeViewController
+  - MFMessageComposeViewController
+  - UIImagePickerController
+  - SLComposeViewController
+
+ Then PromiseKit presents the view controller returning a promise that is
+ resolved as per the documentation for those classes. Eg. if you present a
+ `UIImagePickerController` the view controller will be presented for you
+ and the returned promise will resolve with the media the user selected.
+
+    [self promiseViewController:[MFMailComposeViewController new] animated:YES completion:nil].then(^{
+        //…
+    });
+
+ Otherwise PromiseKit expects your view controller to implement a
+ `promise` property. This promise will be returned from this method and
+ presentation and dismissal of the presented view controller will be
+ managed for you.
+ 
+    @interface MyViewController: UIViewController
+    @property (readonly) AnyPromise *promise;
+    @end
+
+    @implementation MyViewController {
+        PMKResolver resolve;
+    }
+ 
+    - (void)viewDidLoad {
+        _promise = [[AnyPromise alloc] initWithResolver:&resolve];
+    }
+ 
+    - (void)later {
+        resolve(@"some fulfilled value");
+    }
+
+    @end
+
+ 
+
+    [self promiseViewController:[MyViewController new] aniamted:YES completion:nil].then(^(id value){
+        // value == @"some fulfilled value"
+    });
+
+ @return A promise that can be resolved by the presented view controller.
+*/
+- (AnyPromise *)promiseViewController:(UIViewController *)vc animated:(BOOL)animated completion:(void (^)(void))block;
+
+@end
+
+
+
+@interface UIViewController (PMKUnavailable)
+
+#define PMKRationale \
+    "The promiseViewController system has been rennovated: the fullfil and " \
+    "reject category methods have been removed due to runtime safety " \
+    "concerns and instead you should implement a -promise property on your " \
+    "view controller subclass. @see promiseViewController:animated:completion:"
+
+- (void)fulfill:(id)value __attribute__((unavailable(PMKRationale)));
+- (void)reject:(NSError *)value __attribute__((unavailable(PMKRationale)));
+
+#undef PMKRationale
+
+@end
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIViewController+AnyPromise.m b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIViewController+AnyPromise.m
new file mode 100644
index 00000000000..3dede063bfc
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIViewController+AnyPromise.m
@@ -0,0 +1,130 @@
+#import <PromiseKit/PromiseKit.h>
+#import <UIKit/UINavigationController.h>
+#import <UIKit/UIImagePickerController.h>
+#import "UIViewController+AnyPromise.h"
+
+@interface PMKGenericDelegate : NSObject <UIImagePickerControllerDelegate, UINavigationControllerDelegate> {
+@public
+    PMKResolver resolve;
+}
++ (instancetype)delegateWithPromise:(AnyPromise **)promise;
+@end
+
+
+@implementation UIViewController (PromiseKit)
+
+- (AnyPromise *)promiseViewController:(UIViewController *)vc animated:(BOOL)animated completion:(void (^)(void))block
+{
+    id vc2present = vc;
+    AnyPromise *promise = nil;
+
+    if ([vc isKindOfClass:NSClassFromString(@"MFMailComposeViewController")]) {
+        PMKGenericDelegate *delegate = [PMKGenericDelegate delegateWithPromise:&promise];
+        [vc setValue:delegate forKey:@"mailComposeDelegate"];
+    }
+    else if ([vc isKindOfClass:NSClassFromString(@"MFMessageComposeViewController")]) {
+        PMKGenericDelegate *delegate = [PMKGenericDelegate delegateWithPromise:&promise];
+        [vc setValue:delegate forKey:@"messageComposeDelegate"];
+    }
+    else if ([vc isKindOfClass:NSClassFromString(@"UIImagePickerController")]) {
+        PMKGenericDelegate *delegate = [PMKGenericDelegate delegateWithPromise:&promise];
+        ((UIImagePickerController *)vc).delegate = delegate;
+    }
+    else if ([vc isKindOfClass:NSClassFromString(@"SLComposeViewController")]) {
+        PMKResolver resolve;
+        promise = [[AnyPromise alloc] initWithResolver:&resolve];
+        [vc setValue:^(NSInteger result){
+            if (result == 0) {
+                resolve([NSError cancelledError]);
+            } else {
+                resolve(@(result));
+            }
+        } forKey:@"completionHandler"];
+    }
+    else if ([vc isKindOfClass:[UINavigationController class]])
+        vc = [(id)vc viewControllers].firstObject;
+
+    if (!vc) {
+        id userInfo = @{NSLocalizedDescriptionKey: @"nil or effective nil passed to promiseViewController"};
+        id err = [NSError errorWithDomain:PMKErrorDomain code:PMKInvalidUsageError userInfo:userInfo];
+        return [AnyPromise promiseWithValue:err];
+    }
+
+    if (!promise) {
+        if (![vc respondsToSelector:NSSelectorFromString(@"promise")]) {
+            id userInfo = @{NSLocalizedDescriptionKey: @"ViewController is not promisable"};
+            id err = [NSError errorWithDomain:PMKErrorDomain code:PMKInvalidUsageError userInfo:userInfo];
+            return [AnyPromise promiseWithValue:err];
+        }
+
+        promise = [vc valueForKey:@"promise"];
+
+        if (![promise isKindOfClass:[AnyPromise class]]) {
+            id userInfo = @{NSLocalizedDescriptionKey: @"The promise property is nil or not of type AnyPromise"};
+            id err = [NSError errorWithDomain:PMKErrorDomain code:PMKInvalidUsageError userInfo:userInfo];
+            return [AnyPromise promiseWithValue:err];
+        }
+    }
+
+    if (!promise.pending)
+        return promise;
+
+    [self presentViewController:vc2present animated:animated completion:block];
+
+    promise.finally(^{
+        //TODO can we be more specific?
+        [self dismissViewControllerAnimated:animated completion:nil];
+    });
+
+    return promise;
+}
+
+@end
+
+
+
+@implementation PMKGenericDelegate {
+    id retainCycle;
+}
+
++ (instancetype)delegateWithPromise:(AnyPromise **)promise; {
+    PMKGenericDelegate *d = [PMKGenericDelegate new];
+    d->retainCycle = d;
+    *promise = [[AnyPromise alloc] initWithResolver:&d->resolve];
+    return d;
+}
+
+- (void)mailComposeController:(id)controller didFinishWithResult:(int)result error:(NSError *)error {
+    if (error != nil) {
+        resolve(error);
+    } else if (result == 0) {
+        resolve([NSError cancelledError]);
+    } else {
+        resolve(@(result));
+    }
+    retainCycle = nil;
+}
+
+- (void)messageComposeViewController:(id)controller didFinishWithResult:(int)result {
+    if (result == 2) {
+        id userInfo = @{NSLocalizedDescriptionKey: @"The user’s attempt to save or send the message was unsuccessful."};
+        id error = [NSError errorWithDomain:PMKErrorDomain code:PMKOperationFailed userInfo:userInfo];
+        resolve(error);
+    } else {
+        resolve(@(result));
+    }
+    retainCycle = nil;
+}
+
+- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info {
+    id img = info[UIImagePickerControllerEditedImage] ?: info[UIImagePickerControllerOriginalImage];
+    resolve(PMKManifold(img, info));
+    retainCycle = nil;
+}
+
+- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker {
+    resolve([NSError cancelledError]);
+    retainCycle = nil;
+}
+
+@end
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIViewController+Promise.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIViewController+Promise.swift
new file mode 100644
index 00000000000..1277560d571
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIViewController+Promise.swift
@@ -0,0 +1,136 @@
+import Foundation.NSError
+import UIKit
+#if !COCOAPODS
+import PromiseKit
+#endif
+
+/**
+ To import this `UIViewController` category:
+
+    use_frameworks!
+    pod "PromiseKit/UIKit"
+
+ Or `UIKit` is one of the categories imported by the umbrella pod:
+
+    use_frameworks!
+    pod "PromiseKit"
+
+ And then in your sources:
+
+    import PromiseKit
+*/
+extension UIViewController {
+
+    public enum Error: ErrorType {
+        case NavigationControllerEmpty
+        case NoImageFound
+        case NotPromisable
+        case NotGenericallyPromisable
+        case NilPromisable
+    }
+
+    public func promiseViewController<T>(vc: UIViewController, animated: Bool = true, completion: (() -> Void)? = nil) -> Promise<T> {
+
+        let p: Promise<T> = promise(vc)
+        if p.pending {
+            presentViewController(vc, animated: animated, completion: completion)
+            p.always {
+                self.dismissViewControllerAnimated(animated, completion: nil)
+            }
+        }
+
+        return p
+    }
+    
+    public func promiseViewController<T>(nc: UINavigationController, animated: Bool = true, completion:(()->Void)? = nil) -> Promise<T> {
+        if let vc = nc.viewControllers.first {
+            let p: Promise<T> = promise(vc)
+            if p.pending {
+                presentViewController(nc, animated: animated, completion: completion)
+                p.always {
+                    self.dismissViewControllerAnimated(animated, completion: nil)
+                }
+            }
+            return p
+        } else {
+            return Promise(error: Error.NavigationControllerEmpty)
+        }
+    }
+
+    public func promiseViewController(vc: UIImagePickerController, animated: Bool = true, completion: (() -> Void)? = nil) -> Promise<UIImage> {
+        let proxy = UIImagePickerControllerProxy()
+        vc.delegate = proxy
+        vc.mediaTypes = ["public.image"]  // this promise can only resolve with a UIImage
+        presentViewController(vc, animated: animated, completion: completion)
+        return proxy.promise.then(on: zalgo) { info -> UIImage in
+            if let img = info[UIImagePickerControllerEditedImage] as? UIImage {
+                return img
+            }
+            if let img = info[UIImagePickerControllerOriginalImage] as? UIImage {
+                return img
+            }
+            throw Error.NoImageFound
+        }.always {
+            self.dismissViewControllerAnimated(animated, completion: nil)
+        }
+    }
+}
+
+@objc public protocol Promisable {
+    /**
+    Provide a promise for promiseViewController here.
+
+    The resulting property must be annotated with @objc.
+
+    Obviously return a Promise<T>. There is an issue with generics and Swift and
+    protocols currently so we couldn't specify that.
+    */
+    var promise: AnyObject! { get }
+}
+
+private func promise<T>(vc: UIViewController) -> Promise<T> {
+    if !vc.conformsToProtocol(Promisable) {
+        return Promise(error: UIViewController.Error.NotPromisable)
+    } else if let promise = vc.valueForKeyPath("promise") as? Promise<T> {
+        return promise
+    } else if let _: AnyObject = vc.valueForKeyPath("promise") {
+        return Promise(error: UIViewController.Error.NotGenericallyPromisable)
+    } else {
+        return Promise(error: UIViewController.Error.NilPromisable)
+    }
+}
+
+
+// internal scope because used by ALAssetsLibrary extension
+@objc class UIImagePickerControllerProxy: NSObject, UIImagePickerControllerDelegate, UINavigationControllerDelegate {
+    let (promise, fulfill, reject) = Promise<[NSObject : AnyObject]>.pendingPromise()
+    var retainCycle: AnyObject?
+
+    required override init() {
+        super.init()
+        retainCycle = self
+    }
+
+    func imagePickerController(picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [String : AnyObject]) {
+        fulfill(info)
+        retainCycle = nil
+    }
+
+    func imagePickerControllerDidCancel(picker: UIImagePickerController) {
+        reject(UIImagePickerController.Error.Cancelled)
+        retainCycle = nil
+    }
+}
+
+
+extension UIImagePickerController {
+    public enum Error: CancellableErrorType {
+        case Cancelled
+
+        public var cancelled: Bool {
+            switch self {
+                case .Cancelled: return true
+            }
+        }
+    }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/README.markdown b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/README.markdown
new file mode 100644
index 00000000000..30dba5f10be
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/README.markdown
@@ -0,0 +1,120 @@
+![PromiseKit](http://methylblue.com/junk/PMKBanner.png)
+
+Modern development is highly asynchronous: isn’t it about time we had tools that made programming asynchronously powerful, easy and delightful?
+
+```swift
+UIApplication.sharedApplication().networkActivityIndicatorVisible = true
+
+when(fetchImage(), getLocation()).then { image, location in
+    self.imageView.image = image;
+    self.label.text = "Buy your cat a house in \(location)"
+}.always {
+    UIApplication.sharedApplication().networkActivityIndicatorVisible = false
+}.error { error in
+    UIAlertView(…).show()
+}
+```
+
+PromiseKit is a thoughtful and complete implementation of promises for iOS and OS X with first-class support for **both** Objective-C *and* Swift.
+
+[![Join the chat at https://gitter.im/mxcl/PromiseKit](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mxcl/PromiseKit?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) ![](https://img.shields.io/cocoapods/v/PromiseKit.svg?label=Current%20Release)  [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg)](https://github.com/Carthage/Carthage)
+
+
+# Which PromiseKit Should I Use?
+
+If you are writing a library, **use PromiseKit 1.6**. This is because PromiseKit > 2 breaks everytime Swift changes. While Swift is in flux it is not feasible to depend on a library that will break every time Xcode updates.
+
+If you are making an app then PromiseKit 3 is the best PromiseKit, you may have to make some fixes when Xcode updates, but probably you will be OK as long as you update PromiseKit when Xcode updates.
+
+PromiseKit 1 and 3 can be installed in parallel if necessary, but CocoaPods will not support this.
+
+Once Swift becomes ABI or API stable we can all just move to the latest PromiseKit.
+
+Thus we intend to support PromiseKit 1.x for longer than expected.
+
+
+# PromiseKit 3
+
+In Swift 2.0 `catch` and `defer` became reserved keywords mandating we rename our functions with these names. This forced a major semantic version change on PromiseKit and thus we took the opportunity to make other minor (source compatability breaking) improvements.
+
+Thus if you cannot afford to adapt to PromiseKit 3 but still want to use Xcode-7.0/Swift-2.0 we provide a [minimal changes branch] where `catch` and `defer` are renamed `catch_` and `defer_` and all other changes are the bare minimum to make PromiseKit 2 compile against Swift 2.
+
+If you still are using Xcode 6 and Swift 1.2 then use PromiseKit 2.
+
+[minimal changes branch]: https://github.com/mxcl/PromiseKit/tree/swift-2.0-minimal-changes
+
+# PromiseKit 2
+
+PromiseKit 2 contains many interesting and important additions. Check out our our [release announcement](http://promisekit.org/PromiseKit-2.0-Released) for full details.
+
+# PromiseKit 1
+
+The original, nice to use with Objective-C, less nice to use with Swift, hence PromiseKit 2.
+
+
+# How To Get Started
+
+* Check out the complete, comprehensive [PromiseKit documentation](http://promisekit.org).
+* Read the [API documentation](http://cocoadocs.org/docsets/PromiseKit/), (note the documentation is not 100% currently as CocoaDocs is not good with Swift, you may have better luck reading the comments in the sources).
+* [Integrate](http://promisekit.org/getting-started) promises into your existing projects.
+
+## Quick Start Guide
+
+### CocoaPods
+
+```ruby
+use_frameworks!
+
+pod "PromiseKit", "~> 2.0"
+```
+
+### Carthage
+```ruby
+github "mxcl/PromiseKit" ~> 2.0
+```
+
+*Note*: In order to avoid linking nearly all system frameworks with PromiseKit, the convenience categories have not been included with the Carthage framework . You must manually copy the categories you need in from the Carthage checkout.
+
+### Standalone Distributions
+
+* [iOS 8 & OS X 10.9  Frameworks](https://github.com/mxcl/PromiseKit/releases/download/2.2.2/PromiseKit-2.2.2.zip) (Binaries)
+
+*Please note*, the preferred way to integrate PromiseKit is CocoaPods or Carthage.
+
+###  iOS 7 And Below
+
+Neither CocoaPods or Carthage will install PromiseKit 2 for an iOS 7 target. Your options are:
+
+ 1. `pod "PromiseKit", "~> 1.5"` †‡
+ 2. Use our [iOS 7 EZ-Bake](https://github.com/PromiseKit/EZiOS7)
+ 3. Download our pre-built static framework (coming soon!)
+
+† There is no Swift support with PromiseKit 1.x installed via CocoaPods.<br>‡ PromiseKit 1.x will work as far back as iOS 5 if required.
+
+
+# Donations
+
+PromiseKit is hundreds of hours of work almost completely by just me: [Max Howell](https://twitter.com/mxcl). I thoroughly enjoyed making PromiseKit, but nevertheless if you have found it useful then your bitcoin will give me a warm fuzzy feeling from my head right down to my toes: 1JDbV5zuym3jFw4kBCc5Z758maUD8e4dKR.
+
+
+# License
+
+Copyright 2015, Max Howell; <mxcl@me.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise+Private.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise+Private.h
new file mode 100644
index 00000000000..77376cc1c8c
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise+Private.h
@@ -0,0 +1,47 @@
+@import Foundation.NSError;
+@import Foundation.NSPointerArray;
+
+#if TARGET_OS_IPHONE
+    #define NSPointerArrayMake(N) ({ \
+        NSPointerArray *aa = [NSPointerArray strongObjectsPointerArray]; \
+        aa.count = N; \
+        aa; \
+    })
+#else
+    static inline NSPointerArray * __nonnull NSPointerArrayMake(NSUInteger count) {
+      #pragma clang diagnostic push
+      #pragma clang diagnostic ignored "-Wdeprecated-declarations"
+        NSPointerArray *aa = [[NSPointerArray class] respondsToSelector:@selector(strongObjectsPointerArray)]
+            ? [NSPointerArray strongObjectsPointerArray]
+            : [NSPointerArray pointerArrayWithStrongObjects];
+      #pragma clang diagnostic pop
+        aa.count = count;
+        return aa;
+    }
+#endif
+
+#define IsError(o) [o isKindOfClass:[NSError class]]
+#define IsPromise(o) [o isKindOfClass:[AnyPromise class]]
+
+#import "AnyPromise.h"
+
+@interface AnyPromise (Swift)
+- (void)pipe:(void (^ __nonnull)(id __nonnull))body;
+- (AnyPromise * __nonnull)initWithBridge:(void (^ __nonnull)(PMKResolver __nonnull))resolver;
+@end
+
+extern NSError * __nullable PMKProcessUnhandledException(id __nonnull thrown);
+
+// TODO really this is not valid, we should instead nest the errors with NSUnderlyingError
+// since a special error subclass may be being used and we may not set it up correctly
+// with our copy
+#define NSErrorSupplement(_err, supplements) ({ \
+    NSError *err = _err; \
+    id userInfo = err.userInfo.mutableCopy ?: [NSMutableArray new]; \
+    [userInfo addEntriesFromDictionary:supplements]; \
+    [[[err class] alloc] initWithDomain:err.domain code:err.code userInfo:userInfo]; \
+})
+
+@interface NSError (PMKUnhandledErrorHandler)
+- (void)pmk_consume;
+@end
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise.h
new file mode 100644
index 00000000000..5a76d4d7147
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise.h
@@ -0,0 +1,268 @@
+#import <dispatch/object.h>
+#import <dispatch/queue.h>
+#import <Foundation/NSObject.h>
+#import "Umbrella.h"
+
+typedef void (^PMKResolver)(id __nullable);
+
+typedef NS_ENUM(NSInteger, PMKCatchPolicy) {
+    PMKCatchPolicyAllErrors,
+    PMKCatchPolicyAllErrorsExceptCancellation
+};
+
+
+/**
+ @see AnyPromise.swift
+*/
+@interface AnyPromise (objc)
+
+/**
+ The provided block is executed when its receiver is resolved.
+
+ If you provide a block that takes a parameter, the value of the receiver will be passed as that parameter.
+
+ @param block The block that is executed when the receiver is resolved.
+
+    [NSURLConnection GET:url].then(^(NSData *data){
+        // do something with data
+    });
+
+ @return A new promise that is resolved with the value returned from the provided block. For example:
+
+    [NSURLConnection GET:url].then(^(NSData *data){
+        return data.length;
+    }).then(^(NSNumber *number){
+        //…
+    });
+
+ @warning *Important* The block passed to `then` may take zero, one, two or three arguments, and return an object or return nothing. This flexibility is why the method signature for then is `id`, which means you will not get completion for the block parameter, and must type it yourself. It is safe to type any block syntax here, so to start with try just: `^{}`.
+
+ @warning *Important* If an exception is thrown inside your block, or you return an `NSError` object the next `Promise` will be rejected. See `catch` for documentation on error handling.
+
+ @warning *Important* `then` is always executed on the main queue.
+
+ @see thenOn
+ @see thenInBackground
+*/
+- (AnyPromise * __nonnull (^ __nonnull)(id __nonnull))then;
+
+
+/**
+ The provided block is executed on the default queue when the receiver is fulfilled.
+
+ This method is provided as a convenience for `thenOn`.
+
+ @see then
+ @see thenOn
+*/
+- (AnyPromise * __nonnull(^ __nonnull)(id __nonnull))thenInBackground;
+
+/**
+ The provided block is executed on the dispatch queue of your choice when the receiver is fulfilled.
+
+ @see then
+ @see thenInBackground
+*/
+- (AnyPromise * __nonnull(^ __nonnull)(dispatch_queue_t __nonnull, id __nonnull))thenOn;
+
+#ifndef __cplusplus
+/**
+ The provided block is executed when the receiver is rejected.
+
+ Provide a block of form `^(NSError *){}` or simply `^{}`. The parameter has type `id` to give you the freedom to choose either.
+
+ The provided block always runs on the main queue.
+ 
+ @warning *Note* Cancellation errors are not caught.
+ 
+ @warning *Note* Since catch is a c++ keyword, this method is not availble in Objective-C++ files. Instead use catchWithPolicy.
+
+ @see catchWithPolicy
+*/
+- (AnyPromise * __nonnull(^ __nonnull)(id __nonnull))catch;
+#endif
+
+/**
+ The provided block is executed when the receiver is rejected with the specified policy.
+
+ @param policy The policy with which to catch. Either for all errors, or all errors *except* cancellation errors.
+
+ @see catch
+*/
+- (AnyPromise * __nonnull(^ __nonnull)(PMKCatchPolicy, id __nonnull))catchWithPolicy;
+
+/**
+ The provided block is executed when the receiver is resolved.
+
+ The provided block always runs on the main queue.
+
+ @see finallyOn
+*/
+- (AnyPromise * __nonnull(^ __nonnull)(dispatch_block_t __nonnull))finally;
+
+/**
+ The provided block is executed on the dispatch queue of your choice when the receiver is resolved.
+
+ @see finally
+ */
+- (AnyPromise * __nonnull(^ __nonnull)(dispatch_queue_t __nonnull, dispatch_block_t __nonnull))finallyOn;
+
+/**
+ The value of the asynchronous task this promise represents.
+
+ A promise has `nil` value if the asynchronous task it represents has not
+ finished. If the value is `nil` the promise is still `pending`.
+
+ @warning *Note* Our Swift variant’s value property returns nil if the
+ promise is rejected where AnyPromise will return the error object. This
+ fits with the pattern where AnyPromise is not strictly typed and is more
+ dynamic, but you should be aware of the distinction.
+
+ @return If `resolved`, the object that was used to resolve this promise;
+ if `pending`, nil.
+*/
+- (id __nullable)value;
+
+/**
+ Creates a resolved promise.
+
+ When developing your own promise systems, it is ocassionally useful to be able to return an already resolved promise.
+
+ @param value The value with which to resolve this promise. Passing an `NSError` will cause the promise to be rejected, otherwise the promise will be fulfilled.
+
+ @return A resolved promise.
+*/
++ (instancetype __nonnull)promiseWithValue:(id __nullable)value;
+
+/**
+ Create a new promise that resolves with the provided block.
+
+ Use this method when wrapping asynchronous code that does *not* use
+ promises so that this code can be used in promise chains.
+ 
+ If `resolve` is called with an `NSError` object, the promise is
+ rejected, otherwise the promise is fulfilled.
+
+ Don’t use this method if you already have promises! Instead, just
+ return your promise.
+
+ Should you need to fulfill a promise but have no sensical value to use:
+ your promise is a `void` promise: fulfill with `nil`.
+
+ The block you pass is executed immediately on the calling thread.
+
+ @param block The provided block is immediately executed, inside the block
+ call `resolve` to resolve this promise and cause any attached handlers to
+ execute. If you are wrapping a delegate-based system, we recommend
+ instead to use: initWithResolver:
+
+ @return A new promise.
+ 
+ @warning *Important* Resolving a promise with `nil` fulfills it.
+
+ @see http://promisekit.org/sealing-your-own-promises/
+ @see http://promisekit.org/wrapping-delegation/
+*/
++ (instancetype __nonnull)promiseWithResolverBlock:(void (^ __nonnull)(PMKResolver __nonnull resolve))resolverBlock;
+
+/**
+ Create a new promise with an associated resolver.
+
+ Use this method when wrapping asynchronous code that does *not* use
+ promises so that this code can be used in promise chains. Generally,
+ prefer resolverWithBlock: as the resulting code is more elegant.
+
+    PMKResolver resolve;
+    AnyPromise *promise = [[AnyPromise alloc] initWithResolver:&resolve];
+
+    // later
+    resolve(@"foo");
+
+ @param resolver A reference to a block pointer of PMKResolver type.
+ You can then call your resolver to resolve this promise.
+
+ @return A new promise.
+
+ @warning *Important* The resolver strongly retains the promise.
+
+ @see promiseWithResolverBlock:
+*/
+- (instancetype __nonnull)initWithResolver:(PMKResolver __strong __nonnull * __nonnull)resolver;
+
+@end
+
+
+
+@interface AnyPromise (Unavailable)
+
+- (instancetype __nonnull)init __attribute__((unavailable("It is illegal to create an unresolvable promise.")));
++ (instancetype __nonnull)new __attribute__((unavailable("It is illegal to create an unresolvable promise.")));
+
+@end
+
+
+
+typedef void (^PMKAdapter)(id __nullable, NSError * __nullable);
+typedef void (^PMKIntegerAdapter)(NSInteger, NSError * __nullable);
+typedef void (^PMKBooleanAdapter)(BOOL, NSError * __nullable);
+
+@interface AnyPromise (Adapters)
+
+/**
+ Create a new promise by adapting an existing asynchronous system.
+
+ The pattern of a completion block that passes two parameters, the first
+ the result and the second an `NSError` object is so common that we
+ provide this convenience adapter to make wrapping such systems more
+ elegant.
+
+    return [PMKPromise promiseWithAdapterBlock:^(PMKAdapter adapter){
+        PFQuery *query = [PFQuery …];
+        [query findObjectsInBackgroundWithBlock:adapter];
+    }];
+
+ @warning *Important* If both parameters are nil, the promise fulfills,
+ if both are non-nil the promise rejects. This is per the convention.
+
+ @see http://promisekit.org/sealing-your-own-promises/
+ */
++ (instancetype __nonnull)promiseWithAdapterBlock:(void (^ __nonnull)(PMKAdapter __nonnull adapter))block;
+
+/**
+ Create a new promise by adapting an existing asynchronous system.
+
+ Adapts asynchronous systems that complete with `^(NSInteger, NSError *)`.
+ NSInteger will cast to enums provided the enum has been wrapped with
+ `NS_ENUM`. All of Apple’s enums are, so if you find one that hasn’t you
+ may need to make a pull-request.
+
+ @see promiseWithAdapter
+ */
++ (instancetype __nonnull)promiseWithIntegerAdapterBlock:(void (^ __nonnull)(PMKIntegerAdapter __nonnull adapter))block;
+
+/**
+ Create a new promise by adapting an existing asynchronous system.
+
+ Adapts asynchronous systems that complete with `^(BOOL, NSError *)`.
+
+ @see promiseWithAdapter
+ */
++ (instancetype __nonnull)promiseWithBooleanAdapterBlock:(void (^ __nonnull)(PMKBooleanAdapter __nonnull adapter))block;
+
+@end
+
+
+
+/**
+ Whenever resolving a promise you may resolve with a tuple, eg.
+ returning from a `then` or `catch` handler or resolving a new promise.
+
+ Consumers of your Promise are not compelled to consume any arguments and
+ in fact will often only consume the first parameter. Thus ensure the
+ order of parameters is: from most-important to least-important.
+
+ Currently PromiseKit limits you to THREE parameters to the manifold.
+*/
+#define PMKManifold(...) __PMKManifold(__VA_ARGS__, 3, 2, 1)
+#define __PMKManifold(_1, _2, _3, N, ...) __PMKArrayWithCount(N, _1, _2, _3)
+extern id __nonnull __PMKArrayWithCount(NSUInteger, ...);
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise.m b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise.m
new file mode 100644
index 00000000000..bcda12caba8
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise.m
@@ -0,0 +1,154 @@
+#import "AnyPromise.h"
+#import "AnyPromise+Private.h"
+@import Foundation.NSKeyValueCoding;
+#import "PMKCallVariadicBlock.m"
+
+NSString *const PMKErrorDomain = @"PMKErrorDomain";
+
+
+@implementation AnyPromise (objc)
+
+- (instancetype)initWithResolver:(PMKResolver __strong *)resolver {
+    return [self initWithBridge:^(PMKResolver resolve){
+        *resolver = resolve;
+    }];
+}
+
++ (instancetype)promiseWithResolverBlock:(void (^)(PMKResolver))resolveBlock {
+    return [[self alloc] initWithBridge:resolveBlock];
+}
+
++ (instancetype)promiseWithValue:(id)value {
+    return [[self alloc] initWithBridge:^(PMKResolver resolve){
+        resolve(value);
+    }];
+}
+
+static inline AnyPromise *AnyPromiseWhen(AnyPromise *when, void(^then)(id, PMKResolver)) {
+    return [[AnyPromise alloc] initWithBridge:^(PMKResolver resolve){
+        [when pipe:^(id obj){
+            then(obj, resolve);
+        }];
+    }];
+}
+
+static inline AnyPromise *__then(AnyPromise *self, dispatch_queue_t queue, id block) {
+    return AnyPromiseWhen(self, ^(id obj, PMKResolver resolve) {
+        if (IsError(obj)) {
+            resolve(obj);
+        } else dispatch_async(queue, ^{
+            resolve(PMKCallVariadicBlock(block, obj));
+        });
+    });
+}
+
+- (AnyPromise *(^)(id))then {
+    return ^(id block) {
+        return __then(self, dispatch_get_main_queue(), block);
+    };
+}
+
+- (AnyPromise *(^)(dispatch_queue_t, id))thenOn {
+    return ^(dispatch_queue_t queue, id block) {
+        return __then(self, queue, block);
+    };
+}
+
+- (AnyPromise *(^)(id))thenInBackground {
+    return ^(id block) {
+        return __then(self, dispatch_get_global_queue(0, 0), block);
+    };
+}
+
+static inline AnyPromise *__catch(AnyPromise *self, BOOL includeCancellation, id block) {
+    return AnyPromiseWhen(self, ^(id obj, PMKResolver resolve) {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            if (IsError(obj) && (includeCancellation || ![obj cancelled])) {
+                [obj pmk_consume];
+                resolve(PMKCallVariadicBlock(block, obj));
+            } else {
+                resolve(obj);
+            }
+        });
+    });
+}
+
+- (AnyPromise *(^)(id))catch {
+    return ^(id block) {
+        return __catch(self, NO, block);
+    };
+}
+
+- (AnyPromise *(^)(PMKCatchPolicy, id))catchWithPolicy {
+    return ^(PMKCatchPolicy policy, id block) {
+        return __catch(self, policy == PMKCatchPolicyAllErrors, block);
+    };
+}
+
+static inline AnyPromise *__finally(AnyPromise *self, dispatch_queue_t queue, dispatch_block_t block) {
+    return AnyPromiseWhen(self, ^(id obj, PMKResolver resolve) {
+        dispatch_async(queue, ^{
+            block();
+            resolve(obj);
+        });
+    });
+}
+
+- (AnyPromise *(^)(dispatch_block_t))finally {
+    return ^(dispatch_block_t block) {
+        return __finally(self, dispatch_get_main_queue(), block);
+    };
+}
+
+- (AnyPromise *(^)(dispatch_queue_t, dispatch_block_t))finallyOn {
+    return ^(dispatch_queue_t queue, dispatch_block_t block) {
+        return __finally(self, queue, block);
+    };
+}
+
+- (id)value {
+    id result = [self valueForKey:@"__value"];
+    return [result isKindOfClass:[PMKArray class]]
+        ? result[0]
+        : result;
+}
+
+@end
+
+
+
+@implementation AnyPromise (Adapters)
+
++ (instancetype)promiseWithAdapterBlock:(void (^)(PMKAdapter))block {
+    return [self promiseWithResolverBlock:^(PMKResolver resolve) {
+        block(^(id value, id error){
+            resolve(error ?: value);
+        });
+    }];
+}
+
++ (instancetype)promiseWithIntegerAdapterBlock:(void (^)(PMKIntegerAdapter))block {
+    return [self promiseWithResolverBlock:^(PMKResolver resolve) {
+        block(^(NSInteger value, id error){
+            if (error) {
+                resolve(error);
+            } else {
+                resolve(@(value));
+            }
+        });
+    }];
+}
+
++ (instancetype)promiseWithBooleanAdapterBlock:(void (^)(PMKBooleanAdapter adapter))block {
+    return [self promiseWithResolverBlock:^(PMKResolver resolve) {
+        block(^(BOOL value, id error){
+            if (error) {
+                resolve(error);
+            } else {
+                resolve(@(value));
+            }
+        });
+    }];
+}
+
+@end
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise.swift
new file mode 100644
index 00000000000..e672d5ecd85
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise.swift
@@ -0,0 +1,233 @@
+import Foundation.NSError
+
+@objc(AnyPromise) public class AnyPromise: NSObject {
+
+    private var state: State
+
+    /**
+     - Returns: A new AnyPromise bound to a Promise<T?>.
+     The two promises represent the same task, any changes to either will instantly reflect on both.
+    */
+    public init<T: AnyObject>(bound: Promise<T?>) {
+        var resolve: ((AnyObject?) -> Void)!
+        state = State(resolver: &resolve)
+        bound.pipe { resolution in
+            switch resolution {
+            case .Fulfilled(let value):
+                resolve(value)
+            case .Rejected(let error, let token):
+                let nserror = error as NSError
+                unconsume(error: nserror, reusingToken: token)
+                resolve(nserror)
+            }
+        }
+    }
+
+    /**
+     - Returns: A new AnyPromise bound to a Promise<T>.
+     The two promises represent the same task, any changes to either will instantly reflect on both.
+    */
+    convenience public init<T: AnyObject>(bound: Promise<T>) {
+        // FIXME efficiency. Allocating the extra promise for conversion sucks.
+        self.init(bound: bound.then(on: zalgo){ Optional.Some($0) })
+    }
+
+    /**
+     - Returns: A new `AnyPromise` bound to a `Promise<[T]>`.
+     The two promises represent the same task, any changes to either will instantly reflect on both.
+     The value is converted to an NSArray so Objective-C can use it.
+    */
+    convenience public init<T: AnyObject>(bound: Promise<[T]>) {
+        self.init(bound: bound.then(on: zalgo) { NSArray(array: $0) })
+    }
+
+    /**
+     - Returns: A new AnyPromise bound to a `Promise<[T:U]>`.
+     The two promises represent the same task, any changes to either will instantly reflect on both.
+     The value is converted to an NSDictionary so Objective-C can use it.
+    */
+    convenience public init<T: AnyObject, U: AnyObject>(bound: Promise<[T:U]>) {
+        self.init(bound: bound.then(on: zalgo) { NSDictionary(dictionary: $0) })
+    }
+
+    /**
+     - Returns: A new AnyPromise bound to a `Promise<String>`.
+     The two promises represent the same task, any changes to either will instantly reflect on both.
+     The value is converted to an NSString so Objective-C can use it.
+     */
+    convenience public init(bound: Promise<String>) {
+        self.init(bound: bound.then(on: zalgo) { NSString(string: $0) })
+    }
+
+    /**
+     - Returns: A new AnyPromise bound to a `Promise<Int>`.
+     The two promises represent the same task, any changes to either will instantly reflect on both.
+     The value is converted to an NSNumber so Objective-C can use it.
+    */
+    convenience public init(bound: Promise<Int>) {
+        self.init(bound: bound.then(on: zalgo) { NSNumber(integer: $0) })
+    }
+
+    /**
+     - Returns: A new AnyPromise bound to a `Promise<Bool>`.
+     The two promises represent the same task, any changes to either will instantly reflect on both.
+     The value is converted to an NSNumber so Objective-C can use it.
+     */
+    convenience public init(bound: Promise<Bool>) {
+        self.init(bound: bound.then(on: zalgo) { NSNumber(bool: $0) })
+    }
+
+    /**
+     - Returns: A new AnyPromise bound to a `Promise<Void>`.
+     The two promises represent the same task, any changes to either will instantly reflect on both.
+    */
+    convenience public init(bound: Promise<Void>) {
+        self.init(bound: bound.then(on: zalgo) { Optional<AnyObject>.None })
+    }
+
+    @objc init(@noescape bridge: ((AnyObject?) -> Void) -> Void) {
+        var resolve: ((AnyObject?) -> Void)!
+        state = State(resolver: &resolve)
+        bridge { result in
+            if let next = result as? AnyPromise {
+                next.pipe(resolve)
+            } else {
+                resolve(result)
+            }
+        }
+    }
+
+    @objc func pipe(body: (AnyObject?) -> Void) {
+        state.get { seal in
+            switch seal {
+            case .Pending(let handlers):
+                handlers.append(body)
+            case .Resolved(let value):
+                body(value)
+            }
+        }
+    }
+
+    @objc var __value: AnyObject? {
+        return state.get() ?? nil
+    }
+
+    /**
+     A promise starts pending and eventually resolves.
+     - Returns: `true` if the promise has not yet resolved.
+    */
+    @objc public var pending: Bool {
+        return state.get() == nil
+    }
+
+    /**
+     A promise starts pending and eventually resolves.
+     - Returns: `true` if the promise has resolved.
+    */
+    @objc public var resolved: Bool {
+        return !pending
+    }
+
+    /**
+     A fulfilled promise has resolved successfully.
+     - Returns: `true` if the promise was fulfilled.
+    */
+    @objc public var fulfilled: Bool {
+        switch state.get() {
+        case .Some(let obj) where obj is NSError:
+            return false
+        case .Some:
+            return true
+        case .None:
+            return false
+        }
+    }
+
+    /**
+     A rejected promise has resolved without success.
+     - Returns: `true` if the promise was rejected.
+    */
+    @objc public var rejected: Bool {
+        switch state.get() {
+        case .Some(let obj) where obj is NSError:
+            return true
+        default:
+            return false
+        }
+    }
+
+    /**
+     Continue a Promise<T> chain from an AnyPromise.
+    */
+    public func then<T>(on q: dispatch_queue_t = dispatch_get_main_queue(), body: (AnyObject?) throws -> T) -> Promise<T> {
+        return Promise(sealant: { resolve in
+            pipe { object in
+                if let error = object as? NSError {
+                    resolve(.Rejected(error, error.token))
+                } else {
+                    contain_zalgo(q, rejecter: resolve) {
+                        resolve(.Fulfilled(try body(self.valueForKey("value"))))
+                    }
+                }
+            }
+        })
+    }
+
+    /**
+     Continue a Promise<T> chain from an AnyPromise.
+    */
+    public func then(on q: dispatch_queue_t = dispatch_get_main_queue(), body: (AnyObject?) -> AnyPromise) -> Promise<AnyObject?> {
+        return Promise { fulfill, reject in
+            pipe { object in
+                if let error = object as? NSError {
+                    reject(error)
+                } else {
+                    contain_zalgo(q) {
+                        body(object).pipe { object in
+                            if let error = object as? NSError {
+                                reject(error)
+                            } else {
+                                fulfill(object)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     Continue a Promise<T> chain from an AnyPromise.
+    */
+    public func then<T>(on q: dispatch_queue_t = dispatch_get_main_queue(), body: (AnyObject?) -> Promise<T>) -> Promise<T> {
+        return Promise(sealant: { resolve in
+            pipe { object in
+                if let error = object as? NSError {
+                    resolve(.Rejected(error, error.token))
+                } else {
+                    contain_zalgo(q) {
+                        body(object).pipe(resolve)
+                    }
+                }
+            }
+        })
+    }
+
+    private class State: UnsealedState<AnyObject?> {
+        required init(inout resolver: ((AnyObject?) -> Void)!) {
+            var preresolve: ((AnyObject?) -> Void)!
+            super.init(resolver: &preresolve)
+            resolver = { obj in
+                if let error = obj as? NSError { unconsume(error: error) }
+                preresolve(obj)
+            }
+        }
+    }
+}
+
+
+extension AnyPromise {
+    override public var description: String {
+        return "AnyPromise: \(state)"
+    }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/Error.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/Error.swift
new file mode 100644
index 00000000000..b07dc418158
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/Error.swift
@@ -0,0 +1,216 @@
+import Dispatch
+import Foundation.NSError
+import Foundation.NSURLError
+
+public enum Error: ErrorType {
+    /**
+     The ErrorType for a rejected `when`.
+     - Parameter 0: The index of the promise that was rejected.
+     - Parameter 1: The error from the promise that rejected this `when`.
+    */
+    case When(Int, ErrorType)
+
+    /**
+     The ErrorType for a rejected `join`.
+     - Parameter 0: The promises passed to this `join` that did not *all* fulfill.
+     - Note: The array is untyped because Swift generics are fussy with enums.
+    */
+    case Join([AnyObject])
+
+    /**
+     The closure with form (T?, ErrorType?) was called with (nil, nil)
+     This is invalid as per the calling convention.
+    */
+    case DoubleOhSux0r
+
+    /**
+     A handler returned its own promise. 99% of the time, this is likely a 
+     programming error. It is also invalid per Promises/A+.
+    */
+    case ReturnedSelf
+}
+
+public enum URLError: ErrorType {
+    /**
+     The URLRequest succeeded but a valid UIImage could not be decoded from
+     the data that was received.
+    */
+    case InvalidImageData(NSURLRequest, NSData)
+
+    /**
+     An NSError was received from an underlying Cocoa function.
+     FIXME sucks?
+    */
+    case UnderlyingCocoaError(NSURLRequest, NSData?, NSURLResponse?, NSError)
+
+    /**
+     The HTTP request returned a non-200 status code.
+    */
+    case BadResponse(NSURLRequest, NSData?, NSURLResponse?)
+
+    /**
+     The data could not be decoded using the encoding specified by the HTTP
+     response headers.
+    */
+    case StringEncoding(NSURLRequest, NSData, NSURLResponse)
+
+    /**
+     Usually the `NSURLResponse` is actually an `NSHTTPURLResponse`, if so you
+     can access it using this property. Since it is returned as an unwrapped
+     optional: be sure.
+    */
+    public var NSHTTPURLResponse: Foundation.NSHTTPURLResponse! {
+        switch self {
+        case .InvalidImageData:
+            return nil
+        case .UnderlyingCocoaError(_, _, let rsp, _):
+            return rsp as! Foundation.NSHTTPURLResponse
+        case .BadResponse(_, _, let rsp):
+            return rsp as! Foundation.NSHTTPURLResponse
+        case .StringEncoding(_, _, let rsp):
+            return rsp as! Foundation.NSHTTPURLResponse
+        }
+    }
+}
+
+public enum JSONError: ErrorType {
+    case UnexpectedRootNode(AnyObject)
+}
+
+
+//////////////////////////////////////////////////////////// Cancellation
+private struct ErrorPair: Hashable {
+    let domain: String
+    let code: Int
+    init(_ d: String, _ c: Int) {
+        domain = d; code = c
+    }
+    var hashValue: Int {
+        return "\(domain):\(code)".hashValue
+    }
+}
+
+private func ==(lhs: ErrorPair, rhs: ErrorPair) -> Bool {
+    return lhs.domain == rhs.domain && lhs.code == rhs.code
+}
+
+extension NSError {
+    @objc public class func cancelledError() -> NSError {
+        let info: [NSObject: AnyObject] = [NSLocalizedDescriptionKey: "The operation was cancelled"]
+        return NSError(domain: PMKErrorDomain, code: PMKOperationCancelled, userInfo: info)
+    }
+
+    /**
+      - Warning: You may only call this method on the main thread.
+     */
+    @objc public class func registerCancelledErrorDomain(domain: String, code: Int) {
+        cancelledErrorIdentifiers.insert(ErrorPair(domain, code))
+    }
+}
+
+public protocol CancellableErrorType: ErrorType {
+    var cancelled: Bool { get }
+}
+
+extension NSError: CancellableErrorType {
+    /**
+     - Warning: You may only call this method on the main thread.
+    */
+    @objc public var cancelled: Bool {
+        if !NSThread.isMainThread() {
+            NSLog("PromiseKit: Warning: `cancelled` called on background thread.")
+        }
+
+        return cancelledErrorIdentifiers.contains(ErrorPair(domain, code))
+    }
+}
+
+
+////////////////////////////////////////// Predefined Cancellation Errors
+private var cancelledErrorIdentifiers = Set([
+    ErrorPair(PMKErrorDomain, PMKOperationCancelled),
+    ErrorPair(NSURLErrorDomain, NSURLErrorCancelled)
+])
+
+extension NSURLError: CancellableErrorType {
+    public var cancelled: Bool {
+        return self == .Cancelled
+    }
+}
+
+
+//////////////////////////////////////////////////////// Unhandled Errors
+/**
+ The unhandled error handler.
+
+ If a promise is rejected and no catch handler is called in its chain,
+ the provided handler is called. The default handler logs the error.
+
+     PMKUnhandledErrorHandler = { error in
+         mylogf("Unhandled error: \(error)")
+     }
+
+ - Warning: *Important* The handler is executed on an undefined queue.
+ - Warning: *Important* Don’t use promises in your handler, or you risk an infinite error loop.
+ - Returns: The previous unhandled error handler.
+*/
+public var PMKUnhandledErrorHandler = { (error: ErrorType) -> Void in
+    dispatch_async(dispatch_get_main_queue()) {
+        let cancelled = (error as? CancellableErrorType)?.cancelled ?? false
+                                                       // ^-------^ must be called on main queue
+        if !cancelled {
+            NSLog("PromiseKit: Unhandled Error: %@", "\(error)")
+        }
+    }
+}
+
+class ErrorConsumptionToken {
+    var consumed = false
+    let error: ErrorType!
+
+    init(_ error: ErrorType) {
+        self.error = error
+    }
+
+    init(_ error: NSError) {
+        self.error = error.copy() as! NSError
+    }
+
+    deinit {
+        if !consumed {
+            PMKUnhandledErrorHandler(error)
+        }
+    }
+}
+
+private var handle: UInt8 = 0
+
+extension NSError {
+    @objc func pmk_consume() {
+        // The association could be nil if the objc_setAssociatedObject
+        // has taken a *really* long time. Or perhaps the user has
+        // overused `zalgo`. Thus we ignore it. This is an unlikely edge
+        // case and the unhandled-error feature is not mission-critical.
+
+        if let token = objc_getAssociatedObject(self, &handle) as? ErrorConsumptionToken {
+            token.consumed = true
+        }
+    }
+
+    var token: ErrorConsumptionToken! {
+        return objc_getAssociatedObject(self, &handle) as? ErrorConsumptionToken
+    }
+}
+
+func unconsume(error error: NSError, var reusingToken token: ErrorConsumptionToken? = nil) {
+    if token != nil {
+        objc_setAssociatedObject(error, &handle, token, .OBJC_ASSOCIATION_RETAIN)
+    } else {
+        token = objc_getAssociatedObject(error, &handle) as? ErrorConsumptionToken
+        if token == nil {
+            token = ErrorConsumptionToken(error)
+            objc_setAssociatedObject(error, &handle, token, .OBJC_ASSOCIATION_RETAIN)
+        }
+    }
+    token!.consumed = false
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/NSError+Cancellation.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/NSError+Cancellation.h
new file mode 100644
index 00000000000..99d1da6d7ab
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/NSError+Cancellation.h
@@ -0,0 +1,16 @@
+#import <Foundation/NSError.h>
+
+#if !defined(SWIFT_PASTE)
+# define SWIFT_PASTE_HELPER(x, y) x##y
+# define SWIFT_PASTE(x, y) SWIFT_PASTE_HELPER(x, y)
+#endif
+
+#if !defined(SWIFT_EXTENSION)
+# define SWIFT_EXTENSION(M) SWIFT_PASTE(M##_Swift_, __LINE__)
+#endif
+
+@interface NSError (SWIFT_EXTENSION(PromiseKit))
++ (NSError * __nonnull)cancelledError;
++ (void)registerCancelledErrorDomain:(NSString * __nonnull)domain code:(NSInteger)code;
+@property (nonatomic, readonly) BOOL cancelled;
+@end
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/NSMethodSignatureForBlock.m b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/NSMethodSignatureForBlock.m
new file mode 100644
index 00000000000..700c1b37ef7
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/NSMethodSignatureForBlock.m
@@ -0,0 +1,77 @@
+#import <Foundation/NSMethodSignature.h>
+
+struct PMKBlockLiteral {
+    void *isa; // initialized to &_NSConcreteStackBlock or &_NSConcreteGlobalBlock
+    int flags;
+    int reserved;
+    void (*invoke)(void *, ...);
+    struct block_descriptor {
+        unsigned long int reserved;	// NULL
+    	unsigned long int size;         // sizeof(struct Block_literal_1)
+        // optional helper functions
+    	void (*copy_helper)(void *dst, void *src);     // IFF (1<<25)
+    	void (*dispose_helper)(void *src);             // IFF (1<<25)
+        // required ABI.2010.3.16
+        const char *signature;                         // IFF (1<<30)
+    } *descriptor;
+    // imported variables
+};
+
+typedef NS_OPTIONS(NSUInteger, PMKBlockDescriptionFlags) {
+    PMKBlockDescriptionFlagsHasCopyDispose = (1 << 25),
+    PMKBlockDescriptionFlagsHasCtor = (1 << 26), // helpers have C++ code
+    PMKBlockDescriptionFlagsIsGlobal = (1 << 28),
+    PMKBlockDescriptionFlagsHasStret = (1 << 29), // IFF BLOCK_HAS_SIGNATURE
+    PMKBlockDescriptionFlagsHasSignature = (1 << 30)
+};
+
+// It appears 10.7 doesn't support quotes in method signatures. Remove them
+// via @rabovik's method. See https://github.com/OliverLetterer/SLObjectiveCRuntimeAdditions/pull/2
+#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_8
+NS_INLINE static const char * pmk_removeQuotesFromMethodSignature(const char *str){
+    char *result = malloc(strlen(str) + 1);
+    BOOL skip = NO;
+    char *to = result;
+    char c;
+    while ((c = *str++)) {
+        if ('"' == c) {
+            skip = !skip;
+            continue;
+        }
+        if (skip) continue;
+        *to++ = c;
+    }
+    *to = '\0';
+    return result;
+}
+#endif
+
+static NSMethodSignature *NSMethodSignatureForBlock(id block) {
+    if (!block)
+        return nil;
+
+    struct PMKBlockLiteral *blockRef = (__bridge struct PMKBlockLiteral *)block;
+    PMKBlockDescriptionFlags flags = (PMKBlockDescriptionFlags)blockRef->flags;
+
+    if (flags & PMKBlockDescriptionFlagsHasSignature) {
+        void *signatureLocation = blockRef->descriptor;
+        signatureLocation += sizeof(unsigned long int);
+        signatureLocation += sizeof(unsigned long int);
+
+        if (flags & PMKBlockDescriptionFlagsHasCopyDispose) {
+            signatureLocation += sizeof(void(*)(void *dst, void *src));
+            signatureLocation += sizeof(void (*)(void *src));
+        }
+
+        const char *signature = (*(const char **)signatureLocation);
+#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_8
+        signature = pmk_removeQuotesFromMethodSignature(signature);
+        NSMethodSignature *nsSignature = [NSMethodSignature signatureWithObjCTypes:signature];
+        free((void *)signature);
+
+        return nsSignature;
+#endif
+        return [NSMethodSignature signatureWithObjCTypes:signature];
+    }
+    return 0;
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/PMK.modulemap b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/PMK.modulemap
new file mode 100644
index 00000000000..7e55ef9dc2b
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/PMK.modulemap
@@ -0,0 +1,32 @@
+framework module PromiseKit {
+  umbrella header "Umbrella.h"
+
+  header "NSError+Cancellation.h"
+
+  exclude header "AnyPromise.h"
+  exclude header "PromiseKit.h"
+  exclude header "PMKPromise.h"
+  exclude header "Promise.h"
+
+  exclude header "Pods-PromiseKit-umbrella.h"
+
+  exclude header "ACAccountStore+AnyPromise.h"
+  exclude header "AVAudioSession+AnyPromise.h"
+  exclude header "CKContainer+AnyPromise.h"
+  exclude header "CKDatabase+AnyPromise.h"
+  exclude header "CLGeocoder+AnyPromise.h"
+  exclude header "CLLocationManager+AnyPromise.h"
+  exclude header "NSNotificationCenter+AnyPromise.h"
+  exclude header "NSTask+AnyPromise.h"
+  exclude header "NSURLConnection+AnyPromise.h"
+  exclude header "MKDirections+AnyPromise.h"
+  exclude header "MKMapSnapshotter+AnyPromise.h"
+  exclude header "CALayer+AnyPromise.h"
+  exclude header "SLRequest+AnyPromise.h"
+  exclude header "SKRequest+AnyPromise.h"
+  exclude header "SCNetworkReachability+AnyPromise.h"
+  exclude header "UIActionSheet+AnyPromise.h"
+  exclude header "UIAlertView+AnyPromise.h"
+  exclude header "UIView+AnyPromise.h"
+  exclude header "UIViewController+AnyPromise.h"
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/PMKCallVariadicBlock.m b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/PMKCallVariadicBlock.m
new file mode 100644
index 00000000000..a3d45113d42
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/PMKCallVariadicBlock.m
@@ -0,0 +1,145 @@
+#import <dispatch/once.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSError.h>
+#import <Foundation/NSException.h>
+#import "NSMethodSignatureForBlock.m"
+#import <PromiseKit/Umbrella.h>
+#import <PromiseKit/PromiseKit.h>
+#import <string.h>
+
+#ifndef PMKLog
+#define PMKLog NSLog
+#endif
+
+@interface PMKArray : NSObject {
+@public
+    id objs[3];
+    NSUInteger count;
+} @end
+
+@implementation PMKArray
+
+- (id)objectAtIndexedSubscript:(NSUInteger)idx {
+    if (count <= idx) {
+        // this check is necessary due to lack of checks in `pmk_safely_call_block`
+        return nil;
+    }
+    return objs[idx];
+}
+
+@end
+
+id __PMKArrayWithCount(NSUInteger count, ...) {
+    PMKArray *this = [PMKArray new];
+    this->count = count;
+    va_list args;
+    va_start(args, count);
+    for (NSUInteger x = 0; x < count; ++x)
+        this->objs[x] = va_arg(args, id);
+    va_end(args);
+    return this;
+}
+
+
+static inline id _PMKCallVariadicBlock(id frock, id result) {
+    NSCAssert(frock, @"");
+
+    NSMethodSignature *sig = NSMethodSignatureForBlock(frock);
+    const NSUInteger nargs = sig.numberOfArguments;
+    const char rtype = sig.methodReturnType[0];
+
+    #define call_block_with_rtype(type) ({^type{ \
+        switch (nargs) { \
+            case 1: \
+                return ((type(^)(void))frock)(); \
+            case 2: { \
+                const id arg = [result class] == [PMKArray class] ? result[0] : result; \
+                return ((type(^)(id))frock)(arg); \
+            } \
+            case 3: { \
+                type (^block)(id, id) = frock; \
+                return [result class] == [PMKArray class] \
+                    ? block(result[0], result[1]) \
+                    : block(result, nil); \
+            } \
+            case 4: { \
+                type (^block)(id, id, id) = frock; \
+                return [result class] == [PMKArray class] \
+                    ? block(result[0], result[1], result[2]) \
+                    : block(result, nil, nil); \
+            } \
+            default: \
+                @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"PromiseKit: The provided block’s argument count is unsupported." userInfo:nil]; \
+        }}();})
+
+    switch (rtype) {
+        case 'v':
+            call_block_with_rtype(void);
+            return nil;
+        case '@':
+            return call_block_with_rtype(id) ?: nil;
+        case '*': {
+            char *str = call_block_with_rtype(char *);
+            return str ? @(str) : nil;
+        }
+        case 'c': return @(call_block_with_rtype(char));
+        case 'i': return @(call_block_with_rtype(int));
+        case 's': return @(call_block_with_rtype(short));
+        case 'l': return @(call_block_with_rtype(long));
+        case 'q': return @(call_block_with_rtype(long long));
+        case 'C': return @(call_block_with_rtype(unsigned char));
+        case 'I': return @(call_block_with_rtype(unsigned int));
+        case 'S': return @(call_block_with_rtype(unsigned short));
+        case 'L': return @(call_block_with_rtype(unsigned long));
+        case 'Q': return @(call_block_with_rtype(unsigned long long));
+        case 'f': return @(call_block_with_rtype(float));
+        case 'd': return @(call_block_with_rtype(double));
+        case 'B': return @(call_block_with_rtype(_Bool));
+        case '^':
+            if (strcmp(sig.methodReturnType, "^v") == 0) {
+                call_block_with_rtype(void);
+                return nil;
+            }
+            // else fall through!
+        default:
+            @throw [NSException exceptionWithName:@"PromiseKit" reason:@"PromiseKit: Unsupported method signature." userInfo:nil];
+    }
+}
+
+static id PMKCallVariadicBlock(id frock, id result) {
+    @try {
+        return _PMKCallVariadicBlock(frock, result);
+    } @catch (id thrown) {
+        return PMKProcessUnhandledException(thrown);
+    }
+}
+
+
+static dispatch_once_t onceToken;
+static NSError *(^PMKUnhandledExceptionHandler)(id);
+
+NSError *PMKProcessUnhandledException(id thrown) {
+
+    dispatch_once(&onceToken, ^{
+        PMKUnhandledExceptionHandler = ^id(id reason){
+            if ([reason isKindOfClass:[NSError class]])
+                return reason;
+            if ([reason isKindOfClass:[NSString class]])
+                return [NSError errorWithDomain:PMKErrorDomain code:PMKUnexpectedError userInfo:@{NSLocalizedDescriptionKey: reason}];
+            return nil;
+        };
+    });
+
+    id err = PMKUnhandledExceptionHandler(thrown);
+    if (!err) {
+        NSLog(@"PromiseKit no longer catches *all* exceptions. However you can change this behavior by setting a new PMKProcessUnhandledException handler.");
+        @throw thrown;
+    }
+    return err;
+}
+
+void PMKSetUnhandledExceptionHandler(NSError *(^newHandler)(id)) {
+    dispatch_once(&onceToken, ^{
+        PMKUnhandledExceptionHandler = newHandler;
+    });
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/Promise+Properties.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/Promise+Properties.swift
new file mode 100644
index 00000000000..a101d957476
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/Promise+Properties.swift
@@ -0,0 +1,57 @@
+extension Promise {
+    /**
+     - Returns: The error with which this promise was rejected; `nil` if this promise is not rejected.
+    */
+    public var error: ErrorType? {
+        switch state.get() {
+        case .None:
+            return nil
+        case .Some(.Fulfilled):
+            return nil
+        case .Some(.Rejected(let error, _)):
+            return error
+        }
+    }
+
+    /**
+     - Returns: `true` if the promise has not yet resolved.
+    */
+    public var pending: Bool {
+        return state.get() == nil
+    }
+
+    /**
+     - Returns: `true` if the promise has resolved.
+    */
+    public var resolved: Bool {
+        return !pending
+    }
+
+    /**
+     - Returns: `true` if the promise was fulfilled.
+    */
+    public var fulfilled: Bool {
+        return value != nil
+    }
+
+    /**
+     - Returns: `true` if the promise was rejected.
+    */
+    public var rejected: Bool {
+        return error != nil
+    }
+
+    /**
+     - Returns: The value with which this promise was fulfilled or `nil` if this promise is pending or rejected.
+    */
+    public var value: T? {
+        switch state.get() {
+        case .None:
+            return nil
+        case .Some(.Fulfilled(let value)):
+            return value
+        case .Some(.Rejected):
+            return nil
+        }
+    }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/Promise.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/Promise.swift
new file mode 100644
index 00000000000..a99b6977e2b
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/Promise.swift
@@ -0,0 +1,667 @@
+import Dispatch
+import Foundation.NSError
+
+/**
+ A *promise* represents the future value of a task.
+
+ To obtain the value of a promise we call `then`.
+
+ Promises are chainable: `then` returns a promise, you can call `then` on
+ that promise, which returns a promise, you can call `then` on that
+ promise, et cetera.
+
+ Promises start in a pending state and *resolve* with a value to become
+ *fulfilled* or with an `ErrorType` to become rejected.
+
+ - SeeAlso: [PromiseKit `then` Guide](http://promisekit.org/then/)
+ - SeeAlso: [PromiseKit Chaining Guide](http://promisekit.org/chaining/)
+*/
+public class Promise<T> {
+    let state: State<Resolution<T>>
+
+    /**
+     Create a new pending promise.
+
+     Use this method when wrapping asynchronous systems that do *not* use
+     promises so that they can be involved in promise chains.
+
+     Don’t use this method if you already have promises! Instead, just return
+     your promise!
+
+     The closure you pass is executed immediately on the calling thread.
+
+         func fetchKitten() -> Promise<UIImage> {
+             return Promise { fulfill, reject in
+                 KittenFetcher.fetchWithCompletionBlock({ img, err in
+                     if err == nil {
+                         if img.size.width > 0 {
+                             fulfill(img)
+                         } else {
+                             reject(Error.ImageTooSmall)
+                         }
+                     } else {
+                         reject(err)
+                     }
+                 })
+             }
+         }
+
+     - Parameter resolvers: The provided closure is called immediately.
+     Inside, execute your asynchronous system, calling fulfill if it suceeds
+     and reject for any errors.
+
+     - Returns: return A new promise.
+
+     - Note: If you are wrapping a delegate-based system, we recommend
+     to use instead: Promise.pendingPromise()
+
+     - SeeAlso: http://promisekit.org/sealing-your-own-promises/
+     - SeeAlso: http://promisekit.org/wrapping-delegation/
+     - SeeAlso: init(resolver:)
+    */
+    public init(@noescape resolvers: (fulfill: (T) -> Void, reject: (ErrorType) -> Void) throws -> Void) {
+        var resolve: ((Resolution<T>) -> Void)!
+        state = UnsealedState(resolver: &resolve)
+        do {
+            try resolvers(fulfill: { resolve(.Fulfilled($0)) }, reject: { error in
+                if self.pending {
+                    resolve(.Rejected(error, ErrorConsumptionToken(error)))
+                } else {
+                    NSLog("PromiseKit: Warning: reject called on already rejected Promise: %@", "\(error)")
+                }
+            })
+        } catch {
+            resolve(.Rejected(error, ErrorConsumptionToken(error)))
+        }
+    }
+
+    /**
+     Create a new pending promise.
+
+     This initializer is convenient when wrapping asynchronous systems that
+     use common patterns. For example:
+
+         func fetchKitten() -> Promise<UIImage> {
+             return Promise { resolve in
+                 KittenFetcher.fetchWithCompletionBlock(resolve)
+             }
+         }
+
+     - SeeAlso: init(resolvers:)
+    */
+    public convenience init(@noescape resolver: ((T?, NSError?) -> Void) throws -> Void) {
+        self.init(sealant: { resolve in
+            try resolver { obj, err in
+                if let obj = obj {
+                    resolve(.Fulfilled(obj))
+                } else if let err = err {
+                    resolve(.Rejected(err, ErrorConsumptionToken(err as ErrorType)))
+                } else {
+                    resolve(.Rejected(Error.DoubleOhSux0r, ErrorConsumptionToken(Error.DoubleOhSux0r)))
+                }
+            }
+        })
+    }
+
+    /**
+     Create a new pending promise.
+
+     This initializer is convenient when wrapping asynchronous systems that
+     use common patterns. For example:
+
+         func fetchKitten() -> Promise<UIImage> {
+             return Promise { resolve in
+                 KittenFetcher.fetchWithCompletionBlock(resolve)
+             }
+         }
+
+     - SeeAlso: init(resolvers:)
+    */
+    public convenience init(@noescape resolver: ((T, NSError?) -> Void) throws -> Void) {
+        self.init(sealant: { resolve in
+            try resolver { obj, err in
+                if let err = err {
+                    resolve(.Rejected(err, ErrorConsumptionToken(err)))
+                } else {
+                    resolve(.Fulfilled(obj))
+                }
+            }
+        })
+    }
+
+    /**
+     Create a new fulfilled promise.
+    */
+    public init(_ value: T) {
+        state = SealedState(resolution: .Fulfilled(value))
+    }
+
+    @available(*, unavailable, message="T cannot conform to ErrorType")
+    public init<T: ErrorType>(_ value: T) { abort() }
+
+    /**
+     Create a new rejected promise.
+    */
+    public init(error: ErrorType) {
+        /**
+          Implementation note, the error label is necessary to prevent:
+
+             let p = Promise(ErrorType())
+
+          Resulting in Promise<ErrorType>. The above @available annotation
+          does not help for some reason. A work-around is:
+
+             let p: Promise<Void> = Promise(ErrorType())
+        
+          But I can’t expect users to do this.
+        */
+        state = SealedState(resolution: .Rejected(error, ErrorConsumptionToken(error)))
+    }
+
+    /**
+     Careful with this, it is imperative that sealant can only be called once
+     or you will end up with spurious unhandled-errors due to possible double
+     rejections and thus immediately deallocated ErrorConsumptionTokens.
+    */
+    init(@noescape sealant: ((Resolution<T>) -> Void) throws -> Void) {
+        var resolve: ((Resolution<T>) -> Void)!
+        state = UnsealedState(resolver: &resolve)
+        do {
+            try sealant(resolve)
+        } catch {
+            resolve(.Rejected(error, ErrorConsumptionToken(error)))
+        }
+    }
+
+    /**
+     A `typealias` for the return values of `pendingPromise()`. Simplifies declaration of properties that reference the values' containing tuple when this is necessary. For example, when working with multiple `pendingPromise()`s within the same scope, or when the promise initialization must occur outside of the caller's initialization.
+
+         ```
+         class Foo: BarDelegate {
+         var pendingPromise: Promise<Int>.PendingPromise?
+         }
+         ```
+     - SeeAlso: pendingPromise()
+     */
+    public typealias PendingPromise = (promise: Promise, fulfill: (T) -> Void, reject: (ErrorType) -> Void)
+
+    /**
+     Making promises that wrap asynchronous delegation systems or other larger asynchronous systems without a simple completion handler is easier with pendingPromise.
+
+         class Foo: BarDelegate {
+             let (promise, fulfill, reject) = Promise<Int>.pendingPromise()
+    
+             func barDidFinishWithResult(result: Int) {
+                 fulfill(result)
+             }
+    
+             func barDidError(error: NSError) {
+                 reject(error)
+             }
+         }
+
+     - Returns: A tuple consisting of: 
+       1) A promise
+       2) A function that fulfills that promise
+       3) A function that rejects that promise
+    */
+    public class func pendingPromise() -> PendingPromise {
+        var fulfill: ((T) -> Void)!
+        var reject: ((ErrorType) -> Void)!
+        let promise = Promise { fulfill = $0; reject = $1 }
+        return (promise, fulfill, reject)
+    }
+
+    func pipe(body: (Resolution<T>) -> Void) {
+        state.get { seal in
+            switch seal {
+            case .Pending(let handlers):
+                handlers.append(body)
+            case .Resolved(let resolution):
+                body(resolution)
+            }
+        }
+    }
+
+    private convenience init<U>(when: Promise<U>, body: (Resolution<U>, (Resolution<T>) -> Void) -> Void) {
+        self.init { resolve in
+            when.pipe { resolution in
+                body(resolution, resolve)
+            }
+        }
+    }
+
+    /**
+     The provided closure is executed when this Promise is resolved.
+
+     - Parameter on: The queue on which body should be executed.
+     - Parameter body: The closure that is executed when this Promise is fulfilled.
+     - Returns: A new promise that is resolved with the value returned from the provided closure. For example:
+
+           NSURLConnection.GET(url).then { (data: NSData) -> Int in
+               //…
+               return data.length
+           }.then { length in
+               //…
+           }
+
+     - SeeAlso: `thenInBackground`
+    */
+    public func then<U>(on q: dispatch_queue_t = dispatch_get_main_queue(), _ body: (T) throws -> U) -> Promise<U> {
+        return Promise<U>(when: self) { resolution, resolve in
+            switch resolution {
+            case .Rejected(let error):
+                resolve(.Rejected(error))
+            case .Fulfilled(let value):
+                contain_zalgo(q, rejecter: resolve) {
+                    resolve(.Fulfilled(try body(value)))
+                }
+            }
+        }
+    }
+
+    /**
+     The provided closure is executed when this Promise is resolved.
+
+     - Parameter on: The queue on which body should be executed.
+     - Parameter body: The closure that is executed when this Promise is fulfilled.
+     - Returns: A new promise that is resolved when the Promise returned from the provided closure resolves. For example:
+
+           NSURLSession.GET(url1).then { (data: NSData) -> Promise<NSData> in
+               //…
+               return NSURLSession.GET(url2)
+           }.then { data in
+               //…
+           }
+
+     - SeeAlso: `thenInBackground`
+    */
+    public func then<U>(on q: dispatch_queue_t = dispatch_get_main_queue(), _ body: (T) throws -> Promise<U>) -> Promise<U> {
+        return Promise<U>(when: self) { resolution, resolve in
+            switch resolution {
+            case .Rejected(let error):
+                resolve(.Rejected(error))
+            case .Fulfilled(let value):
+                contain_zalgo(q, rejecter: resolve) {
+                    let promise = try body(value)
+                    guard promise !== self else { throw Error.ReturnedSelf }
+                    promise.pipe(resolve)
+                }
+            }
+        }
+    }
+
+    @available(*, unavailable)
+    public func then<U>(on: dispatch_queue_t = dispatch_get_main_queue(), _ body: (T) throws -> Promise<U>?) -> Promise<U> { abort() }
+
+    /**
+     The provided closure is executed when this Promise is resolved.
+
+     - Parameter on: The queue on which body should be executed.
+     - Parameter body: The closure that is executed when this Promise is fulfilled.
+     - Returns: A new promise that is resolved when the AnyPromise returned from the provided closure resolves. For example:
+
+           NSURLSession.GET(url).then { (data: NSData) -> AnyPromise in
+               //…
+               return SCNetworkReachability()
+           }.then { _ in
+               //…
+           }
+
+     - SeeAlso: `thenInBackground`
+    */
+    public func then(on q: dispatch_queue_t = dispatch_get_main_queue(), body: (T) throws -> AnyPromise) -> Promise<AnyObject?> {
+        return Promise<AnyObject?>(when: self) { resolution, resolve in
+            switch resolution {
+            case .Rejected(let error):
+                resolve(.Rejected(error))
+            case .Fulfilled(let value):
+                contain_zalgo(q, rejecter: resolve) {
+                    try body(value).pipe(resolve)
+                }
+            }
+        }
+    }
+
+    @available(*, unavailable)
+    public func then(on: dispatch_queue_t = dispatch_get_main_queue(), body: (T) throws -> AnyPromise?) -> Promise<AnyObject?> { abort() }
+
+    /**
+     The provided closure is executed on the default background queue when this Promise is fulfilled.
+
+     This method is provided as a convenience for `then`.
+
+     - SeeAlso: `then`
+    */
+    public func thenInBackground<U>(body: (T) throws -> U) -> Promise<U> {
+        return then(on: dispatch_get_global_queue(0, 0), body)
+    }
+
+    /**
+     The provided closure is executed on the default background queue when this Promise is fulfilled.
+
+     This method is provided as a convenience for `then`.
+
+     - SeeAlso: `then`
+    */
+    public func thenInBackground<U>(body: (T) throws -> Promise<U>) -> Promise<U> {
+        return then(on: dispatch_get_global_queue(0, 0), body)
+    }
+
+    @available(*, unavailable)
+    public func thenInBackground<U>(body: (T) throws -> Promise<U>?) -> Promise<U> { abort() }
+
+    /**
+     The provided closure is executed when this promise is rejected.
+
+     Rejecting a promise cascades: rejecting all subsequent promises (unless
+     recover is invoked) thus you will typically place your catch at the end
+     of a chain. Often utility promises will not have a catch, instead
+     delegating the error handling to the caller.
+
+     The provided closure always runs on the main queue.
+
+     - Parameter policy: The default policy does not execute your handler for cancellation errors. See registerCancellationError for more documentation.
+     - Parameter body: The handler to execute if this promise is rejected.
+     - SeeAlso: `registerCancellationError`
+    */
+    public func error(policy policy: ErrorPolicy = .AllErrorsExceptCancellation, _ body: (ErrorType) -> Void) {
+        
+        func consume(error: ErrorType, _ token: ErrorConsumptionToken) {
+            token.consumed = true
+            body(error)
+        }
+
+        pipe { resolution in
+            switch (resolution, policy) {
+            case (let .Rejected(error, token), .AllErrorsExceptCancellation):
+                dispatch_async(dispatch_get_main_queue()) {
+                    guard let cancellableError = error as? CancellableErrorType where cancellableError.cancelled else {
+                        consume(error, token)
+                        return
+                    }
+                }
+            case (let .Rejected(error, token), _):
+                dispatch_async(dispatch_get_main_queue()) {
+                    consume(error, token)
+                }
+            case (.Fulfilled, _):
+                break
+            }
+        }
+    }
+
+    /**
+     The provided closure is executed when this promise is rejected giving you
+     an opportunity to recover from the error and continue the promise chain.
+    */
+    public func recover(on q: dispatch_queue_t = dispatch_get_main_queue(), _ body: (ErrorType) throws -> Promise) -> Promise {
+        return Promise(when: self) { resolution, resolve in
+            switch resolution {
+            case .Rejected(let error, let token):
+                contain_zalgo(q, rejecter: resolve) {
+                    token.consumed = true
+                    let promise = try body(error)
+                    guard promise !== self else { throw Error.ReturnedSelf }
+                    promise.pipe(resolve)
+                }
+            case .Fulfilled:
+                resolve(resolution)
+            }
+        }
+    }
+
+    @available(*, unavailable)
+    public func recover(on: dispatch_queue_t = dispatch_get_main_queue(), _ body: (ErrorType) throws -> Promise?) -> Promise { abort() }
+
+    public func recover(on q: dispatch_queue_t = dispatch_get_main_queue(), _ body: (ErrorType) throws -> T) -> Promise {
+        return Promise(when: self) { resolution, resolve in
+            switch resolution {
+            case .Rejected(let error, let token):
+                contain_zalgo(q, rejecter: resolve) {
+                    token.consumed = true
+                    resolve(.Fulfilled(try body(error)))
+                }
+            case .Fulfilled:
+                resolve(resolution)
+            }
+        }
+    }
+
+    /**
+     The provided closure is executed when this Promise is resolved.
+
+         UIApplication.sharedApplication().networkActivityIndicatorVisible = true
+         somePromise().then {
+             //…
+         }.always {
+             UIApplication.sharedApplication().networkActivityIndicatorVisible = false
+         }
+
+     - Parameter on: The queue on which body should be executed.
+     - Parameter body: The closure that is executed when this Promise is resolved.
+    */
+    public func always(on q: dispatch_queue_t = dispatch_get_main_queue(), _ body: () -> Void) -> Promise {
+        return Promise(when: self) { resolution, resolve in
+            contain_zalgo(q) {
+                body()
+                resolve(resolution)
+            }
+        }
+    }
+
+    @available(*, unavailable, renamed="ensure")
+    public func finally(on: dispatch_queue_t = dispatch_get_main_queue(), body: () -> Void) -> Promise { abort() }
+
+    @available(*, unavailable, renamed="report")
+    public func catch_(policy policy: ErrorPolicy = .AllErrorsExceptCancellation, body: () -> Void) -> Promise { abort() }
+
+    @available(*, unavailable, renamed="pendingPromise")
+    public class func defer_() -> (promise: Promise, fulfill: (T) -> Void, reject: (ErrorType) -> Void) { abort() }
+
+    @available(*, deprecated, renamed="error")
+    public func report(policy policy: ErrorPolicy = .AllErrorsExceptCancellation, _ body: (ErrorType) -> Void) { error(policy: policy, body) }
+
+    @available(*, deprecated, renamed="always")
+    public func ensure(on q: dispatch_queue_t = dispatch_get_main_queue(), _ body: () -> Void) -> Promise { return always(on: q, body) }
+}
+
+
+/**
+ Zalgo is dangerous.
+
+ Pass as the `on` parameter for a `then`. Causes the handler to be executed
+ as soon as it is resolved. That means it will be executed on the queue it
+ is resolved. This means you cannot predict the queue.
+
+ In the case that the promise is already resolved the handler will be
+ executed immediately.
+
+ zalgo is provided for libraries providing promises that have good tests
+ that prove unleashing zalgo is safe. You can also use it in your
+ application code in situations where performance is critical, but be
+ careful: read the essay at the provided link to understand the risks.
+
+ - SeeAlso: http://blog.izs.me/post/59142742143/designing-apis-for-asynchrony
+*/
+public let zalgo: dispatch_queue_t = dispatch_queue_create("Zalgo", nil)
+
+/**
+ Waldo is dangerous.
+
+ Waldo is zalgo, unless the current queue is the main thread, in which case
+ we dispatch to the default background queue.
+
+ If your block is likely to take more than a few milliseconds to execute,
+ then you should use waldo: 60fps means the main thread cannot hang longer
+ than 17 milliseconds. Don’t contribute to UI lag.
+
+ Conversely if your then block is trivial, use zalgo: GCD is not free and
+ for whatever reason you may already be on the main thread so just do what
+ you are doing quickly and pass on execution.
+
+ It is considered good practice for asynchronous APIs to complete onto the
+ main thread. Apple do not always honor this, nor do other developers.
+ However, they *should*. In that respect waldo is a good choice if your
+ then is going to take a while and doesn’t interact with the UI.
+
+ Please note (again) that generally you should not use zalgo or waldo. The
+ performance gains are neglible and we provide these functions only out of
+ a misguided sense that library code should be as optimized as possible.
+ If you use zalgo or waldo without tests proving their correctness you may
+ unwillingly introduce horrendous, near-impossible-to-trace bugs.
+
+ - SeeAlso: zalgo
+*/
+public let waldo: dispatch_queue_t = dispatch_queue_create("Waldo", nil)
+
+func contain_zalgo(q: dispatch_queue_t, block: () -> Void) {
+    if q === zalgo {
+        block()
+    } else if q === waldo {
+        if NSThread.isMainThread() {
+            dispatch_async(dispatch_get_global_queue(0, 0), block)
+        } else {
+            block()
+        }
+    } else {
+        dispatch_async(q, block)
+    }
+}
+
+func contain_zalgo<T>(q: dispatch_queue_t, rejecter resolve: (Resolution<T>) -> Void, block: () throws -> Void) {
+    contain_zalgo(q) {
+        do {
+            try block()
+        } catch {
+            resolve(.Rejected(error, ErrorConsumptionToken(error)))
+        }
+    }
+}
+
+
+extension Promise {
+    /**
+     Void promises are less prone to generics-of-doom scenarios.
+     - SeeAlso: when.swift contains enlightening examples of using `Promise<Void>` to simplify your code.
+    */
+    public func asVoid() -> Promise<Void> {
+        return then(on: zalgo) { _ in return }
+    }
+}
+
+
+extension Promise: CustomStringConvertible {
+    public var description: String {
+        return "Promise: \(state)"
+    }
+}
+
+/**
+ `firstly` can make chains more readable.
+
+ Compare:
+
+     NSURLConnection.GET(url1).then {
+         NSURLConnection.GET(url2)
+     }.then {
+         NSURLConnection.GET(url3)
+     }
+
+ With:
+
+     firstly {
+         NSURLConnection.GET(url1)
+     }.then {
+         NSURLConnection.GET(url2)
+     }.then {
+         NSURLConnection.GET(url3)
+     }
+*/
+public func firstly<T>(@noescape promise: () throws -> Promise<T>) -> Promise<T> {
+    do {
+        return try promise()
+    } catch {
+        return Promise(error: error)
+    }
+}
+
+/**
+ `firstly` can make chains more readable.
+
+ Compare:
+
+     SCNetworkReachability().then {
+         NSURLSession.GET(url2)
+     }.then {
+         NSURLSession.GET(url3)
+     }
+
+ With:
+
+     firstly {
+         SCNetworkReachability()
+     }.then {
+         NSURLSession.GET(url2)
+     }.then {
+         NSURLSession.GET(url3)
+     }
+*/
+public func firstly(@noescape promise: () throws -> AnyPromise) -> Promise<AnyObject?> {
+    return Promise { resolve in
+        try promise().pipe(resolve)
+    }
+}
+
+@available(*, unavailable, message="Instead, throw")
+public func firstly<T: ErrorType>(@noescape promise: () throws -> Promise<T>) -> Promise<T> {
+    fatalError("Unavailable function")
+}
+
+
+public enum ErrorPolicy {
+    case AllErrors
+    case AllErrorsExceptCancellation
+}
+
+
+extension AnyPromise {
+    private func pipe(resolve: (Resolution<AnyObject?>) -> Void) -> Void {
+        pipe { (obj: AnyObject?) in
+            if let error = obj as? NSError {
+                resolve(.Rejected(error, ErrorConsumptionToken(error)))
+            } else {
+                // possibly the value of this promise is a PMKManifold, if so
+                // calling the objc `value` method will return the first item.
+                resolve(.Fulfilled(self.valueForKey("value")))
+            }
+        }
+    }
+}
+
+
+extension Promise {
+    @available(*, unavailable, message="T cannot conform to ErrorType")
+    public convenience init<T: ErrorType>(@noescape resolvers: (fulfill: (T) -> Void, reject: (ErrorType) -> Void) throws -> Void) { abort() }
+
+    @available(*, unavailable, message="T cannot conform to ErrorType")
+    public convenience init<T: ErrorType>(@noescape resolver: ((T?, NSError?) -> Void) throws -> Void) { abort() }
+
+    @available(*, unavailable, message="T cannot conform to ErrorType")
+    public convenience init<T: ErrorType>(@noescape resolver: ((T, NSError?) -> Void) throws -> Void) { abort() }
+
+    @available(*, unavailable, message="T cannot conform to ErrorType")
+    public class func pendingPromise<T: ErrorType>() -> (promise: Promise, fulfill: (T) -> Void, reject: (ErrorType) -> Void) { abort() }
+
+    @available (*, unavailable, message="U cannot conform to ErrorType")
+    public func then<U: ErrorType>(on: dispatch_queue_t = dispatch_get_main_queue(), _ body: (T) throws -> U) -> Promise<U> { abort() }
+
+    @available (*, unavailable, message="U cannot conform to ErrorType")
+    public func then<U: ErrorType>(on: dispatch_queue_t = dispatch_get_main_queue(), _ body: (T) throws -> Promise<U>) -> Promise<U> { abort() }
+
+    @available(*, unavailable, message="U cannot conform to ErrorType")
+    public func thenInBackground<U: ErrorType>(body: (T) throws -> U) -> Promise<U> { abort() }
+
+    @available(*, unavailable, message="U cannot conform to ErrorType")
+    public func thenInBackground<U: ErrorType>(body: (T) throws -> Promise<U>) -> Promise<U> { abort() }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/PromiseKit.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/PromiseKit.h
new file mode 100644
index 00000000000..a35384ab2e6
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/PromiseKit.h
@@ -0,0 +1,248 @@
+#import <dispatch/queue.h>
+#import <Foundation/NSDate.h>
+#import <Foundation/NSObject.h>
+#import <PromiseKit/AnyPromise.h>
+#import <PromiseKit/NSError+Cancellation.h>
+#import <PromiseKit/Umbrella.h>
+
+
+
+/**
+ @return A new promise that resolves after the specified duration.
+
+ @parameter duration The duration in seconds to wait before this promise is resolve.
+
+ For example:
+
+    PMKAfter(1).then(^{
+        //…
+    });
+*/
+extern AnyPromise * __nonnull PMKAfter(NSTimeInterval duration);
+
+
+
+/**
+ `when` is a mechanism for waiting more than one asynchronous task and responding when they are all complete.
+
+ `PMKWhen` accepts varied input. If an array is passed then when those promises fulfill, when’s promise fulfills with an array of fulfillment values. If a dictionary is passed then the same occurs, but when’s promise fulfills with a dictionary of fulfillments keyed as per the input.
+
+ Interestingly, if a single promise is passed then when waits on that single promise, and if a single non-promise object is passed then when fulfills immediately with that object. If the array or dictionary that is passed contains objects that are not promises, then these objects are considered fulfilled promises. The reason we do this is to allow a pattern know as "abstracting away asynchronicity".
+
+ If *any* of the provided promises reject, the returned promise is immediately rejected with that promise’s rejection. The error’s `userInfo` object is supplemented with `PMKFailingPromiseIndexKey`.
+
+ For example:
+
+    PMKWhen(@[promise1, promise2]).then(^(NSArray *results){
+        //…
+    });
+
+ @warning *Important* In the event of rejection the other promises will continue to resolve and as per any other promise will eithe fulfill or reject. This is the right pattern for `getter` style asynchronous tasks, but often for `setter` tasks (eg. storing data on a server), you most likely will need to wait on all tasks and then act based on which have succeeded and which have failed. In such situations use `PMKJoin`.
+
+ @param input The input upon which to wait before resolving this promise.
+
+ @return A promise that is resolved with either:
+
+  1. An array of values from the provided array of promises.
+  2. The value from the provided promise.
+  3. The provided non-promise object.
+
+ @see PMKJoin
+
+*/
+extern AnyPromise * __nonnull PMKWhen(id __nonnull input);
+
+
+
+/**
+ Creates a new promise that resolves only when all provided promises have resolved.
+
+ Typically, you should use `PMKWhen`.
+
+ For example:
+
+    PMKJoin(@[promise1, promise2]).then(^(NSArray *resultingValues){
+        //…
+    }).catch(^(NSError *error){
+        assert(error.domain == PMKErrorDomain);
+        assert(error.code == PMKJoinError);
+
+        NSArray *promises = error.userInfo[PMKJoinPromisesKey];
+        for (AnyPromise *promise in promises) {
+            if (promise.rejected) {
+                //…
+            }
+        }
+    });
+
+ @param promises An array of promises.
+
+ @return A promise that thens three parameters:
+
+  1) An array of mixed values and errors from the resolved input.
+  2) An array of values from the promises that fulfilled.
+  3) An array of errors from the promises that rejected or nil if all promises fulfilled.
+
+ @see when
+*/
+AnyPromise *__nonnull PMKJoin(NSArray * __nonnull promises);
+
+
+
+/**
+ Literally hangs this thread until the promise has resolved.
+ 
+ Do not use hang… unless you are testing, playing or debugging.
+ 
+ If you use it in production code I will literally and honestly cry like a child.
+ 
+ @return The resolved value of the promise.
+
+ @warning T SAFE. IT IS NOT SAFE. IT IS NOT SAFE. IT IS NOT SAFE. IT IS NO
+*/
+extern id __nullable PMKHang(AnyPromise * __nonnull promise);
+
+
+
+/**
+ Sets the unhandled exception handler.
+
+ If an exception is thrown inside an AnyPromise handler it is caught and
+ this handler is executed to determine if the promise is rejected.
+ 
+ The default handler rejects the promise if an NSError or an NSString is
+ thrown.
+ 
+ The default handler in PromiseKit 1.x would reject whatever object was
+ thrown (including nil).
+
+ @warning *Important* This handler is provided to allow you to customize
+ which exceptions cause rejection and which abort. You should either
+ return a fully-formed NSError object or nil. Returning nil causes the
+ exception to be re-thrown.
+
+ @warning *Important* The handler is executed on an undefined queue.
+
+ @warning *Important* This function is thread-safe, but to facilitate this
+ it can only be called once per application lifetime and it must be called
+ before any promise in the app throws an exception. Subsequent calls will
+ silently fail.
+*/
+extern void PMKSetUnhandledExceptionHandler(NSError * __nullable (^__nonnull handler)(id __nullable));
+
+
+
+/**
+ Executes the provided block on a background queue.
+
+ dispatch_promise is a convenient way to start a promise chain where the
+ first step needs to run synchronously on a background queue.
+
+    dispatch_promise(^{
+        return md5(input);
+    }).then(^(NSString *md5){
+        NSLog(@"md5: %@", md5);
+    });
+
+ @param block The block to be executed in the background. Returning an `NSError` will reject the promise, everything else (including void) fulfills the promise.
+
+ @return A promise resolved with the return value of the provided block.
+
+ @see dispatch_async
+*/
+extern AnyPromise * __nonnull dispatch_promise(id __nonnull block);
+
+
+
+/**
+ Executes the provided block on the specified background queue.
+
+    dispatch_promise_on(myDispatchQueue, ^{
+        return md5(input);
+    }).then(^(NSString *md5){
+        NSLog(@"md5: %@", md5);
+    });
+
+ @param block The block to be executed in the background. Returning an `NSError` will reject the promise, everything else (including void) fulfills the promise.
+
+ @return A promise resolved with the return value of the provided block.
+
+ @see dispatch_promise
+*/
+extern AnyPromise * __nonnull dispatch_promise_on(dispatch_queue_t __nonnull queue, id __nonnull block);
+
+
+
+#define PMKJSONDeserializationOptions ((NSJSONReadingOptions)(NSJSONReadingAllowFragments | NSJSONReadingMutableContainers))
+
+/**
+ Really we shouldn’t assume JSON for (application|text)/(x-)javascript,
+ really we should return a String of Javascript. However in practice
+ for the apps we write it *will be* JSON. Thus if you actually want
+ a Javascript String, use the promise variant of our category functions.
+*/
+#define PMKHTTPURLResponseIsJSON(rsp) [@[@"application/json", @"text/json", @"text/javascript", @"application/x-javascript", @"application/javascript"] containsObject:[rsp MIMEType]]
+#define PMKHTTPURLResponseIsImage(rsp) [@[@"image/tiff", @"image/jpeg", @"image/gif", @"image/png", @"image/ico", @"image/x-icon", @"image/bmp", @"image/x-bmp", @"image/x-xbitmap", @"image/x-win-bitmap"] containsObject:[rsp MIMEType]]
+#define PMKHTTPURLResponseIsText(rsp) [[rsp MIMEType] hasPrefix:@"text/"]
+
+
+
+#if defined(__has_include)
+  #if __has_include(<PromiseKit/ACAccountStore+AnyPromise.h>)
+    #import <PromiseKit/ACAccountStore+AnyPromise.h>
+  #endif
+  #if __has_include(<PromiseKit/AVAudioSession+AnyPromise.h>)
+    #import <PromiseKit/AVAudioSession+AnyPromise.h>
+  #endif
+  #if __has_include(<PromiseKit/CKContainer+AnyPromise.h>)
+    #import <PromiseKit/CKContainer+AnyPromise.h>
+  #endif
+  #if __has_include(<PromiseKit/CKDatabase+AnyPromise.h>)
+    #import <PromiseKit/CKDatabase+AnyPromise.h>
+  #endif
+  #if __has_include(<PromiseKit/CLGeocoder+AnyPromise.h>)
+    #import <PromiseKit/CLGeocoder+AnyPromise.h>
+  #endif
+  #if __has_include(<PromiseKit/CLLocationManager+AnyPromise.h>)
+    #import <PromiseKit/CLLocationManager+AnyPromise.h>
+  #endif
+  #if __has_include(<PromiseKit/NSNotificationCenter+AnyPromise.h>)
+    #import <PromiseKit/NSNotificationCenter+AnyPromise.h>
+  #endif
+  #if __has_include(<PromiseKit/NSTask+AnyPromise.h>)
+    #import <PromiseKit/NSTask+AnyPromise.h>
+  #endif
+  #if __has_include(<PromiseKit/NSURLConnection+AnyPromise.h>)
+    #import <PromiseKit/NSURLConnection+AnyPromise.h>
+  #endif
+  #if __has_include(<PromiseKit/MKDirections+AnyPromise.h>)
+    #import <PromiseKit/MKDirections+AnyPromise.h>
+  #endif
+  #if __has_include(<PromiseKit/MKMapSnapshotter+AnyPromise.h>)
+    #import <PromiseKit/MKMapSnapshotter+AnyPromise.h>
+  #endif
+  #if __has_include(<PromiseKit/CALayer+AnyPromise.h>)
+    #import <PromiseKit/CALayer+AnyPromise.h>
+  #endif
+  #if __has_include(<PromiseKit/SLRequest+AnyPromise.h>)
+    #import <PromiseKit/SLRequest+AnyPromise.h>
+  #endif
+  #if __has_include(<PromiseKit/SKRequest+AnyPromise.h>)
+    #import <PromiseKit/SKRequest+AnyPromise.h>
+  #endif
+  #if __has_include(<PromiseKit/SCNetworkReachability+AnyPromise.h>)
+    #import <PromiseKit/SCNetworkReachability+AnyPromise.h>
+  #endif
+  #if __has_include(<PromiseKit/UIActionSheet+AnyPromise.h>)
+    #import <PromiseKit/UIActionSheet+AnyPromise.h>
+  #endif
+  #if __has_include(<PromiseKit/UIAlertView+AnyPromise.h>)
+    #import <PromiseKit/UIAlertView+AnyPromise.h>
+  #endif
+  #if __has_include(<PromiseKit/UIView+AnyPromise.h>)
+    #import <PromiseKit/UIView+AnyPromise.h>
+  #endif
+  #if __has_include(<PromiseKit/UIViewController+AnyPromise.h>)
+    #import <PromiseKit/UIViewController+AnyPromise.h>
+  #endif
+#endif
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/State.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/State.swift
new file mode 100644
index 00000000000..bb8eeb1fba9
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/State.swift
@@ -0,0 +1,156 @@
+import Dispatch
+import Foundation  // NSLog
+
+enum Seal<R> {
+    case Pending(Handlers<R>)
+    case Resolved(R)
+}
+
+enum Resolution<T> {
+    case Fulfilled(T)
+    case Rejected(ErrorType, ErrorConsumptionToken)
+}
+
+// would be a protocol, but you can't have typed variables of “generic”
+// protocols in Swift 2. That is, I couldn’t do var state: State<R> when
+// it was a protocol. There is no work around.
+class State<R> {
+    func get() -> R? { fatalError("Abstract Base Class") }
+    func get(body: (Seal<R>) -> Void) { fatalError("Abstract Base Class") }
+}
+
+class UnsealedState<R>: State<R> {
+    private let barrier = dispatch_queue_create("org.promisekit.barrier", DISPATCH_QUEUE_CONCURRENT)
+    private var seal: Seal<R>
+
+    /**
+     Quick return, but will not provide the handlers array because
+     it could be modified while you are using it by another thread.
+     If you need the handlers, use the second `get` variant.
+    */
+    override func get() -> R? {
+        var result: R?
+        dispatch_sync(barrier) {
+            if case .Resolved(let resolution) = self.seal {
+                result = resolution
+            }
+        }
+        return result
+    }
+
+    override func get(body: (Seal<R>) -> Void) {
+        var sealed = false
+        dispatch_sync(barrier) {
+            switch self.seal {
+            case .Resolved:
+                sealed = true
+            case .Pending:
+                sealed = false
+            }
+        }
+        if !sealed {
+            dispatch_barrier_sync(barrier) {
+                switch (self.seal) {
+                case .Pending:
+                    body(self.seal)
+                case .Resolved:
+                    sealed = true  // welcome to race conditions
+                }
+            }
+        }
+        if sealed {
+            body(seal)
+        }
+    }
+
+    required init(inout resolver: ((R) -> Void)!) {
+        seal = .Pending(Handlers<R>())
+        super.init()
+        resolver = { resolution in
+            var handlers: Handlers<R>?
+            dispatch_barrier_sync(self.barrier) {
+                if case .Pending(let hh) = self.seal {
+                    self.seal = .Resolved(resolution)
+                    handlers = hh
+                }
+            }
+            if let handlers = handlers {
+                for handler in handlers {
+                    handler(resolution)
+                }
+            }
+        }
+    }
+
+    deinit {
+        if case .Pending = seal {
+            NSLog("PromiseKit: Pending Promise deallocated! This is usually a bug")
+        }
+    }
+}
+
+class SealedState<R>: State<R> {
+    private let resolution: R
+    
+    init(resolution: R) {
+        self.resolution = resolution
+    }
+    
+    override func get() -> R? {
+        return resolution
+    }
+
+    override func get(body: (Seal<R>) -> Void) {
+        body(.Resolved(resolution))
+    }
+}
+
+
+class Handlers<R>: SequenceType {
+    var bodies: [(R)->Void] = []
+
+    func append(body: (R)->Void) {
+        bodies.append(body)
+    }
+
+    func generate() -> IndexingGenerator<[(R)->Void]> {
+        return bodies.generate()
+    }
+
+    var count: Int {
+        return bodies.count
+    }
+}
+
+
+extension Resolution: CustomStringConvertible {
+    var description: String {
+        switch self {
+        case .Fulfilled(let value):
+            return "Fulfilled with value: \(value)"
+        case .Rejected(let error):
+            return "Rejected with error: \(error)"
+        }
+    }
+}
+
+extension UnsealedState: CustomStringConvertible {
+    var description: String {
+        var rv: String!
+        get { seal in
+            switch seal {
+            case .Pending(let handlers):
+                rv = "Pending with \(handlers.count) handlers"
+            case .Resolved(let resolution):
+                rv = "\(resolution)"
+            }
+        }
+        return "UnsealedState: \(rv)"
+    }
+}
+
+extension SealedState: CustomStringConvertible {
+    var description: String {
+        return "SealedState: \(resolution)"
+    }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/URLDataPromise.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/URLDataPromise.swift
new file mode 100644
index 00000000000..00cd7a7f814
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/URLDataPromise.swift
@@ -0,0 +1,106 @@
+import Foundation
+
+public enum Encoding {
+    case JSON(NSJSONReadingOptions)
+}
+
+public class URLDataPromise: Promise<NSData> {
+    public func asDataAndResponse() -> Promise<(NSData, NSURLResponse)> {
+        return then(on: zalgo) { ($0, self.URLResponse) }
+    }
+
+    public func asString() -> Promise<String> {
+        return then(on: waldo) { data -> String in
+            guard let str = NSString(data: data, encoding: self.URLResponse.stringEncoding ?? NSUTF8StringEncoding) else {
+                throw URLError.StringEncoding(self.URLRequest, data, self.URLResponse)
+            }
+            return str as String
+        }
+    }
+
+    public func asArray(encoding: Encoding = .JSON(.AllowFragments)) -> Promise<NSArray> {
+        return then(on: waldo) { data -> NSArray in
+            switch encoding {
+            case .JSON(let options):
+                guard !data.b0rkedEmptyRailsResponse else { return NSArray() }
+                let json = try NSJSONSerialization.JSONObjectWithData(data, options: options)
+                guard let array = json as? NSArray else { throw JSONError.UnexpectedRootNode(json) }
+                return array
+            }
+        }
+    }
+
+    public func asDictionary(encoding: Encoding = .JSON(.AllowFragments)) -> Promise<NSDictionary> {
+        return then(on: waldo) { data -> NSDictionary in
+            switch encoding {
+            case .JSON(let options):
+                guard !data.b0rkedEmptyRailsResponse else { return NSDictionary() }
+                let json = try NSJSONSerialization.JSONObjectWithData(data, options: options)
+                guard let dict = json as? NSDictionary else { throw JSONError.UnexpectedRootNode(json) }
+                return dict
+            }
+        }
+    }
+
+    private override init(@noescape resolvers: (fulfill: (NSData) -> Void, reject: (ErrorType) -> Void) throws -> Void) {
+        super.init(resolvers: resolvers)
+    }
+
+    public override init(error: ErrorType) {
+        super.init(error: error)
+    }
+
+    private var URLRequest: NSURLRequest!
+    private var URLResponse: NSURLResponse!
+
+    public class func go(request: NSURLRequest, @noescape body: ((NSData?, NSURLResponse?, NSError?) -> Void) -> Void) -> URLDataPromise {
+        var promise: URLDataPromise!
+        promise = URLDataPromise { fulfill, reject in
+            body { data, rsp, error in
+                promise.URLRequest = request
+                promise.URLResponse = rsp
+
+                if let error = error {
+                    reject(URLError.UnderlyingCocoaError(request, data, rsp, error))
+                } else if let data = data, rsp = rsp as? NSHTTPURLResponse where rsp.statusCode >= 200 && rsp.statusCode < 300 {
+                    fulfill(data)
+                } else if let data = data where !(rsp is NSHTTPURLResponse) {
+                    fulfill(data)
+                } else {
+                    reject(URLError.BadResponse(request, data, rsp))
+                }
+            }
+        }
+        return promise
+    }
+}
+
+#if os(iOS)
+    import UIKit.UIImage
+
+    extension URLDataPromise {
+        public func asImage() -> Promise<UIImage> {
+            return then(on: waldo) { data -> UIImage in
+                guard let img = UIImage(data: data), cgimg = img.CGImage else {
+                    throw URLError.InvalidImageData(self.URLRequest, data)
+                }
+                return UIImage(CGImage: cgimg, scale: img.scale, orientation: img.imageOrientation)
+            }
+        }
+    }
+#endif
+
+extension NSURLResponse {
+    private var stringEncoding: UInt? {
+        guard let encodingName = textEncodingName else { return nil }
+        let encoding = CFStringConvertIANACharSetNameToEncoding(encodingName)
+        guard encoding != kCFStringEncodingInvalidId else { return nil }
+        return CFStringConvertEncodingToNSStringEncoding(encoding)
+    }
+}
+
+extension NSData {
+    private var b0rkedEmptyRailsResponse: Bool {
+        return self == NSData(bytes: " ", length: 1)
+    }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/Umbrella.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/Umbrella.h
new file mode 100644
index 00000000000..7ac2a562862
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/Umbrella.h
@@ -0,0 +1,59 @@
+#import <Foundation/NSObjCRuntime.h>
+#import <Foundation/NSString.h>
+
+FOUNDATION_EXPORT double PromiseKitVersionNumber;
+FOUNDATION_EXPORT const unsigned char PromiseKitVersionString[];
+
+extern NSString * const PMKErrorDomain;
+
+#define PMKFailingPromiseIndexKey @"PMKFailingPromiseIndexKey"
+#define PMKURLErrorFailingURLResponseKey @"PMKURLErrorFailingURLResponseKey"
+#define PMKURLErrorFailingDataKey @"PMKURLErrorFailingDataKey"
+#define PMKURLErrorFailingStringKey @"PMKURLErrorFailingStringKey"
+#define PMKJSONErrorJSONObjectKey @"PMKJSONErrorJSONObjectKey"
+#define PMKJoinPromisesKey @"PMKJoinPromisesKey"
+
+#define PMKUnexpectedError 1l
+#define PMKUnknownError 2l
+#define PMKInvalidUsageError 3l
+#define PMKAccessDeniedError 4l
+#define PMKOperationCancelled 5l
+#define PMKNotFoundError 6l
+#define PMKJSONError 7l
+#define PMKOperationFailed 8l
+#define PMKTaskError 9l
+#define PMKJoinError 10l
+
+#if !(defined(PMKEZBake) && defined(SWIFT_CLASS))
+    #if !defined(SWIFT_PASTE)
+    # define SWIFT_PASTE_HELPER(x, y) x##y
+    # define SWIFT_PASTE(x, y) SWIFT_PASTE_HELPER(x, y)
+    #endif
+    #if !defined(SWIFT_METATYPE)
+    # define SWIFT_METATYPE(X) Class
+    #endif
+
+    #if defined(__has_attribute) && __has_attribute(objc_runtime_name)
+    # define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X)))
+    #else
+    # define SWIFT_RUNTIME_NAME(X)
+    #endif
+    #if !defined(SWIFT_CLASS_EXTRA)
+    # define SWIFT_CLASS_EXTRA
+    #endif
+    #if !defined(SWIFT_CLASS)
+    # if defined(__has_attribute) && __has_attribute(objc_subclassing_restricted)
+    #  define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA
+    # else
+    #  define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA
+    # endif
+    #endif
+
+    SWIFT_CLASS("AnyPromise")
+    @interface AnyPromise : NSObject
+    @property (nonatomic, readonly) BOOL pending;
+    @property (nonatomic, readonly) BOOL resolved;
+    @property (nonatomic, readonly) BOOL fulfilled;
+    @property (nonatomic, readonly) BOOL rejected;
+    @end
+#endif
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/after.m b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/after.m
new file mode 100644
index 00000000000..c5f7a3b9e6e
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/after.m
@@ -0,0 +1,13 @@
+#import "AnyPromise.h"
+@import Dispatch;
+@import Foundation.NSDate;
+@import Foundation.NSValue;
+
+AnyPromise *PMKAfter(NSTimeInterval duration) {
+    return [AnyPromise promiseWithResolverBlock:^(PMKResolver resolve) {
+        dispatch_time_t time = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(duration * NSEC_PER_SEC));
+        dispatch_after(time, dispatch_get_global_queue(0, 0), ^{
+            resolve(@(duration));
+        });
+    }];
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/after.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/after.swift
new file mode 100644
index 00000000000..f5bcd3d741c
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/after.swift
@@ -0,0 +1,20 @@
+import Dispatch
+import Foundation.NSDate
+
+/**
+ ```
+ after(1).then {
+     //…
+ }
+ ```
+
+ - Returns: A new promise that resolves after the specified duration.
+ - Parameter duration: The duration in seconds to wait before this promise is resolve.
+*/
+public func after(delay: NSTimeInterval) -> Promise<Void> {
+    return Promise { fulfill, _ in
+        let delta = delay * NSTimeInterval(NSEC_PER_SEC)
+        let when = dispatch_time(DISPATCH_TIME_NOW, Int64(delta))
+        dispatch_after(when, dispatch_get_global_queue(0, 0), fulfill)
+    }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/dispatch_promise.m b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/dispatch_promise.m
new file mode 100644
index 00000000000..71c8e74a34c
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/dispatch_promise.m
@@ -0,0 +1,10 @@
+@import Dispatch;
+#import "PromiseKit.h"
+
+AnyPromise *dispatch_promise(id block) {
+    return dispatch_promise_on(dispatch_get_global_queue(0, 0), block);
+}
+
+AnyPromise *dispatch_promise_on(dispatch_queue_t queue, id block) {
+    return [AnyPromise promiseWithValue:nil].thenOn(queue, block);
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/dispatch_promise.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/dispatch_promise.swift
new file mode 100644
index 00000000000..4a8133e524a
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/dispatch_promise.swift
@@ -0,0 +1,23 @@
+import Dispatch
+import Foundation.NSError
+
+/**
+ ```
+ dispatch_promise {
+     try md5(input)
+ }.then { md5 in
+     //…
+ }
+ ```
+
+ - Parameter on: The queue on which to dispatch `body`.
+ - Parameter body: The closure that resolves this promise.
+ - Returns: A new promise resolved by the provided closure.
+*/
+public func dispatch_promise<T>(on queue: dispatch_queue_t = dispatch_get_global_queue(0, 0), body: () throws -> T) -> Promise<T> {
+    return Promise(sealant: { resolve in
+        contain_zalgo(queue, rejecter: resolve) {
+            resolve(.Fulfilled(try body()))
+        }
+    })
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/hang.m b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/hang.m
new file mode 100644
index 00000000000..ee3d9dea0fb
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/hang.m
@@ -0,0 +1,24 @@
+#import "AnyPromise.h"
+#import "AnyPromise+Private.h"
+@import CoreFoundation.CFRunLoop;
+
+id PMKHang(AnyPromise *promise) {
+    if (promise.pending) {
+        static CFRunLoopSourceContext context;
+
+        CFRunLoopRef runLoop = CFRunLoopGetCurrent();
+        CFRunLoopSourceRef runLoopSource = CFRunLoopSourceCreate(NULL, 0, &context);
+        CFRunLoopAddSource(runLoop, runLoopSource, kCFRunLoopDefaultMode);
+
+        promise.finally(^{
+            CFRunLoopStop(runLoop);
+        });
+        while (promise.pending) {
+            CFRunLoopRun();
+        }
+        CFRunLoopRemoveSource(runLoop, runLoopSource, kCFRunLoopDefaultMode);
+        CFRelease(runLoopSource);
+    }
+
+    return promise.value;
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/join.m b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/join.m
new file mode 100644
index 00000000000..b18e05269e1
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/join.m
@@ -0,0 +1,47 @@
+#import "AnyPromise.h"
+#import "AnyPromise+Private.h"
+@import Foundation.NSDictionary;
+@import Foundation.NSError;
+@import Foundation.NSNull;
+#import <libkern/OSAtomic.h>
+#import <PromiseKit/Umbrella.h>
+
+@implementation AnyPromise (join)
+
+AnyPromise *PMKJoin(NSArray *promises) {
+    if (promises == nil)
+        return [AnyPromise promiseWithValue:[NSError errorWithDomain:PMKErrorDomain code:PMKInvalidUsageError userInfo:@{NSLocalizedDescriptionKey: @"PMKJoin(nil)"}]];
+
+    if (promises.count == 0)
+        return [AnyPromise promiseWithValue:promises];
+
+    return [AnyPromise promiseWithResolverBlock:^(PMKResolver resolve) {
+        NSPointerArray *results = NSPointerArrayMake(promises.count);
+        __block int32_t countdown = (int32_t)promises.count;
+        __block BOOL rejected = NO;
+
+        [promises enumerateObjectsUsingBlock:^(AnyPromise *promise, NSUInteger ii, BOOL *stop) {
+            [promise pipe:^(id value) {
+
+                if (IsError(value)) {
+                    [value pmk_consume];
+                    rejected = YES;
+                }
+
+                [results replacePointerAtIndex:ii withPointer:(__bridge void *)(value ?: [NSNull null])];
+
+                if (OSAtomicDecrement32(&countdown) == 0) {
+                    if (!rejected) {
+                        resolve(results.allObjects);
+                    } else {
+                        id userInfo = @{PMKJoinPromisesKey: promises};
+                        id err = [NSError errorWithDomain:PMKErrorDomain code:PMKJoinError userInfo:userInfo];
+                        resolve(err);
+                    }
+                }
+            }];
+        }];
+    }];
+}
+
+@end
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/join.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/join.swift
new file mode 100644
index 00000000000..22f2da367ed
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/join.swift
@@ -0,0 +1,44 @@
+import Dispatch
+
+/**
+ Waits on all provided promises.
+
+ `when` rejects as soon as one of the provided promises rejects. `join` waits on all provided promises, then rejects if any of those promises rejected, otherwise it fulfills with values from the provided promises.
+
+     join(promise1, promise2, promise3).then { results in
+         //…
+     }.error { error in
+         switch error {
+         case Error.Join(let promises):
+             //…
+         }
+     }
+
+ - Returns: A new promise that resolves once all the provided promises resolve.
+*/
+public func join<T>(promises: Promise<T>...) -> Promise<[T]> {
+    var countdown = promises.count
+    let barrier = dispatch_queue_create("org.promisekit.barrier.join", DISPATCH_QUEUE_CONCURRENT)
+    var rejected = false
+
+    return Promise { fulfill, reject in
+        for promise in promises {
+            promise.pipe { resolution in
+                dispatch_barrier_sync(barrier) {
+                    if case .Rejected(_, let token) = resolution {
+                        token.consumed = true  // the parent Error.Join consumes all
+                        rejected = true
+                    }
+
+                    if --countdown == 0 {
+                        if rejected {
+                            reject(Error.Join(promises))
+                        } else {
+                            fulfill(promises.map{ $0.value! })
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/race.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/race.swift
new file mode 100644
index 00000000000..2b60ca476b9
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/race.swift
@@ -0,0 +1,20 @@
+
+/**
+ Resolves with the first resolving promise from a set of promises.
+
+ ```
+ race(promise1, promise2, promise3).then { winner in
+     //…
+ }
+ ```
+
+ - Returns: A new promise that resolves when the first promise in the provided promises resolves.
+ - Warning: If any of the provided promises reject, the returned promise is rejected.
+*/
+public func race<T>(promises: Promise<T>...) -> Promise<T> {
+    return Promise(sealant: { resolve in
+        for promise in promises {
+            promise.pipe(resolve)
+        }
+    })
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/when.m b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/when.m
new file mode 100644
index 00000000000..b4f21f23332
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/when.m
@@ -0,0 +1,86 @@
+#import "AnyPromise.h"
+#import "AnyPromise+Private.h"
+@import Foundation.NSDictionary;
+@import Foundation.NSError;
+@import Foundation.NSProgress;
+@import Foundation.NSNull;
+#import <libkern/OSAtomic.h>
+#import "Umbrella.h"
+
+// NSProgress resources:
+//  * https://robots.thoughtbot.com/asynchronous-nsprogress
+//  * http://oleb.net/blog/2014/03/nsprogress/
+// NSProgress! Beware!
+//  * https://github.com/AFNetworking/AFNetworking/issues/2261
+
+AnyPromise *PMKWhen(id promises) {
+    if (promises == nil)
+        return [AnyPromise promiseWithValue:[NSError errorWithDomain:PMKErrorDomain code:PMKInvalidUsageError userInfo:@{NSLocalizedDescriptionKey: @"PMKWhen(nil)"}]];
+
+    if ([promises isKindOfClass:[NSArray class]] || [promises isKindOfClass:[NSDictionary class]]) {
+        if ([promises count] == 0)
+            return [AnyPromise promiseWithValue:promises];
+    } else if ([promises isKindOfClass:[AnyPromise class]]) {
+        promises = @[promises];
+    } else {
+        return [AnyPromise promiseWithValue:promises];
+    }
+
+#ifndef PMKDisableProgress
+    NSProgress *progress = [NSProgress progressWithTotalUnitCount:[promises count]];
+    progress.pausable = NO;
+    progress.cancellable = NO;
+#else
+    struct PMKProgress {
+        int completedUnitCount;
+        int totalUnitCount;
+    };
+    __block struct PMKProgress progress;
+#endif
+
+    __block int32_t countdown = (int32_t)[promises count];
+    BOOL const isdict = [promises isKindOfClass:[NSDictionary class]];
+
+    return [AnyPromise promiseWithResolverBlock:^(PMKResolver resolve) {
+        NSInteger index = 0;
+
+        for (__strong id key in promises) {
+            AnyPromise *promise = isdict ? promises[key] : key;
+            if (!isdict) key = @(index);
+
+            if (![promise isKindOfClass:[AnyPromise class]])
+                promise = [AnyPromise promiseWithValue:promise];
+
+            [promise pipe:^(id value){
+                if (progress.fractionCompleted >= 1)
+                    return;
+
+                if (IsError(value)) {
+                    progress.completedUnitCount = progress.totalUnitCount;
+                    resolve(NSErrorSupplement(value, @{PMKFailingPromiseIndexKey: key}));
+                }
+                else if (OSAtomicDecrement32(&countdown) == 0) {
+                    progress.completedUnitCount = progress.totalUnitCount;
+
+                    id results;
+                    if (isdict) {
+                        results = [NSMutableDictionary new];
+                        for (id key in promises) {
+                            id promise = promises[key];
+                            results[key] = IsPromise(promise) ? ((AnyPromise *)promise).value : promise;
+                        }
+                    } else {
+                        results = [NSMutableArray new];
+                        for (AnyPromise *promise in promises) {
+                            id value = IsPromise(promise) ? (promise.value ?: [NSNull null]) : promise;
+                            [results addObject:value];
+                        }
+                    }
+                    resolve(results);
+                } else {
+                    progress.completedUnitCount++;
+                }
+            }];
+        }
+    }];
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/when.swift b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/when.swift
new file mode 100644
index 00000000000..f6ab1324291
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/PromiseKit/Sources/when.swift
@@ -0,0 +1,87 @@
+import Foundation.NSProgress
+
+private func _when<T>(promises: [Promise<T>]) -> Promise<Void> {
+    let (rootPromise, fulfill, reject) = Promise<Void>.pendingPromise()
+#if !PMKDisableProgress
+    let progress = NSProgress(totalUnitCount: Int64(promises.count))
+    progress.cancellable = false
+    progress.pausable = false
+#else
+    var progress: (completedUnitCount: Int, totalUnitCount: Int) = (0, 0)
+#endif
+    var countdown = promises.count
+    if countdown == 0 {
+        fulfill()
+        return rootPromise
+    }
+    let barrier = dispatch_queue_create("org.promisekit.barrier.when", DISPATCH_QUEUE_CONCURRENT)
+
+    for (index, promise) in promises.enumerate() {
+        promise.pipe { resolution in
+            dispatch_barrier_sync(barrier) {
+                switch resolution {
+                case .Rejected(let error, let token):
+                    token.consumed = true   // all errors are consumed by the parent Error.When
+                    if rootPromise.pending {
+                        progress.completedUnitCount = progress.totalUnitCount
+                        reject(Error.When(index, error))
+                    }
+                case .Fulfilled:
+                    guard rootPromise.pending else { return }
+                    progress.completedUnitCount++
+                    if --countdown == 0 {
+                        fulfill()
+                    }
+                }
+            }
+        }
+    }
+
+    return rootPromise
+}
+
+/**
+ Wait for all promises in a set to resolve.
+
+ For example:
+
+     when(promise1, promise2).then { results in
+         //…
+     }.error { error in
+         switch error {
+         case Error.When(let index, NSURLError.NoConnection):
+             //…
+         case Error.When(let index, CLError.NotAuthorized):
+             //…
+         }
+     }
+
+ - Warning: If *any* of the provided promises reject, the returned promise is immediately rejected with that promise’s rejection. The error’s `userInfo` object is supplemented with `PMKFailingPromiseIndexKey`.
+ - Warning: In the event of rejection the other promises will continue to resolve and, as per any other promise, will either fulfill or reject. This is the right pattern for `getter` style asynchronous tasks, but often for `setter` tasks (eg. storing data on a server), you most likely will need to wait on all tasks and then act based on which have succeeded and which have failed, in such situations use `join`.
+ - Parameter promises: The promises upon which to wait before the returned promise resolves.
+ - Returns: A new promise that resolves when all the provided promises fulfill or one of the provided promises rejects.
+ - SeeAlso: `join()`
+*/
+public func when<T>(promises: [Promise<T>]) -> Promise<[T]> {
+    return _when(promises).then(on: zalgo) { promises.map{ $0.value! } }
+}
+
+public func when<T>(promises: Promise<T>...) -> Promise<[T]> {
+    return when(promises)
+}
+
+public func when(promises: Promise<Void>...) -> Promise<Void> {
+    return _when(promises)
+}
+
+public func when(promises: [Promise<Void>]) -> Promise<Void> {
+    return _when(promises)
+}
+
+public func when<U, V>(pu: Promise<U>, _ pv: Promise<V>) -> Promise<(U, V)> {
+    return _when([pu.asVoid(), pv.asVoid()]).then(on: zalgo) { (pu.value!, pv.value!) }
+}
+
+public func when<U, V, X>(pu: Promise<U>, _ pv: Promise<V>, _ px: Promise<X>) -> Promise<(U, V, X)> {
+    return _when([pu.asVoid(), pv.asVoid(), px.asVoid()]).then(on: zalgo) { (pu.value!, pv.value!, px.value!) }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-dummy.m b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-dummy.m
new file mode 100644
index 00000000000..a6c4594242e
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-dummy.m	
@@ -0,0 +1,5 @@
+#import <Foundation/Foundation.h>
+@interface PodsDummy_Alamofire : NSObject
+@end
+@implementation PodsDummy_Alamofire
+@end
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-prefix.pch b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-prefix.pch
new file mode 100644
index 00000000000..aa992a4adb2
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-prefix.pch	
@@ -0,0 +1,4 @@
+#ifdef __OBJC__
+#import <UIKit/UIKit.h>
+#endif
+
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-umbrella.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-umbrella.h
new file mode 100644
index 00000000000..6b71676a9bd
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-umbrella.h	
@@ -0,0 +1,6 @@
+#import <UIKit/UIKit.h>
+
+
+FOUNDATION_EXPORT double AlamofireVersionNumber;
+FOUNDATION_EXPORT const unsigned char AlamofireVersionString[];
+
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.modulemap b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.modulemap
new file mode 100644
index 00000000000..d1f125fab6b
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.modulemap	
@@ -0,0 +1,6 @@
+framework module Alamofire {
+  umbrella header "Alamofire-umbrella.h"
+
+  export *
+  module * { export * }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig
new file mode 100644
index 00000000000..baea9f3b46a
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig	
@@ -0,0 +1,5 @@
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
+HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/Alamofire" "${PODS_ROOT}/Headers/Public"
+OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
+PODS_ROOT = ${SRCROOT}
+SKIP_INSTALL = YES
\ No newline at end of file
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Info.plist b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Info.plist
new file mode 100644
index 00000000000..93987c18ff5
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Info.plist	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleExecutable</key>
+  <string>${EXECUTABLE_NAME}</string>
+  <key>CFBundleIdentifier</key>
+  <string>org.cocoapods.${PRODUCT_NAME:rfc1034identifier}</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>${PRODUCT_NAME}</string>
+  <key>CFBundlePackageType</key>
+  <string>FMWK</string>
+  <key>CFBundleShortVersionString</key>
+  <string>3.1.5</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>${CURRENT_PROJECT_VERSION}</string>
+  <key>NSPrincipalClass</key>
+  <string></string>
+</dict>
+</plist>
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/Info.plist b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/Info.plist
new file mode 100644
index 00000000000..ce3a3137315
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/Info.plist	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleExecutable</key>
+  <string>${EXECUTABLE_NAME}</string>
+  <key>CFBundleIdentifier</key>
+  <string>org.cocoapods.${PRODUCT_NAME:rfc1034identifier}</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>${PRODUCT_NAME}</string>
+  <key>CFBundlePackageType</key>
+  <string>FMWK</string>
+  <key>CFBundleShortVersionString</key>
+  <string>3.1.1</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>${CURRENT_PROJECT_VERSION}</string>
+  <key>NSPrincipalClass</key>
+  <string></string>
+</dict>
+</plist>
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ-dummy.m b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ-dummy.m
new file mode 100644
index 00000000000..144970817e1
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ-dummy.m	
@@ -0,0 +1,5 @@
+#import <Foundation/Foundation.h>
+@interface PodsDummy_OMGHTTPURLRQ : NSObject
+@end
+@implementation PodsDummy_OMGHTTPURLRQ
+@end
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ-prefix.pch b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ-prefix.pch
new file mode 100644
index 00000000000..aa992a4adb2
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ-prefix.pch	
@@ -0,0 +1,4 @@
+#ifdef __OBJC__
+#import <UIKit/UIKit.h>
+#endif
+
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ-umbrella.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ-umbrella.h
new file mode 100644
index 00000000000..e6ad2ae2f6d
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ-umbrella.h	
@@ -0,0 +1,9 @@
+#import <UIKit/UIKit.h>
+
+#import "OMGFormURLEncode.h"
+#import "OMGHTTPURLRQ.h"
+#import "OMGUserAgent.h"
+
+FOUNDATION_EXPORT double OMGHTTPURLRQVersionNumber;
+FOUNDATION_EXPORT const unsigned char OMGHTTPURLRQVersionString[];
+
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ.modulemap b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ.modulemap
new file mode 100644
index 00000000000..f508eea999b
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ.modulemap	
@@ -0,0 +1,6 @@
+framework module OMGHTTPURLRQ {
+  umbrella header "OMGHTTPURLRQ-umbrella.h"
+
+  export *
+  module * { export * }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ.xcconfig b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ.xcconfig
new file mode 100644
index 00000000000..13e88fd2ece
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ.xcconfig	
@@ -0,0 +1,4 @@
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
+HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/OMGHTTPURLRQ" "${PODS_ROOT}/Headers/Public"
+PODS_ROOT = ${SRCROOT}
+SKIP_INSTALL = YES
\ No newline at end of file
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/Info.plist b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/Info.plist
new file mode 100644
index 00000000000..94e53826685
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/Info.plist	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleExecutable</key>
+  <string>${EXECUTABLE_NAME}</string>
+  <key>CFBundleIdentifier</key>
+  <string>org.cocoapods.${PRODUCT_NAME:rfc1034identifier}</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>${PRODUCT_NAME}</string>
+  <key>CFBundlePackageType</key>
+  <string>FMWK</string>
+  <key>CFBundleShortVersionString</key>
+  <string>0.0.1</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>${CURRENT_PROJECT_VERSION}</string>
+  <key>NSPrincipalClass</key>
+  <string></string>
+</dict>
+</plist>
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-dummy.m b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-dummy.m
new file mode 100644
index 00000000000..749b412f85c
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-dummy.m	
@@ -0,0 +1,5 @@
+#import <Foundation/Foundation.h>
+@interface PodsDummy_PetstoreClient : NSObject
+@end
+@implementation PodsDummy_PetstoreClient
+@end
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-prefix.pch b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-prefix.pch
new file mode 100644
index 00000000000..aa992a4adb2
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-prefix.pch	
@@ -0,0 +1,4 @@
+#ifdef __OBJC__
+#import <UIKit/UIKit.h>
+#endif
+
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-umbrella.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-umbrella.h
new file mode 100644
index 00000000000..75c63f7c53e
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-umbrella.h	
@@ -0,0 +1,6 @@
+#import <UIKit/UIKit.h>
+
+
+FOUNDATION_EXPORT double PetstoreClientVersionNumber;
+FOUNDATION_EXPORT const unsigned char PetstoreClientVersionString[];
+
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.modulemap b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.modulemap
new file mode 100644
index 00000000000..7fdfc46cf79
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.modulemap	
@@ -0,0 +1,6 @@
+framework module PetstoreClient {
+  umbrella header "PetstoreClient-umbrella.h"
+
+  export *
+  module * { export * }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig
new file mode 100644
index 00000000000..f579ebfea5e
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig	
@@ -0,0 +1,5 @@
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
+HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/PetstoreClient" "${PODS_ROOT}/Headers/Public"
+OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
+PODS_ROOT = ${SRCROOT}
+SKIP_INSTALL = YES
\ No newline at end of file
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Info.plist b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Info.plist
new file mode 100644
index 00000000000..69745425863
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Info.plist	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleExecutable</key>
+  <string>${EXECUTABLE_NAME}</string>
+  <key>CFBundleIdentifier</key>
+  <string>org.cocoapods.${PRODUCT_NAME:rfc1034identifier}</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>${PRODUCT_NAME}</string>
+  <key>CFBundlePackageType</key>
+  <string>FMWK</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0.0</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>${CURRENT_PROJECT_VERSION}</string>
+  <key>NSPrincipalClass</key>
+  <string></string>
+</dict>
+</plist>
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Pods-acknowledgements.markdown b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Pods-acknowledgements.markdown
new file mode 100644
index 00000000000..a24fb37c814
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Pods-acknowledgements.markdown	
@@ -0,0 +1,34 @@
+# Acknowledgements
+This application makes use of the following third party libraries:
+
+## Alamofire
+
+Copyright (c) 2014–2016 Alamofire Software Foundation (http://alamofire.org/)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+## OMGHTTPURLRQ
+
+See README.markdown for full license text.
+
+## PromiseKit
+
+@see README
+Generated by CocoaPods - http://cocoapods.org
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Pods-acknowledgements.plist b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Pods-acknowledgements.plist
new file mode 100644
index 00000000000..0dca0acc18f
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Pods-acknowledgements.plist	
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreferenceSpecifiers</key>
+	<array>
+		<dict>
+			<key>FooterText</key>
+			<string>This application makes use of the following third party libraries:</string>
+			<key>Title</key>
+			<string>Acknowledgements</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>Copyright (c) 2014&#8211;2016 Alamofire Software Foundation (http://alamofire.org/)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+</string>
+			<key>Title</key>
+			<string>Alamofire</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>See README.markdown for full license text.</string>
+			<key>Title</key>
+			<string>OMGHTTPURLRQ</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>@see README</string>
+			<key>Title</key>
+			<string>PromiseKit</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>Generated by CocoaPods - http://cocoapods.org</string>
+			<key>Title</key>
+			<string></string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+	</array>
+	<key>StringsTable</key>
+	<string>Acknowledgements</string>
+	<key>Title</key>
+	<string>Acknowledgements</string>
+</dict>
+</plist>
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Pods-dummy.m b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Pods-dummy.m
new file mode 100644
index 00000000000..ade64bd1a9b
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Pods-dummy.m	
@@ -0,0 +1,5 @@
+#import <Foundation/Foundation.h>
+@interface PodsDummy_Pods : NSObject
+@end
+@implementation PodsDummy_Pods
+@end
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Pods-frameworks.sh b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Pods-frameworks.sh
new file mode 100755
index 00000000000..be3c5c77d9f
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Pods-frameworks.sh	
@@ -0,0 +1,97 @@
+#!/bin/sh
+set -e
+
+echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+
+SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
+
+install_framework()
+{
+  if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then
+    local source="${BUILT_PRODUCTS_DIR}/$1"
+  elif [ -r "${BUILT_PRODUCTS_DIR}/$(basename "$1")" ]; then
+    local source="${BUILT_PRODUCTS_DIR}/$(basename "$1")"
+  elif [ -r "$1" ]; then
+    local source="$1"
+  fi
+
+  local destination="${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+
+  if [ -L "${source}" ]; then
+      echo "Symlinked..."
+      source="$(readlink "${source}")"
+  fi
+
+  # use filter instead of exclude so missing patterns dont' throw errors
+  echo "rsync -av --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${destination}\""
+  rsync -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}"
+
+  local basename
+  basename="$(basename -s .framework "$1")"
+  binary="${destination}/${basename}.framework/${basename}"
+  if ! [ -r "$binary" ]; then
+    binary="${destination}/${basename}"
+  fi
+
+  # Strip invalid architectures so "fat" simulator / device frameworks work on device
+  if [[ "$(file "$binary")" == *"dynamically linked shared library"* ]]; then
+    strip_invalid_archs "$binary"
+  fi
+
+  # Resign the code if required by the build settings to avoid unstable apps
+  code_sign_if_enabled "${destination}/$(basename "$1")"
+
+  # Embed linked Swift runtime libraries. No longer necessary as of Xcode 7.
+  if [ "${XCODE_VERSION_MAJOR}" -lt 7 ]; then
+    local swift_runtime_libs
+    swift_runtime_libs=$(xcrun otool -LX "$binary" | grep --color=never @rpath/libswift | sed -E s/@rpath\\/\(.+dylib\).*/\\1/g | uniq -u  && exit ${PIPESTATUS[0]})
+    for lib in $swift_runtime_libs; do
+      echo "rsync -auv \"${SWIFT_STDLIB_PATH}/${lib}\" \"${destination}\""
+      rsync -auv "${SWIFT_STDLIB_PATH}/${lib}" "${destination}"
+      code_sign_if_enabled "${destination}/${lib}"
+    done
+  fi
+}
+
+# Signs a framework with the provided identity
+code_sign_if_enabled() {
+  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
+    # Use the current code_sign_identitiy
+    echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
+    echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements \"$1\""
+    /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements "$1"
+  fi
+}
+
+# Strip invalid architectures
+strip_invalid_archs() {
+  binary="$1"
+  # Get architectures for current file
+  archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)"
+  stripped=""
+  for arch in $archs; do
+    if ! [[ "${VALID_ARCHS}" == *"$arch"* ]]; then
+      # Strip non-valid architectures in-place
+      lipo -remove "$arch" -output "$binary" "$binary" || exit 1
+      stripped="$stripped $arch"
+    fi
+  done
+  if [[ "$stripped" ]]; then
+    echo "Stripped $binary of architectures:$stripped"
+  fi
+}
+
+
+if [[ "$CONFIGURATION" == "Debug" ]]; then
+  install_framework "Pods/Alamofire.framework"
+  install_framework "Pods/OMGHTTPURLRQ.framework"
+  install_framework "Pods/PetstoreClient.framework"
+  install_framework "Pods/PromiseKit.framework"
+fi
+if [[ "$CONFIGURATION" == "Release" ]]; then
+  install_framework "Pods/Alamofire.framework"
+  install_framework "Pods/OMGHTTPURLRQ.framework"
+  install_framework "Pods/PetstoreClient.framework"
+  install_framework "Pods/PromiseKit.framework"
+fi
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Pods-resources.sh b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Pods-resources.sh
new file mode 100755
index 00000000000..16774fb4661
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Pods-resources.sh	
@@ -0,0 +1,95 @@
+#!/bin/sh
+set -e
+
+mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+
+RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
+> "$RESOURCES_TO_COPY"
+
+XCASSET_FILES=()
+
+realpath() {
+  DIRECTORY="$(cd "${1%/*}" && pwd)"
+  FILENAME="${1##*/}"
+  echo "$DIRECTORY/$FILENAME"
+}
+
+install_resource()
+{
+  case $1 in
+    *.storyboard)
+      echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc ${PODS_ROOT}/$1 --sdk ${SDKROOT}"
+      ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc" "${PODS_ROOT}/$1" --sdk "${SDKROOT}"
+      ;;
+    *.xib)
+      echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib ${PODS_ROOT}/$1 --sdk ${SDKROOT}"
+      ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib" "${PODS_ROOT}/$1" --sdk "${SDKROOT}"
+      ;;
+    *.framework)
+      echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      echo "rsync -av ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      rsync -av "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      ;;
+    *.xcdatamodel)
+      echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1"`.mom\""
+      xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodel`.mom"
+      ;;
+    *.xcdatamodeld)
+      echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd\""
+      xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd"
+      ;;
+    *.xcmappingmodel)
+      echo "xcrun mapc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm\""
+      xcrun mapc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm"
+      ;;
+    *.xcassets)
+      ABSOLUTE_XCASSET_FILE=$(realpath "${PODS_ROOT}/$1")
+      XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE")
+      ;;
+    /*)
+      echo "$1"
+      echo "$1" >> "$RESOURCES_TO_COPY"
+      ;;
+    *)
+      echo "${PODS_ROOT}/$1"
+      echo "${PODS_ROOT}/$1" >> "$RESOURCES_TO_COPY"
+      ;;
+  esac
+}
+
+mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
+  mkdir -p "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+fi
+rm -f "$RESOURCES_TO_COPY"
+
+if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
+then
+  case "${TARGETED_DEVICE_FAMILY}" in
+    1,2)
+      TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
+      ;;
+    1)
+      TARGET_DEVICE_ARGS="--target-device iphone"
+      ;;
+    2)
+      TARGET_DEVICE_ARGS="--target-device ipad"
+      ;;
+    *)
+      TARGET_DEVICE_ARGS="--target-device mac"
+      ;;
+  esac
+
+  # Find all other xcassets (this unfortunately includes those of path pods and other targets).
+  OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
+  while read line; do
+    if [[ $line != "`realpath $PODS_ROOT`*" ]]; then
+      XCASSET_FILES+=("$line")
+    fi
+  done <<<"$OTHER_XCASSETS"
+
+  printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${IPHONEOS_DEPLOYMENT_TARGET}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+fi
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Pods-umbrella.h b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Pods-umbrella.h
new file mode 100644
index 00000000000..21dcfd2c21e
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Pods-umbrella.h	
@@ -0,0 +1,6 @@
+#import <UIKit/UIKit.h>
+
+
+FOUNDATION_EXPORT double PodsVersionNumber;
+FOUNDATION_EXPORT const unsigned char PodsVersionString[];
+
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Pods.debug.xcconfig b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Pods.debug.xcconfig
new file mode 100644
index 00000000000..ed219269397
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Pods.debug.xcconfig	
@@ -0,0 +1,9 @@
+EMBEDDED_CONTENT_CONTAINS_SWIFT = YES
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
+LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
+OTHER_CFLAGS = $(inherited) -iquote "$CONFIGURATION_BUILD_DIR/Alamofire.framework/Headers" -iquote "$CONFIGURATION_BUILD_DIR/OMGHTTPURLRQ.framework/Headers" -iquote "$CONFIGURATION_BUILD_DIR/PetstoreClient.framework/Headers" -iquote "$CONFIGURATION_BUILD_DIR/PromiseKit.framework/Headers"
+OTHER_LDFLAGS = $(inherited) -framework "Alamofire" -framework "OMGHTTPURLRQ" -framework "PetstoreClient" -framework "PromiseKit"
+OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
+PODS_FRAMEWORK_BUILD_PATH = $(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/Pods
+PODS_ROOT = ${SRCROOT}/Pods
+SWIFT_INSTALL_OBJC_HEADER = NO
\ No newline at end of file
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Pods.modulemap b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Pods.modulemap
new file mode 100644
index 00000000000..84134130779
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Pods.modulemap	
@@ -0,0 +1,6 @@
+framework module Pods {
+  umbrella header "Pods-umbrella.h"
+
+  export *
+  module * { export * }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Pods.release.xcconfig b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Pods.release.xcconfig
new file mode 100644
index 00000000000..ed219269397
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods/Pods.release.xcconfig	
@@ -0,0 +1,9 @@
+EMBEDDED_CONTENT_CONTAINS_SWIFT = YES
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
+LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
+OTHER_CFLAGS = $(inherited) -iquote "$CONFIGURATION_BUILD_DIR/Alamofire.framework/Headers" -iquote "$CONFIGURATION_BUILD_DIR/OMGHTTPURLRQ.framework/Headers" -iquote "$CONFIGURATION_BUILD_DIR/PetstoreClient.framework/Headers" -iquote "$CONFIGURATION_BUILD_DIR/PromiseKit.framework/Headers"
+OTHER_LDFLAGS = $(inherited) -framework "Alamofire" -framework "OMGHTTPURLRQ" -framework "PetstoreClient" -framework "PromiseKit"
+OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
+PODS_FRAMEWORK_BUILD_PATH = $(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/Pods
+PODS_ROOT = ${SRCROOT}/Pods
+SWIFT_INSTALL_OBJC_HEADER = NO
\ No newline at end of file
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PromiseKit/Info.plist b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PromiseKit/Info.plist
new file mode 100644
index 00000000000..039da19eb7c
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PromiseKit/Info.plist	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleExecutable</key>
+  <string>${EXECUTABLE_NAME}</string>
+  <key>CFBundleIdentifier</key>
+  <string>org.cocoapods.${PRODUCT_NAME:rfc1034identifier}</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>${PRODUCT_NAME}</string>
+  <key>CFBundlePackageType</key>
+  <string>FMWK</string>
+  <key>CFBundleShortVersionString</key>
+  <string>3.0.3</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>${CURRENT_PROJECT_VERSION}</string>
+  <key>NSPrincipalClass</key>
+  <string></string>
+</dict>
+</plist>
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit-dummy.m b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit-dummy.m
new file mode 100644
index 00000000000..ce92451305b
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit-dummy.m	
@@ -0,0 +1,5 @@
+#import <Foundation/Foundation.h>
+@interface PodsDummy_PromiseKit : NSObject
+@end
+@implementation PodsDummy_PromiseKit
+@end
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit-prefix.pch b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit-prefix.pch
new file mode 100644
index 00000000000..aa992a4adb2
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit-prefix.pch	
@@ -0,0 +1,4 @@
+#ifdef __OBJC__
+#import <UIKit/UIKit.h>
+#endif
+
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit.modulemap b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit.modulemap
new file mode 100644
index 00000000000..7e55ef9dc2b
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit.modulemap	
@@ -0,0 +1,32 @@
+framework module PromiseKit {
+  umbrella header "Umbrella.h"
+
+  header "NSError+Cancellation.h"
+
+  exclude header "AnyPromise.h"
+  exclude header "PromiseKit.h"
+  exclude header "PMKPromise.h"
+  exclude header "Promise.h"
+
+  exclude header "Pods-PromiseKit-umbrella.h"
+
+  exclude header "ACAccountStore+AnyPromise.h"
+  exclude header "AVAudioSession+AnyPromise.h"
+  exclude header "CKContainer+AnyPromise.h"
+  exclude header "CKDatabase+AnyPromise.h"
+  exclude header "CLGeocoder+AnyPromise.h"
+  exclude header "CLLocationManager+AnyPromise.h"
+  exclude header "NSNotificationCenter+AnyPromise.h"
+  exclude header "NSTask+AnyPromise.h"
+  exclude header "NSURLConnection+AnyPromise.h"
+  exclude header "MKDirections+AnyPromise.h"
+  exclude header "MKMapSnapshotter+AnyPromise.h"
+  exclude header "CALayer+AnyPromise.h"
+  exclude header "SLRequest+AnyPromise.h"
+  exclude header "SKRequest+AnyPromise.h"
+  exclude header "SCNetworkReachability+AnyPromise.h"
+  exclude header "UIActionSheet+AnyPromise.h"
+  exclude header "UIAlertView+AnyPromise.h"
+  exclude header "UIView+AnyPromise.h"
+  exclude header "UIViewController+AnyPromise.h"
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit.xcconfig b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit.xcconfig
new file mode 100644
index 00000000000..66f974aa5ca
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit.xcconfig	
@@ -0,0 +1,7 @@
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
+HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/PromiseKit" "${PODS_ROOT}/Headers/Public"
+OTHER_LDFLAGS = -framework "Foundation" -framework "QuartzCore" -framework "UIKit"
+OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
+PODS_ROOT = ${SRCROOT}
+SKIP_INSTALL = YES
+SWIFT_INSTALL_OBJC_HEADER = NO
\ No newline at end of file
diff --git a/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
new file mode 100644
index 00000000000..d65a2a49ff8
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
@@ -0,0 +1,490 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		30ED4051B9A69550250EC1E8 /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C07EC0A94AA0F86D60668B32 /* Pods.framework */; };
+		6D4EFB951C692C6300B96B06 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D4EFB941C692C6300B96B06 /* AppDelegate.swift */; };
+		6D4EFB971C692C6300B96B06 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D4EFB961C692C6300B96B06 /* ViewController.swift */; };
+		6D4EFB9A1C692C6300B96B06 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6D4EFB981C692C6300B96B06 /* Main.storyboard */; };
+		6D4EFB9C1C692C6300B96B06 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6D4EFB9B1C692C6300B96B06 /* Assets.xcassets */; };
+		6D4EFB9F1C692C6300B96B06 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6D4EFB9D1C692C6300B96B06 /* LaunchScreen.storyboard */; };
+		6D4EFBB51C693BE200B96B06 /* PetAPITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D4EFBB41C693BE200B96B06 /* PetAPITests.swift */; };
+		6D4EFBB71C693BED00B96B06 /* StoreAPITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D4EFBB61C693BED00B96B06 /* StoreAPITests.swift */; };
+		6D4EFBB91C693BFC00B96B06 /* UserAPITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D4EFBB81C693BFC00B96B06 /* UserAPITests.swift */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		6D4EFBA61C692C6300B96B06 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 6D4EFB891C692C6300B96B06 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 6D4EFB901C692C6300B96B06;
+			remoteInfo = SwaggerClient;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXFileReference section */
+		6D4EFB911C692C6300B96B06 /* SwaggerClient.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SwaggerClient.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		6D4EFB941C692C6300B96B06 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		6D4EFB961C692C6300B96B06 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
+		6D4EFB991C692C6300B96B06 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
+		6D4EFB9B1C692C6300B96B06 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		6D4EFB9E1C692C6300B96B06 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
+		6D4EFBA01C692C6300B96B06 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		6D4EFBA51C692C6300B96B06 /* SwaggerClientTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SwaggerClientTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		6D4EFBAB1C692C6300B96B06 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		6D4EFBB41C693BE200B96B06 /* PetAPITests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PetAPITests.swift; sourceTree = "<group>"; };
+		6D4EFBB61C693BED00B96B06 /* StoreAPITests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StoreAPITests.swift; sourceTree = "<group>"; };
+		6D4EFBB81C693BFC00B96B06 /* UserAPITests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserAPITests.swift; sourceTree = "<group>"; };
+		8A9666BD47569881BB2CE936 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
+		C07EC0A94AA0F86D60668B32 /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		DB0055390ED4A7AE7901DEDD /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		6D4EFB8E1C692C6300B96B06 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				30ED4051B9A69550250EC1E8 /* Pods.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		6D4EFBA21C692C6300B96B06 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		0E57353437EAD141ADC443DF /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				8A9666BD47569881BB2CE936 /* Pods.debug.xcconfig */,
+				DB0055390ED4A7AE7901DEDD /* Pods.release.xcconfig */,
+			);
+			name = Pods;
+			sourceTree = "<group>";
+		};
+		3FABC56EC0BA84CBF4F99564 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				C07EC0A94AA0F86D60668B32 /* Pods.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		6D4EFB881C692C6300B96B06 = {
+			isa = PBXGroup;
+			children = (
+				6D4EFB931C692C6300B96B06 /* SwaggerClient */,
+				6D4EFBA81C692C6300B96B06 /* SwaggerClientTests */,
+				6D4EFB921C692C6300B96B06 /* Products */,
+				0E57353437EAD141ADC443DF /* Pods */,
+				3FABC56EC0BA84CBF4F99564 /* Frameworks */,
+			);
+			sourceTree = "<group>";
+		};
+		6D4EFB921C692C6300B96B06 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				6D4EFB911C692C6300B96B06 /* SwaggerClient.app */,
+				6D4EFBA51C692C6300B96B06 /* SwaggerClientTests.xctest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		6D4EFB931C692C6300B96B06 /* SwaggerClient */ = {
+			isa = PBXGroup;
+			children = (
+				6D4EFB941C692C6300B96B06 /* AppDelegate.swift */,
+				6D4EFB961C692C6300B96B06 /* ViewController.swift */,
+				6D4EFB981C692C6300B96B06 /* Main.storyboard */,
+				6D4EFB9B1C692C6300B96B06 /* Assets.xcassets */,
+				6D4EFB9D1C692C6300B96B06 /* LaunchScreen.storyboard */,
+				6D4EFBA01C692C6300B96B06 /* Info.plist */,
+			);
+			path = SwaggerClient;
+			sourceTree = "<group>";
+		};
+		6D4EFBA81C692C6300B96B06 /* SwaggerClientTests */ = {
+			isa = PBXGroup;
+			children = (
+				6D4EFBAB1C692C6300B96B06 /* Info.plist */,
+				6D4EFBB41C693BE200B96B06 /* PetAPITests.swift */,
+				6D4EFBB61C693BED00B96B06 /* StoreAPITests.swift */,
+				6D4EFBB81C693BFC00B96B06 /* UserAPITests.swift */,
+			);
+			path = SwaggerClientTests;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		6D4EFB901C692C6300B96B06 /* SwaggerClient */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 6D4EFBAE1C692C6300B96B06 /* Build configuration list for PBXNativeTarget "SwaggerClient" */;
+			buildPhases = (
+				8FB32D92B81A800A0BF4CD88 /* Check Pods Manifest.lock */,
+				6D4EFB8D1C692C6300B96B06 /* Sources */,
+				6D4EFB8E1C692C6300B96B06 /* Frameworks */,
+				6D4EFB8F1C692C6300B96B06 /* Resources */,
+				26CEE7DFCFEEFE9269C60201 /* Embed Pods Frameworks */,
+				C6760DAD5440B116B9A1DB88 /* Copy Pods Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = SwaggerClient;
+			productName = SwaggerClient;
+			productReference = 6D4EFB911C692C6300B96B06 /* SwaggerClient.app */;
+			productType = "com.apple.product-type.application";
+		};
+		6D4EFBA41C692C6300B96B06 /* SwaggerClientTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 6D4EFBB11C692C6300B96B06 /* Build configuration list for PBXNativeTarget "SwaggerClientTests" */;
+			buildPhases = (
+				6D4EFBA11C692C6300B96B06 /* Sources */,
+				6D4EFBA21C692C6300B96B06 /* Frameworks */,
+				6D4EFBA31C692C6300B96B06 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				6D4EFBA71C692C6300B96B06 /* PBXTargetDependency */,
+			);
+			name = SwaggerClientTests;
+			productName = SwaggerClientTests;
+			productReference = 6D4EFBA51C692C6300B96B06 /* SwaggerClientTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		6D4EFB891C692C6300B96B06 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastSwiftUpdateCheck = 0720;
+				LastUpgradeCheck = 0720;
+				ORGANIZATIONNAME = Swagger;
+				TargetAttributes = {
+					6D4EFB901C692C6300B96B06 = {
+						CreatedOnToolsVersion = 7.2.1;
+					};
+					6D4EFBA41C692C6300B96B06 = {
+						CreatedOnToolsVersion = 7.2.1;
+						TestTargetID = 6D4EFB901C692C6300B96B06;
+					};
+				};
+			};
+			buildConfigurationList = 6D4EFB8C1C692C6300B96B06 /* Build configuration list for PBXProject "SwaggerClient" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = 6D4EFB881C692C6300B96B06;
+			productRefGroup = 6D4EFB921C692C6300B96B06 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				6D4EFB901C692C6300B96B06 /* SwaggerClient */,
+				6D4EFBA41C692C6300B96B06 /* SwaggerClientTests */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		6D4EFB8F1C692C6300B96B06 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				6D4EFB9F1C692C6300B96B06 /* LaunchScreen.storyboard in Resources */,
+				6D4EFB9C1C692C6300B96B06 /* Assets.xcassets in Resources */,
+				6D4EFB9A1C692C6300B96B06 /* Main.storyboard in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		6D4EFBA31C692C6300B96B06 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		26CEE7DFCFEEFE9269C60201 /* Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Embed Pods Frameworks";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		8FB32D92B81A800A0BF4CD88 /* Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Check Pods Manifest.lock";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
+			showEnvVarsInLog = 0;
+		};
+		C6760DAD5440B116B9A1DB88 /* Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Copy Pods Resources";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		6D4EFB8D1C692C6300B96B06 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				6D4EFB971C692C6300B96B06 /* ViewController.swift in Sources */,
+				6D4EFB951C692C6300B96B06 /* AppDelegate.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		6D4EFBA11C692C6300B96B06 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				6D4EFBB71C693BED00B96B06 /* StoreAPITests.swift in Sources */,
+				6D4EFBB91C693BFC00B96B06 /* UserAPITests.swift in Sources */,
+				6D4EFBB51C693BE200B96B06 /* PetAPITests.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		6D4EFBA71C692C6300B96B06 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 6D4EFB901C692C6300B96B06 /* SwaggerClient */;
+			targetProxy = 6D4EFBA61C692C6300B96B06 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin PBXVariantGroup section */
+		6D4EFB981C692C6300B96B06 /* Main.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				6D4EFB991C692C6300B96B06 /* Base */,
+			);
+			name = Main.storyboard;
+			sourceTree = "<group>";
+		};
+		6D4EFB9D1C692C6300B96B06 /* LaunchScreen.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				6D4EFB9E1C692C6300B96B06 /* Base */,
+			);
+			name = LaunchScreen.storyboard;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		6D4EFBAC1C692C6300B96B06 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		6D4EFBAD1C692C6300B96B06 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		6D4EFBAF1C692C6300B96B06 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 8A9666BD47569881BB2CE936 /* Pods.debug.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				INFOPLIST_FILE = SwaggerClient/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.swagger.SwaggerClient;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		6D4EFBB01C692C6300B96B06 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DB0055390ED4A7AE7901DEDD /* Pods.release.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				INFOPLIST_FILE = SwaggerClient/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.swagger.SwaggerClient;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+		6D4EFBB21C692C6300B96B06 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				INFOPLIST_FILE = SwaggerClientTests/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.swagger.SwaggerClientTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwaggerClient.app/SwaggerClient";
+			};
+			name = Debug;
+		};
+		6D4EFBB31C692C6300B96B06 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				INFOPLIST_FILE = SwaggerClientTests/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.swagger.SwaggerClientTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwaggerClient.app/SwaggerClient";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		6D4EFB8C1C692C6300B96B06 /* Build configuration list for PBXProject "SwaggerClient" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				6D4EFBAC1C692C6300B96B06 /* Debug */,
+				6D4EFBAD1C692C6300B96B06 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		6D4EFBAE1C692C6300B96B06 /* Build configuration list for PBXNativeTarget "SwaggerClient" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				6D4EFBAF1C692C6300B96B06 /* Debug */,
+				6D4EFBB01C692C6300B96B06 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		6D4EFBB11C692C6300B96B06 /* Build configuration list for PBXNativeTarget "SwaggerClientTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				6D4EFBB21C692C6300B96B06 /* Debug */,
+				6D4EFBB31C692C6300B96B06 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 6D4EFB891C692C6300B96B06 /* Project object */;
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient.xcodeproj/xcshareddata/xcschemes/SwaggerClient.xcscheme b/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient.xcodeproj/xcshareddata/xcschemes/SwaggerClient.xcscheme
new file mode 100644
index 00000000000..5ba034cec55
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient.xcodeproj/xcshareddata/xcschemes/SwaggerClient.xcscheme
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0720"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES"
+            hideIssues = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "6D4EFB901C692C6300B96B06"
+               BuildableName = "SwaggerClient.app"
+               BlueprintName = "SwaggerClient"
+               ReferencedContainer = "container:SwaggerClient.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "6D4EFBA41C692C6300B96B06"
+               BuildableName = "SwaggerClientTests.xctest"
+               BlueprintName = "SwaggerClientTests"
+               ReferencedContainer = "container:SwaggerClient.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6D4EFB901C692C6300B96B06"
+            BuildableName = "SwaggerClient.app"
+            BlueprintName = "SwaggerClient"
+            ReferencedContainer = "container:SwaggerClient.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6D4EFB901C692C6300B96B06"
+            BuildableName = "SwaggerClient.app"
+            BlueprintName = "SwaggerClient"
+            ReferencedContainer = "container:SwaggerClient.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6D4EFB901C692C6300B96B06"
+            BuildableName = "SwaggerClient.app"
+            BlueprintName = "SwaggerClient"
+            ReferencedContainer = "container:SwaggerClient.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient.xcworkspace/contents.xcworkspacedata b/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 00000000000..9b3fa18954f
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:SwaggerClient.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/AppDelegate.swift b/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/AppDelegate.swift
new file mode 100644
index 00000000000..3769667ad9c
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/AppDelegate.swift
@@ -0,0 +1,46 @@
+//
+//  AppDelegate.swift
+//  SwaggerClient
+//
+//  Created by Joseph Zuromski on 2/8/16.
+//  Copyright © 2016 Swagger. All rights reserved.
+//
+
+import UIKit
+
+@UIApplicationMain
+class AppDelegate: UIResponder, UIApplicationDelegate {
+
+    var window: UIWindow?
+
+
+    func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
+        // Override point for customization after application launch.
+        return true
+    }
+
+    func applicationWillResignActive(application: UIApplication) {
+        // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
+        // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
+    }
+
+    func applicationDidEnterBackground(application: UIApplication) {
+        // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
+        // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
+    }
+
+    func applicationWillEnterForeground(application: UIApplication) {
+        // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
+    }
+
+    func applicationDidBecomeActive(application: UIApplication) {
+        // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+    }
+
+    func applicationWillTerminate(application: UIApplication) {
+        // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
+    }
+
+
+}
+
diff --git a/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/Assets.xcassets/AppIcon.appiconset/Contents.json b/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/Assets.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 00000000000..36d2c80d889
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,68 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "76x76",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "76x76",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/Base.lproj/LaunchScreen.storyboard b/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/Base.lproj/LaunchScreen.storyboard
new file mode 100644
index 00000000000..2e721e1833f
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/Base.lproj/LaunchScreen.storyboard
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8150" systemVersion="15A204g" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8122"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
+                        <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <animations/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="53" y="375"/>
+        </scene>
+    </scenes>
+</document>
diff --git a/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/Base.lproj/Main.storyboard b/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/Base.lproj/Main.storyboard
new file mode 100644
index 00000000000..3a2a49bad8c
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/Base.lproj/Main.storyboard
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6211" systemVersion="14A298i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6204"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="tne-QT-ifu">
+            <objects>
+                <viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="target" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
+                        <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
+            </objects>
+        </scene>
+    </scenes>
+</document>
diff --git a/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/Info.plist b/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/Info.plist
new file mode 100644
index 00000000000..bb71d00fa8a
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/Info.plist
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIMainStoryboardFile</key>
+	<string>Main</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+    <key>NSAppTransportSecurity</key>
+    <dict>
+        <key>NSExceptionDomains</key>
+        <dict>
+            <key>petstore.swagger.io</key>
+            <dict>
+                <!--Include to allow HTTP requests-->
+                <key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
+                <true/>
+            </dict>
+        </dict>
+    </dict>
+</dict>
+</plist>
diff --git a/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/ViewController.swift b/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/ViewController.swift
new file mode 100644
index 00000000000..cd7e9a16761
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/ViewController.swift
@@ -0,0 +1,25 @@
+//
+//  ViewController.swift
+//  SwaggerClient
+//
+//  Created by Joseph Zuromski on 2/8/16.
+//  Copyright © 2016 Swagger. All rights reserved.
+//
+
+import UIKit
+
+class ViewController: UIViewController {
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        // Do any additional setup after loading the view, typically from a nib.
+    }
+
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+        // Dispose of any resources that can be recreated.
+    }
+
+
+}
+
diff --git a/samples/client/petstore/swift/SwaggerClientTests/SwaggerClientTests/Info.plist b/samples/client/petstore/swift/SwaggerClientTests/SwaggerClientTests/Info.plist
new file mode 100644
index 00000000000..802f84f540d
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/SwaggerClientTests/Info.plist
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+    <key>NSAppTransportSecurity</key>
+    <dict>
+        <key>NSExceptionDomains</key>
+        <dict>
+            <key>petstore.swagger.io</key>
+            <dict>
+                <!--Include to allow HTTP requests-->
+                <key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
+                <true/>
+            </dict>
+        </dict>
+    </dict>
+</dict>
+</plist>
diff --git a/samples/client/petstore/swift/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift b/samples/client/petstore/swift/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift
new file mode 100644
index 00000000000..c5f9750c8bf
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift
@@ -0,0 +1,83 @@
+//
+//  PetAPITests.swift
+//  SwaggerClient
+//
+//  Created by Joseph Zuromski on 2/8/16.
+//  Copyright © 2016 Swagger. All rights reserved.
+//
+
+import PetstoreClient
+import PromiseKit
+import XCTest
+@testable import SwaggerClient
+
+class PetAPITests: XCTestCase {
+    
+    let testTimeout = 10.0
+
+    override func setUp() {
+        super.setUp()
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+    
+    override func tearDown() {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+        super.tearDown()
+    }
+    
+    func test1CreatePet() {
+        let expectation = self.expectationWithDescription("testCreatePet")
+        let newPet = Pet()
+        let category = PetstoreClient.Category()
+        category.id = 1234
+        category.name = "eyeColor"
+        newPet.category = category
+        newPet.id = 1000
+        newPet.name = "Fluffy"
+        newPet.status = .Available
+        PetAPI.addPet(body: newPet).then {
+                expectation.fulfill()
+            }.always {
+                // Noop for now
+            }.error { errorType -> Void in
+                XCTFail("error creating pet")
+        }
+        self.waitForExpectationsWithTimeout(testTimeout, handler: nil)
+    }
+    
+    func test2GetPet() {
+        let expectation = self.expectationWithDescription("testGetPet")
+        PetAPI.getPetById(petId: 1000).then { pet -> Void in
+                XCTAssert(pet.id == 1000, "invalid id")
+                XCTAssert(pet.name == "Fluffy", "invalid name")
+                expectation.fulfill()
+            }.always {
+                // Noop for now
+            }.error { errorType -> Void in
+                XCTFail("error creating pet")
+        }
+        self.waitForExpectationsWithTimeout(testTimeout, handler: nil)
+    }
+    
+    func test3DeletePet() {
+        let expectation = self.expectationWithDescription("testDeletePet")
+        PetAPI.deletePet(petId: 1000).always {
+                // expectation.fulfill()
+            }.always {
+                // Noop for now
+            }.error { errorType -> Void in
+                // The server gives us no data back so alamofire parsing fails - at least
+                // verify that is the error we get here
+                // Error Domain=com.alamofire.error Code=-6006 "JSON could not be serialized. Input data was nil or zero
+                // length." UserInfo={NSLocalizedFailureReason=JSON could not be serialized. Input data was nil or zero
+                // length.}
+                let error = errorType as NSError
+                if error.code == -6006 {
+                    expectation.fulfill()
+                } else {
+                    XCTFail("error logging out")
+                }
+        }
+        self.waitForExpectationsWithTimeout(testTimeout, handler: nil)
+    }
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift b/samples/client/petstore/swift/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift
new file mode 100644
index 00000000000..38948737687
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift
@@ -0,0 +1,87 @@
+//
+//  StoreAPITests.swift
+//  SwaggerClient
+//
+//  Created by Joseph Zuromski on 2/8/16.
+//  Copyright © 2016 Swagger. All rights reserved.
+//
+
+import PetstoreClient
+import PromiseKit
+import XCTest
+@testable import SwaggerClient
+
+class StoreAPITests: XCTestCase {
+    
+    let testTimeout = 10.0
+
+    override func setUp() {
+        super.setUp()
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+    
+    override func tearDown() {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+        super.tearDown()
+    }
+    
+    func test1PlaceOrder() {
+        let order = Order()
+        order.id = 1000
+        order.petId = 1000
+        order.complete = false
+        order.quantity = 10
+        order.shipDate = NSDate()
+        order.status = .Placed
+        let expectation = self.expectationWithDescription("testPlaceOrder")
+        StoreAPI.placeOrder(body: order).then { order -> Void in
+                XCTAssert(order.id == 1000, "invalid id")
+                XCTAssert(order.quantity == 10, "invalid quantity")
+                XCTAssert(order.status == .Placed, "invalid status")
+                expectation.fulfill()
+            }.always {
+                // Noop for now
+            }.error { errorType -> Void in
+                XCTFail("error placing order")
+        }
+        self.waitForExpectationsWithTimeout(testTimeout, handler: nil)
+    }
+    
+    func test2GetOrder() {
+        let expectation = self.expectationWithDescription("testGetOrder")
+        StoreAPI.getOrderById(orderId: "1000").then { order -> Void in
+            XCTAssert(order.id == 1000, "invalid id")
+            XCTAssert(order.quantity == 10, "invalid quantity")
+            XCTAssert(order.status == .Placed, "invalid status")
+            expectation.fulfill()
+            }.always {
+                // Noop for now
+            }.error { errorType -> Void in
+                XCTFail("error placing order")
+        }
+        self.waitForExpectationsWithTimeout(testTimeout, handler: nil)
+    }
+    
+    func test3DeleteOrder() {
+        let expectation = self.expectationWithDescription("testDeleteOrder")
+        StoreAPI.deleteOrder(orderId: "1000").then {
+                expectation.fulfill()
+            }.always {
+                // Noop for now
+            }.error { errorType -> Void in
+                // The server gives us no data back so alamofire parsing fails - at least
+                // verify that is the error we get here
+                // Error Domain=com.alamofire.error Code=-6006 "JSON could not be serialized. Input data was nil or zero
+                // length." UserInfo={NSLocalizedFailureReason=JSON could not be serialized. Input data was nil or zero
+                // length.}
+                let error = errorType as NSError
+                if error.code == -6006 {
+                    expectation.fulfill()
+                } else {
+                    XCTFail("error deleting order")
+                }
+        }
+        self.waitForExpectationsWithTimeout(testTimeout, handler: nil)
+    }
+
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift b/samples/client/petstore/swift/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift
new file mode 100644
index 00000000000..7129ecd226a
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift
@@ -0,0 +1,142 @@
+//
+//  UserAPITests.swift
+//  SwaggerClient
+//
+//  Created by Joseph Zuromski on 2/8/16.
+//  Copyright © 2016 Swagger. All rights reserved.
+//
+
+import PetstoreClient
+import PromiseKit
+import XCTest
+@testable import SwaggerClient
+
+class UserAPITests: XCTestCase {
+
+    let testTimeout = 10.0
+    
+    override func setUp() {
+        super.setUp()
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+    
+    override func tearDown() {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+        super.tearDown()
+    }
+    
+    func testLogin() {
+        let expectation = self.expectationWithDescription("testLogin")
+        UserAPI.loginUser(username: "swiftTester", password: "swift").then { _ -> Void in
+                expectation.fulfill()
+            }.always {
+                // Noop for now
+            }.error { errorType -> Void in
+                // The server isn't returning JSON - and currently the alamofire implementation
+                // always parses responses as JSON, so making an exception for this here
+                // Error Domain=NSCocoaErrorDomain Code=3840 "Invalid value around character 0." 
+                // UserInfo={NSDebugDescription=Invalid value around character 0.}
+                let error = errorType as NSError
+                if error.code == 3840 {
+                    expectation.fulfill()
+                } else {
+                    XCTFail("error logging in")
+                }
+        }
+        self.waitForExpectationsWithTimeout(testTimeout, handler: nil)
+    }
+    
+    func testLogout() {
+        let expectation = self.expectationWithDescription("testLogout")
+        UserAPI.logoutUser().then {
+                expectation.fulfill()
+            }.always {
+                // Noop for now
+            }.error { errorType -> Void in
+                // The server gives us no data back so alamofire parsing fails - at least
+                // verify that is the error we get here
+                // Error Domain=com.alamofire.error Code=-6006 "JSON could not be serialized. Input data was nil or zero
+                // length." UserInfo={NSLocalizedFailureReason=JSON could not be serialized. Input data was nil or zero 
+                // length.}
+                let error = errorType as NSError
+                if error.code == -6006 {
+                    expectation.fulfill()
+                } else {
+                    XCTFail("error logging out")
+                }
+        }
+        self.waitForExpectationsWithTimeout(testTimeout, handler: nil)
+    }
+    
+    func test1CreateUser() {
+        let expectation = self.expectationWithDescription("testCreateUser")
+        let newUser = User()
+        newUser.email = "test@test.com"
+        newUser.firstName = "Test"
+        newUser.lastName = "Tester"
+        newUser.id = 1000
+        newUser.password = "test!"
+        newUser.phone = "867-5309"
+        newUser.username = "test@test.com"
+        newUser.userStatus = 0
+        UserAPI.createUser(body: newUser).then {
+                expectation.fulfill()
+            }.always {
+                // Noop for now
+            }.error { errorType -> Void in
+                // The server gives us no data back so alamofire parsing fails - at least
+                // verify that is the error we get here
+                // Error Domain=com.alamofire.error Code=-6006 "JSON could not be serialized. Input data was nil or zero
+                // length." UserInfo={NSLocalizedFailureReason=JSON could not be serialized. Input data was nil or zero
+                // length.}
+                let error = errorType as NSError
+                if error.code == -6006 {
+                    expectation.fulfill()
+                } else {
+                    XCTFail("error creating user")
+                }
+        }
+        self.waitForExpectationsWithTimeout(testTimeout, handler: nil)
+    }
+    
+    func test2GetUser() {
+        let expectation = self.expectationWithDescription("testGetUser")
+        UserAPI.getUserByName(username: "test@test.com").then {user -> Void in
+                XCTAssert(user.userStatus == 0, "invalid userStatus")
+                XCTAssert(user.email == "test@test.com", "invalid email")
+                XCTAssert(user.firstName == "Test", "invalid firstName")
+                XCTAssert(user.lastName == "Tester", "invalid lastName")
+                XCTAssert(user.password == "test!", "invalid password")
+                XCTAssert(user.phone == "867-5309", "invalid phone")
+                expectation.fulfill()
+            }.always {
+                // Noop for now
+            }.error { errorType -> Void in
+                XCTFail("error getting user")
+        }
+        self.waitForExpectationsWithTimeout(testTimeout, handler: nil)
+    }
+    
+    func test3DeleteUser() {
+        let expectation = self.expectationWithDescription("testDeleteUser")
+        UserAPI.deleteUser(username: "test@test.com").then {
+                expectation.fulfill()
+            }.always {
+                // Noop for now
+            }.error { errorType -> Void in
+                // The server gives us no data back so alamofire parsing fails - at least
+                // verify that is the error we get here
+                // Error Domain=com.alamofire.error Code=-6006 "JSON could not be serialized. Input data was nil or zero
+                // length." UserInfo={NSLocalizedFailureReason=JSON could not be serialized. Input data was nil or zero
+                // length.}
+                let error = errorType as NSError
+                if error.code == -6006 {
+                    expectation.fulfill()
+                } else {
+                    XCTFail("error logging out")
+                }
+        }
+        self.waitForExpectationsWithTimeout(testTimeout, handler: nil)
+    }
+
+}
diff --git a/samples/client/petstore/swift/SwaggerClientTests/pom.xml b/samples/client/petstore/swift/SwaggerClientTests/pom.xml
new file mode 100644
index 00000000000..58c75cb5be1
--- /dev/null
+++ b/samples/client/petstore/swift/SwaggerClientTests/pom.xml
@@ -0,0 +1,65 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>io.swagger</groupId>
+    <artifactId>SwiftPetstoreClientTests</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>Swift Swagger Petstore Client</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>install-pods</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>pod</executable>
+                            <arguments>
+                                <argument>install</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xcodebuild-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>xcodebuild</executable>
+                            <arguments>
+                                <argument>-workspace</argument>
+                                <argument>SwaggerClient.xcworkspace</argument>
+                                <argument>-scheme</argument>
+                                <argument>SwaggerClient</argument>
+                                <argument>test</argument>
+                                <argument>-destination</argument>
+                                <argument>platform=iOS Simulator,name=iPhone 6,OS=9.2</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/samples/client/petstore/swift/git_push.sh b/samples/client/petstore/swift/git_push.sh
new file mode 100644
index 00000000000..1a36388db02
--- /dev/null
+++ b/samples/client/petstore/swift/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="YOUR_GIT_USR_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="YOUR_GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/client/petstore/typescript-angular/API/Client/Category.ts b/samples/client/petstore/typescript-angular/API/Client/Category.ts
index a802fe4ebdf..5e8c3bee67c 100644
--- a/samples/client/petstore/typescript-angular/API/Client/Category.ts
+++ b/samples/client/petstore/typescript-angular/API/Client/Category.ts
@@ -5,9 +5,9 @@ namespace API.Client {
 
     export interface Category {
 
-        id?: number;
+        "id"?: number;
 
-        name?: string;
+        "name"?: string;
     }
 
 }
diff --git a/samples/client/petstore/typescript-angular/API/Client/InlineResponse200.ts b/samples/client/petstore/typescript-angular/API/Client/InlineResponse200.ts
new file mode 100644
index 00000000000..079eac61bc6
--- /dev/null
+++ b/samples/client/petstore/typescript-angular/API/Client/InlineResponse200.ts
@@ -0,0 +1,32 @@
+/// <reference path="api.d.ts" />
+
+namespace API.Client {
+    'use strict';
+
+    export interface InlineResponse200 {
+
+        "tags"?: Array<Tag>;
+
+        "id": number;
+
+        "category"?: any;
+
+        /**
+         * pet status in the store
+         */
+        "status"?: InlineResponse200.StatusEnum;
+
+        "name"?: string;
+
+        "photoUrls"?: Array<string>;
+    }
+
+    export namespace InlineResponse200 {
+
+        export enum StatusEnum { 
+            available = <any> 'available',
+            pending = <any> 'pending',
+            sold = <any> 'sold'
+        }
+    }
+}
diff --git a/samples/client/petstore/typescript-angular/API/Client/Model200Response.ts b/samples/client/petstore/typescript-angular/API/Client/Model200Response.ts
new file mode 100644
index 00000000000..ef34114f4a3
--- /dev/null
+++ b/samples/client/petstore/typescript-angular/API/Client/Model200Response.ts
@@ -0,0 +1,11 @@
+/// <reference path="api.d.ts" />
+
+namespace API.Client {
+    'use strict';
+
+    export interface Model200Response {
+
+        "name"?: number;
+    }
+
+}
diff --git a/samples/client/petstore/typescript-angular/API/Client/ModelReturn.ts b/samples/client/petstore/typescript-angular/API/Client/ModelReturn.ts
new file mode 100644
index 00000000000..c147566cf47
--- /dev/null
+++ b/samples/client/petstore/typescript-angular/API/Client/ModelReturn.ts
@@ -0,0 +1,11 @@
+/// <reference path="api.d.ts" />
+
+namespace API.Client {
+    'use strict';
+
+    export interface ModelReturn {
+
+        "return"?: number;
+    }
+
+}
diff --git a/samples/client/petstore/typescript-angular/API/Client/Name.ts b/samples/client/petstore/typescript-angular/API/Client/Name.ts
new file mode 100644
index 00000000000..9277422d52f
--- /dev/null
+++ b/samples/client/petstore/typescript-angular/API/Client/Name.ts
@@ -0,0 +1,11 @@
+/// <reference path="api.d.ts" />
+
+namespace API.Client {
+    'use strict';
+
+    export interface Name {
+
+        "name"?: number;
+    }
+
+}
diff --git a/samples/client/petstore/typescript-angular/API/Client/Order.ts b/samples/client/petstore/typescript-angular/API/Client/Order.ts
index 1dd84e6d0ad..c86c372063b 100644
--- a/samples/client/petstore/typescript-angular/API/Client/Order.ts
+++ b/samples/client/petstore/typescript-angular/API/Client/Order.ts
@@ -5,20 +5,20 @@ namespace API.Client {
 
     export interface Order {
 
-        id?: number;
+        "id"?: number;
 
-        petId?: number;
+        "petId"?: number;
 
-        quantity?: number;
+        "quantity"?: number;
 
-        shipDate?: Date;
+        "shipDate"?: Date;
 
         /**
          * Order Status
          */
-        status?: Order.StatusEnum;
+        "status"?: Order.StatusEnum;
 
-        complete?: boolean;
+        "complete"?: boolean;
     }
 
     export namespace Order {
@@ -26,7 +26,7 @@ namespace API.Client {
         export enum StatusEnum { 
             placed = <any> 'placed',
             approved = <any> 'approved',
-            delivered = <any> 'delivered',
+            delivered = <any> 'delivered'
         }
     }
 }
diff --git a/samples/client/petstore/typescript-angular/API/Client/Pet.ts b/samples/client/petstore/typescript-angular/API/Client/Pet.ts
index 60431f69c83..bc3bcd11f2e 100644
--- a/samples/client/petstore/typescript-angular/API/Client/Pet.ts
+++ b/samples/client/petstore/typescript-angular/API/Client/Pet.ts
@@ -5,20 +5,20 @@ namespace API.Client {
 
     export interface Pet {
 
-        id?: number;
+        "id"?: number;
 
-        category?: Category;
+        "category"?: Category;
 
-        name: string;
+        "name": string;
 
-        photoUrls: Array<string>;
+        "photoUrls": Array<string>;
 
-        tags?: Array<Tag>;
+        "tags"?: Array<Tag>;
 
         /**
          * pet status in the store
          */
-        status?: Pet.StatusEnum;
+        "status"?: Pet.StatusEnum;
     }
 
     export namespace Pet {
@@ -26,7 +26,7 @@ namespace API.Client {
         export enum StatusEnum { 
             available = <any> 'available',
             pending = <any> 'pending',
-            sold = <any> 'sold',
+            sold = <any> 'sold'
         }
     }
 }
diff --git a/samples/client/petstore/typescript-angular/API/Client/PetApi.ts b/samples/client/petstore/typescript-angular/API/Client/PetApi.ts
index 11ef0aa3d5a..d11e0d780ed 100644
--- a/samples/client/petstore/typescript-angular/API/Client/PetApi.ts
+++ b/samples/client/petstore/typescript-angular/API/Client/PetApi.ts
@@ -27,18 +27,18 @@ namespace API.Client {
         }
 
         /**
-         * Update an existing pet
+         * Add a new pet to the store
          * 
          * @param body Pet object that needs to be added to the store
          */
-        public updatePet (body?: Pet, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
-            const path = this.basePath + '/pet';
+        public addPet (body?: Pet, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
+            const localVarPath = this.basePath + '/pet';
 
             let queryParameters: any = {};
             let headerParams: any = this.extendObj({}, this.defaultHeaders);
             let httpRequestParams: any = {
-                method: 'PUT',
-                url: path,
+                method: 'POST',
+                url: localVarPath,
                 json: true,
                 data: body,
                 
@@ -54,18 +54,18 @@ namespace API.Client {
             return this.$http(httpRequestParams);
         }
         /**
-         * Add a new pet to the store
+         * Fake endpoint to test byte array in body parameter for adding a new pet to the store
          * 
-         * @param body Pet object that needs to be added to the store
+         * @param body Pet object in the form of byte array
          */
-        public addPet (body?: Pet, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
-            const path = this.basePath + '/pet';
+        public addPetUsingByteArray (body?: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
+            const localVarPath = this.basePath + '/pet?testing_byte_array=true';
 
             let queryParameters: any = {};
             let headerParams: any = this.extendObj({}, this.defaultHeaders);
             let httpRequestParams: any = {
                 method: 'POST',
-                url: path,
+                url: localVarPath,
                 json: true,
                 data: body,
                 
@@ -80,13 +80,47 @@ namespace API.Client {
 
             return this.$http(httpRequestParams);
         }
+        /**
+         * Deletes a pet
+         * 
+         * @param petId Pet id to delete
+         * @param apiKey 
+         */
+        public deletePet (petId: number, apiKey?: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
+            const localVarPath = this.basePath + '/pet/{petId}'
+                .replace('{' + 'petId' + '}', String(petId));
+
+            let queryParameters: any = {};
+            let headerParams: any = this.extendObj({}, this.defaultHeaders);
+            // verify required parameter 'petId' is set
+            if (!petId) {
+                throw new Error('Missing required parameter petId when calling deletePet');
+            }
+            headerParams['api_key'] = apiKey;
+
+            let httpRequestParams: any = {
+                method: 'DELETE',
+                url: localVarPath,
+                json: true,
+                
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams);
+            }
+
+            return this.$http(httpRequestParams);
+        }
         /**
          * Finds Pets by status
-         * Multiple status values can be provided with comma seperated strings
-         * @param status Status values that need to be considered for filter
+         * Multiple status values can be provided with comma separated strings
+         * @param status Status values that need to be considered for query
          */
         public findPetsByStatus (status?: Array<string>, extraHttpRequestParams?: any ) : ng.IHttpPromise<Array<Pet>> {
-            const path = this.basePath + '/pet/findByStatus';
+            const localVarPath = this.basePath + '/pet/findByStatus';
 
             let queryParameters: any = {};
             let headerParams: any = this.extendObj({}, this.defaultHeaders);
@@ -96,7 +130,7 @@ namespace API.Client {
 
             let httpRequestParams: any = {
                 method: 'GET',
-                url: path,
+                url: localVarPath,
                 json: true,
                 
                 
@@ -116,7 +150,7 @@ namespace API.Client {
          * @param tags Tags to filter by
          */
         public findPetsByTags (tags?: Array<string>, extraHttpRequestParams?: any ) : ng.IHttpPromise<Array<Pet>> {
-            const path = this.basePath + '/pet/findByTags';
+            const localVarPath = this.basePath + '/pet/findByTags';
 
             let queryParameters: any = {};
             let headerParams: any = this.extendObj({}, this.defaultHeaders);
@@ -126,7 +160,7 @@ namespace API.Client {
 
             let httpRequestParams: any = {
                 method: 'GET',
-                url: path,
+                url: localVarPath,
                 json: true,
                 
                 
@@ -146,7 +180,7 @@ namespace API.Client {
          * @param petId ID of pet that needs to be fetched
          */
         public getPetById (petId: number, extraHttpRequestParams?: any ) : ng.IHttpPromise<Pet> {
-            const path = this.basePath + '/pet/{petId}'
+            const localVarPath = this.basePath + '/pet/{petId}'
                 .replace('{' + 'petId' + '}', String(petId));
 
             let queryParameters: any = {};
@@ -157,7 +191,7 @@ namespace API.Client {
             }
             let httpRequestParams: any = {
                 method: 'GET',
-                url: path,
+                url: localVarPath,
                 json: true,
                 
                 
@@ -171,6 +205,95 @@ namespace API.Client {
 
             return this.$http(httpRequestParams);
         }
+        /**
+         * Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+         * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+         * @param petId ID of pet that needs to be fetched
+         */
+        public getPetByIdInObject (petId: number, extraHttpRequestParams?: any ) : ng.IHttpPromise<InlineResponse200> {
+            const localVarPath = this.basePath + '/pet/{petId}?response=inline_arbitrary_object'
+                .replace('{' + 'petId' + '}', String(petId));
+
+            let queryParameters: any = {};
+            let headerParams: any = this.extendObj({}, this.defaultHeaders);
+            // verify required parameter 'petId' is set
+            if (!petId) {
+                throw new Error('Missing required parameter petId when calling getPetByIdInObject');
+            }
+            let httpRequestParams: any = {
+                method: 'GET',
+                url: localVarPath,
+                json: true,
+                
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams);
+            }
+
+            return this.$http(httpRequestParams);
+        }
+        /**
+         * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+         * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+         * @param petId ID of pet that needs to be fetched
+         */
+        public petPetIdtestingByteArraytrueGet (petId: number, extraHttpRequestParams?: any ) : ng.IHttpPromise<string> {
+            const localVarPath = this.basePath + '/pet/{petId}?testing_byte_array=true'
+                .replace('{' + 'petId' + '}', String(petId));
+
+            let queryParameters: any = {};
+            let headerParams: any = this.extendObj({}, this.defaultHeaders);
+            // verify required parameter 'petId' is set
+            if (!petId) {
+                throw new Error('Missing required parameter petId when calling petPetIdtestingByteArraytrueGet');
+            }
+            let httpRequestParams: any = {
+                method: 'GET',
+                url: localVarPath,
+                json: true,
+                
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams);
+            }
+
+            return this.$http(httpRequestParams);
+        }
+        /**
+         * Update an existing pet
+         * 
+         * @param body Pet object that needs to be added to the store
+         */
+        public updatePet (body?: Pet, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
+            const localVarPath = this.basePath + '/pet';
+
+            let queryParameters: any = {};
+            let headerParams: any = this.extendObj({}, this.defaultHeaders);
+            let httpRequestParams: any = {
+                method: 'PUT',
+                url: localVarPath,
+                json: true,
+                data: body,
+                
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams);
+            }
+
+            return this.$http(httpRequestParams);
+        }
         /**
          * Updates a pet in the store with form data
          * 
@@ -179,7 +302,7 @@ namespace API.Client {
          * @param status Updated status of the pet
          */
         public updatePetWithForm (petId: string, name?: string, status?: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
-            const path = this.basePath + '/pet/{petId}'
+            const localVarPath = this.basePath + '/pet/{petId}'
                 .replace('{' + 'petId' + '}', String(petId));
 
             let queryParameters: any = {};
@@ -198,7 +321,7 @@ namespace API.Client {
 
             let httpRequestParams: any = {
                 method: 'POST',
-                url: path,
+                url: localVarPath,
                 json: false,
                 
                 data: this.$httpParamSerializer(formParams),
@@ -213,40 +336,6 @@ namespace API.Client {
 
             return this.$http(httpRequestParams);
         }
-        /**
-         * Deletes a pet
-         * 
-         * @param petId Pet id to delete
-         * @param apiKey 
-         */
-        public deletePet (petId: number, apiKey?: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
-            const path = this.basePath + '/pet/{petId}'
-                .replace('{' + 'petId' + '}', String(petId));
-
-            let queryParameters: any = {};
-            let headerParams: any = this.extendObj({}, this.defaultHeaders);
-            // verify required parameter 'petId' is set
-            if (!petId) {
-                throw new Error('Missing required parameter petId when calling deletePet');
-            }
-            headerParams['api_key'] = apiKey;
-
-            let httpRequestParams: any = {
-                method: 'DELETE',
-                url: path,
-                json: true,
-                
-                
-                params: queryParameters,
-                headers: headerParams
-            };
-
-            if (extraHttpRequestParams) {
-                httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams);
-            }
-
-            return this.$http(httpRequestParams);
-        }
         /**
          * uploads an image
          * 
@@ -255,7 +344,7 @@ namespace API.Client {
          * @param file file to upload
          */
         public uploadFile (petId: number, additionalMetadata?: string, file?: any, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
-            const path = this.basePath + '/pet/{petId}/uploadImage'
+            const localVarPath = this.basePath + '/pet/{petId}/uploadImage'
                 .replace('{' + 'petId' + '}', String(petId));
 
             let queryParameters: any = {};
@@ -274,7 +363,7 @@ namespace API.Client {
 
             let httpRequestParams: any = {
                 method: 'POST',
-                url: path,
+                url: localVarPath,
                 json: false,
                 
                 data: this.$httpParamSerializer(formParams),
diff --git a/samples/client/petstore/typescript-angular/API/Client/SpecialModelName.ts b/samples/client/petstore/typescript-angular/API/Client/SpecialModelName.ts
new file mode 100644
index 00000000000..550ab8cd008
--- /dev/null
+++ b/samples/client/petstore/typescript-angular/API/Client/SpecialModelName.ts
@@ -0,0 +1,11 @@
+/// <reference path="api.d.ts" />
+
+namespace API.Client {
+    'use strict';
+
+    export interface SpecialModelName {
+
+        "$Special[propertyName]"?: number;
+    }
+
+}
diff --git a/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts b/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts
index 3d3c445a144..193e12fe5e5 100644
--- a/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts
+++ b/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts
@@ -26,18 +26,135 @@ namespace API.Client {
             return <T1&T2>objA;
         }
 
+        /**
+         * Delete purchase order by ID
+         * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+         * @param orderId ID of the order that needs to be deleted
+         */
+        public deleteOrder (orderId: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
+            const localVarPath = this.basePath + '/store/order/{orderId}'
+                .replace('{' + 'orderId' + '}', String(orderId));
+
+            let queryParameters: any = {};
+            let headerParams: any = this.extendObj({}, this.defaultHeaders);
+            // verify required parameter 'orderId' is set
+            if (!orderId) {
+                throw new Error('Missing required parameter orderId when calling deleteOrder');
+            }
+            let httpRequestParams: any = {
+                method: 'DELETE',
+                url: localVarPath,
+                json: true,
+                
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams);
+            }
+
+            return this.$http(httpRequestParams);
+        }
+        /**
+         * Finds orders by status
+         * A single status value can be provided as a string
+         * @param status Status value that needs to be considered for query
+         */
+        public findOrdersByStatus (status?: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<Array<Order>> {
+            const localVarPath = this.basePath + '/store/findByStatus';
+
+            let queryParameters: any = {};
+            let headerParams: any = this.extendObj({}, this.defaultHeaders);
+            if (status !== undefined) {
+                queryParameters['status'] = status;
+            }
+
+            let httpRequestParams: any = {
+                method: 'GET',
+                url: localVarPath,
+                json: true,
+                
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams);
+            }
+
+            return this.$http(httpRequestParams);
+        }
         /**
          * Returns pet inventories by status
          * Returns a map of status codes to quantities
          */
         public getInventory (extraHttpRequestParams?: any ) : ng.IHttpPromise<{ [key: string]: number; }> {
-            const path = this.basePath + '/store/inventory';
+            const localVarPath = this.basePath + '/store/inventory';
 
             let queryParameters: any = {};
             let headerParams: any = this.extendObj({}, this.defaultHeaders);
             let httpRequestParams: any = {
                 method: 'GET',
-                url: path,
+                url: localVarPath,
+                json: true,
+                
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams);
+            }
+
+            return this.$http(httpRequestParams);
+        }
+        /**
+         * Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+         * Returns an arbitrary object which is actually a map of status codes to quantities
+         */
+        public getInventoryInObject (extraHttpRequestParams?: any ) : ng.IHttpPromise<any> {
+            const localVarPath = this.basePath + '/store/inventory?response=arbitrary_object';
+
+            let queryParameters: any = {};
+            let headerParams: any = this.extendObj({}, this.defaultHeaders);
+            let httpRequestParams: any = {
+                method: 'GET',
+                url: localVarPath,
+                json: true,
+                
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams);
+            }
+
+            return this.$http(httpRequestParams);
+        }
+        /**
+         * Find purchase order by ID
+         * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+         * @param orderId ID of pet that needs to be fetched
+         */
+        public getOrderById (orderId: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<Order> {
+            const localVarPath = this.basePath + '/store/order/{orderId}'
+                .replace('{' + 'orderId' + '}', String(orderId));
+
+            let queryParameters: any = {};
+            let headerParams: any = this.extendObj({}, this.defaultHeaders);
+            // verify required parameter 'orderId' is set
+            if (!orderId) {
+                throw new Error('Missing required parameter orderId when calling getOrderById');
+            }
+            let httpRequestParams: any = {
+                method: 'GET',
+                url: localVarPath,
                 json: true,
                 
                 
@@ -57,13 +174,13 @@ namespace API.Client {
          * @param body order placed for purchasing the pet
          */
         public placeOrder (body?: Order, extraHttpRequestParams?: any ) : ng.IHttpPromise<Order> {
-            const path = this.basePath + '/store/order';
+            const localVarPath = this.basePath + '/store/order';
 
             let queryParameters: any = {};
             let headerParams: any = this.extendObj({}, this.defaultHeaders);
             let httpRequestParams: any = {
                 method: 'POST',
-                url: path,
+                url: localVarPath,
                 json: true,
                 data: body,
                 
@@ -76,68 +193,6 @@ namespace API.Client {
                 httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams);
             }
 
-            return this.$http(httpRequestParams);
-        }
-        /**
-         * Find purchase order by ID
-         * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-         * @param orderId ID of pet that needs to be fetched
-         */
-        public getOrderById (orderId: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<Order> {
-            const path = this.basePath + '/store/order/{orderId}'
-                .replace('{' + 'orderId' + '}', String(orderId));
-
-            let queryParameters: any = {};
-            let headerParams: any = this.extendObj({}, this.defaultHeaders);
-            // verify required parameter 'orderId' is set
-            if (!orderId) {
-                throw new Error('Missing required parameter orderId when calling getOrderById');
-            }
-            let httpRequestParams: any = {
-                method: 'GET',
-                url: path,
-                json: true,
-                
-                
-                params: queryParameters,
-                headers: headerParams
-            };
-
-            if (extraHttpRequestParams) {
-                httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams);
-            }
-
-            return this.$http(httpRequestParams);
-        }
-        /**
-         * Delete purchase order by ID
-         * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-         * @param orderId ID of the order that needs to be deleted
-         */
-        public deleteOrder (orderId: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
-            const path = this.basePath + '/store/order/{orderId}'
-                .replace('{' + 'orderId' + '}', String(orderId));
-
-            let queryParameters: any = {};
-            let headerParams: any = this.extendObj({}, this.defaultHeaders);
-            // verify required parameter 'orderId' is set
-            if (!orderId) {
-                throw new Error('Missing required parameter orderId when calling deleteOrder');
-            }
-            let httpRequestParams: any = {
-                method: 'DELETE',
-                url: path,
-                json: true,
-                
-                
-                params: queryParameters,
-                headers: headerParams
-            };
-
-            if (extraHttpRequestParams) {
-                httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams);
-            }
-
             return this.$http(httpRequestParams);
         }
     }
diff --git a/samples/client/petstore/typescript-angular/API/Client/Tag.ts b/samples/client/petstore/typescript-angular/API/Client/Tag.ts
index 1c0284cce48..9c24419ec30 100644
--- a/samples/client/petstore/typescript-angular/API/Client/Tag.ts
+++ b/samples/client/petstore/typescript-angular/API/Client/Tag.ts
@@ -5,9 +5,9 @@ namespace API.Client {
 
     export interface Tag {
 
-        id?: number;
+        "id"?: number;
 
-        name?: string;
+        "name"?: string;
     }
 
 }
diff --git a/samples/client/petstore/typescript-angular/API/Client/User.ts b/samples/client/petstore/typescript-angular/API/Client/User.ts
index 7c2b0b78b0c..4744abb6a7c 100644
--- a/samples/client/petstore/typescript-angular/API/Client/User.ts
+++ b/samples/client/petstore/typescript-angular/API/Client/User.ts
@@ -5,24 +5,24 @@ namespace API.Client {
 
     export interface User {
 
-        id?: number;
+        "id"?: number;
 
-        username?: string;
+        "username"?: string;
 
-        firstName?: string;
+        "firstName"?: string;
 
-        lastName?: string;
+        "lastName"?: string;
 
-        email?: string;
+        "email"?: string;
 
-        password?: string;
+        "password"?: string;
 
-        phone?: string;
+        "phone"?: string;
 
         /**
          * User Status
          */
-        userStatus?: number;
+        "userStatus"?: number;
     }
 
 }
diff --git a/samples/client/petstore/typescript-angular/API/Client/UserApi.ts b/samples/client/petstore/typescript-angular/API/Client/UserApi.ts
index 376bdb8935a..c1111e146ad 100644
--- a/samples/client/petstore/typescript-angular/API/Client/UserApi.ts
+++ b/samples/client/petstore/typescript-angular/API/Client/UserApi.ts
@@ -32,13 +32,13 @@ namespace API.Client {
          * @param body Created user object
          */
         public createUser (body?: User, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
-            const path = this.basePath + '/user';
+            const localVarPath = this.basePath + '/user';
 
             let queryParameters: any = {};
             let headerParams: any = this.extendObj({}, this.defaultHeaders);
             let httpRequestParams: any = {
                 method: 'POST',
-                url: path,
+                url: localVarPath,
                 json: true,
                 data: body,
                 
@@ -59,13 +59,13 @@ namespace API.Client {
          * @param body List of user object
          */
         public createUsersWithArrayInput (body?: Array<User>, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
-            const path = this.basePath + '/user/createWithArray';
+            const localVarPath = this.basePath + '/user/createWithArray';
 
             let queryParameters: any = {};
             let headerParams: any = this.extendObj({}, this.defaultHeaders);
             let httpRequestParams: any = {
                 method: 'POST',
-                url: path,
+                url: localVarPath,
                 json: true,
                 data: body,
                 
@@ -86,137 +86,13 @@ namespace API.Client {
          * @param body List of user object
          */
         public createUsersWithListInput (body?: Array<User>, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
-            const path = this.basePath + '/user/createWithList';
+            const localVarPath = this.basePath + '/user/createWithList';
 
             let queryParameters: any = {};
             let headerParams: any = this.extendObj({}, this.defaultHeaders);
             let httpRequestParams: any = {
                 method: 'POST',
-                url: path,
-                json: true,
-                data: body,
-                
-                
-                params: queryParameters,
-                headers: headerParams
-            };
-
-            if (extraHttpRequestParams) {
-                httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams);
-            }
-
-            return this.$http(httpRequestParams);
-        }
-        /**
-         * Logs user into the system
-         * 
-         * @param username The user name for login
-         * @param password The password for login in clear text
-         */
-        public loginUser (username?: string, password?: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<string> {
-            const path = this.basePath + '/user/login';
-
-            let queryParameters: any = {};
-            let headerParams: any = this.extendObj({}, this.defaultHeaders);
-            if (username !== undefined) {
-                queryParameters['username'] = username;
-            }
-
-            if (password !== undefined) {
-                queryParameters['password'] = password;
-            }
-
-            let httpRequestParams: any = {
-                method: 'GET',
-                url: path,
-                json: true,
-                
-                
-                params: queryParameters,
-                headers: headerParams
-            };
-
-            if (extraHttpRequestParams) {
-                httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams);
-            }
-
-            return this.$http(httpRequestParams);
-        }
-        /**
-         * Logs out current logged in user session
-         * 
-         */
-        public logoutUser (extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
-            const path = this.basePath + '/user/logout';
-
-            let queryParameters: any = {};
-            let headerParams: any = this.extendObj({}, this.defaultHeaders);
-            let httpRequestParams: any = {
-                method: 'GET',
-                url: path,
-                json: true,
-                
-                
-                params: queryParameters,
-                headers: headerParams
-            };
-
-            if (extraHttpRequestParams) {
-                httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams);
-            }
-
-            return this.$http(httpRequestParams);
-        }
-        /**
-         * Get user by user name
-         * 
-         * @param username The name that needs to be fetched. Use user1 for testing.
-         */
-        public getUserByName (username: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<User> {
-            const path = this.basePath + '/user/{username}'
-                .replace('{' + 'username' + '}', String(username));
-
-            let queryParameters: any = {};
-            let headerParams: any = this.extendObj({}, this.defaultHeaders);
-            // verify required parameter 'username' is set
-            if (!username) {
-                throw new Error('Missing required parameter username when calling getUserByName');
-            }
-            let httpRequestParams: any = {
-                method: 'GET',
-                url: path,
-                json: true,
-                
-                
-                params: queryParameters,
-                headers: headerParams
-            };
-
-            if (extraHttpRequestParams) {
-                httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams);
-            }
-
-            return this.$http(httpRequestParams);
-        }
-        /**
-         * Updated user
-         * This can only be done by the logged in user.
-         * @param username name that need to be deleted
-         * @param body Updated user object
-         */
-        public updateUser (username: string, body?: User, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
-            const path = this.basePath + '/user/{username}'
-                .replace('{' + 'username' + '}', String(username));
-
-            let queryParameters: any = {};
-            let headerParams: any = this.extendObj({}, this.defaultHeaders);
-            // verify required parameter 'username' is set
-            if (!username) {
-                throw new Error('Missing required parameter username when calling updateUser');
-            }
-            let httpRequestParams: any = {
-                method: 'PUT',
-                url: path,
+                url: localVarPath,
                 json: true,
                 data: body,
                 
@@ -237,7 +113,7 @@ namespace API.Client {
          * @param username The name that needs to be deleted
          */
         public deleteUser (username: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
-            const path = this.basePath + '/user/{username}'
+            const localVarPath = this.basePath + '/user/{username}'
                 .replace('{' + 'username' + '}', String(username));
 
             let queryParameters: any = {};
@@ -248,7 +124,7 @@ namespace API.Client {
             }
             let httpRequestParams: any = {
                 method: 'DELETE',
-                url: path,
+                url: localVarPath,
                 json: true,
                 
                 
@@ -260,6 +136,130 @@ namespace API.Client {
                 httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams);
             }
 
+            return this.$http(httpRequestParams);
+        }
+        /**
+         * Get user by user name
+         * 
+         * @param username The name that needs to be fetched. Use user1 for testing.
+         */
+        public getUserByName (username: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<User> {
+            const localVarPath = this.basePath + '/user/{username}'
+                .replace('{' + 'username' + '}', String(username));
+
+            let queryParameters: any = {};
+            let headerParams: any = this.extendObj({}, this.defaultHeaders);
+            // verify required parameter 'username' is set
+            if (!username) {
+                throw new Error('Missing required parameter username when calling getUserByName');
+            }
+            let httpRequestParams: any = {
+                method: 'GET',
+                url: localVarPath,
+                json: true,
+                
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams);
+            }
+
+            return this.$http(httpRequestParams);
+        }
+        /**
+         * Logs user into the system
+         * 
+         * @param username The user name for login
+         * @param password The password for login in clear text
+         */
+        public loginUser (username?: string, password?: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<string> {
+            const localVarPath = this.basePath + '/user/login';
+
+            let queryParameters: any = {};
+            let headerParams: any = this.extendObj({}, this.defaultHeaders);
+            if (username !== undefined) {
+                queryParameters['username'] = username;
+            }
+
+            if (password !== undefined) {
+                queryParameters['password'] = password;
+            }
+
+            let httpRequestParams: any = {
+                method: 'GET',
+                url: localVarPath,
+                json: true,
+                
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams);
+            }
+
+            return this.$http(httpRequestParams);
+        }
+        /**
+         * Logs out current logged in user session
+         * 
+         */
+        public logoutUser (extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
+            const localVarPath = this.basePath + '/user/logout';
+
+            let queryParameters: any = {};
+            let headerParams: any = this.extendObj({}, this.defaultHeaders);
+            let httpRequestParams: any = {
+                method: 'GET',
+                url: localVarPath,
+                json: true,
+                
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams);
+            }
+
+            return this.$http(httpRequestParams);
+        }
+        /**
+         * Updated user
+         * This can only be done by the logged in user.
+         * @param username name that need to be deleted
+         * @param body Updated user object
+         */
+        public updateUser (username: string, body?: User, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
+            const localVarPath = this.basePath + '/user/{username}'
+                .replace('{' + 'username' + '}', String(username));
+
+            let queryParameters: any = {};
+            let headerParams: any = this.extendObj({}, this.defaultHeaders);
+            // verify required parameter 'username' is set
+            if (!username) {
+                throw new Error('Missing required parameter username when calling updateUser');
+            }
+            let httpRequestParams: any = {
+                method: 'PUT',
+                url: localVarPath,
+                json: true,
+                data: body,
+                
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                httpRequestParams = this.extendObj(httpRequestParams, extraHttpRequestParams);
+            }
+
             return this.$http(httpRequestParams);
         }
     }
diff --git a/samples/client/petstore/typescript-angular/API/Client/api.d.ts b/samples/client/petstore/typescript-angular/API/Client/api.d.ts
index 19c60623dc9..c9e5e7a2f57 100644
--- a/samples/client/petstore/typescript-angular/API/Client/api.d.ts
+++ b/samples/client/petstore/typescript-angular/API/Client/api.d.ts
@@ -1,9 +1,14 @@
-/// <reference path="User.ts" />
 /// <reference path="Category.ts" />
-/// <reference path="Pet.ts" />
-/// <reference path="Tag.ts" />
+/// <reference path="InlineResponse200.ts" />
+/// <reference path="Model200Response.ts" />
+/// <reference path="ModelReturn.ts" />
+/// <reference path="Name.ts" />
 /// <reference path="Order.ts" />
+/// <reference path="Pet.ts" />
+/// <reference path="SpecialModelName.ts" />
+/// <reference path="Tag.ts" />
+/// <reference path="User.ts" />
 
-/// <reference path="UserApi.ts" />
 /// <reference path="PetApi.ts" />
 /// <reference path="StoreApi.ts" />
+/// <reference path="UserApi.ts" />
diff --git a/samples/client/petstore/typescript-angular/README.md b/samples/client/petstore/typescript-angular/README.md
index 3a4e49be9e8..0cc8064bedd 100644
--- a/samples/client/petstore/typescript-angular/README.md
+++ b/samples/client/petstore/typescript-angular/README.md
@@ -16,4 +16,4 @@ npm run clean
 
 ## Author
 
-mads@maetzke-tandrup.dk
\ No newline at end of file
+mads@maetzke-tandrup.dk, Swagger-Codegen community
diff --git a/samples/client/petstore/typescript-angular/git_push.sh b/samples/client/petstore/typescript-angular/git_push.sh
new file mode 100644
index 00000000000..1a36388db02
--- /dev/null
+++ b/samples/client/petstore/typescript-angular/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="YOUR_GIT_USR_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="YOUR_GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/client/petstore/typescript-node/README.md b/samples/client/petstore/typescript-node/README.md
index 82225d3260a..02d993a5de9 100644
--- a/samples/client/petstore/typescript-node/README.md
+++ b/samples/client/petstore/typescript-node/README.md
@@ -19,4 +19,4 @@ npm run clean
 
 ## Author
 
-mads@maetzke-tandrup.dk
\ No newline at end of file
+mads@maetzke-tandrup.dk, Swagger-Codegen community
diff --git a/samples/client/petstore/typescript-node/api.ts b/samples/client/petstore/typescript-node/api.ts
index 3ae51281c65..3020e77491c 100644
--- a/samples/client/petstore/typescript-node/api.ts
+++ b/samples/client/petstore/typescript-node/api.ts
@@ -8,68 +8,103 @@ import http = require('http');
 
 /* tslint:disable:no-unused-variable */
 
-export class User {
-    id: number;
-    username: string;
-    firstName: string;
-    lastName: string;
-    email: string;
-    password: string;
-    phone: string;
-    /**
-    * User Status
-    */
-    userStatus: number;
-}
-
 export class Category {
-    id: number;
-    name: string;
+    "id": number;
+    "name": string;
 }
 
-export class Pet {
-    id: number;
-    category: Category;
-    name: string;
-    photoUrls: Array<string>;
-    tags: Array<Tag>;
+export class InlineResponse200 {
+    "tags": Array<Tag>;
+    "id": number;
+    "category": any;
     /**
     * pet status in the store
     */
-    status: Pet.StatusEnum;
+    "status": InlineResponse200.StatusEnum;
+    "name": string;
+    "photoUrls": Array<string>;
 }
 
-export namespace Pet {
+export namespace InlineResponse200 {
     export enum StatusEnum { 
         available = <any> 'available',
         pending = <any> 'pending',
-        sold = <any> 'sold',
+        sold = <any> 'sold'
     }
 }
-export class Tag {
-    id: number;
-    name: string;
+export class Model200Response {
+    "name": number;
+}
+
+export class ModelReturn {
+    "return": number;
+}
+
+export class Name {
+    "name": number;
 }
 
 export class Order {
-    id: number;
-    petId: number;
-    quantity: number;
-    shipDate: Date;
+    "id": number;
+    "petId": number;
+    "quantity": number;
+    "shipDate": Date;
     /**
     * Order Status
     */
-    status: Order.StatusEnum;
-    complete: boolean;
+    "status": Order.StatusEnum;
+    "complete": boolean;
 }
 
 export namespace Order {
     export enum StatusEnum { 
         placed = <any> 'placed',
         approved = <any> 'approved',
-        delivered = <any> 'delivered',
+        delivered = <any> 'delivered'
     }
 }
+export class Pet {
+    "id": number;
+    "category": Category;
+    "name": string;
+    "photoUrls": Array<string>;
+    "tags": Array<Tag>;
+    /**
+    * pet status in the store
+    */
+    "status": Pet.StatusEnum;
+}
+
+export namespace Pet {
+    export enum StatusEnum { 
+        available = <any> 'available',
+        pending = <any> 'pending',
+        sold = <any> 'sold'
+    }
+}
+export class SpecialModelName {
+    "$Special[propertyName]": number;
+}
+
+export class Tag {
+    "id": number;
+    "name": string;
+}
+
+export class User {
+    "id": number;
+    "username": string;
+    "firstName": string;
+    "lastName": string;
+    "email": string;
+    "password": string;
+    "phone": string;
+    /**
+    * User Status
+    */
+    "userStatus": number;
+}
+
 
 interface Authentication {
     /**
@@ -119,462 +154,6 @@ class VoidAuth implements Authentication {
     }
 }
 
-export class UserApi {
-    protected basePath = 'http://petstore.swagger.io/v2';
-    protected defaultHeaders : any = {};
-
-
-
-    public authentications = {
-        'default': <Authentication>new VoidAuth(),
-        'api_key': new ApiKeyAuth('header', 'api_key'),
-        'petstore_auth': new OAuth(),
-    }
-
-    constructor(basePath?: string);
-    constructor(basePathOrUsername: string, password?: string, basePath?: string) {
-        if (password) {
-            if (basePath) {
-                this.basePath = basePath;
-            }
-        } else {
-            if (basePathOrUsername) {
-                this.basePath = basePathOrUsername
-            }
-        }
-    }
-
-    set apiKey(key: string) {
-        this.authentications.api_key.apiKey = key;
-    }
-
-    set accessToken(token: string) {
-        this.authentications.petstore_auth.accessToken = token;
-    }
-    private extendObj<T1,T2>(objA: T1, objB: T2) {
-        for(let key in objB){
-            if(objB.hasOwnProperty(key)){
-                objA[key] = objB[key];
-            }
-        }
-        return <T1&T2>objA;
-    }
-    /**
-     * Create user
-     * This can only be done by the logged in user.
-     * @param body Created user object
-     */
-    public createUser (body?: User) : Promise<{ response: http.ClientResponse; body?: any;  }> {
-        const path = this.basePath + '/user';
-        let queryParameters: any = {};
-        let headerParams: any = this.extendObj({}, this.defaultHeaders);
-        let formParams: any = {};
-
-
-        let useFormData = false;
-
-        let deferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
-
-        let requestOptions: request.Options = {
-            method: 'POST',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: path,
-            json: true,
-            body: body,
-        }
-
-        this.authentications.default.applyToRequest(requestOptions);
-
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                (<any>requestOptions).formData = formParams;
-            } else {
-                requestOptions.form = formParams;
-            }
-        }
-
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                deferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    deferred.resolve({ response: response, body: body });
-                } else {
-                    deferred.reject({ response: response, body: body });
-                }
-            }
-        });
-
-        return deferred.promise;
-    }
-    /**
-     * Creates list of users with given input array
-     * 
-     * @param body List of user object
-     */
-    public createUsersWithArrayInput (body?: Array<User>) : Promise<{ response: http.ClientResponse; body?: any;  }> {
-        const path = this.basePath + '/user/createWithArray';
-        let queryParameters: any = {};
-        let headerParams: any = this.extendObj({}, this.defaultHeaders);
-        let formParams: any = {};
-
-
-        let useFormData = false;
-
-        let deferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
-
-        let requestOptions: request.Options = {
-            method: 'POST',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: path,
-            json: true,
-            body: body,
-        }
-
-        this.authentications.default.applyToRequest(requestOptions);
-
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                (<any>requestOptions).formData = formParams;
-            } else {
-                requestOptions.form = formParams;
-            }
-        }
-
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                deferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    deferred.resolve({ response: response, body: body });
-                } else {
-                    deferred.reject({ response: response, body: body });
-                }
-            }
-        });
-
-        return deferred.promise;
-    }
-    /**
-     * Creates list of users with given input array
-     * 
-     * @param body List of user object
-     */
-    public createUsersWithListInput (body?: Array<User>) : Promise<{ response: http.ClientResponse; body?: any;  }> {
-        const path = this.basePath + '/user/createWithList';
-        let queryParameters: any = {};
-        let headerParams: any = this.extendObj({}, this.defaultHeaders);
-        let formParams: any = {};
-
-
-        let useFormData = false;
-
-        let deferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
-
-        let requestOptions: request.Options = {
-            method: 'POST',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: path,
-            json: true,
-            body: body,
-        }
-
-        this.authentications.default.applyToRequest(requestOptions);
-
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                (<any>requestOptions).formData = formParams;
-            } else {
-                requestOptions.form = formParams;
-            }
-        }
-
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                deferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    deferred.resolve({ response: response, body: body });
-                } else {
-                    deferred.reject({ response: response, body: body });
-                }
-            }
-        });
-
-        return deferred.promise;
-    }
-    /**
-     * Logs user into the system
-     * 
-     * @param username The user name for login
-     * @param password The password for login in clear text
-     */
-    public loginUser (username?: string, password?: string) : Promise<{ response: http.ClientResponse; body: string;  }> {
-        const path = this.basePath + '/user/login';
-        let queryParameters: any = {};
-        let headerParams: any = this.extendObj({}, this.defaultHeaders);
-        let formParams: any = {};
-
-
-        if (username !== undefined) {
-            queryParameters['username'] = username;
-        }
-
-        if (password !== undefined) {
-            queryParameters['password'] = password;
-        }
-
-        let useFormData = false;
-
-        let deferred = promise.defer<{ response: http.ClientResponse; body: string;  }>();
-
-        let requestOptions: request.Options = {
-            method: 'GET',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: path,
-            json: true,
-        }
-
-        this.authentications.default.applyToRequest(requestOptions);
-
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                (<any>requestOptions).formData = formParams;
-            } else {
-                requestOptions.form = formParams;
-            }
-        }
-
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                deferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    deferred.resolve({ response: response, body: body });
-                } else {
-                    deferred.reject({ response: response, body: body });
-                }
-            }
-        });
-
-        return deferred.promise;
-    }
-    /**
-     * Logs out current logged in user session
-     * 
-     */
-    public logoutUser () : Promise<{ response: http.ClientResponse; body?: any;  }> {
-        const path = this.basePath + '/user/logout';
-        let queryParameters: any = {};
-        let headerParams: any = this.extendObj({}, this.defaultHeaders);
-        let formParams: any = {};
-
-
-        let useFormData = false;
-
-        let deferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
-
-        let requestOptions: request.Options = {
-            method: 'GET',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: path,
-            json: true,
-        }
-
-        this.authentications.default.applyToRequest(requestOptions);
-
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                (<any>requestOptions).formData = formParams;
-            } else {
-                requestOptions.form = formParams;
-            }
-        }
-
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                deferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    deferred.resolve({ response: response, body: body });
-                } else {
-                    deferred.reject({ response: response, body: body });
-                }
-            }
-        });
-
-        return deferred.promise;
-    }
-    /**
-     * Get user by user name
-     * 
-     * @param username The name that needs to be fetched. Use user1 for testing.
-     */
-    public getUserByName (username: string) : Promise<{ response: http.ClientResponse; body: User;  }> {
-        const path = this.basePath + '/user/{username}'
-            .replace('{' + 'username' + '}', String(username));
-        let queryParameters: any = {};
-        let headerParams: any = this.extendObj({}, this.defaultHeaders);
-        let formParams: any = {};
-
-
-        // verify required parameter 'username' is set
-        if (!username) {
-            throw new Error('Missing required parameter username when calling getUserByName');
-        }
-
-        let useFormData = false;
-
-        let deferred = promise.defer<{ response: http.ClientResponse; body: User;  }>();
-
-        let requestOptions: request.Options = {
-            method: 'GET',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: path,
-            json: true,
-        }
-
-        this.authentications.default.applyToRequest(requestOptions);
-
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                (<any>requestOptions).formData = formParams;
-            } else {
-                requestOptions.form = formParams;
-            }
-        }
-
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                deferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    deferred.resolve({ response: response, body: body });
-                } else {
-                    deferred.reject({ response: response, body: body });
-                }
-            }
-        });
-
-        return deferred.promise;
-    }
-    /**
-     * Updated user
-     * This can only be done by the logged in user.
-     * @param username name that need to be deleted
-     * @param body Updated user object
-     */
-    public updateUser (username: string, body?: User) : Promise<{ response: http.ClientResponse; body?: any;  }> {
-        const path = this.basePath + '/user/{username}'
-            .replace('{' + 'username' + '}', String(username));
-        let queryParameters: any = {};
-        let headerParams: any = this.extendObj({}, this.defaultHeaders);
-        let formParams: any = {};
-
-
-        // verify required parameter 'username' is set
-        if (!username) {
-            throw new Error('Missing required parameter username when calling updateUser');
-        }
-
-        let useFormData = false;
-
-        let deferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
-
-        let requestOptions: request.Options = {
-            method: 'PUT',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: path,
-            json: true,
-            body: body,
-        }
-
-        this.authentications.default.applyToRequest(requestOptions);
-
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                (<any>requestOptions).formData = formParams;
-            } else {
-                requestOptions.form = formParams;
-            }
-        }
-
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                deferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    deferred.resolve({ response: response, body: body });
-                } else {
-                    deferred.reject({ response: response, body: body });
-                }
-            }
-        });
-
-        return deferred.promise;
-    }
-    /**
-     * Delete user
-     * This can only be done by the logged in user.
-     * @param username The name that needs to be deleted
-     */
-    public deleteUser (username: string) : Promise<{ response: http.ClientResponse; body?: any;  }> {
-        const path = this.basePath + '/user/{username}'
-            .replace('{' + 'username' + '}', String(username));
-        let queryParameters: any = {};
-        let headerParams: any = this.extendObj({}, this.defaultHeaders);
-        let formParams: any = {};
-
-
-        // verify required parameter 'username' is set
-        if (!username) {
-            throw new Error('Missing required parameter username when calling deleteUser');
-        }
-
-        let useFormData = false;
-
-        let deferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
-
-        let requestOptions: request.Options = {
-            method: 'DELETE',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: path,
-            json: true,
-        }
-
-        this.authentications.default.applyToRequest(requestOptions);
-
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                (<any>requestOptions).formData = formParams;
-            } else {
-                requestOptions.form = formParams;
-            }
-        }
-
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                deferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    deferred.resolve({ response: response, body: body });
-                } else {
-                    deferred.reject({ response: response, body: body });
-                }
-            }
-        });
-
-        return deferred.promise;
-    }
-}
 export class PetApi {
     protected basePath = 'http://petstore.swagger.io/v2';
     protected defaultHeaders : any = {};
@@ -583,13 +162,21 @@ export class PetApi {
 
     public authentications = {
         'default': <Authentication>new VoidAuth(),
+        'test_api_key_header': new ApiKeyAuth('header', 'test_api_key_header'),
         'api_key': new ApiKeyAuth('header', 'api_key'),
+        'test_http_basic': new HttpBasicAuth(),
+        'test_api_client_secret': new ApiKeyAuth('header', 'x-test_api_client_secret'),
+        'test_api_client_id': new ApiKeyAuth('header', 'x-test_api_client_id'),
+        'test_api_key_query': new ApiKeyAuth('query', 'test_api_key_query'),
         'petstore_auth': new OAuth(),
     }
 
     constructor(basePath?: string);
+    constructor(username: string, password: string, basePath?: string);
     constructor(basePathOrUsername: string, password?: string, basePath?: string) {
         if (password) {
+            this.username = basePathOrUsername;
+            this.password = password
             if (basePath) {
                 this.basePath = basePath;
             }
@@ -600,10 +187,34 @@ export class PetApi {
         }
     }
 
+    set apiKey(key: string) {
+        this.authentications.test_api_key_header.apiKey = key;
+    }
+
     set apiKey(key: string) {
         this.authentications.api_key.apiKey = key;
     }
 
+    set username(username: string) {
+        this.authentications.test_http_basic.username = username;
+    }
+
+    set password(password: string) {
+        this.authentications.test_http_basic.password = password;
+    }
+
+    set apiKey(key: string) {
+        this.authentications.test_api_client_secret.apiKey = key;
+    }
+
+    set apiKey(key: string) {
+        this.authentications.test_api_client_id.apiKey = key;
+    }
+
+    set apiKey(key: string) {
+        this.authentications.test_api_key_query.apiKey = key;
+    }
+
     set accessToken(token: string) {
         this.authentications.petstore_auth.accessToken = token;
     }
@@ -615,64 +226,13 @@ export class PetApi {
         }
         return <T1&T2>objA;
     }
-    /**
-     * Update an existing pet
-     * 
-     * @param body Pet object that needs to be added to the store
-     */
-    public updatePet (body?: Pet) : Promise<{ response: http.ClientResponse; body?: any;  }> {
-        const path = this.basePath + '/pet';
-        let queryParameters: any = {};
-        let headerParams: any = this.extendObj({}, this.defaultHeaders);
-        let formParams: any = {};
-
-
-        let useFormData = false;
-
-        let deferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
-
-        let requestOptions: request.Options = {
-            method: 'PUT',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: path,
-            json: true,
-            body: body,
-        }
-
-        this.authentications.petstore_auth.applyToRequest(requestOptions);
-
-        this.authentications.default.applyToRequest(requestOptions);
-
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                (<any>requestOptions).formData = formParams;
-            } else {
-                requestOptions.form = formParams;
-            }
-        }
-
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                deferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    deferred.resolve({ response: response, body: body });
-                } else {
-                    deferred.reject({ response: response, body: body });
-                }
-            }
-        });
-
-        return deferred.promise;
-    }
     /**
      * Add a new pet to the store
      * 
      * @param body Pet object that needs to be added to the store
      */
     public addPet (body?: Pet) : Promise<{ response: http.ClientResponse; body?: any;  }> {
-        const path = this.basePath + '/pet';
+        const localVarPath = this.basePath + '/pet';
         let queryParameters: any = {};
         let headerParams: any = this.extendObj({}, this.defaultHeaders);
         let formParams: any = {};
@@ -680,13 +240,13 @@ export class PetApi {
 
         let useFormData = false;
 
-        let deferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
+        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
 
         let requestOptions: request.Options = {
             method: 'POST',
             qs: queryParameters,
             headers: headerParams,
-            uri: path,
+            uri: localVarPath,
             json: true,
             body: body,
         }
@@ -705,25 +265,135 @@ export class PetApi {
 
         request(requestOptions, (error, response, body) => {
             if (error) {
-                deferred.reject(error);
+                localVarDeferred.reject(error);
             } else {
                 if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    deferred.resolve({ response: response, body: body });
+                    localVarDeferred.resolve({ response: response, body: body });
                 } else {
-                    deferred.reject({ response: response, body: body });
+                    localVarDeferred.reject({ response: response, body: body });
                 }
             }
         });
 
-        return deferred.promise;
+        return localVarDeferred.promise;
+    }
+    /**
+     * Fake endpoint to test byte array in body parameter for adding a new pet to the store
+     * 
+     * @param body Pet object in the form of byte array
+     */
+    public addPetUsingByteArray (body?: string) : Promise<{ response: http.ClientResponse; body?: any;  }> {
+        const localVarPath = this.basePath + '/pet?testing_byte_array=true';
+        let queryParameters: any = {};
+        let headerParams: any = this.extendObj({}, this.defaultHeaders);
+        let formParams: any = {};
+
+
+        let useFormData = false;
+
+        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
+
+        let requestOptions: request.Options = {
+            method: 'POST',
+            qs: queryParameters,
+            headers: headerParams,
+            uri: localVarPath,
+            json: true,
+            body: body,
+        }
+
+        this.authentications.petstore_auth.applyToRequest(requestOptions);
+
+        this.authentications.default.applyToRequest(requestOptions);
+
+        if (Object.keys(formParams).length) {
+            if (useFormData) {
+                (<any>requestOptions).formData = formParams;
+            } else {
+                requestOptions.form = formParams;
+            }
+        }
+
+        request(requestOptions, (error, response, body) => {
+            if (error) {
+                localVarDeferred.reject(error);
+            } else {
+                if (response.statusCode >= 200 && response.statusCode <= 299) {
+                    localVarDeferred.resolve({ response: response, body: body });
+                } else {
+                    localVarDeferred.reject({ response: response, body: body });
+                }
+            }
+        });
+
+        return localVarDeferred.promise;
+    }
+    /**
+     * Deletes a pet
+     * 
+     * @param petId Pet id to delete
+     * @param apiKey 
+     */
+    public deletePet (petId: number, apiKey?: string) : Promise<{ response: http.ClientResponse; body?: any;  }> {
+        const localVarPath = this.basePath + '/pet/{petId}'
+            .replace('{' + 'petId' + '}', String(petId));
+        let queryParameters: any = {};
+        let headerParams: any = this.extendObj({}, this.defaultHeaders);
+        let formParams: any = {};
+
+
+        // verify required parameter 'petId' is set
+        if (!petId) {
+            throw new Error('Missing required parameter petId when calling deletePet');
+        }
+
+        headerParams['api_key'] = apiKey;
+
+        let useFormData = false;
+
+        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
+
+        let requestOptions: request.Options = {
+            method: 'DELETE',
+            qs: queryParameters,
+            headers: headerParams,
+            uri: localVarPath,
+            json: true,
+        }
+
+        this.authentications.petstore_auth.applyToRequest(requestOptions);
+
+        this.authentications.default.applyToRequest(requestOptions);
+
+        if (Object.keys(formParams).length) {
+            if (useFormData) {
+                (<any>requestOptions).formData = formParams;
+            } else {
+                requestOptions.form = formParams;
+            }
+        }
+
+        request(requestOptions, (error, response, body) => {
+            if (error) {
+                localVarDeferred.reject(error);
+            } else {
+                if (response.statusCode >= 200 && response.statusCode <= 299) {
+                    localVarDeferred.resolve({ response: response, body: body });
+                } else {
+                    localVarDeferred.reject({ response: response, body: body });
+                }
+            }
+        });
+
+        return localVarDeferred.promise;
     }
     /**
      * Finds Pets by status
-     * Multiple status values can be provided with comma seperated strings
-     * @param status Status values that need to be considered for filter
+     * Multiple status values can be provided with comma separated strings
+     * @param status Status values that need to be considered for query
      */
     public findPetsByStatus (status?: Array<string>) : Promise<{ response: http.ClientResponse; body: Array<Pet>;  }> {
-        const path = this.basePath + '/pet/findByStatus';
+        const localVarPath = this.basePath + '/pet/findByStatus';
         let queryParameters: any = {};
         let headerParams: any = this.extendObj({}, this.defaultHeaders);
         let formParams: any = {};
@@ -735,13 +405,13 @@ export class PetApi {
 
         let useFormData = false;
 
-        let deferred = promise.defer<{ response: http.ClientResponse; body: Array<Pet>;  }>();
+        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Array<Pet>;  }>();
 
         let requestOptions: request.Options = {
             method: 'GET',
             qs: queryParameters,
             headers: headerParams,
-            uri: path,
+            uri: localVarPath,
             json: true,
         }
 
@@ -759,17 +429,17 @@ export class PetApi {
 
         request(requestOptions, (error, response, body) => {
             if (error) {
-                deferred.reject(error);
+                localVarDeferred.reject(error);
             } else {
                 if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    deferred.resolve({ response: response, body: body });
+                    localVarDeferred.resolve({ response: response, body: body });
                 } else {
-                    deferred.reject({ response: response, body: body });
+                    localVarDeferred.reject({ response: response, body: body });
                 }
             }
         });
 
-        return deferred.promise;
+        return localVarDeferred.promise;
     }
     /**
      * Finds Pets by tags
@@ -777,7 +447,7 @@ export class PetApi {
      * @param tags Tags to filter by
      */
     public findPetsByTags (tags?: Array<string>) : Promise<{ response: http.ClientResponse; body: Array<Pet>;  }> {
-        const path = this.basePath + '/pet/findByTags';
+        const localVarPath = this.basePath + '/pet/findByTags';
         let queryParameters: any = {};
         let headerParams: any = this.extendObj({}, this.defaultHeaders);
         let formParams: any = {};
@@ -789,13 +459,13 @@ export class PetApi {
 
         let useFormData = false;
 
-        let deferred = promise.defer<{ response: http.ClientResponse; body: Array<Pet>;  }>();
+        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Array<Pet>;  }>();
 
         let requestOptions: request.Options = {
             method: 'GET',
             qs: queryParameters,
             headers: headerParams,
-            uri: path,
+            uri: localVarPath,
             json: true,
         }
 
@@ -813,17 +483,17 @@ export class PetApi {
 
         request(requestOptions, (error, response, body) => {
             if (error) {
-                deferred.reject(error);
+                localVarDeferred.reject(error);
             } else {
                 if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    deferred.resolve({ response: response, body: body });
+                    localVarDeferred.resolve({ response: response, body: body });
                 } else {
-                    deferred.reject({ response: response, body: body });
+                    localVarDeferred.reject({ response: response, body: body });
                 }
             }
         });
 
-        return deferred.promise;
+        return localVarDeferred.promise;
     }
     /**
      * Find pet by ID
@@ -831,7 +501,7 @@ export class PetApi {
      * @param petId ID of pet that needs to be fetched
      */
     public getPetById (petId: number) : Promise<{ response: http.ClientResponse; body: Pet;  }> {
-        const path = this.basePath + '/pet/{petId}'
+        const localVarPath = this.basePath + '/pet/{petId}'
             .replace('{' + 'petId' + '}', String(petId));
         let queryParameters: any = {};
         let headerParams: any = this.extendObj({}, this.defaultHeaders);
@@ -845,18 +515,20 @@ export class PetApi {
 
         let useFormData = false;
 
-        let deferred = promise.defer<{ response: http.ClientResponse; body: Pet;  }>();
+        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Pet;  }>();
 
         let requestOptions: request.Options = {
             method: 'GET',
             qs: queryParameters,
             headers: headerParams,
-            uri: path,
+            uri: localVarPath,
             json: true,
         }
 
         this.authentications.api_key.applyToRequest(requestOptions);
 
+        this.authentications.petstore_auth.applyToRequest(requestOptions);
+
         this.authentications.default.applyToRequest(requestOptions);
 
         if (Object.keys(formParams).length) {
@@ -869,17 +541,184 @@ export class PetApi {
 
         request(requestOptions, (error, response, body) => {
             if (error) {
-                deferred.reject(error);
+                localVarDeferred.reject(error);
             } else {
                 if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    deferred.resolve({ response: response, body: body });
+                    localVarDeferred.resolve({ response: response, body: body });
                 } else {
-                    deferred.reject({ response: response, body: body });
+                    localVarDeferred.reject({ response: response, body: body });
                 }
             }
         });
 
-        return deferred.promise;
+        return localVarDeferred.promise;
+    }
+    /**
+     * Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+     * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+     * @param petId ID of pet that needs to be fetched
+     */
+    public getPetByIdInObject (petId: number) : Promise<{ response: http.ClientResponse; body: InlineResponse200;  }> {
+        const localVarPath = this.basePath + '/pet/{petId}?response=inline_arbitrary_object'
+            .replace('{' + 'petId' + '}', String(petId));
+        let queryParameters: any = {};
+        let headerParams: any = this.extendObj({}, this.defaultHeaders);
+        let formParams: any = {};
+
+
+        // verify required parameter 'petId' is set
+        if (!petId) {
+            throw new Error('Missing required parameter petId when calling getPetByIdInObject');
+        }
+
+        let useFormData = false;
+
+        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: InlineResponse200;  }>();
+
+        let requestOptions: request.Options = {
+            method: 'GET',
+            qs: queryParameters,
+            headers: headerParams,
+            uri: localVarPath,
+            json: true,
+        }
+
+        this.authentications.api_key.applyToRequest(requestOptions);
+
+        this.authentications.petstore_auth.applyToRequest(requestOptions);
+
+        this.authentications.default.applyToRequest(requestOptions);
+
+        if (Object.keys(formParams).length) {
+            if (useFormData) {
+                (<any>requestOptions).formData = formParams;
+            } else {
+                requestOptions.form = formParams;
+            }
+        }
+
+        request(requestOptions, (error, response, body) => {
+            if (error) {
+                localVarDeferred.reject(error);
+            } else {
+                if (response.statusCode >= 200 && response.statusCode <= 299) {
+                    localVarDeferred.resolve({ response: response, body: body });
+                } else {
+                    localVarDeferred.reject({ response: response, body: body });
+                }
+            }
+        });
+
+        return localVarDeferred.promise;
+    }
+    /**
+     * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+     * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+     * @param petId ID of pet that needs to be fetched
+     */
+    public petPetIdtestingByteArraytrueGet (petId: number) : Promise<{ response: http.ClientResponse; body: string;  }> {
+        const localVarPath = this.basePath + '/pet/{petId}?testing_byte_array=true'
+            .replace('{' + 'petId' + '}', String(petId));
+        let queryParameters: any = {};
+        let headerParams: any = this.extendObj({}, this.defaultHeaders);
+        let formParams: any = {};
+
+
+        // verify required parameter 'petId' is set
+        if (!petId) {
+            throw new Error('Missing required parameter petId when calling petPetIdtestingByteArraytrueGet');
+        }
+
+        let useFormData = false;
+
+        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: string;  }>();
+
+        let requestOptions: request.Options = {
+            method: 'GET',
+            qs: queryParameters,
+            headers: headerParams,
+            uri: localVarPath,
+            json: true,
+        }
+
+        this.authentications.api_key.applyToRequest(requestOptions);
+
+        this.authentications.petstore_auth.applyToRequest(requestOptions);
+
+        this.authentications.default.applyToRequest(requestOptions);
+
+        if (Object.keys(formParams).length) {
+            if (useFormData) {
+                (<any>requestOptions).formData = formParams;
+            } else {
+                requestOptions.form = formParams;
+            }
+        }
+
+        request(requestOptions, (error, response, body) => {
+            if (error) {
+                localVarDeferred.reject(error);
+            } else {
+                if (response.statusCode >= 200 && response.statusCode <= 299) {
+                    localVarDeferred.resolve({ response: response, body: body });
+                } else {
+                    localVarDeferred.reject({ response: response, body: body });
+                }
+            }
+        });
+
+        return localVarDeferred.promise;
+    }
+    /**
+     * Update an existing pet
+     * 
+     * @param body Pet object that needs to be added to the store
+     */
+    public updatePet (body?: Pet) : Promise<{ response: http.ClientResponse; body?: any;  }> {
+        const localVarPath = this.basePath + '/pet';
+        let queryParameters: any = {};
+        let headerParams: any = this.extendObj({}, this.defaultHeaders);
+        let formParams: any = {};
+
+
+        let useFormData = false;
+
+        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
+
+        let requestOptions: request.Options = {
+            method: 'PUT',
+            qs: queryParameters,
+            headers: headerParams,
+            uri: localVarPath,
+            json: true,
+            body: body,
+        }
+
+        this.authentications.petstore_auth.applyToRequest(requestOptions);
+
+        this.authentications.default.applyToRequest(requestOptions);
+
+        if (Object.keys(formParams).length) {
+            if (useFormData) {
+                (<any>requestOptions).formData = formParams;
+            } else {
+                requestOptions.form = formParams;
+            }
+        }
+
+        request(requestOptions, (error, response, body) => {
+            if (error) {
+                localVarDeferred.reject(error);
+            } else {
+                if (response.statusCode >= 200 && response.statusCode <= 299) {
+                    localVarDeferred.resolve({ response: response, body: body });
+                } else {
+                    localVarDeferred.reject({ response: response, body: body });
+                }
+            }
+        });
+
+        return localVarDeferred.promise;
     }
     /**
      * Updates a pet in the store with form data
@@ -889,7 +728,7 @@ export class PetApi {
      * @param status Updated status of the pet
      */
     public updatePetWithForm (petId: string, name?: string, status?: string) : Promise<{ response: http.ClientResponse; body?: any;  }> {
-        const path = this.basePath + '/pet/{petId}'
+        const localVarPath = this.basePath + '/pet/{petId}'
             .replace('{' + 'petId' + '}', String(petId));
         let queryParameters: any = {};
         let headerParams: any = this.extendObj({}, this.defaultHeaders);
@@ -911,13 +750,13 @@ export class PetApi {
             formParams['status'] = status;
         }
 
-        let deferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
+        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
 
         let requestOptions: request.Options = {
             method: 'POST',
             qs: queryParameters,
             headers: headerParams,
-            uri: path,
+            uri: localVarPath,
             json: true,
         }
 
@@ -935,76 +774,17 @@ export class PetApi {
 
         request(requestOptions, (error, response, body) => {
             if (error) {
-                deferred.reject(error);
+                localVarDeferred.reject(error);
             } else {
                 if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    deferred.resolve({ response: response, body: body });
+                    localVarDeferred.resolve({ response: response, body: body });
                 } else {
-                    deferred.reject({ response: response, body: body });
+                    localVarDeferred.reject({ response: response, body: body });
                 }
             }
         });
 
-        return deferred.promise;
-    }
-    /**
-     * Deletes a pet
-     * 
-     * @param petId Pet id to delete
-     * @param apiKey 
-     */
-    public deletePet (petId: number, apiKey?: string) : Promise<{ response: http.ClientResponse; body?: any;  }> {
-        const path = this.basePath + '/pet/{petId}'
-            .replace('{' + 'petId' + '}', String(petId));
-        let queryParameters: any = {};
-        let headerParams: any = this.extendObj({}, this.defaultHeaders);
-        let formParams: any = {};
-
-
-        // verify required parameter 'petId' is set
-        if (!petId) {
-            throw new Error('Missing required parameter petId when calling deletePet');
-        }
-
-        headerParams['api_key'] = apiKey;
-
-        let useFormData = false;
-
-        let deferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
-
-        let requestOptions: request.Options = {
-            method: 'DELETE',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: path,
-            json: true,
-        }
-
-        this.authentications.petstore_auth.applyToRequest(requestOptions);
-
-        this.authentications.default.applyToRequest(requestOptions);
-
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                (<any>requestOptions).formData = formParams;
-            } else {
-                requestOptions.form = formParams;
-            }
-        }
-
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                deferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    deferred.resolve({ response: response, body: body });
-                } else {
-                    deferred.reject({ response: response, body: body });
-                }
-            }
-        });
-
-        return deferred.promise;
+        return localVarDeferred.promise;
     }
     /**
      * uploads an image
@@ -1014,7 +794,7 @@ export class PetApi {
      * @param file file to upload
      */
     public uploadFile (petId: number, additionalMetadata?: string, file?: any) : Promise<{ response: http.ClientResponse; body?: any;  }> {
-        const path = this.basePath + '/pet/{petId}/uploadImage'
+        const localVarPath = this.basePath + '/pet/{petId}/uploadImage'
             .replace('{' + 'petId' + '}', String(petId));
         let queryParameters: any = {};
         let headerParams: any = this.extendObj({}, this.defaultHeaders);
@@ -1037,13 +817,13 @@ export class PetApi {
         }
         useFormData = true;
 
-        let deferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
+        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
 
         let requestOptions: request.Options = {
             method: 'POST',
             qs: queryParameters,
             headers: headerParams,
-            uri: path,
+            uri: localVarPath,
             json: true,
         }
 
@@ -1061,17 +841,17 @@ export class PetApi {
 
         request(requestOptions, (error, response, body) => {
             if (error) {
-                deferred.reject(error);
+                localVarDeferred.reject(error);
             } else {
                 if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    deferred.resolve({ response: response, body: body });
+                    localVarDeferred.resolve({ response: response, body: body });
                 } else {
-                    deferred.reject({ response: response, body: body });
+                    localVarDeferred.reject({ response: response, body: body });
                 }
             }
         });
 
-        return deferred.promise;
+        return localVarDeferred.promise;
     }
 }
 export class StoreApi {
@@ -1082,13 +862,21 @@ export class StoreApi {
 
     public authentications = {
         'default': <Authentication>new VoidAuth(),
+        'test_api_key_header': new ApiKeyAuth('header', 'test_api_key_header'),
         'api_key': new ApiKeyAuth('header', 'api_key'),
+        'test_http_basic': new HttpBasicAuth(),
+        'test_api_client_secret': new ApiKeyAuth('header', 'x-test_api_client_secret'),
+        'test_api_client_id': new ApiKeyAuth('header', 'x-test_api_client_id'),
+        'test_api_key_query': new ApiKeyAuth('query', 'test_api_key_query'),
         'petstore_auth': new OAuth(),
     }
 
     constructor(basePath?: string);
+    constructor(username: string, password: string, basePath?: string);
     constructor(basePathOrUsername: string, password?: string, basePath?: string) {
         if (password) {
+            this.username = basePathOrUsername;
+            this.password = password
             if (basePath) {
                 this.basePath = basePath;
             }
@@ -1099,10 +887,34 @@ export class StoreApi {
         }
     }
 
+    set apiKey(key: string) {
+        this.authentications.test_api_key_header.apiKey = key;
+    }
+
     set apiKey(key: string) {
         this.authentications.api_key.apiKey = key;
     }
 
+    set username(username: string) {
+        this.authentications.test_http_basic.username = username;
+    }
+
+    set password(password: string) {
+        this.authentications.test_http_basic.password = password;
+    }
+
+    set apiKey(key: string) {
+        this.authentications.test_api_client_secret.apiKey = key;
+    }
+
+    set apiKey(key: string) {
+        this.authentications.test_api_client_id.apiKey = key;
+    }
+
+    set apiKey(key: string) {
+        this.authentications.test_api_key_query.apiKey = key;
+    }
+
     set accessToken(token: string) {
         this.authentications.petstore_auth.accessToken = token;
     }
@@ -1114,12 +926,122 @@ export class StoreApi {
         }
         return <T1&T2>objA;
     }
+    /**
+     * Delete purchase order by ID
+     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+     * @param orderId ID of the order that needs to be deleted
+     */
+    public deleteOrder (orderId: string) : Promise<{ response: http.ClientResponse; body?: any;  }> {
+        const localVarPath = this.basePath + '/store/order/{orderId}'
+            .replace('{' + 'orderId' + '}', String(orderId));
+        let queryParameters: any = {};
+        let headerParams: any = this.extendObj({}, this.defaultHeaders);
+        let formParams: any = {};
+
+
+        // verify required parameter 'orderId' is set
+        if (!orderId) {
+            throw new Error('Missing required parameter orderId when calling deleteOrder');
+        }
+
+        let useFormData = false;
+
+        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
+
+        let requestOptions: request.Options = {
+            method: 'DELETE',
+            qs: queryParameters,
+            headers: headerParams,
+            uri: localVarPath,
+            json: true,
+        }
+
+        this.authentications.default.applyToRequest(requestOptions);
+
+        if (Object.keys(formParams).length) {
+            if (useFormData) {
+                (<any>requestOptions).formData = formParams;
+            } else {
+                requestOptions.form = formParams;
+            }
+        }
+
+        request(requestOptions, (error, response, body) => {
+            if (error) {
+                localVarDeferred.reject(error);
+            } else {
+                if (response.statusCode >= 200 && response.statusCode <= 299) {
+                    localVarDeferred.resolve({ response: response, body: body });
+                } else {
+                    localVarDeferred.reject({ response: response, body: body });
+                }
+            }
+        });
+
+        return localVarDeferred.promise;
+    }
+    /**
+     * Finds orders by status
+     * A single status value can be provided as a string
+     * @param status Status value that needs to be considered for query
+     */
+    public findOrdersByStatus (status?: string) : Promise<{ response: http.ClientResponse; body: Array<Order>;  }> {
+        const localVarPath = this.basePath + '/store/findByStatus';
+        let queryParameters: any = {};
+        let headerParams: any = this.extendObj({}, this.defaultHeaders);
+        let formParams: any = {};
+
+
+        if (status !== undefined) {
+            queryParameters['status'] = status;
+        }
+
+        let useFormData = false;
+
+        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Array<Order>;  }>();
+
+        let requestOptions: request.Options = {
+            method: 'GET',
+            qs: queryParameters,
+            headers: headerParams,
+            uri: localVarPath,
+            json: true,
+        }
+
+        this.authentications.test_api_client_id.applyToRequest(requestOptions);
+
+        this.authentications.test_api_client_secret.applyToRequest(requestOptions);
+
+        this.authentications.default.applyToRequest(requestOptions);
+
+        if (Object.keys(formParams).length) {
+            if (useFormData) {
+                (<any>requestOptions).formData = formParams;
+            } else {
+                requestOptions.form = formParams;
+            }
+        }
+
+        request(requestOptions, (error, response, body) => {
+            if (error) {
+                localVarDeferred.reject(error);
+            } else {
+                if (response.statusCode >= 200 && response.statusCode <= 299) {
+                    localVarDeferred.resolve({ response: response, body: body });
+                } else {
+                    localVarDeferred.reject({ response: response, body: body });
+                }
+            }
+        });
+
+        return localVarDeferred.promise;
+    }
     /**
      * Returns pet inventories by status
      * Returns a map of status codes to quantities
      */
     public getInventory () : Promise<{ response: http.ClientResponse; body: { [key: string]: number; };  }> {
-        const path = this.basePath + '/store/inventory';
+        const localVarPath = this.basePath + '/store/inventory';
         let queryParameters: any = {};
         let headerParams: any = this.extendObj({}, this.defaultHeaders);
         let formParams: any = {};
@@ -1127,13 +1049,13 @@ export class StoreApi {
 
         let useFormData = false;
 
-        let deferred = promise.defer<{ response: http.ClientResponse; body: { [key: string]: number; };  }>();
+        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: { [key: string]: number; };  }>();
 
         let requestOptions: request.Options = {
             method: 'GET',
             qs: queryParameters,
             headers: headerParams,
-            uri: path,
+            uri: localVarPath,
             json: true,
         }
 
@@ -1151,25 +1073,24 @@ export class StoreApi {
 
         request(requestOptions, (error, response, body) => {
             if (error) {
-                deferred.reject(error);
+                localVarDeferred.reject(error);
             } else {
                 if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    deferred.resolve({ response: response, body: body });
+                    localVarDeferred.resolve({ response: response, body: body });
                 } else {
-                    deferred.reject({ response: response, body: body });
+                    localVarDeferred.reject({ response: response, body: body });
                 }
             }
         });
 
-        return deferred.promise;
+        return localVarDeferred.promise;
     }
     /**
-     * Place an order for a pet
-     * 
-     * @param body order placed for purchasing the pet
+     * Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+     * Returns an arbitrary object which is actually a map of status codes to quantities
      */
-    public placeOrder (body?: Order) : Promise<{ response: http.ClientResponse; body: Order;  }> {
-        const path = this.basePath + '/store/order';
+    public getInventoryInObject () : Promise<{ response: http.ClientResponse; body: any;  }> {
+        const localVarPath = this.basePath + '/store/inventory?response=arbitrary_object';
         let queryParameters: any = {};
         let headerParams: any = this.extendObj({}, this.defaultHeaders);
         let formParams: any = {};
@@ -1177,13 +1098,247 @@ export class StoreApi {
 
         let useFormData = false;
 
-        let deferred = promise.defer<{ response: http.ClientResponse; body: Order;  }>();
+        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: any;  }>();
+
+        let requestOptions: request.Options = {
+            method: 'GET',
+            qs: queryParameters,
+            headers: headerParams,
+            uri: localVarPath,
+            json: true,
+        }
+
+        this.authentications.api_key.applyToRequest(requestOptions);
+
+        this.authentications.default.applyToRequest(requestOptions);
+
+        if (Object.keys(formParams).length) {
+            if (useFormData) {
+                (<any>requestOptions).formData = formParams;
+            } else {
+                requestOptions.form = formParams;
+            }
+        }
+
+        request(requestOptions, (error, response, body) => {
+            if (error) {
+                localVarDeferred.reject(error);
+            } else {
+                if (response.statusCode >= 200 && response.statusCode <= 299) {
+                    localVarDeferred.resolve({ response: response, body: body });
+                } else {
+                    localVarDeferred.reject({ response: response, body: body });
+                }
+            }
+        });
+
+        return localVarDeferred.promise;
+    }
+    /**
+     * Find purchase order by ID
+     * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+     * @param orderId ID of pet that needs to be fetched
+     */
+    public getOrderById (orderId: string) : Promise<{ response: http.ClientResponse; body: Order;  }> {
+        const localVarPath = this.basePath + '/store/order/{orderId}'
+            .replace('{' + 'orderId' + '}', String(orderId));
+        let queryParameters: any = {};
+        let headerParams: any = this.extendObj({}, this.defaultHeaders);
+        let formParams: any = {};
+
+
+        // verify required parameter 'orderId' is set
+        if (!orderId) {
+            throw new Error('Missing required parameter orderId when calling getOrderById');
+        }
+
+        let useFormData = false;
+
+        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Order;  }>();
+
+        let requestOptions: request.Options = {
+            method: 'GET',
+            qs: queryParameters,
+            headers: headerParams,
+            uri: localVarPath,
+            json: true,
+        }
+
+        this.authentications.test_api_key_header.applyToRequest(requestOptions);
+
+        this.authentications.test_api_key_query.applyToRequest(requestOptions);
+
+        this.authentications.default.applyToRequest(requestOptions);
+
+        if (Object.keys(formParams).length) {
+            if (useFormData) {
+                (<any>requestOptions).formData = formParams;
+            } else {
+                requestOptions.form = formParams;
+            }
+        }
+
+        request(requestOptions, (error, response, body) => {
+            if (error) {
+                localVarDeferred.reject(error);
+            } else {
+                if (response.statusCode >= 200 && response.statusCode <= 299) {
+                    localVarDeferred.resolve({ response: response, body: body });
+                } else {
+                    localVarDeferred.reject({ response: response, body: body });
+                }
+            }
+        });
+
+        return localVarDeferred.promise;
+    }
+    /**
+     * Place an order for a pet
+     * 
+     * @param body order placed for purchasing the pet
+     */
+    public placeOrder (body?: Order) : Promise<{ response: http.ClientResponse; body: Order;  }> {
+        const localVarPath = this.basePath + '/store/order';
+        let queryParameters: any = {};
+        let headerParams: any = this.extendObj({}, this.defaultHeaders);
+        let formParams: any = {};
+
+
+        let useFormData = false;
+
+        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Order;  }>();
 
         let requestOptions: request.Options = {
             method: 'POST',
             qs: queryParameters,
             headers: headerParams,
-            uri: path,
+            uri: localVarPath,
+            json: true,
+            body: body,
+        }
+
+        this.authentications.test_api_client_id.applyToRequest(requestOptions);
+
+        this.authentications.test_api_client_secret.applyToRequest(requestOptions);
+
+        this.authentications.default.applyToRequest(requestOptions);
+
+        if (Object.keys(formParams).length) {
+            if (useFormData) {
+                (<any>requestOptions).formData = formParams;
+            } else {
+                requestOptions.form = formParams;
+            }
+        }
+
+        request(requestOptions, (error, response, body) => {
+            if (error) {
+                localVarDeferred.reject(error);
+            } else {
+                if (response.statusCode >= 200 && response.statusCode <= 299) {
+                    localVarDeferred.resolve({ response: response, body: body });
+                } else {
+                    localVarDeferred.reject({ response: response, body: body });
+                }
+            }
+        });
+
+        return localVarDeferred.promise;
+    }
+}
+export class UserApi {
+    protected basePath = 'http://petstore.swagger.io/v2';
+    protected defaultHeaders : any = {};
+
+
+
+    public authentications = {
+        'default': <Authentication>new VoidAuth(),
+        'test_api_key_header': new ApiKeyAuth('header', 'test_api_key_header'),
+        'api_key': new ApiKeyAuth('header', 'api_key'),
+        'test_http_basic': new HttpBasicAuth(),
+        'test_api_client_secret': new ApiKeyAuth('header', 'x-test_api_client_secret'),
+        'test_api_client_id': new ApiKeyAuth('header', 'x-test_api_client_id'),
+        'test_api_key_query': new ApiKeyAuth('query', 'test_api_key_query'),
+        'petstore_auth': new OAuth(),
+    }
+
+    constructor(basePath?: string);
+    constructor(username: string, password: string, basePath?: string);
+    constructor(basePathOrUsername: string, password?: string, basePath?: string) {
+        if (password) {
+            this.username = basePathOrUsername;
+            this.password = password
+            if (basePath) {
+                this.basePath = basePath;
+            }
+        } else {
+            if (basePathOrUsername) {
+                this.basePath = basePathOrUsername
+            }
+        }
+    }
+
+    set apiKey(key: string) {
+        this.authentications.test_api_key_header.apiKey = key;
+    }
+
+    set apiKey(key: string) {
+        this.authentications.api_key.apiKey = key;
+    }
+
+    set username(username: string) {
+        this.authentications.test_http_basic.username = username;
+    }
+
+    set password(password: string) {
+        this.authentications.test_http_basic.password = password;
+    }
+
+    set apiKey(key: string) {
+        this.authentications.test_api_client_secret.apiKey = key;
+    }
+
+    set apiKey(key: string) {
+        this.authentications.test_api_client_id.apiKey = key;
+    }
+
+    set apiKey(key: string) {
+        this.authentications.test_api_key_query.apiKey = key;
+    }
+
+    set accessToken(token: string) {
+        this.authentications.petstore_auth.accessToken = token;
+    }
+    private extendObj<T1,T2>(objA: T1, objB: T2) {
+        for(let key in objB){
+            if(objB.hasOwnProperty(key)){
+                objA[key] = objB[key];
+            }
+        }
+        return <T1&T2>objA;
+    }
+    /**
+     * Create user
+     * This can only be done by the logged in user.
+     * @param body Created user object
+     */
+    public createUser (body?: User) : Promise<{ response: http.ClientResponse; body?: any;  }> {
+        const localVarPath = this.basePath + '/user';
+        let queryParameters: any = {};
+        let headerParams: any = this.extendObj({}, this.defaultHeaders);
+        let formParams: any = {};
+
+
+        let useFormData = false;
+
+        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
+
+        let requestOptions: request.Options = {
+            method: 'POST',
+            qs: queryParameters,
+            headers: headerParams,
+            uri: localVarPath,
             json: true,
             body: body,
         }
@@ -1200,46 +1355,41 @@ export class StoreApi {
 
         request(requestOptions, (error, response, body) => {
             if (error) {
-                deferred.reject(error);
+                localVarDeferred.reject(error);
             } else {
                 if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    deferred.resolve({ response: response, body: body });
+                    localVarDeferred.resolve({ response: response, body: body });
                 } else {
-                    deferred.reject({ response: response, body: body });
+                    localVarDeferred.reject({ response: response, body: body });
                 }
             }
         });
 
-        return deferred.promise;
+        return localVarDeferred.promise;
     }
     /**
-     * Find purchase order by ID
-     * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-     * @param orderId ID of pet that needs to be fetched
+     * Creates list of users with given input array
+     * 
+     * @param body List of user object
      */
-    public getOrderById (orderId: string) : Promise<{ response: http.ClientResponse; body: Order;  }> {
-        const path = this.basePath + '/store/order/{orderId}'
-            .replace('{' + 'orderId' + '}', String(orderId));
+    public createUsersWithArrayInput (body?: Array<User>) : Promise<{ response: http.ClientResponse; body?: any;  }> {
+        const localVarPath = this.basePath + '/user/createWithArray';
         let queryParameters: any = {};
         let headerParams: any = this.extendObj({}, this.defaultHeaders);
         let formParams: any = {};
 
 
-        // verify required parameter 'orderId' is set
-        if (!orderId) {
-            throw new Error('Missing required parameter orderId when calling getOrderById');
-        }
-
         let useFormData = false;
 
-        let deferred = promise.defer<{ response: http.ClientResponse; body: Order;  }>();
+        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
 
         let requestOptions: request.Options = {
-            method: 'GET',
+            method: 'POST',
             qs: queryParameters,
             headers: headerParams,
-            uri: path,
+            uri: localVarPath,
             json: true,
+            body: body,
         }
 
         this.authentications.default.applyToRequest(requestOptions);
@@ -1254,45 +1404,150 @@ export class StoreApi {
 
         request(requestOptions, (error, response, body) => {
             if (error) {
-                deferred.reject(error);
+                localVarDeferred.reject(error);
             } else {
                 if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    deferred.resolve({ response: response, body: body });
+                    localVarDeferred.resolve({ response: response, body: body });
                 } else {
-                    deferred.reject({ response: response, body: body });
+                    localVarDeferred.reject({ response: response, body: body });
                 }
             }
         });
 
-        return deferred.promise;
+        return localVarDeferred.promise;
     }
     /**
-     * Delete purchase order by ID
-     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-     * @param orderId ID of the order that needs to be deleted
+     * Creates list of users with given input array
+     * 
+     * @param body List of user object
      */
-    public deleteOrder (orderId: string) : Promise<{ response: http.ClientResponse; body?: any;  }> {
-        const path = this.basePath + '/store/order/{orderId}'
-            .replace('{' + 'orderId' + '}', String(orderId));
+    public createUsersWithListInput (body?: Array<User>) : Promise<{ response: http.ClientResponse; body?: any;  }> {
+        const localVarPath = this.basePath + '/user/createWithList';
         let queryParameters: any = {};
         let headerParams: any = this.extendObj({}, this.defaultHeaders);
         let formParams: any = {};
 
 
-        // verify required parameter 'orderId' is set
-        if (!orderId) {
-            throw new Error('Missing required parameter orderId when calling deleteOrder');
+        let useFormData = false;
+
+        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
+
+        let requestOptions: request.Options = {
+            method: 'POST',
+            qs: queryParameters,
+            headers: headerParams,
+            uri: localVarPath,
+            json: true,
+            body: body,
+        }
+
+        this.authentications.default.applyToRequest(requestOptions);
+
+        if (Object.keys(formParams).length) {
+            if (useFormData) {
+                (<any>requestOptions).formData = formParams;
+            } else {
+                requestOptions.form = formParams;
+            }
+        }
+
+        request(requestOptions, (error, response, body) => {
+            if (error) {
+                localVarDeferred.reject(error);
+            } else {
+                if (response.statusCode >= 200 && response.statusCode <= 299) {
+                    localVarDeferred.resolve({ response: response, body: body });
+                } else {
+                    localVarDeferred.reject({ response: response, body: body });
+                }
+            }
+        });
+
+        return localVarDeferred.promise;
+    }
+    /**
+     * Delete user
+     * This can only be done by the logged in user.
+     * @param username The name that needs to be deleted
+     */
+    public deleteUser (username: string) : Promise<{ response: http.ClientResponse; body?: any;  }> {
+        const localVarPath = this.basePath + '/user/{username}'
+            .replace('{' + 'username' + '}', String(username));
+        let queryParameters: any = {};
+        let headerParams: any = this.extendObj({}, this.defaultHeaders);
+        let formParams: any = {};
+
+
+        // verify required parameter 'username' is set
+        if (!username) {
+            throw new Error('Missing required parameter username when calling deleteUser');
         }
 
         let useFormData = false;
 
-        let deferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
+        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
 
         let requestOptions: request.Options = {
             method: 'DELETE',
             qs: queryParameters,
             headers: headerParams,
-            uri: path,
+            uri: localVarPath,
+            json: true,
+        }
+
+        this.authentications.test_http_basic.applyToRequest(requestOptions);
+
+        this.authentications.default.applyToRequest(requestOptions);
+
+        if (Object.keys(formParams).length) {
+            if (useFormData) {
+                (<any>requestOptions).formData = formParams;
+            } else {
+                requestOptions.form = formParams;
+            }
+        }
+
+        request(requestOptions, (error, response, body) => {
+            if (error) {
+                localVarDeferred.reject(error);
+            } else {
+                if (response.statusCode >= 200 && response.statusCode <= 299) {
+                    localVarDeferred.resolve({ response: response, body: body });
+                } else {
+                    localVarDeferred.reject({ response: response, body: body });
+                }
+            }
+        });
+
+        return localVarDeferred.promise;
+    }
+    /**
+     * Get user by user name
+     * 
+     * @param username The name that needs to be fetched. Use user1 for testing.
+     */
+    public getUserByName (username: string) : Promise<{ response: http.ClientResponse; body: User;  }> {
+        const localVarPath = this.basePath + '/user/{username}'
+            .replace('{' + 'username' + '}', String(username));
+        let queryParameters: any = {};
+        let headerParams: any = this.extendObj({}, this.defaultHeaders);
+        let formParams: any = {};
+
+
+        // verify required parameter 'username' is set
+        if (!username) {
+            throw new Error('Missing required parameter username when calling getUserByName');
+        }
+
+        let useFormData = false;
+
+        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: User;  }>();
+
+        let requestOptions: request.Options = {
+            method: 'GET',
+            qs: queryParameters,
+            headers: headerParams,
+            uri: localVarPath,
             json: true,
         }
 
@@ -1308,16 +1563,176 @@ export class StoreApi {
 
         request(requestOptions, (error, response, body) => {
             if (error) {
-                deferred.reject(error);
+                localVarDeferred.reject(error);
             } else {
                 if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    deferred.resolve({ response: response, body: body });
+                    localVarDeferred.resolve({ response: response, body: body });
                 } else {
-                    deferred.reject({ response: response, body: body });
+                    localVarDeferred.reject({ response: response, body: body });
                 }
             }
         });
 
-        return deferred.promise;
+        return localVarDeferred.promise;
+    }
+    /**
+     * Logs user into the system
+     * 
+     * @param username The user name for login
+     * @param password The password for login in clear text
+     */
+    public loginUser (username?: string, password?: string) : Promise<{ response: http.ClientResponse; body: string;  }> {
+        const localVarPath = this.basePath + '/user/login';
+        let queryParameters: any = {};
+        let headerParams: any = this.extendObj({}, this.defaultHeaders);
+        let formParams: any = {};
+
+
+        if (username !== undefined) {
+            queryParameters['username'] = username;
+        }
+
+        if (password !== undefined) {
+            queryParameters['password'] = password;
+        }
+
+        let useFormData = false;
+
+        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: string;  }>();
+
+        let requestOptions: request.Options = {
+            method: 'GET',
+            qs: queryParameters,
+            headers: headerParams,
+            uri: localVarPath,
+            json: true,
+        }
+
+        this.authentications.default.applyToRequest(requestOptions);
+
+        if (Object.keys(formParams).length) {
+            if (useFormData) {
+                (<any>requestOptions).formData = formParams;
+            } else {
+                requestOptions.form = formParams;
+            }
+        }
+
+        request(requestOptions, (error, response, body) => {
+            if (error) {
+                localVarDeferred.reject(error);
+            } else {
+                if (response.statusCode >= 200 && response.statusCode <= 299) {
+                    localVarDeferred.resolve({ response: response, body: body });
+                } else {
+                    localVarDeferred.reject({ response: response, body: body });
+                }
+            }
+        });
+
+        return localVarDeferred.promise;
+    }
+    /**
+     * Logs out current logged in user session
+     * 
+     */
+    public logoutUser () : Promise<{ response: http.ClientResponse; body?: any;  }> {
+        const localVarPath = this.basePath + '/user/logout';
+        let queryParameters: any = {};
+        let headerParams: any = this.extendObj({}, this.defaultHeaders);
+        let formParams: any = {};
+
+
+        let useFormData = false;
+
+        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
+
+        let requestOptions: request.Options = {
+            method: 'GET',
+            qs: queryParameters,
+            headers: headerParams,
+            uri: localVarPath,
+            json: true,
+        }
+
+        this.authentications.default.applyToRequest(requestOptions);
+
+        if (Object.keys(formParams).length) {
+            if (useFormData) {
+                (<any>requestOptions).formData = formParams;
+            } else {
+                requestOptions.form = formParams;
+            }
+        }
+
+        request(requestOptions, (error, response, body) => {
+            if (error) {
+                localVarDeferred.reject(error);
+            } else {
+                if (response.statusCode >= 200 && response.statusCode <= 299) {
+                    localVarDeferred.resolve({ response: response, body: body });
+                } else {
+                    localVarDeferred.reject({ response: response, body: body });
+                }
+            }
+        });
+
+        return localVarDeferred.promise;
+    }
+    /**
+     * Updated user
+     * This can only be done by the logged in user.
+     * @param username name that need to be deleted
+     * @param body Updated user object
+     */
+    public updateUser (username: string, body?: User) : Promise<{ response: http.ClientResponse; body?: any;  }> {
+        const localVarPath = this.basePath + '/user/{username}'
+            .replace('{' + 'username' + '}', String(username));
+        let queryParameters: any = {};
+        let headerParams: any = this.extendObj({}, this.defaultHeaders);
+        let formParams: any = {};
+
+
+        // verify required parameter 'username' is set
+        if (!username) {
+            throw new Error('Missing required parameter username when calling updateUser');
+        }
+
+        let useFormData = false;
+
+        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
+
+        let requestOptions: request.Options = {
+            method: 'PUT',
+            qs: queryParameters,
+            headers: headerParams,
+            uri: localVarPath,
+            json: true,
+            body: body,
+        }
+
+        this.authentications.default.applyToRequest(requestOptions);
+
+        if (Object.keys(formParams).length) {
+            if (useFormData) {
+                (<any>requestOptions).formData = formParams;
+            } else {
+                requestOptions.form = formParams;
+            }
+        }
+
+        request(requestOptions, (error, response, body) => {
+            if (error) {
+                localVarDeferred.reject(error);
+            } else {
+                if (response.statusCode >= 200 && response.statusCode <= 299) {
+                    localVarDeferred.resolve({ response: response, body: body });
+                } else {
+                    localVarDeferred.reject({ response: response, body: body });
+                }
+            }
+        });
+
+        return localVarDeferred.promise;
     }
 }
diff --git a/samples/client/petstore/typescript-node/git_push.sh b/samples/client/petstore/typescript-node/git_push.sh
new file mode 100644
index 00000000000..1a36388db02
--- /dev/null
+++ b/samples/client/petstore/typescript-node/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="YOUR_GIT_USR_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="YOUR_GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/client/wordnik-api-objc/Podfile b/samples/client/wordnik-api-objc/Podfile
deleted file mode 100644
index d5f43cfcb7d..00000000000
--- a/samples/client/wordnik-api-objc/Podfile
+++ /dev/null
@@ -1,4 +0,0 @@
-platform :ios, '6.0'
-xcodeproj 'WordnikApiClient/WordnikApiClient.xcodeproj'
-pod 'AFNetworking', '~> 1.0'
-
diff --git a/samples/client/wordnik-api-objc/client/SWGAccountApi.h b/samples/client/wordnik-api-objc/client/SWGAccountApi.h
deleted file mode 100644
index 826c7b93327..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGAccountApi.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGUser.h"
-#import "SWGWordList.h"
-#import "SWGApiTokenStatus.h"
-#import "SWGAuthenticationToken.h"
-
-
-
-@interface SWGAccountApi: NSObject
-
--(void) addHeader:(NSString*)value forKey:(NSString*)key;
--(unsigned long) requestQueueSize;
-+(SWGAccountApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key;
-+(void) setBasePath:(NSString*)basePath;
-+(NSString*) getBasePath;
-/**
-
- Authenticates a User
- 
- @param username A confirmed Wordnik username
- @param password The user's password
- */
--(NSNumber*) authenticateWithCompletionBlock :(NSString*) username 
-        password:(NSString*) password 
-        completionHandler: (void (^)(SWGAuthenticationToken* output, NSError* error))completionBlock;
-
-/**
-
- Authenticates a user
- 
- @param username A confirmed Wordnik username
- @param body The user's password
- */
--(NSNumber*) authenticatePostWithCompletionBlock :(NSString*) username 
-        body:(NSString*) body 
-        completionHandler: (void (^)(SWGAuthenticationToken* output, NSError* error))completionBlock;
-
-/**
-
- Fetches WordList objects for the logged-in user.
- 
- @param auth_token auth_token of logged-in user
- @param skip Results to skip
- @param limit Maximum number of results to return
- */
--(NSNumber*) getWordListsForLoggedInUserWithCompletionBlock :(NSString*) auth_token 
-        skip:(NSNumber*) skip 
-        limit:(NSNumber*) limit 
-        completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock;
-
-/**
-
- Returns usage statistics for the API account.
- 
- @param api_key Wordnik authentication token
- */
--(NSNumber*) getApiTokenStatusWithCompletionBlock :(NSString*) api_key 
-        completionHandler: (void (^)(SWGApiTokenStatus* output, NSError* error))completionBlock;
-
-/**
-
- Returns the logged-in User
- Requires a valid auth_token to be set.
- @param auth_token The auth token of the logged-in user, obtained by calling /account.{format}/authenticate/{username} (described above)
- */
--(NSNumber*) getLoggedInUserWithCompletionBlock :(NSString*) auth_token 
-        completionHandler: (void (^)(SWGUser* output, NSError* error))completionBlock;
-
-@end
diff --git a/samples/client/wordnik-api-objc/client/SWGAccountApi.m b/samples/client/wordnik-api-objc/client/SWGAccountApi.m
deleted file mode 100644
index 1330a284e6a..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGAccountApi.m
+++ /dev/null
@@ -1,318 +0,0 @@
-#import "SWGAccountApi.h"
-#import "SWGFile.h"
-#import "SWGApiClient.h"
-#import "SWGUser.h"
-#import "SWGWordList.h"
-#import "SWGApiTokenStatus.h"
-#import "SWGAuthenticationToken.h"
-
-
-
-
-@implementation SWGAccountApi
-static NSString * basePath = @"http://api.wordnik.com/v4";
-
-+(SWGAccountApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key {
-    static SWGAccountApi* singletonAPI = nil;
-
-    if (singletonAPI == nil) {
-        singletonAPI = [[SWGAccountApi alloc] init];
-        [singletonAPI addHeader:headerValue forKey:key];
-    }
-    return singletonAPI;
-}
-
-+(void) setBasePath:(NSString*)path {
-    basePath = path;
-}
-
-+(NSString*) getBasePath {
-    return basePath;
-}
-
--(SWGApiClient*) apiClient {
-    return [SWGApiClient sharedClientFromPool:basePath];
-}
-
--(void) addHeader:(NSString*)value forKey:(NSString*)key {
-    [[self apiClient] setHeaderValue:value forKey:key];
-}
-
--(id) init {
-    self = [super init];
-    [self apiClient];
-    return self;
-}
-
--(void) setHeaderValue:(NSString*) value
-           forKey:(NSString*)key {
-    [[self apiClient] setHeaderValue:value forKey:key];
-}
-
--(unsigned long) requestQueueSize {
-    return [SWGApiClient requestQueueSize];
-}
-
-
--(NSNumber*) authenticateWithCompletionBlock:(NSString*) username
-        password:(NSString*) password
-        completionHandler: (void (^)(SWGAuthenticationToken* output, NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/account.{format}/authenticate/{username}", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"username", @"}"]] withString: [SWGApiClient escape:username]];
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(password != nil)
-        queryParams[@"password"] = password;
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    id bodyDictionary = nil;
-        if(username == nil) {
-        // error
-    }
-    if(password == nil) {
-        // error
-    }
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client dictionary:requestUrl 
-                              method:@"GET" 
-                         queryParams:queryParams 
-                                body:bodyDictionary 
-                        headerParams:headerParams
-                  requestContentType:requestContentType
-                 responseContentType:responseContentType
-                     completionBlock:^(NSDictionary *data, NSError *error) {
-                        if (error) {
-                            completionBlock(nil, error);return;
-                        }
-                        SWGAuthenticationToken *result = nil;
-                        if (data) {
-                            result = [[SWGAuthenticationToken alloc]initWithValues: data];
-                        }
-                        completionBlock(result , nil);}];
-    
-
-}
-
--(NSNumber*) authenticatePostWithCompletionBlock:(NSString*) username
-        body:(NSString*) body
-        completionHandler: (void (^)(SWGAuthenticationToken* output, NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/account.{format}/authenticate/{username}", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"username", @"}"]] withString: [SWGApiClient escape:username]];
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    id bodyDictionary = nil;
-        if(body != nil && [body isKindOfClass:[NSArray class]]){
-        NSMutableArray * objs = [[NSMutableArray alloc] init];
-        for (id dict in (NSArray*)body) {
-            if([dict respondsToSelector:@selector(asDictionary)]) {
-                [objs addObject:[(SWGObject*)dict asDictionary]];
-            }
-            else{
-                [objs addObject:dict];
-            }
-        }
-        bodyDictionary = objs;
-    }
-    else if([body respondsToSelector:@selector(asDictionary)]) {
-        bodyDictionary = [(SWGObject*)body asDictionary];
-    }
-    else if([body isKindOfClass:[NSString class]]) {
-        // convert it to a dictionary
-        NSError * error;
-        NSString * str = (NSString*)body;
-        NSDictionary *JSON =
-            [NSJSONSerialization JSONObjectWithData:[str dataUsingEncoding:NSUTF8StringEncoding]
-                                            options:NSJSONReadingMutableContainers
-                                              error:&error];
-        bodyDictionary = JSON;
-    }
-    else if([body isKindOfClass: [SWGFile class]]) {
-        requestContentType = @"form-data";
-        bodyDictionary = body;
-    }
-    else{
-        NSLog(@"don't know what to do with %@", body);
-    }
-
-    if(username == nil) {
-        // error
-    }
-    if(body == nil) {
-        // error
-    }
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client dictionary:requestUrl 
-                              method:@"POST" 
-                         queryParams:queryParams 
-                                body:bodyDictionary 
-                        headerParams:headerParams
-                  requestContentType:requestContentType
-                 responseContentType:responseContentType
-                     completionBlock:^(NSDictionary *data, NSError *error) {
-                        if (error) {
-                            completionBlock(nil, error);return;
-                        }
-                        SWGAuthenticationToken *result = nil;
-                        if (data) {
-                            result = [[SWGAuthenticationToken alloc]initWithValues: data];
-                        }
-                        completionBlock(result , nil);}];
-    
-
-}
-
--(NSNumber*) getWordListsForLoggedInUserWithCompletionBlock:(NSString*) auth_token
-        skip:(NSNumber*) skip
-        limit:(NSNumber*) limit
-        completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/account.{format}/wordLists", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(skip != nil)
-        queryParams[@"skip"] = skip;
-    if(limit != nil)
-        queryParams[@"limit"] = limit;
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    if(auth_token != nil)
-        headerParams[@"auth_token"] = auth_token;
-    id bodyDictionary = nil;
-        if(auth_token == nil) {
-        // error
-    }
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client dictionary: requestUrl 
-                               method: @"GET" 
-                          queryParams: queryParams 
-                                 body: bodyDictionary 
-                         headerParams: headerParams
-                   requestContentType: requestContentType
-                  responseContentType: responseContentType
-                      completionBlock: ^(NSDictionary *data, NSError *error) {
-                         if (error) {
-                             completionBlock(nil, error);return;
-                         }
-                         
-                         if([data isKindOfClass:[NSArray class]]){
-                             NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[data count]];
-                             for (NSDictionary* dict in (NSArray*)data) {
-                                SWGWordList* d = [[SWGWordList alloc]initWithValues: dict];
-                                [objs addObject:d];
-                             }
-                             completionBlock(objs, nil);
-                         }
-                        }];
-    
-
-}
-
--(NSNumber*) getApiTokenStatusWithCompletionBlock:(NSString*) api_key
-        completionHandler: (void (^)(SWGApiTokenStatus* output, NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/account.{format}/apiTokenStatus", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    if(api_key != nil)
-        headerParams[@"api_key"] = api_key;
-    id bodyDictionary = nil;
-        SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client dictionary:requestUrl 
-                              method:@"GET" 
-                         queryParams:queryParams 
-                                body:bodyDictionary 
-                        headerParams:headerParams
-                  requestContentType:requestContentType
-                 responseContentType:responseContentType
-                     completionBlock:^(NSDictionary *data, NSError *error) {
-                        if (error) {
-                            completionBlock(nil, error);return;
-                        }
-                        SWGApiTokenStatus *result = nil;
-                        if (data) {
-                            result = [[SWGApiTokenStatus alloc]initWithValues: data];
-                        }
-                        completionBlock(result , nil);}];
-    
-
-}
-
--(NSNumber*) getLoggedInUserWithCompletionBlock:(NSString*) auth_token
-        completionHandler: (void (^)(SWGUser* output, NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/account.{format}/user", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    if(auth_token != nil)
-        headerParams[@"auth_token"] = auth_token;
-    id bodyDictionary = nil;
-        if(auth_token == nil) {
-        // error
-    }
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client dictionary:requestUrl 
-                              method:@"GET" 
-                         queryParams:queryParams 
-                                body:bodyDictionary 
-                        headerParams:headerParams
-                  requestContentType:requestContentType
-                 responseContentType:responseContentType
-                     completionBlock:^(NSDictionary *data, NSError *error) {
-                        if (error) {
-                            completionBlock(nil, error);return;
-                        }
-                        SWGUser *result = nil;
-                        if (data) {
-                            result = [[SWGUser alloc]initWithValues: data];
-                        }
-                        completionBlock(result , nil);}];
-    
-
-}
-
-
-
-@end
diff --git a/samples/client/wordnik-api-objc/client/SWGApiClient.h b/samples/client/wordnik-api-objc/client/SWGApiClient.h
deleted file mode 100644
index aab60cd0595..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGApiClient.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "AFHTTPClient.h"
-
-@interface SWGApiClient : AFHTTPClient
-
-@property(nonatomic, assign) NSURLRequestCachePolicy cachePolicy;
-@property(nonatomic, assign) NSTimeInterval timeoutInterval;
-@property(nonatomic, assign) BOOL logRequests;
-@property(nonatomic, assign) BOOL logCacheHits;
-@property(nonatomic, assign) BOOL logServerResponses;
-@property(nonatomic, assign) BOOL logJSON;
-@property(nonatomic, assign) BOOL logHTTP;
-@property(nonatomic, readonly) NSOperationQueue* queue;
-
-+(SWGApiClient *)sharedClientFromPool:(NSString *)baseUrl;
-
-+(NSOperationQueue*) sharedQueue;
-
-+(void)setLoggingEnabled:(bool) state;
-
-+(void)clearCache;
-
-+(void)setCacheEnabled:(BOOL) enabled;
-
-+(unsigned long)requestQueueSize;
-
-+(void) setOfflineState:(BOOL) state;
-
-+(AFNetworkReachabilityStatus) getReachabilityStatus;
-
-+(NSNumber*) nextRequestId;
-
-+(NSNumber*) queueRequest;
-
-+(void) cancelRequest:(NSNumber*)requestId;
-
-+(NSString*) escape:(id)unescaped;
-
-+(void) setReachabilityChangeBlock:(void(^)(int))changeBlock;
-
-+(void) configureCacheReachibilityForHost:(NSString*)host;
-
--(void)setHeaderValue:(NSString*) value
-                forKey:(NSString*) forKey;
-
--(NSNumber*)  dictionary:(NSString*) path
-                  method:(NSString*) method
-             queryParams:(NSDictionary*) queryParams
-                    body:(id) body
-            headerParams:(NSDictionary*) headerParams
-      requestContentType:(NSString*) requestContentType
-     responseContentType:(NSString*) responseContentType
-         completionBlock:(void (^)(NSDictionary*, NSError *))completionBlock;
-
--(NSNumber*)  stringWithCompletionBlock:(NSString*) path
-                                 method:(NSString*) method
-                            queryParams:(NSDictionary*) queryParams
-                                   body:(id) body
-                           headerParams:(NSDictionary*) headerParams
-                     requestContentType:(NSString*) requestContentType
-                    responseContentType:(NSString*) responseContentType
-                        completionBlock:(void (^)(NSString*, NSError *))completionBlock;
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGApiClient.m b/samples/client/wordnik-api-objc/client/SWGApiClient.m
deleted file mode 100644
index 1c48412bc5a..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGApiClient.m
+++ /dev/null
@@ -1,419 +0,0 @@
-#import "SWGApiClient.h"
-#import "SWGFile.h"
-
-#import "AFJSONRequestOperation.h"
-
-@implementation SWGApiClient
-
-static long requestId = 0;
-static bool offlineState = true;
-static NSMutableSet * queuedRequests = nil;
-static bool cacheEnabled = false;
-static AFNetworkReachabilityStatus reachabilityStatus = AFNetworkReachabilityStatusNotReachable;
-static NSOperationQueue* sharedQueue;
-static void (^reachabilityChangeBlock)(int);
-static bool loggingEnabled = false;
-
-+(void)setLoggingEnabled:(bool) state {
-    loggingEnabled = state;
-}
-
-+(void)clearCache {
-    [[NSURLCache sharedURLCache] removeAllCachedResponses];
-}
-
-+(void)setCacheEnabled:(BOOL)enabled {
-    cacheEnabled = enabled;
-}
-
-+(void)configureCacheWithMemoryAndDiskCapacity:(unsigned long) memorySize
-                                      diskSize:(unsigned long) diskSize {
-    NSAssert(memorySize > 0, @"invalid in-memory cache size");
-    NSAssert(diskSize >= 0, @"invalid disk cache size");
-    
-    NSURLCache *cache =
-    [[NSURLCache alloc]
-     initWithMemoryCapacity:memorySize
-     diskCapacity:diskSize
-     diskPath:@"swagger_url_cache"];
-    
-    [NSURLCache setSharedURLCache:cache];
-}
-
-+(NSOperationQueue*) sharedQueue {
-    return sharedQueue;
-}
-
-+(SWGApiClient *)sharedClientFromPool:(NSString *)baseUrl {
-    static NSMutableDictionary *_pool = nil;
-    if (queuedRequests == nil) {
-        queuedRequests = [[NSMutableSet alloc]init];
-    }
-    if(_pool == nil) {
-        // setup static vars
-        // create queue
-        sharedQueue = [[NSOperationQueue alloc] init];
-        
-        // create pool
-        _pool = [[NSMutableDictionary alloc] init];
-        
-        // initialize URL cache
-        [SWGApiClient configureCacheWithMemoryAndDiskCapacity:4*1024*1024 diskSize:32*1024*1024];
-        
-        // configure reachability
-        [SWGApiClient configureCacheReachibilityForHost:baseUrl];
-    }
-    
-    @synchronized(self) {
-        SWGApiClient * client = [_pool objectForKey:baseUrl];
-        if (client == nil) {
-            client = [[SWGApiClient alloc] initWithBaseURL:[NSURL URLWithString:baseUrl]];
-            [client registerHTTPOperationClass:[AFJSONRequestOperation class]];
-            client.parameterEncoding = AFJSONParameterEncoding;
-            [_pool setValue:client forKey:baseUrl ];
-            if(loggingEnabled)
-                NSLog(@"new client for path %@", baseUrl);
-        }
-        if(loggingEnabled)
-            NSLog(@"returning client for path %@", baseUrl);
-        return client;
-    }
-}
-
--(void)setHeaderValue:(NSString*) value
-               forKey:(NSString*) forKey {
-    [self setDefaultHeader:forKey value:value];
-}
-
-+(unsigned long)requestQueueSize {
-    return [queuedRequests count];
-}
-
-+(NSNumber*) nextRequestId {
-    long nextId = ++requestId;
-    if(loggingEnabled)
-        NSLog(@"got id %ld", nextId);
-    return [NSNumber numberWithLong:nextId];
-}
-
-+(NSNumber*) queueRequest {
-    NSNumber* requestId = [SWGApiClient nextRequestId];
-    if(loggingEnabled)
-        NSLog(@"added %@ to request queue", requestId);
-    [queuedRequests addObject:requestId];
-    return requestId;
-}
-
-+(void) cancelRequest:(NSNumber*)requestId {
-    [queuedRequests removeObject:requestId];
-}
-
-+(NSString*) escape:(id)unescaped {
-    if([unescaped isKindOfClass:[NSString class]]){
-        return (NSString *)CFBridgingRelease
-        (CFURLCreateStringByAddingPercentEscapes(
-                                                 NULL,
-                                                 (__bridge CFStringRef) unescaped,
-                                                 NULL,
-                                                 (CFStringRef)@"!*'();:@&=+$,/?%#[]",
-                                                 kCFStringEncodingUTF8));
-    }
-    else {
-        return [NSString stringWithFormat:@"%@", unescaped];
-    }
-}
-
--(Boolean) executeRequestWithId:(NSNumber*) requestId {
-    NSSet* matchingItems = [queuedRequests objectsPassingTest:^BOOL(id obj, BOOL *stop) {
-        if([obj intValue]  == [requestId intValue])
-            return TRUE;
-        else return FALSE;
-    }];
-    
-    if(matchingItems.count == 1) {
-        if(loggingEnabled)
-            NSLog(@"removing request id %@", requestId);
-        [queuedRequests removeObject:requestId];
-        return true;
-    }
-    else
-        return false;
-}
-
--(id)initWithBaseURL:(NSURL *)url {
-    self = [super initWithBaseURL:url];
-    if (!self)
-        return nil;
-    return self;
-}
-
-+(AFNetworkReachabilityStatus) getReachabilityStatus {
-    return reachabilityStatus;
-}
-
-+(void) setReachabilityChangeBlock:(void(^)(int))changeBlock {
-    reachabilityChangeBlock = changeBlock;
-}
-
-+(void) setOfflineState:(BOOL) state {
-    offlineState = state;
-}
-
-+(void) configureCacheReachibilityForHost:(NSString*)host {
-    [[SWGApiClient sharedClientFromPool:host ] setReachabilityStatusChangeBlock:^(AFNetworkReachabilityStatus status) {
-        reachabilityStatus = status;
-        switch (status) {
-            case AFNetworkReachabilityStatusUnknown:
-                if(loggingEnabled)
-                    NSLog(@"reachability changed to AFNetworkReachabilityStatusUnknown");
-                [SWGApiClient setOfflineState:true];
-                break;
-                
-            case AFNetworkReachabilityStatusNotReachable:
-                if(loggingEnabled)
-                    NSLog(@"reachability changed to AFNetworkReachabilityStatusNotReachable");
-                [SWGApiClient setOfflineState:true];
-                break;
-                
-            case AFNetworkReachabilityStatusReachableViaWWAN:
-                if(loggingEnabled)
-                    NSLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWWAN");
-                [SWGApiClient setOfflineState:false];
-                break;
-                
-            case AFNetworkReachabilityStatusReachableViaWiFi:
-                if(loggingEnabled)
-                    NSLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWiFi");
-                [SWGApiClient setOfflineState:false];
-                break;
-            default:
-                break;
-        }
-        // call the reachability block, if configured
-        if(reachabilityChangeBlock != nil) {
-            reachabilityChangeBlock(status);
-        }
-    }];
-}
-
--(NSString*) pathWithQueryParamsToString:(NSString*) path
-                             queryParams:(NSDictionary*) queryParams {
-    NSString * separator = nil;
-    int counter = 0;
-    
-    NSMutableString * requestUrl = [NSMutableString stringWithFormat:@"%@", path];
-    if(queryParams != nil){
-        for(NSString * key in [queryParams keyEnumerator]){
-            if(counter == 0) separator = @"?";
-            else separator = @"&";
-            NSString * value;
-            if([[queryParams valueForKey:key] isKindOfClass:[NSString class]]){
-                value = [SWGApiClient escape:[queryParams valueForKey:key]];
-            }
-            else {
-                value = [NSString stringWithFormat:@"%@", [queryParams valueForKey:key]];
-            }
-            [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
-                                      [SWGApiClient escape:key], value]];
-            counter += 1;
-        }
-    }
-    return requestUrl;
-}
-
-- (NSString*)descriptionForRequest:(NSURLRequest*)request {
-    return [[request URL] absoluteString];
-}
-
-- (void)logRequest:(NSURLRequest*)request {
-    NSLog(@"request: %@", [self descriptionForRequest:request]);
-}
-
-- (void)logResponse:(id)data forRequest:(NSURLRequest*)request error:(NSError*)error {
-    NSLog(@"request: %@  response: %@ ",  [self descriptionForRequest:request], data );
-}
-
-
--(NSNumber*)  dictionary:(NSString*) path
-                  method:(NSString*) method
-             queryParams:(NSDictionary*) queryParams
-                    body:(id) body
-            headerParams:(NSDictionary*) headerParams
-      requestContentType:(NSString*) requestContentType
-     responseContentType:(NSString*) responseContentType
-         completionBlock:(void (^)(NSDictionary*, NSError *))completionBlock {
-    
-    NSMutableURLRequest * request = nil;
-    
-    if ([body isKindOfClass:[SWGFile class]]){
-        SWGFile * file = (SWGFile*) body;
-        
-        request = [self multipartFormRequestWithMethod:@"POST"
-                                                  path:path
-                                            parameters:nil
-                             constructingBodyWithBlock: ^(id <AFMultipartFormData> formData) {
-                                 [formData appendPartWithFileData:[file data]
-                                                             name:@"image"
-                                                         fileName:[file name]
-                                                         mimeType:[file mimeType]];
-                             }];
-    }
-    else {
-        request = [self requestWithMethod:method
-                                     path:[self pathWithQueryParamsToString:path queryParams:queryParams]
-                               parameters:body];
-    }
-    BOOL hasHeaderParams = false;
-    if(headerParams != nil && [headerParams count] > 0)
-        hasHeaderParams = true;
-    if(offlineState) {
-        NSLog(@"%@ cache forced", path);
-        [request setCachePolicy:NSURLRequestReturnCacheDataDontLoad];
-    }
-    else if(!hasHeaderParams && [method isEqualToString:@"GET"] && cacheEnabled) {
-        NSLog(@"%@ cache enabled", path);
-        [request setCachePolicy:NSURLRequestUseProtocolCachePolicy];
-    }
-    else {
-        NSLog(@"%@ cache disabled", path);
-        [request setCachePolicy:NSURLRequestReloadIgnoringLocalCacheData];
-    }
-
-    if(body != nil) {
-        if([body isKindOfClass:[NSDictionary class]] || [body isKindOfClass:[NSArray class]]){
-            [request setValue:requestContentType forHTTPHeaderField:@"Content-Type"];
-        }
-        else if ([body isKindOfClass:[SWGFile class]]) {}
-        else {
-            NSAssert(false, @"unsupported post type!");
-        }
-    }
-    if(headerParams != nil){
-        for(NSString * key in [headerParams keyEnumerator]){
-            [request setValue:[headerParams valueForKey:key] forHTTPHeaderField:key];
-        }
-    }
-    [request setValue:[headerParams valueForKey:responseContentType] forHTTPHeaderField:@"Accept"];
-    
-    // Always disable cookies!
-    [request setHTTPShouldHandleCookies:NO];
-    
-    
-    if (self.logRequests) {
-        [self logRequest:request];
-    }
-    
-    NSNumber* requestId = [SWGApiClient queueRequest];
-    AFJSONRequestOperation *op =
-    [AFJSONRequestOperation
-     JSONRequestOperationWithRequest:request
-     success:^(NSURLRequest *request, NSHTTPURLResponse *response, id JSON) {
-         if([self executeRequestWithId:requestId]) {
-             if(self.logServerResponses)
-                 [self logResponse:JSON forRequest:request error:nil];
-             completionBlock(JSON, nil);
-         }
-     } failure:^(NSURLRequest *request, NSHTTPURLResponse *response, NSError *error, id data) {
-         if([self executeRequestWithId:requestId]) {
-             if(self.logServerResponses)
-                 [self logResponse:nil forRequest:request error:error];
-             completionBlock(nil, error);
-         }
-     }
-     ];
-    
-    [self enqueueHTTPRequestOperation:op];
-    return requestId;
-}
-
--(NSNumber*)  stringWithCompletionBlock:(NSString*) path
-                                 method:(NSString*) method
-                            queryParams:(NSDictionary*) queryParams
-                                   body:(id) body
-                           headerParams:(NSDictionary*) headerParams
-                     requestContentType:(NSString*) requestContentType
-                    responseContentType:(NSString*) responseContentType
-                        completionBlock:(void (^)(NSString*, NSError *))completionBlock {
-    AFHTTPClient *client = self;
-    client.parameterEncoding = AFJSONParameterEncoding;
-    
-    NSMutableURLRequest * request = nil;
-    
-    if ([body isKindOfClass:[SWGFile class]]){
-        SWGFile * file = (SWGFile*) body;
-        
-        request = [self multipartFormRequestWithMethod:@"POST"
-                                                  path:path
-                                            parameters:nil
-                             constructingBodyWithBlock: ^(id <AFMultipartFormData> formData) {
-                                 [formData appendPartWithFileData:[file data]
-                                                             name:@"image"
-                                                         fileName:[file name]
-                                                         mimeType:[file mimeType]];
-                             }];
-    }
-    else {
-        request = [self requestWithMethod:method
-                                     path:[self pathWithQueryParamsToString:path queryParams:queryParams]
-                               parameters:body];
-    }
-    
-    BOOL hasHeaderParams = false;
-    if(headerParams != nil && [headerParams count] > 0)
-        hasHeaderParams = true;
-    if(offlineState) {
-        NSLog(@"%@ cache forced", path);
-        [request setCachePolicy:NSURLRequestReturnCacheDataDontLoad];
-    }
-    else if(!hasHeaderParams && [method isEqualToString:@"GET"] && cacheEnabled) {
-        NSLog(@"%@ cache enabled", path);
-        [request setCachePolicy:NSURLRequestUseProtocolCachePolicy];
-    }
-    else {
-        NSLog(@"%@ cache disabled", path);
-        [request setCachePolicy:NSURLRequestReloadIgnoringLocalCacheData];
-    }
-    
-    if(body != nil) {
-        if([body isKindOfClass:[NSDictionary class]]){
-            [request setValue:requestContentType forHTTPHeaderField:@"Content-Type"];
-        }
-        else if ([body isKindOfClass:[SWGFile class]]){}
-        else {
-            NSAssert(false, @"unsupported post type!");
-        }
-    }
-    if(headerParams != nil){
-        for(NSString * key in [headerParams keyEnumerator]){
-            [request setValue:[headerParams valueForKey:key] forHTTPHeaderField:key];
-        }
-    }
-    [request setValue:[headerParams valueForKey:responseContentType] forHTTPHeaderField:@"Accept"];
-    
-    // Always disable cookies!
-    [request setHTTPShouldHandleCookies:NO];
-    
-    NSNumber* requestId = [SWGApiClient queueRequest];
-    AFHTTPRequestOperation *op = [[AFHTTPRequestOperation alloc] initWithRequest:request];
-    [op setCompletionBlockWithSuccess:
-     ^(AFHTTPRequestOperation *resp,
-       id responseObject) {
-         NSString *response = [resp responseString];
-         if([self executeRequestWithId:requestId]) {
-             if(self.logServerResponses)
-                 [self logResponse:responseObject forRequest:request error:nil];
-             completionBlock(response, nil);
-         }
-     } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
-         if([self executeRequestWithId:requestId]) {
-             if(self.logServerResponses)
-                 [self logResponse:nil forRequest:request error:error];
-             completionBlock(nil, error);
-         }
-     }];
-    
-    [self enqueueHTTPRequestOperation:op];
-    return requestId;
-}
-
-@end
diff --git a/samples/client/wordnik-api-objc/client/SWGApiTokenStatus.h b/samples/client/wordnik-api-objc/client/SWGApiTokenStatus.h
deleted file mode 100644
index 819c01144a0..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGApiTokenStatus.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGApiTokenStatus : SWGObject
-
-@property(nonatomic) NSNumber* valid;  
-
-@property(nonatomic) NSString* token;  
-
-@property(nonatomic) NSNumber* resetsInMillis;  
-
-@property(nonatomic) NSNumber* remainingCalls;  
-
-@property(nonatomic) NSNumber* expiresInMillis;  
-
-@property(nonatomic) NSNumber* totalRequests;  
-
-- (id) valid: (NSNumber*) valid
-     token: (NSString*) token
-     resetsInMillis: (NSNumber*) resetsInMillis
-     remainingCalls: (NSNumber*) remainingCalls
-     expiresInMillis: (NSNumber*) expiresInMillis
-     totalRequests: (NSNumber*) totalRequests;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGApiTokenStatus.m b/samples/client/wordnik-api-objc/client/SWGApiTokenStatus.m
deleted file mode 100644
index 91c9491df4d..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGApiTokenStatus.m
+++ /dev/null
@@ -1,51 +0,0 @@
-#import "SWGDate.h"
-#import "SWGApiTokenStatus.h"
-
-@implementation SWGApiTokenStatus
-
--(id)valid: (NSNumber*) valid
-    token: (NSString*) token
-    resetsInMillis: (NSNumber*) resetsInMillis
-    remainingCalls: (NSNumber*) remainingCalls
-    expiresInMillis: (NSNumber*) expiresInMillis
-    totalRequests: (NSNumber*) totalRequests
-{
-  _valid = valid;
-  _token = token;
-  _resetsInMillis = resetsInMillis;
-  _remainingCalls = remainingCalls;
-  _expiresInMillis = expiresInMillis;
-  _totalRequests = totalRequests;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _valid = dict[@"valid"]; 
-        _token = dict[@"token"]; 
-        _resetsInMillis = dict[@"resetsInMillis"]; 
-        _remainingCalls = dict[@"remainingCalls"]; 
-        _expiresInMillis = dict[@"expiresInMillis"]; 
-        _totalRequests = dict[@"totalRequests"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(_valid != nil) dict[@"valid"] = _valid ;
-        if(_token != nil) dict[@"token"] = _token ;
-        if(_resetsInMillis != nil) dict[@"resetsInMillis"] = _resetsInMillis ;
-        if(_remainingCalls != nil) dict[@"remainingCalls"] = _remainingCalls ;
-        if(_expiresInMillis != nil) dict[@"expiresInMillis"] = _expiresInMillis ;
-        if(_totalRequests != nil) dict[@"totalRequests"] = _totalRequests ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGAudioFile.h b/samples/client/wordnik-api-objc/client/SWGAudioFile.h
deleted file mode 100644
index 4002d5ea4d5..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGAudioFile.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-#import "SWGDate.h"
-
-
-@interface SWGAudioFile : SWGObject
-
-@property(nonatomic) NSString* attributionUrl;  
-
-@property(nonatomic) NSNumber* commentCount;  
-
-@property(nonatomic) NSNumber* voteCount;  
-
-@property(nonatomic) NSString* fileUrl;  
-
-@property(nonatomic) NSString* audioType;  
-
-@property(nonatomic) NSNumber* _id;  
-
-@property(nonatomic) NSNumber* duration;  
-
-@property(nonatomic) NSString* attributionText;  
-
-@property(nonatomic) NSString* createdBy;  
-
-@property(nonatomic) NSString* description;  
-
-@property(nonatomic) SWGDate* createdAt;  
-
-@property(nonatomic) NSNumber* voteWeightedAverage;  
-
-@property(nonatomic) NSNumber* voteAverage;  
-
-@property(nonatomic) NSString* word;  
-
-- (id) attributionUrl: (NSString*) attributionUrl
-     commentCount: (NSNumber*) commentCount
-     voteCount: (NSNumber*) voteCount
-     fileUrl: (NSString*) fileUrl
-     audioType: (NSString*) audioType
-     _id: (NSNumber*) _id
-     duration: (NSNumber*) duration
-     attributionText: (NSString*) attributionText
-     createdBy: (NSString*) createdBy
-     description: (NSString*) description
-     createdAt: (SWGDate*) createdAt
-     voteWeightedAverage: (NSNumber*) voteWeightedAverage
-     voteAverage: (NSNumber*) voteAverage
-     word: (NSString*) word;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGAudioFile.m b/samples/client/wordnik-api-objc/client/SWGAudioFile.m
deleted file mode 100644
index 3ceeffa80eb..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGAudioFile.m
+++ /dev/null
@@ -1,102 +0,0 @@
-#import "SWGDate.h"
-#import "SWGAudioFile.h"
-
-@implementation SWGAudioFile
-
--(id)attributionUrl: (NSString*) attributionUrl
-    commentCount: (NSNumber*) commentCount
-    voteCount: (NSNumber*) voteCount
-    fileUrl: (NSString*) fileUrl
-    audioType: (NSString*) audioType
-    _id: (NSNumber*) _id
-    duration: (NSNumber*) duration
-    attributionText: (NSString*) attributionText
-    createdBy: (NSString*) createdBy
-    description: (NSString*) description
-    createdAt: (SWGDate*) createdAt
-    voteWeightedAverage: (NSNumber*) voteWeightedAverage
-    voteAverage: (NSNumber*) voteAverage
-    word: (NSString*) word
-{
-  _attributionUrl = attributionUrl;
-  _commentCount = commentCount;
-  _voteCount = voteCount;
-  _fileUrl = fileUrl;
-  _audioType = audioType;
-  __id = _id;
-  _duration = duration;
-  _attributionText = attributionText;
-  _createdBy = createdBy;
-  _description = description;
-  _createdAt = createdAt;
-  _voteWeightedAverage = voteWeightedAverage;
-  _voteAverage = voteAverage;
-  _word = word;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _attributionUrl = dict[@"attributionUrl"]; 
-        _commentCount = dict[@"commentCount"]; 
-        _voteCount = dict[@"voteCount"]; 
-        _fileUrl = dict[@"fileUrl"]; 
-        _audioType = dict[@"audioType"]; 
-        __id = dict[@"id"]; 
-        _duration = dict[@"duration"]; 
-        _attributionText = dict[@"attributionText"]; 
-        _createdBy = dict[@"createdBy"]; 
-        _description = dict[@"description"]; 
-        id createdAt_dict = dict[@"createdAt"];
-        if(createdAt_dict != nil)
-            _createdAt = [[SWGDate alloc]initWithValues:createdAt_dict];
-        _voteWeightedAverage = dict[@"voteWeightedAverage"]; 
-        _voteAverage = dict[@"voteAverage"]; 
-        _word = dict[@"word"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(_attributionUrl != nil) dict[@"attributionUrl"] = _attributionUrl ;
-        if(_commentCount != nil) dict[@"commentCount"] = _commentCount ;
-        if(_voteCount != nil) dict[@"voteCount"] = _voteCount ;
-        if(_fileUrl != nil) dict[@"fileUrl"] = _fileUrl ;
-        if(_audioType != nil) dict[@"audioType"] = _audioType ;
-        if(__id != nil) dict[@"id"] = __id ;
-        if(_duration != nil) dict[@"duration"] = _duration ;
-        if(_attributionText != nil) dict[@"attributionText"] = _attributionText ;
-        if(_createdBy != nil) dict[@"createdBy"] = _createdBy ;
-        if(_description != nil) dict[@"description"] = _description ;
-        if(_createdAt != nil){
-        if([_createdAt isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGDate *createdAt in (NSArray*)_createdAt) {
-                [array addObject:[(SWGObject*)createdAt asDictionary]];
-            }
-            dict[@"createdAt"] = array;
-        }
-        else if(_createdAt && [_createdAt isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_createdAt toString];
-            if(dateString){
-                dict[@"createdAt"] = dateString;
-            }
-        }
-        else {
-        if(_createdAt != nil) dict[@"createdAt"] = [(SWGObject*)_createdAt asDictionary];
-        }
-    }
-    if(_voteWeightedAverage != nil) dict[@"voteWeightedAverage"] = _voteWeightedAverage ;
-        if(_voteAverage != nil) dict[@"voteAverage"] = _voteAverage ;
-        if(_word != nil) dict[@"word"] = _word ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGAuthenticationToken.h b/samples/client/wordnik-api-objc/client/SWGAuthenticationToken.h
deleted file mode 100644
index c821521b909..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGAuthenticationToken.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGAuthenticationToken : SWGObject
-
-@property(nonatomic) NSString* token;  
-
-@property(nonatomic) NSNumber* userId;  
-
-@property(nonatomic) NSString* userSignature;  
-
-- (id) token: (NSString*) token
-     userId: (NSNumber*) userId
-     userSignature: (NSString*) userSignature;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGAuthenticationToken.m b/samples/client/wordnik-api-objc/client/SWGAuthenticationToken.m
deleted file mode 100644
index aa78c3de3e6..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGAuthenticationToken.m
+++ /dev/null
@@ -1,39 +0,0 @@
-#import "SWGDate.h"
-#import "SWGAuthenticationToken.h"
-
-@implementation SWGAuthenticationToken
-
--(id)token: (NSString*) token
-    userId: (NSNumber*) userId
-    userSignature: (NSString*) userSignature
-{
-  _token = token;
-  _userId = userId;
-  _userSignature = userSignature;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _token = dict[@"token"]; 
-        _userId = dict[@"userId"]; 
-        _userSignature = dict[@"userSignature"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(_token != nil) dict[@"token"] = _token ;
-        if(_userId != nil) dict[@"userId"] = _userId ;
-        if(_userSignature != nil) dict[@"userSignature"] = _userSignature ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGBigram.h b/samples/client/wordnik-api-objc/client/SWGBigram.h
deleted file mode 100644
index 51430a54661..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGBigram.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGBigram : SWGObject
-
-@property(nonatomic) NSNumber* count;  
-
-@property(nonatomic) NSString* gram2;  
-
-@property(nonatomic) NSString* gram1;  
-
-@property(nonatomic) NSNumber* wlmi;  
-
-@property(nonatomic) NSNumber* mi;  
-
-- (id) count: (NSNumber*) count
-     gram2: (NSString*) gram2
-     gram1: (NSString*) gram1
-     wlmi: (NSNumber*) wlmi
-     mi: (NSNumber*) mi;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGBigram.m b/samples/client/wordnik-api-objc/client/SWGBigram.m
deleted file mode 100644
index 5cddc8dde7e..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGBigram.m
+++ /dev/null
@@ -1,47 +0,0 @@
-#import "SWGDate.h"
-#import "SWGBigram.h"
-
-@implementation SWGBigram
-
--(id)count: (NSNumber*) count
-    gram2: (NSString*) gram2
-    gram1: (NSString*) gram1
-    wlmi: (NSNumber*) wlmi
-    mi: (NSNumber*) mi
-{
-  _count = count;
-  _gram2 = gram2;
-  _gram1 = gram1;
-  _wlmi = wlmi;
-  _mi = mi;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _count = dict[@"count"]; 
-        _gram2 = dict[@"gram2"]; 
-        _gram1 = dict[@"gram1"]; 
-        _wlmi = dict[@"wlmi"]; 
-        _mi = dict[@"mi"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(_count != nil) dict[@"count"] = _count ;
-        if(_gram2 != nil) dict[@"gram2"] = _gram2 ;
-        if(_gram1 != nil) dict[@"gram1"] = _gram1 ;
-        if(_wlmi != nil) dict[@"wlmi"] = _wlmi ;
-        if(_mi != nil) dict[@"mi"] = _mi ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGCitation.h b/samples/client/wordnik-api-objc/client/SWGCitation.h
deleted file mode 100644
index 4f06535d53b..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGCitation.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGCitation : SWGObject
-
-@property(nonatomic) NSString* cite;  
-
-@property(nonatomic) NSString* source;  
-
-- (id) cite: (NSString*) cite
-     source: (NSString*) source;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGCitation.m b/samples/client/wordnik-api-objc/client/SWGCitation.m
deleted file mode 100644
index a0ffb75d6f6..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGCitation.m
+++ /dev/null
@@ -1,35 +0,0 @@
-#import "SWGDate.h"
-#import "SWGCitation.h"
-
-@implementation SWGCitation
-
--(id)cite: (NSString*) cite
-    source: (NSString*) source
-{
-  _cite = cite;
-  _source = source;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _cite = dict[@"cite"]; 
-        _source = dict[@"source"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(_cite != nil) dict[@"cite"] = _cite ;
-        if(_source != nil) dict[@"source"] = _source ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGContentProvider.h b/samples/client/wordnik-api-objc/client/SWGContentProvider.h
deleted file mode 100644
index ca85afa74af..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGContentProvider.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGContentProvider : SWGObject
-
-@property(nonatomic) NSNumber* _id;  
-
-@property(nonatomic) NSString* name;  
-
-- (id) _id: (NSNumber*) _id
-     name: (NSString*) name;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGContentProvider.m b/samples/client/wordnik-api-objc/client/SWGContentProvider.m
deleted file mode 100644
index be5337c0b6d..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGContentProvider.m
+++ /dev/null
@@ -1,35 +0,0 @@
-#import "SWGDate.h"
-#import "SWGContentProvider.h"
-
-@implementation SWGContentProvider
-
--(id)_id: (NSNumber*) _id
-    name: (NSString*) name
-{
-  __id = _id;
-  _name = name;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        __id = dict[@"id"]; 
-        _name = dict[@"name"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(__id != nil) dict[@"id"] = __id ;
-        if(_name != nil) dict[@"name"] = _name ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGDate.h b/samples/client/wordnik-api-objc/client/SWGDate.h
deleted file mode 100644
index 2c6c7cfe01b..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGDate.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-@interface SWGDate : SWGObject {
-@private
-    NSDate *_date;
-}
-@property(nonatomic, readonly) NSDate* date;
-
-- (id) initWithValues: (NSString*)input;
--(NSString*) toString;
-@end
\ No newline at end of file
diff --git a/samples/client/wordnik-api-objc/client/SWGDate.m b/samples/client/wordnik-api-objc/client/SWGDate.m
deleted file mode 100644
index 07a1405626b..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGDate.m
+++ /dev/null
@@ -1,34 +0,0 @@
-#import "SWGDate.h"
-
-@implementation SWGDate
-
-@synthesize date = _date;
-
-- (id) initWithValues:(NSString*)input {
-    if([input isKindOfClass:[NSString class]]){
-        NSDateFormatter* df = [NSDateFormatter new];
-        NSLocale *locale = [[NSLocale new]                        
-                            initWithLocaleIdentifier:@"en_US_POSIX"];
-        [df setLocale:locale];
-        [df setDateFormat:@"yyyy-MM-dd'T'HH:mm:ss.SSSZ"];
-
-        _date = [df dateFromString:input];
-    }
-    else if([input isKindOfClass:[NSNumber class]]) {
-        NSTimeInterval interval = [input doubleValue];
-        _date = [[NSDate alloc] initWithTimeIntervalSince1970:interval];        
-    }
-    return self;
-}
-
--(NSString*) toString {
-    NSDateFormatter* df = [NSDateFormatter new];
-    NSLocale *locale = [[NSLocale new]                        
-                        initWithLocaleIdentifier:@"en_US_POSIX"];
-    [df setLocale:locale];
-    [df setDateFormat:@"yyyy-MM-dd'T'HH:mm:ss.SSSZ"];
-    
-    return [df stringFromDate:_date];
-}
-
-@end
\ No newline at end of file
diff --git a/samples/client/wordnik-api-objc/client/SWGDefinition.h b/samples/client/wordnik-api-objc/client/SWGDefinition.h
deleted file mode 100644
index 170df8f3554..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGDefinition.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-#import "SWGLabel.h"
-#import "SWGExampleUsage.h"
-#import "SWGTextPron.h"
-#import "SWGCitation.h"
-#import "SWGRelated.h"
-#import "SWGNote.h"
-
-
-@interface SWGDefinition : SWGObject
-
-@property(nonatomic) NSString* extendedText;  
-
-@property(nonatomic) NSString* text;  
-
-@property(nonatomic) NSString* sourceDictionary;  
-
-@property(nonatomic) NSArray* citations;  
-
-@property(nonatomic) NSArray* labels;  
-
-@property(nonatomic) NSNumber* score;  
-
-@property(nonatomic) NSArray* exampleUses;  
-
-@property(nonatomic) NSString* attributionUrl;  
-
-@property(nonatomic) NSString* seqString;  
-
-@property(nonatomic) NSString* attributionText;  
-
-@property(nonatomic) NSArray* relatedWords;  
-
-@property(nonatomic) NSString* sequence;  
-
-@property(nonatomic) NSString* word;  
-
-@property(nonatomic) NSArray* notes;  
-
-@property(nonatomic) NSArray* textProns;  
-
-@property(nonatomic) NSString* partOfSpeech;  
-
-- (id) extendedText: (NSString*) extendedText
-     text: (NSString*) text
-     sourceDictionary: (NSString*) sourceDictionary
-     citations: (NSArray*) citations
-     labels: (NSArray*) labels
-     score: (NSNumber*) score
-     exampleUses: (NSArray*) exampleUses
-     attributionUrl: (NSString*) attributionUrl
-     seqString: (NSString*) seqString
-     attributionText: (NSString*) attributionText
-     relatedWords: (NSArray*) relatedWords
-     sequence: (NSString*) sequence
-     word: (NSString*) word
-     notes: (NSArray*) notes
-     textProns: (NSArray*) textProns
-     partOfSpeech: (NSString*) partOfSpeech;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGDefinition.m b/samples/client/wordnik-api-objc/client/SWGDefinition.m
deleted file mode 100644
index fa53497953e..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGDefinition.m
+++ /dev/null
@@ -1,307 +0,0 @@
-#import "SWGDate.h"
-#import "SWGDefinition.h"
-
-@implementation SWGDefinition
-
--(id)extendedText: (NSString*) extendedText
-    text: (NSString*) text
-    sourceDictionary: (NSString*) sourceDictionary
-    citations: (NSArray*) citations
-    labels: (NSArray*) labels
-    score: (NSNumber*) score
-    exampleUses: (NSArray*) exampleUses
-    attributionUrl: (NSString*) attributionUrl
-    seqString: (NSString*) seqString
-    attributionText: (NSString*) attributionText
-    relatedWords: (NSArray*) relatedWords
-    sequence: (NSString*) sequence
-    word: (NSString*) word
-    notes: (NSArray*) notes
-    textProns: (NSArray*) textProns
-    partOfSpeech: (NSString*) partOfSpeech
-{
-  _extendedText = extendedText;
-  _text = text;
-  _sourceDictionary = sourceDictionary;
-  _citations = citations;
-  _labels = labels;
-  _score = score;
-  _exampleUses = exampleUses;
-  _attributionUrl = attributionUrl;
-  _seqString = seqString;
-  _attributionText = attributionText;
-  _relatedWords = relatedWords;
-  _sequence = sequence;
-  _word = word;
-  _notes = notes;
-  _textProns = textProns;
-  _partOfSpeech = partOfSpeech;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _extendedText = dict[@"extendedText"]; 
-        _text = dict[@"text"]; 
-        _sourceDictionary = dict[@"sourceDictionary"]; 
-        id citations_dict = dict[@"citations"];
-        if([citations_dict isKindOfClass:[NSArray class]]) {
-
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)citations_dict count]];
-
-            if([(NSArray*)citations_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)citations_dict) {
-                    SWGCitation* d = [[SWGCitation alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                
-                _citations = [[NSArray alloc] initWithArray:objs];
-            }
-            else {
-                _citations = [[NSArray alloc] init];
-            }
-        }
-        else {
-            _citations = [[NSArray alloc] init];
-        }
-        id labels_dict = dict[@"labels"];
-        if([labels_dict isKindOfClass:[NSArray class]]) {
-
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)labels_dict count]];
-
-            if([(NSArray*)labels_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)labels_dict) {
-                    SWGLabel* d = [[SWGLabel alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                
-                _labels = [[NSArray alloc] initWithArray:objs];
-            }
-            else {
-                _labels = [[NSArray alloc] init];
-            }
-        }
-        else {
-            _labels = [[NSArray alloc] init];
-        }
-        _score = dict[@"score"]; 
-        id exampleUses_dict = dict[@"exampleUses"];
-        if([exampleUses_dict isKindOfClass:[NSArray class]]) {
-
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)exampleUses_dict count]];
-
-            if([(NSArray*)exampleUses_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)exampleUses_dict) {
-                    SWGExampleUsage* d = [[SWGExampleUsage alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                
-                _exampleUses = [[NSArray alloc] initWithArray:objs];
-            }
-            else {
-                _exampleUses = [[NSArray alloc] init];
-            }
-        }
-        else {
-            _exampleUses = [[NSArray alloc] init];
-        }
-        _attributionUrl = dict[@"attributionUrl"]; 
-        _seqString = dict[@"seqString"]; 
-        _attributionText = dict[@"attributionText"]; 
-        id relatedWords_dict = dict[@"relatedWords"];
-        if([relatedWords_dict isKindOfClass:[NSArray class]]) {
-
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)relatedWords_dict count]];
-
-            if([(NSArray*)relatedWords_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)relatedWords_dict) {
-                    SWGRelated* d = [[SWGRelated alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                
-                _relatedWords = [[NSArray alloc] initWithArray:objs];
-            }
-            else {
-                _relatedWords = [[NSArray alloc] init];
-            }
-        }
-        else {
-            _relatedWords = [[NSArray alloc] init];
-        }
-        _sequence = dict[@"sequence"]; 
-        _word = dict[@"word"]; 
-        id notes_dict = dict[@"notes"];
-        if([notes_dict isKindOfClass:[NSArray class]]) {
-
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)notes_dict count]];
-
-            if([(NSArray*)notes_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)notes_dict) {
-                    SWGNote* d = [[SWGNote alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                
-                _notes = [[NSArray alloc] initWithArray:objs];
-            }
-            else {
-                _notes = [[NSArray alloc] init];
-            }
-        }
-        else {
-            _notes = [[NSArray alloc] init];
-        }
-        id textProns_dict = dict[@"textProns"];
-        if([textProns_dict isKindOfClass:[NSArray class]]) {
-
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)textProns_dict count]];
-
-            if([(NSArray*)textProns_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)textProns_dict) {
-                    SWGTextPron* d = [[SWGTextPron alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                
-                _textProns = [[NSArray alloc] initWithArray:objs];
-            }
-            else {
-                _textProns = [[NSArray alloc] init];
-            }
-        }
-        else {
-            _textProns = [[NSArray alloc] init];
-        }
-        _partOfSpeech = dict[@"partOfSpeech"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(_extendedText != nil) dict[@"extendedText"] = _extendedText ;
-        if(_text != nil) dict[@"text"] = _text ;
-        if(_sourceDictionary != nil) dict[@"sourceDictionary"] = _sourceDictionary ;
-        if(_citations != nil){
-        if([_citations isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGCitation *citations in (NSArray*)_citations) {
-                [array addObject:[(SWGObject*)citations asDictionary]];
-            }
-            dict[@"citations"] = array;
-        }
-        else if(_citations && [_citations isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_citations toString];
-            if(dateString){
-                dict[@"citations"] = dateString;
-            }
-        }
-        else {
-        if(_citations != nil) dict[@"citations"] = [(SWGObject*)_citations asDictionary];
-        }
-    }
-    if(_labels != nil){
-        if([_labels isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGLabel *labels in (NSArray*)_labels) {
-                [array addObject:[(SWGObject*)labels asDictionary]];
-            }
-            dict[@"labels"] = array;
-        }
-        else if(_labels && [_labels isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_labels toString];
-            if(dateString){
-                dict[@"labels"] = dateString;
-            }
-        }
-        else {
-        if(_labels != nil) dict[@"labels"] = [(SWGObject*)_labels asDictionary];
-        }
-    }
-    if(_score != nil) dict[@"score"] = _score ;
-        if(_exampleUses != nil){
-        if([_exampleUses isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGExampleUsage *exampleUses in (NSArray*)_exampleUses) {
-                [array addObject:[(SWGObject*)exampleUses asDictionary]];
-            }
-            dict[@"exampleUses"] = array;
-        }
-        else if(_exampleUses && [_exampleUses isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_exampleUses toString];
-            if(dateString){
-                dict[@"exampleUses"] = dateString;
-            }
-        }
-        else {
-        if(_exampleUses != nil) dict[@"exampleUses"] = [(SWGObject*)_exampleUses asDictionary];
-        }
-    }
-    if(_attributionUrl != nil) dict[@"attributionUrl"] = _attributionUrl ;
-        if(_seqString != nil) dict[@"seqString"] = _seqString ;
-        if(_attributionText != nil) dict[@"attributionText"] = _attributionText ;
-        if(_relatedWords != nil){
-        if([_relatedWords isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGRelated *relatedWords in (NSArray*)_relatedWords) {
-                [array addObject:[(SWGObject*)relatedWords asDictionary]];
-            }
-            dict[@"relatedWords"] = array;
-        }
-        else if(_relatedWords && [_relatedWords isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_relatedWords toString];
-            if(dateString){
-                dict[@"relatedWords"] = dateString;
-            }
-        }
-        else {
-        if(_relatedWords != nil) dict[@"relatedWords"] = [(SWGObject*)_relatedWords asDictionary];
-        }
-    }
-    if(_sequence != nil) dict[@"sequence"] = _sequence ;
-        if(_word != nil) dict[@"word"] = _word ;
-        if(_notes != nil){
-        if([_notes isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGNote *notes in (NSArray*)_notes) {
-                [array addObject:[(SWGObject*)notes asDictionary]];
-            }
-            dict[@"notes"] = array;
-        }
-        else if(_notes && [_notes isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_notes toString];
-            if(dateString){
-                dict[@"notes"] = dateString;
-            }
-        }
-        else {
-        if(_notes != nil) dict[@"notes"] = [(SWGObject*)_notes asDictionary];
-        }
-    }
-    if(_textProns != nil){
-        if([_textProns isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGTextPron *textProns in (NSArray*)_textProns) {
-                [array addObject:[(SWGObject*)textProns asDictionary]];
-            }
-            dict[@"textProns"] = array;
-        }
-        else if(_textProns && [_textProns isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_textProns toString];
-            if(dateString){
-                dict[@"textProns"] = dateString;
-            }
-        }
-        else {
-        if(_textProns != nil) dict[@"textProns"] = [(SWGObject*)_textProns asDictionary];
-        }
-    }
-    if(_partOfSpeech != nil) dict[@"partOfSpeech"] = _partOfSpeech ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGDefinitionSearchResults.h b/samples/client/wordnik-api-objc/client/SWGDefinitionSearchResults.h
deleted file mode 100644
index b0fbf13e163..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGDefinitionSearchResults.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-#import "SWGDefinition.h"
-
-
-@interface SWGDefinitionSearchResults : SWGObject
-
-@property(nonatomic) NSArray* results;  
-
-@property(nonatomic) NSNumber* totalResults;  
-
-- (id) results: (NSArray*) results
-     totalResults: (NSNumber*) totalResults;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGDefinitionSearchResults.m b/samples/client/wordnik-api-objc/client/SWGDefinitionSearchResults.m
deleted file mode 100644
index ac5a746043b..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGDefinitionSearchResults.m
+++ /dev/null
@@ -1,71 +0,0 @@
-#import "SWGDate.h"
-#import "SWGDefinitionSearchResults.h"
-
-@implementation SWGDefinitionSearchResults
-
--(id)results: (NSArray*) results
-    totalResults: (NSNumber*) totalResults
-{
-  _results = results;
-  _totalResults = totalResults;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        id results_dict = dict[@"results"];
-        if([results_dict isKindOfClass:[NSArray class]]) {
-
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)results_dict count]];
-
-            if([(NSArray*)results_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)results_dict) {
-                    SWGDefinition* d = [[SWGDefinition alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                
-                _results = [[NSArray alloc] initWithArray:objs];
-            }
-            else {
-                _results = [[NSArray alloc] init];
-            }
-        }
-        else {
-            _results = [[NSArray alloc] init];
-        }
-        _totalResults = dict[@"totalResults"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(_results != nil){
-        if([_results isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGDefinition *results in (NSArray*)_results) {
-                [array addObject:[(SWGObject*)results asDictionary]];
-            }
-            dict[@"results"] = array;
-        }
-        else if(_results && [_results isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_results toString];
-            if(dateString){
-                dict[@"results"] = dateString;
-            }
-        }
-        else {
-        if(_results != nil) dict[@"results"] = [(SWGObject*)_results asDictionary];
-        }
-    }
-    if(_totalResults != nil) dict[@"totalResults"] = _totalResults ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGExample.h b/samples/client/wordnik-api-objc/client/SWGExample.h
deleted file mode 100644
index eea0fe81a7b..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGExample.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-#import "SWGSentence.h"
-#import "SWGContentProvider.h"
-#import "SWGScoredWord.h"
-
-
-@interface SWGExample : SWGObject
-
-@property(nonatomic) NSNumber* _id;  
-
-@property(nonatomic) NSNumber* exampleId;  
-
-@property(nonatomic) NSString* title;  
-
-@property(nonatomic) NSString* text;  
-
-@property(nonatomic) SWGScoredWord* score;  
-
-@property(nonatomic) SWGSentence* sentence;  
-
-@property(nonatomic) NSString* word;  
-
-@property(nonatomic) SWGContentProvider* provider;  
-
-@property(nonatomic) NSNumber* year;  
-
-@property(nonatomic) NSNumber* rating;  
-
-@property(nonatomic) NSNumber* documentId;  
-
-@property(nonatomic) NSString* url;  
-
-- (id) _id: (NSNumber*) _id
-     exampleId: (NSNumber*) exampleId
-     title: (NSString*) title
-     text: (NSString*) text
-     score: (SWGScoredWord*) score
-     sentence: (SWGSentence*) sentence
-     word: (NSString*) word
-     provider: (SWGContentProvider*) provider
-     year: (NSNumber*) year
-     rating: (NSNumber*) rating
-     documentId: (NSNumber*) documentId
-     url: (NSString*) url;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGExample.m b/samples/client/wordnik-api-objc/client/SWGExample.m
deleted file mode 100644
index 5249ceffde8..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGExample.m
+++ /dev/null
@@ -1,132 +0,0 @@
-#import "SWGDate.h"
-#import "SWGExample.h"
-
-@implementation SWGExample
-
--(id)_id: (NSNumber*) _id
-    exampleId: (NSNumber*) exampleId
-    title: (NSString*) title
-    text: (NSString*) text
-    score: (SWGScoredWord*) score
-    sentence: (SWGSentence*) sentence
-    word: (NSString*) word
-    provider: (SWGContentProvider*) provider
-    year: (NSNumber*) year
-    rating: (NSNumber*) rating
-    documentId: (NSNumber*) documentId
-    url: (NSString*) url
-{
-  __id = _id;
-  _exampleId = exampleId;
-  _title = title;
-  _text = text;
-  _score = score;
-  _sentence = sentence;
-  _word = word;
-  _provider = provider;
-  _year = year;
-  _rating = rating;
-  _documentId = documentId;
-  _url = url;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        __id = dict[@"id"]; 
-        _exampleId = dict[@"exampleId"]; 
-        _title = dict[@"title"]; 
-        _text = dict[@"text"]; 
-        id score_dict = dict[@"score"];
-        if(score_dict != nil)
-            _score = [[SWGScoredWord alloc]initWithValues:score_dict];
-        id sentence_dict = dict[@"sentence"];
-        if(sentence_dict != nil)
-            _sentence = [[SWGSentence alloc]initWithValues:sentence_dict];
-        _word = dict[@"word"]; 
-        id provider_dict = dict[@"provider"];
-        if(provider_dict != nil)
-            _provider = [[SWGContentProvider alloc]initWithValues:provider_dict];
-        _year = dict[@"year"]; 
-        _rating = dict[@"rating"]; 
-        _documentId = dict[@"documentId"]; 
-        _url = dict[@"url"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(__id != nil) dict[@"id"] = __id ;
-        if(_exampleId != nil) dict[@"exampleId"] = _exampleId ;
-        if(_title != nil) dict[@"title"] = _title ;
-        if(_text != nil) dict[@"text"] = _text ;
-        if(_score != nil){
-        if([_score isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGScoredWord *score in (NSArray*)_score) {
-                [array addObject:[(SWGObject*)score asDictionary]];
-            }
-            dict[@"score"] = array;
-        }
-        else if(_score && [_score isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_score toString];
-            if(dateString){
-                dict[@"score"] = dateString;
-            }
-        }
-        else {
-        if(_score != nil) dict[@"score"] = [(SWGObject*)_score asDictionary];
-        }
-    }
-    if(_sentence != nil){
-        if([_sentence isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGSentence *sentence in (NSArray*)_sentence) {
-                [array addObject:[(SWGObject*)sentence asDictionary]];
-            }
-            dict[@"sentence"] = array;
-        }
-        else if(_sentence && [_sentence isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_sentence toString];
-            if(dateString){
-                dict[@"sentence"] = dateString;
-            }
-        }
-        else {
-        if(_sentence != nil) dict[@"sentence"] = [(SWGObject*)_sentence asDictionary];
-        }
-    }
-    if(_word != nil) dict[@"word"] = _word ;
-        if(_provider != nil){
-        if([_provider isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGContentProvider *provider in (NSArray*)_provider) {
-                [array addObject:[(SWGObject*)provider asDictionary]];
-            }
-            dict[@"provider"] = array;
-        }
-        else if(_provider && [_provider isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_provider toString];
-            if(dateString){
-                dict[@"provider"] = dateString;
-            }
-        }
-        else {
-        if(_provider != nil) dict[@"provider"] = [(SWGObject*)_provider asDictionary];
-        }
-    }
-    if(_year != nil) dict[@"year"] = _year ;
-        if(_rating != nil) dict[@"rating"] = _rating ;
-        if(_documentId != nil) dict[@"documentId"] = _documentId ;
-        if(_url != nil) dict[@"url"] = _url ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGExampleSearchResults.h b/samples/client/wordnik-api-objc/client/SWGExampleSearchResults.h
deleted file mode 100644
index e4caa320967..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGExampleSearchResults.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-#import "SWGFacet.h"
-#import "SWGExample.h"
-
-
-@interface SWGExampleSearchResults : SWGObject
-
-@property(nonatomic) NSArray* facets;  
-
-@property(nonatomic) NSArray* examples;  
-
-- (id) facets: (NSArray*) facets
-     examples: (NSArray*) examples;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGExampleSearchResults.m b/samples/client/wordnik-api-objc/client/SWGExampleSearchResults.m
deleted file mode 100644
index 01f1319c4fe..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGExampleSearchResults.m
+++ /dev/null
@@ -1,107 +0,0 @@
-#import "SWGDate.h"
-#import "SWGExampleSearchResults.h"
-
-@implementation SWGExampleSearchResults
-
--(id)facets: (NSArray*) facets
-    examples: (NSArray*) examples
-{
-  _facets = facets;
-  _examples = examples;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        id facets_dict = dict[@"facets"];
-        if([facets_dict isKindOfClass:[NSArray class]]) {
-
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)facets_dict count]];
-
-            if([(NSArray*)facets_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)facets_dict) {
-                    SWGFacet* d = [[SWGFacet alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                
-                _facets = [[NSArray alloc] initWithArray:objs];
-            }
-            else {
-                _facets = [[NSArray alloc] init];
-            }
-        }
-        else {
-            _facets = [[NSArray alloc] init];
-        }
-        id examples_dict = dict[@"examples"];
-        if([examples_dict isKindOfClass:[NSArray class]]) {
-
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)examples_dict count]];
-
-            if([(NSArray*)examples_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)examples_dict) {
-                    SWGExample* d = [[SWGExample alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                
-                _examples = [[NSArray alloc] initWithArray:objs];
-            }
-            else {
-                _examples = [[NSArray alloc] init];
-            }
-        }
-        else {
-            _examples = [[NSArray alloc] init];
-        }
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(_facets != nil){
-        if([_facets isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGFacet *facets in (NSArray*)_facets) {
-                [array addObject:[(SWGObject*)facets asDictionary]];
-            }
-            dict[@"facets"] = array;
-        }
-        else if(_facets && [_facets isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_facets toString];
-            if(dateString){
-                dict[@"facets"] = dateString;
-            }
-        }
-        else {
-        if(_facets != nil) dict[@"facets"] = [(SWGObject*)_facets asDictionary];
-        }
-    }
-    if(_examples != nil){
-        if([_examples isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGExample *examples in (NSArray*)_examples) {
-                [array addObject:[(SWGObject*)examples asDictionary]];
-            }
-            dict[@"examples"] = array;
-        }
-        else if(_examples && [_examples isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_examples toString];
-            if(dateString){
-                dict[@"examples"] = dateString;
-            }
-        }
-        else {
-        if(_examples != nil) dict[@"examples"] = [(SWGObject*)_examples asDictionary];
-        }
-    }
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGExampleUsage.h b/samples/client/wordnik-api-objc/client/SWGExampleUsage.h
deleted file mode 100644
index 629139108e8..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGExampleUsage.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGExampleUsage : SWGObject
-
-@property(nonatomic) NSString* text;  
-
-- (id) text: (NSString*) text;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGExampleUsage.m b/samples/client/wordnik-api-objc/client/SWGExampleUsage.m
deleted file mode 100644
index b4887d79255..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGExampleUsage.m
+++ /dev/null
@@ -1,31 +0,0 @@
-#import "SWGDate.h"
-#import "SWGExampleUsage.h"
-
-@implementation SWGExampleUsage
-
--(id)text: (NSString*) text
-{
-  _text = text;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _text = dict[@"text"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(_text != nil) dict[@"text"] = _text ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGFacet.h b/samples/client/wordnik-api-objc/client/SWGFacet.h
deleted file mode 100644
index 2b6cec19304..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGFacet.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-#import "SWGFacetValue.h"
-
-
-@interface SWGFacet : SWGObject
-
-@property(nonatomic) NSArray* facetValues;  
-
-@property(nonatomic) NSString* name;  
-
-- (id) facetValues: (NSArray*) facetValues
-     name: (NSString*) name;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGFacet.m b/samples/client/wordnik-api-objc/client/SWGFacet.m
deleted file mode 100644
index 4a48345e862..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGFacet.m
+++ /dev/null
@@ -1,71 +0,0 @@
-#import "SWGDate.h"
-#import "SWGFacet.h"
-
-@implementation SWGFacet
-
--(id)facetValues: (NSArray*) facetValues
-    name: (NSString*) name
-{
-  _facetValues = facetValues;
-  _name = name;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        id facetValues_dict = dict[@"facetValues"];
-        if([facetValues_dict isKindOfClass:[NSArray class]]) {
-
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)facetValues_dict count]];
-
-            if([(NSArray*)facetValues_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)facetValues_dict) {
-                    SWGFacetValue* d = [[SWGFacetValue alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                
-                _facetValues = [[NSArray alloc] initWithArray:objs];
-            }
-            else {
-                _facetValues = [[NSArray alloc] init];
-            }
-        }
-        else {
-            _facetValues = [[NSArray alloc] init];
-        }
-        _name = dict[@"name"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(_facetValues != nil){
-        if([_facetValues isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGFacetValue *facetValues in (NSArray*)_facetValues) {
-                [array addObject:[(SWGObject*)facetValues asDictionary]];
-            }
-            dict[@"facetValues"] = array;
-        }
-        else if(_facetValues && [_facetValues isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_facetValues toString];
-            if(dateString){
-                dict[@"facetValues"] = dateString;
-            }
-        }
-        else {
-        if(_facetValues != nil) dict[@"facetValues"] = [(SWGObject*)_facetValues asDictionary];
-        }
-    }
-    if(_name != nil) dict[@"name"] = _name ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGFacetValue.h b/samples/client/wordnik-api-objc/client/SWGFacetValue.h
deleted file mode 100644
index 3e434ae763a..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGFacetValue.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGFacetValue : SWGObject
-
-@property(nonatomic) NSNumber* count;  
-
-@property(nonatomic) NSString* value;  
-
-- (id) count: (NSNumber*) count
-     value: (NSString*) value;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGFacetValue.m b/samples/client/wordnik-api-objc/client/SWGFacetValue.m
deleted file mode 100644
index 6dbbfc755b6..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGFacetValue.m
+++ /dev/null
@@ -1,35 +0,0 @@
-#import "SWGDate.h"
-#import "SWGFacetValue.h"
-
-@implementation SWGFacetValue
-
--(id)count: (NSNumber*) count
-    value: (NSString*) value
-{
-  _count = count;
-  _value = value;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _count = dict[@"count"]; 
-        _value = dict[@"value"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(_count != nil) dict[@"count"] = _count ;
-        if(_value != nil) dict[@"value"] = _value ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGFile.h b/samples/client/wordnik-api-objc/client/SWGFile.h
deleted file mode 100644
index fe6e81c289d..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGFile.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface SWGFile : NSObject
-
-@property(nonatomic, readonly) NSString* name;
-@property(nonatomic, readonly) NSString* mimeType;
-@property(nonatomic, readonly) NSData* data;
-
-- (id) initWithNameData: (NSString*) filename
-               mimeType: (NSString*) mimeType
-                   data: (NSData*) data;
-    
-    @end
\ No newline at end of file
diff --git a/samples/client/wordnik-api-objc/client/SWGFile.m b/samples/client/wordnik-api-objc/client/SWGFile.m
deleted file mode 100644
index 42552767af4..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGFile.m
+++ /dev/null
@@ -1,26 +0,0 @@
-#import "SWGFile.h"
-
-@implementation SWGFile
-
-@synthesize name = _name;
-@synthesize mimeType = _mimeType;
-@synthesize data = _data;
-
-- (id) init {
-    self = [super init];
-    return self;
-}
-
-- (id) initWithNameData: (NSString*) filename
-               mimeType: (NSString*) fileMimeType
-                   data: (NSData*) data {
-	self = [super init];
-	if(self) {
-		_name = filename;
-		_mimeType = fileMimeType;
-		_data = data;
-	}
-	return self;
-}
-
-@end
\ No newline at end of file
diff --git a/samples/client/wordnik-api-objc/client/SWGFrequency.h b/samples/client/wordnik-api-objc/client/SWGFrequency.h
deleted file mode 100644
index abe388e2c82..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGFrequency.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGFrequency : SWGObject
-
-@property(nonatomic) NSNumber* count;  
-
-@property(nonatomic) NSNumber* year;  
-
-- (id) count: (NSNumber*) count
-     year: (NSNumber*) year;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGFrequency.m b/samples/client/wordnik-api-objc/client/SWGFrequency.m
deleted file mode 100644
index cd7345d3b95..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGFrequency.m
+++ /dev/null
@@ -1,35 +0,0 @@
-#import "SWGDate.h"
-#import "SWGFrequency.h"
-
-@implementation SWGFrequency
-
--(id)count: (NSNumber*) count
-    year: (NSNumber*) year
-{
-  _count = count;
-  _year = year;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _count = dict[@"count"]; 
-        _year = dict[@"year"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(_count != nil) dict[@"count"] = _count ;
-        if(_year != nil) dict[@"year"] = _year ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGFrequencySummary.h b/samples/client/wordnik-api-objc/client/SWGFrequencySummary.h
deleted file mode 100644
index e7f25905dc0..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGFrequencySummary.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-#import "SWGFrequency.h"
-
-
-@interface SWGFrequencySummary : SWGObject
-
-@property(nonatomic) NSNumber* unknownYearCount;  
-
-@property(nonatomic) NSNumber* totalCount;  
-
-@property(nonatomic) NSString* frequencyString;  
-
-@property(nonatomic) NSString* word;  
-
-@property(nonatomic) NSArray* frequency;  
-
-- (id) unknownYearCount: (NSNumber*) unknownYearCount
-     totalCount: (NSNumber*) totalCount
-     frequencyString: (NSString*) frequencyString
-     word: (NSString*) word
-     frequency: (NSArray*) frequency;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGFrequencySummary.m b/samples/client/wordnik-api-objc/client/SWGFrequencySummary.m
deleted file mode 100644
index 46d28a6bb73..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGFrequencySummary.m
+++ /dev/null
@@ -1,83 +0,0 @@
-#import "SWGDate.h"
-#import "SWGFrequencySummary.h"
-
-@implementation SWGFrequencySummary
-
--(id)unknownYearCount: (NSNumber*) unknownYearCount
-    totalCount: (NSNumber*) totalCount
-    frequencyString: (NSString*) frequencyString
-    word: (NSString*) word
-    frequency: (NSArray*) frequency
-{
-  _unknownYearCount = unknownYearCount;
-  _totalCount = totalCount;
-  _frequencyString = frequencyString;
-  _word = word;
-  _frequency = frequency;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _unknownYearCount = dict[@"unknownYearCount"]; 
-        _totalCount = dict[@"totalCount"]; 
-        _frequencyString = dict[@"frequencyString"]; 
-        _word = dict[@"word"]; 
-        id frequency_dict = dict[@"frequency"];
-        if([frequency_dict isKindOfClass:[NSArray class]]) {
-
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)frequency_dict count]];
-
-            if([(NSArray*)frequency_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)frequency_dict) {
-                    SWGFrequency* d = [[SWGFrequency alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                
-                _frequency = [[NSArray alloc] initWithArray:objs];
-            }
-            else {
-                _frequency = [[NSArray alloc] init];
-            }
-        }
-        else {
-            _frequency = [[NSArray alloc] init];
-        }
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(_unknownYearCount != nil) dict[@"unknownYearCount"] = _unknownYearCount ;
-        if(_totalCount != nil) dict[@"totalCount"] = _totalCount ;
-        if(_frequencyString != nil) dict[@"frequencyString"] = _frequencyString ;
-        if(_word != nil) dict[@"word"] = _word ;
-        if(_frequency != nil){
-        if([_frequency isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGFrequency *frequency in (NSArray*)_frequency) {
-                [array addObject:[(SWGObject*)frequency asDictionary]];
-            }
-            dict[@"frequency"] = array;
-        }
-        else if(_frequency && [_frequency isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_frequency toString];
-            if(dateString){
-                dict[@"frequency"] = dateString;
-            }
-        }
-        else {
-        if(_frequency != nil) dict[@"frequency"] = [(SWGObject*)_frequency asDictionary];
-        }
-    }
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGLabel.h b/samples/client/wordnik-api-objc/client/SWGLabel.h
deleted file mode 100644
index bc3366425f9..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGLabel.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGLabel : SWGObject
-
-@property(nonatomic) NSString* text;  
-
-@property(nonatomic) NSString* type;  
-
-- (id) text: (NSString*) text
-     type: (NSString*) type;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGLabel.m b/samples/client/wordnik-api-objc/client/SWGLabel.m
deleted file mode 100644
index cb62621fcab..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGLabel.m
+++ /dev/null
@@ -1,35 +0,0 @@
-#import "SWGDate.h"
-#import "SWGLabel.h"
-
-@implementation SWGLabel
-
--(id)text: (NSString*) text
-    type: (NSString*) type
-{
-  _text = text;
-  _type = type;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _text = dict[@"text"]; 
-        _type = dict[@"type"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(_text != nil) dict[@"text"] = _text ;
-        if(_type != nil) dict[@"type"] = _type ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGNote.h b/samples/client/wordnik-api-objc/client/SWGNote.h
deleted file mode 100644
index 48d45fbc9bb..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGNote.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGNote : SWGObject
-
-@property(nonatomic) NSString* noteType;  
-
-@property(nonatomic) NSArray* appliesTo;  
-
-@property(nonatomic) NSString* value;  
-
-@property(nonatomic) NSNumber* pos;  
-
-- (id) noteType: (NSString*) noteType
-     appliesTo: (NSArray*) appliesTo
-     value: (NSString*) value
-     pos: (NSNumber*) pos;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGNote.m b/samples/client/wordnik-api-objc/client/SWGNote.m
deleted file mode 100644
index 4755a8cc3b3..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGNote.m
+++ /dev/null
@@ -1,43 +0,0 @@
-#import "SWGDate.h"
-#import "SWGNote.h"
-
-@implementation SWGNote
-
--(id)noteType: (NSString*) noteType
-    appliesTo: (NSArray*) appliesTo
-    value: (NSString*) value
-    pos: (NSNumber*) pos
-{
-  _noteType = noteType;
-  _appliesTo = appliesTo;
-  _value = value;
-  _pos = pos;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _noteType = dict[@"noteType"]; 
-        _appliesTo = dict[@"appliesTo"]; 
-        _value = dict[@"value"]; 
-        _pos = dict[@"pos"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(_noteType != nil) dict[@"noteType"] = _noteType ;
-        if(_appliesTo != nil) dict[@"appliesTo"] = _appliesTo ;
-        if(_value != nil) dict[@"value"] = _value ;
-        if(_pos != nil) dict[@"pos"] = _pos ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGObject.h b/samples/client/wordnik-api-objc/client/SWGObject.h
deleted file mode 100644
index 031bae69279..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGObject.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface SWGObject : NSObject
-- (id) initWithValues:(NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-@end
diff --git a/samples/client/wordnik-api-objc/client/SWGObject.m b/samples/client/wordnik-api-objc/client/SWGObject.m
deleted file mode 100644
index 9b37b3592b1..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGObject.m
+++ /dev/null
@@ -1,17 +0,0 @@
-#import "SWGObject.h"
-
-@implementation SWGObject
-
-- (id) initWithValues:(NSDictionary*)dict {
-    return self;
-}
-
-- (NSDictionary*) asDictionary{
-    return [NSDictionary init];
-}
-
-- (NSString*)description {
-    return [NSString stringWithFormat:@"%@ %@", [super description], [self asDictionary]];
-}
-
-@end
diff --git a/samples/client/wordnik-api-objc/client/SWGRelated.h b/samples/client/wordnik-api-objc/client/SWGRelated.h
deleted file mode 100644
index 2b5b19596cc..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGRelated.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGRelated : SWGObject
-
-@property(nonatomic) NSString* label1;  
-
-@property(nonatomic) NSString* relationshipType;  
-
-@property(nonatomic) NSString* label2;  
-
-@property(nonatomic) NSString* label3;  
-
-@property(nonatomic) NSArray* words;  
-
-@property(nonatomic) NSString* gram;  
-
-@property(nonatomic) NSString* label4;  
-
-- (id) label1: (NSString*) label1
-     relationshipType: (NSString*) relationshipType
-     label2: (NSString*) label2
-     label3: (NSString*) label3
-     words: (NSArray*) words
-     gram: (NSString*) gram
-     label4: (NSString*) label4;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGRelated.m b/samples/client/wordnik-api-objc/client/SWGRelated.m
deleted file mode 100644
index a13043ecb5d..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGRelated.m
+++ /dev/null
@@ -1,55 +0,0 @@
-#import "SWGDate.h"
-#import "SWGRelated.h"
-
-@implementation SWGRelated
-
--(id)label1: (NSString*) label1
-    relationshipType: (NSString*) relationshipType
-    label2: (NSString*) label2
-    label3: (NSString*) label3
-    words: (NSArray*) words
-    gram: (NSString*) gram
-    label4: (NSString*) label4
-{
-  _label1 = label1;
-  _relationshipType = relationshipType;
-  _label2 = label2;
-  _label3 = label3;
-  _words = words;
-  _gram = gram;
-  _label4 = label4;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _label1 = dict[@"label1"]; 
-        _relationshipType = dict[@"relationshipType"]; 
-        _label2 = dict[@"label2"]; 
-        _label3 = dict[@"label3"]; 
-        _words = dict[@"words"]; 
-        _gram = dict[@"gram"]; 
-        _label4 = dict[@"label4"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(_label1 != nil) dict[@"label1"] = _label1 ;
-        if(_relationshipType != nil) dict[@"relationshipType"] = _relationshipType ;
-        if(_label2 != nil) dict[@"label2"] = _label2 ;
-        if(_label3 != nil) dict[@"label3"] = _label3 ;
-        if(_words != nil) dict[@"words"] = _words ;
-        if(_gram != nil) dict[@"gram"] = _gram ;
-        if(_label4 != nil) dict[@"label4"] = _label4 ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGScoredWord.h b/samples/client/wordnik-api-objc/client/SWGScoredWord.h
deleted file mode 100644
index 847c4ecdbb1..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGScoredWord.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGScoredWord : SWGObject
-
-@property(nonatomic) NSNumber* position;  
-
-@property(nonatomic) NSNumber* _id;  
-
-@property(nonatomic) NSNumber* docTermCount;  
-
-@property(nonatomic) NSString* lemma;  
-
-@property(nonatomic) NSString* wordType;  
-
-@property(nonatomic) NSNumber* score;  
-
-@property(nonatomic) NSNumber* sentenceId;  
-
-@property(nonatomic) NSString* word;  
-
-@property(nonatomic) NSNumber* stopword;  
-
-@property(nonatomic) NSNumber* baseWordScore;  
-
-@property(nonatomic) NSString* partOfSpeech;  
-
-- (id) position: (NSNumber*) position
-     _id: (NSNumber*) _id
-     docTermCount: (NSNumber*) docTermCount
-     lemma: (NSString*) lemma
-     wordType: (NSString*) wordType
-     score: (NSNumber*) score
-     sentenceId: (NSNumber*) sentenceId
-     word: (NSString*) word
-     stopword: (NSNumber*) stopword
-     baseWordScore: (NSNumber*) baseWordScore
-     partOfSpeech: (NSString*) partOfSpeech;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGScoredWord.m b/samples/client/wordnik-api-objc/client/SWGScoredWord.m
deleted file mode 100644
index c8f508a076a..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGScoredWord.m
+++ /dev/null
@@ -1,71 +0,0 @@
-#import "SWGDate.h"
-#import "SWGScoredWord.h"
-
-@implementation SWGScoredWord
-
--(id)position: (NSNumber*) position
-    _id: (NSNumber*) _id
-    docTermCount: (NSNumber*) docTermCount
-    lemma: (NSString*) lemma
-    wordType: (NSString*) wordType
-    score: (NSNumber*) score
-    sentenceId: (NSNumber*) sentenceId
-    word: (NSString*) word
-    stopword: (NSNumber*) stopword
-    baseWordScore: (NSNumber*) baseWordScore
-    partOfSpeech: (NSString*) partOfSpeech
-{
-  _position = position;
-  __id = _id;
-  _docTermCount = docTermCount;
-  _lemma = lemma;
-  _wordType = wordType;
-  _score = score;
-  _sentenceId = sentenceId;
-  _word = word;
-  _stopword = stopword;
-  _baseWordScore = baseWordScore;
-  _partOfSpeech = partOfSpeech;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _position = dict[@"position"]; 
-        __id = dict[@"id"]; 
-        _docTermCount = dict[@"docTermCount"]; 
-        _lemma = dict[@"lemma"]; 
-        _wordType = dict[@"wordType"]; 
-        _score = dict[@"score"]; 
-        _sentenceId = dict[@"sentenceId"]; 
-        _word = dict[@"word"]; 
-        _stopword = dict[@"stopword"]; 
-        _baseWordScore = dict[@"baseWordScore"]; 
-        _partOfSpeech = dict[@"partOfSpeech"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(_position != nil) dict[@"position"] = _position ;
-        if(__id != nil) dict[@"id"] = __id ;
-        if(_docTermCount != nil) dict[@"docTermCount"] = _docTermCount ;
-        if(_lemma != nil) dict[@"lemma"] = _lemma ;
-        if(_wordType != nil) dict[@"wordType"] = _wordType ;
-        if(_score != nil) dict[@"score"] = _score ;
-        if(_sentenceId != nil) dict[@"sentenceId"] = _sentenceId ;
-        if(_word != nil) dict[@"word"] = _word ;
-        if(_stopword != nil) dict[@"stopword"] = _stopword ;
-        if(_baseWordScore != nil) dict[@"baseWordScore"] = _baseWordScore ;
-        if(_partOfSpeech != nil) dict[@"partOfSpeech"] = _partOfSpeech ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGScrabbleScoreResult.h b/samples/client/wordnik-api-objc/client/SWGScrabbleScoreResult.h
deleted file mode 100644
index 03a7e8c2c8d..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGScrabbleScoreResult.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGScrabbleScoreResult : SWGObject
-
-@property(nonatomic) NSNumber* value;  
-
-- (id) value: (NSNumber*) value;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGScrabbleScoreResult.m b/samples/client/wordnik-api-objc/client/SWGScrabbleScoreResult.m
deleted file mode 100644
index 16768110f6b..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGScrabbleScoreResult.m
+++ /dev/null
@@ -1,31 +0,0 @@
-#import "SWGDate.h"
-#import "SWGScrabbleScoreResult.h"
-
-@implementation SWGScrabbleScoreResult
-
--(id)value: (NSNumber*) value
-{
-  _value = value;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _value = dict[@"value"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(_value != nil) dict[@"value"] = _value ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGSentence.h b/samples/client/wordnik-api-objc/client/SWGSentence.h
deleted file mode 100644
index 8ae078086eb..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGSentence.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-#import "SWGScoredWord.h"
-
-
-@interface SWGSentence : SWGObject
-
-@property(nonatomic) NSNumber* hasScoredWords;  
-
-@property(nonatomic) NSNumber* _id;  
-
-@property(nonatomic) NSArray* scoredWords;  
-
-@property(nonatomic) NSString* display;  
-
-@property(nonatomic) NSNumber* rating;  
-
-@property(nonatomic) NSNumber* documentMetadataId;  
-
-- (id) hasScoredWords: (NSNumber*) hasScoredWords
-     _id: (NSNumber*) _id
-     scoredWords: (NSArray*) scoredWords
-     display: (NSString*) display
-     rating: (NSNumber*) rating
-     documentMetadataId: (NSNumber*) documentMetadataId;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGSentence.m b/samples/client/wordnik-api-objc/client/SWGSentence.m
deleted file mode 100644
index 5b716e70077..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGSentence.m
+++ /dev/null
@@ -1,87 +0,0 @@
-#import "SWGDate.h"
-#import "SWGSentence.h"
-
-@implementation SWGSentence
-
--(id)hasScoredWords: (NSNumber*) hasScoredWords
-    _id: (NSNumber*) _id
-    scoredWords: (NSArray*) scoredWords
-    display: (NSString*) display
-    rating: (NSNumber*) rating
-    documentMetadataId: (NSNumber*) documentMetadataId
-{
-  _hasScoredWords = hasScoredWords;
-  __id = _id;
-  _scoredWords = scoredWords;
-  _display = display;
-  _rating = rating;
-  _documentMetadataId = documentMetadataId;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _hasScoredWords = dict[@"hasScoredWords"]; 
-        __id = dict[@"id"]; 
-        id scoredWords_dict = dict[@"scoredWords"];
-        if([scoredWords_dict isKindOfClass:[NSArray class]]) {
-
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)scoredWords_dict count]];
-
-            if([(NSArray*)scoredWords_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)scoredWords_dict) {
-                    SWGScoredWord* d = [[SWGScoredWord alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                
-                _scoredWords = [[NSArray alloc] initWithArray:objs];
-            }
-            else {
-                _scoredWords = [[NSArray alloc] init];
-            }
-        }
-        else {
-            _scoredWords = [[NSArray alloc] init];
-        }
-        _display = dict[@"display"]; 
-        _rating = dict[@"rating"]; 
-        _documentMetadataId = dict[@"documentMetadataId"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(_hasScoredWords != nil) dict[@"hasScoredWords"] = _hasScoredWords ;
-        if(__id != nil) dict[@"id"] = __id ;
-        if(_scoredWords != nil){
-        if([_scoredWords isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGScoredWord *scoredWords in (NSArray*)_scoredWords) {
-                [array addObject:[(SWGObject*)scoredWords asDictionary]];
-            }
-            dict[@"scoredWords"] = array;
-        }
-        else if(_scoredWords && [_scoredWords isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_scoredWords toString];
-            if(dateString){
-                dict[@"scoredWords"] = dateString;
-            }
-        }
-        else {
-        if(_scoredWords != nil) dict[@"scoredWords"] = [(SWGObject*)_scoredWords asDictionary];
-        }
-    }
-    if(_display != nil) dict[@"display"] = _display ;
-        if(_rating != nil) dict[@"rating"] = _rating ;
-        if(_documentMetadataId != nil) dict[@"documentMetadataId"] = _documentMetadataId ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGSimpleDefinition.h b/samples/client/wordnik-api-objc/client/SWGSimpleDefinition.h
deleted file mode 100644
index 4f42e142c2b..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGSimpleDefinition.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGSimpleDefinition : SWGObject
-
-@property(nonatomic) NSString* text;  
-
-@property(nonatomic) NSString* source;  
-
-@property(nonatomic) NSString* note;  
-
-@property(nonatomic) NSString* partOfSpeech;  
-
-- (id) text: (NSString*) text
-     source: (NSString*) source
-     note: (NSString*) note
-     partOfSpeech: (NSString*) partOfSpeech;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGSimpleDefinition.m b/samples/client/wordnik-api-objc/client/SWGSimpleDefinition.m
deleted file mode 100644
index b86c662dd10..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGSimpleDefinition.m
+++ /dev/null
@@ -1,43 +0,0 @@
-#import "SWGDate.h"
-#import "SWGSimpleDefinition.h"
-
-@implementation SWGSimpleDefinition
-
--(id)text: (NSString*) text
-    source: (NSString*) source
-    note: (NSString*) note
-    partOfSpeech: (NSString*) partOfSpeech
-{
-  _text = text;
-  _source = source;
-  _note = note;
-  _partOfSpeech = partOfSpeech;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _text = dict[@"text"]; 
-        _source = dict[@"source"]; 
-        _note = dict[@"note"]; 
-        _partOfSpeech = dict[@"partOfSpeech"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(_text != nil) dict[@"text"] = _text ;
-        if(_source != nil) dict[@"source"] = _source ;
-        if(_note != nil) dict[@"note"] = _note ;
-        if(_partOfSpeech != nil) dict[@"partOfSpeech"] = _partOfSpeech ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGSimpleExample.h b/samples/client/wordnik-api-objc/client/SWGSimpleExample.h
deleted file mode 100644
index 14a18851271..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGSimpleExample.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGSimpleExample : SWGObject
-
-@property(nonatomic) NSNumber* _id;  
-
-@property(nonatomic) NSString* title;  
-
-@property(nonatomic) NSString* text;  
-
-@property(nonatomic) NSString* url;  
-
-- (id) _id: (NSNumber*) _id
-     title: (NSString*) title
-     text: (NSString*) text
-     url: (NSString*) url;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGSimpleExample.m b/samples/client/wordnik-api-objc/client/SWGSimpleExample.m
deleted file mode 100644
index e8892e522c7..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGSimpleExample.m
+++ /dev/null
@@ -1,43 +0,0 @@
-#import "SWGDate.h"
-#import "SWGSimpleExample.h"
-
-@implementation SWGSimpleExample
-
--(id)_id: (NSNumber*) _id
-    title: (NSString*) title
-    text: (NSString*) text
-    url: (NSString*) url
-{
-  __id = _id;
-  _title = title;
-  _text = text;
-  _url = url;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        __id = dict[@"id"]; 
-        _title = dict[@"title"]; 
-        _text = dict[@"text"]; 
-        _url = dict[@"url"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(__id != nil) dict[@"id"] = __id ;
-        if(_title != nil) dict[@"title"] = _title ;
-        if(_text != nil) dict[@"text"] = _text ;
-        if(_url != nil) dict[@"url"] = _url ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGStringValue.h b/samples/client/wordnik-api-objc/client/SWGStringValue.h
deleted file mode 100644
index d96477cfe87..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGStringValue.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGStringValue : SWGObject
-
-@property(nonatomic) NSString* word;  
-
-- (id) word: (NSString*) word;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGStringValue.m b/samples/client/wordnik-api-objc/client/SWGStringValue.m
deleted file mode 100644
index bf543f49b0c..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGStringValue.m
+++ /dev/null
@@ -1,31 +0,0 @@
-#import "SWGDate.h"
-#import "SWGStringValue.h"
-
-@implementation SWGStringValue
-
--(id)word: (NSString*) word
-{
-  _word = word;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _word = dict[@"word"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(_word != nil) dict[@"word"] = _word ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGSyllable.h b/samples/client/wordnik-api-objc/client/SWGSyllable.h
deleted file mode 100644
index 1e2da7da648..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGSyllable.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGSyllable : SWGObject
-
-@property(nonatomic) NSString* text;  
-
-@property(nonatomic) NSNumber* seq;  
-
-@property(nonatomic) NSString* type;  
-
-- (id) text: (NSString*) text
-     seq: (NSNumber*) seq
-     type: (NSString*) type;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGSyllable.m b/samples/client/wordnik-api-objc/client/SWGSyllable.m
deleted file mode 100644
index 7eba9045af5..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGSyllable.m
+++ /dev/null
@@ -1,39 +0,0 @@
-#import "SWGDate.h"
-#import "SWGSyllable.h"
-
-@implementation SWGSyllable
-
--(id)text: (NSString*) text
-    seq: (NSNumber*) seq
-    type: (NSString*) type
-{
-  _text = text;
-  _seq = seq;
-  _type = type;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _text = dict[@"text"]; 
-        _seq = dict[@"seq"]; 
-        _type = dict[@"type"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(_text != nil) dict[@"text"] = _text ;
-        if(_seq != nil) dict[@"seq"] = _seq ;
-        if(_type != nil) dict[@"type"] = _type ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGTextPron.h b/samples/client/wordnik-api-objc/client/SWGTextPron.h
deleted file mode 100644
index 68f199ffc85..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGTextPron.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGTextPron : SWGObject
-
-@property(nonatomic) NSString* raw;  
-
-@property(nonatomic) NSNumber* seq;  
-
-@property(nonatomic) NSString* rawType;  
-
-- (id) raw: (NSString*) raw
-     seq: (NSNumber*) seq
-     rawType: (NSString*) rawType;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGTextPron.m b/samples/client/wordnik-api-objc/client/SWGTextPron.m
deleted file mode 100644
index 7ac3f3969fa..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGTextPron.m
+++ /dev/null
@@ -1,39 +0,0 @@
-#import "SWGDate.h"
-#import "SWGTextPron.h"
-
-@implementation SWGTextPron
-
--(id)raw: (NSString*) raw
-    seq: (NSNumber*) seq
-    rawType: (NSString*) rawType
-{
-  _raw = raw;
-  _seq = seq;
-  _rawType = rawType;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _raw = dict[@"raw"]; 
-        _seq = dict[@"seq"]; 
-        _rawType = dict[@"rawType"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(_raw != nil) dict[@"raw"] = _raw ;
-        if(_seq != nil) dict[@"seq"] = _seq ;
-        if(_rawType != nil) dict[@"rawType"] = _rawType ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGUser.h b/samples/client/wordnik-api-objc/client/SWGUser.h
deleted file mode 100644
index 494e5a7461d..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGUser.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGUser : SWGObject
-
-@property(nonatomic) NSNumber* _id;  
-
-@property(nonatomic) NSString* username;  
-
-@property(nonatomic) NSString* email;  
-
-@property(nonatomic) NSNumber* status;  
-
-@property(nonatomic) NSString* faceBookId;  
-
-@property(nonatomic) NSString* userName;  
-
-@property(nonatomic) NSString* displayName;  
-
-@property(nonatomic) NSString* password;  
-
-- (id) _id: (NSNumber*) _id
-     username: (NSString*) username
-     email: (NSString*) email
-     status: (NSNumber*) status
-     faceBookId: (NSString*) faceBookId
-     userName: (NSString*) userName
-     displayName: (NSString*) displayName
-     password: (NSString*) password;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGUser.m b/samples/client/wordnik-api-objc/client/SWGUser.m
deleted file mode 100644
index be8b3e255d2..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGUser.m
+++ /dev/null
@@ -1,59 +0,0 @@
-#import "SWGDate.h"
-#import "SWGUser.h"
-
-@implementation SWGUser
-
--(id)_id: (NSNumber*) _id
-    username: (NSString*) username
-    email: (NSString*) email
-    status: (NSNumber*) status
-    faceBookId: (NSString*) faceBookId
-    userName: (NSString*) userName
-    displayName: (NSString*) displayName
-    password: (NSString*) password
-{
-  __id = _id;
-  _username = username;
-  _email = email;
-  _status = status;
-  _faceBookId = faceBookId;
-  _userName = userName;
-  _displayName = displayName;
-  _password = password;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        __id = dict[@"id"]; 
-        _username = dict[@"username"]; 
-        _email = dict[@"email"]; 
-        _status = dict[@"status"]; 
-        _faceBookId = dict[@"faceBookId"]; 
-        _userName = dict[@"userName"]; 
-        _displayName = dict[@"displayName"]; 
-        _password = dict[@"password"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(__id != nil) dict[@"id"] = __id ;
-        if(_username != nil) dict[@"username"] = _username ;
-        if(_email != nil) dict[@"email"] = _email ;
-        if(_status != nil) dict[@"status"] = _status ;
-        if(_faceBookId != nil) dict[@"faceBookId"] = _faceBookId ;
-        if(_userName != nil) dict[@"userName"] = _userName ;
-        if(_displayName != nil) dict[@"displayName"] = _displayName ;
-        if(_password != nil) dict[@"password"] = _password ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGWordApi.h b/samples/client/wordnik-api-objc/client/SWGWordApi.h
deleted file mode 100644
index 64fd0f44e6b..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGWordApi.h
+++ /dev/null
@@ -1,195 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGFrequencySummary.h"
-#import "SWGBigram.h"
-#import "SWGWordObject.h"
-#import "SWGExampleSearchResults.h"
-#import "SWGExample.h"
-#import "SWGScrabbleScoreResult.h"
-#import "SWGTextPron.h"
-#import "SWGSyllable.h"
-#import "SWGRelated.h"
-#import "SWGDefinition.h"
-#import "SWGAudioFile.h"
-
-
-
-@interface SWGWordApi: NSObject
-
--(void) addHeader:(NSString*)value forKey:(NSString*)key;
--(unsigned long) requestQueueSize;
-+(SWGWordApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key;
-+(void) setBasePath:(NSString*)basePath;
-+(NSString*) getBasePath;
-/**
-
- Returns examples for a word
- 
- @param word Word to return examples for
- @param includeDuplicates Show duplicate examples from different sources
- @param useCanonical If true will try to return the correct word root ('cats' -&gt; 'cat'). If false returns exactly what was requested.
- @param skip Results to skip
- @param limit Maximum number of results to return
- */
--(NSNumber*) getExamplesWithCompletionBlock :(NSString*) word 
-        includeDuplicates:(NSString*) includeDuplicates 
-        useCanonical:(NSString*) useCanonical 
-        skip:(NSNumber*) skip 
-        limit:(NSNumber*) limit 
-        completionHandler: (void (^)(SWGExampleSearchResults* output, NSError* error))completionBlock;
-
-/**
-
- Given a word as a string, returns the WordObject that represents it
- 
- @param word String value of WordObject to return
- @param useCanonical If true will try to return the correct word root ('cats' -&gt; 'cat'). If false returns exactly what was requested.
- @param includeSuggestions Return suggestions (for correct spelling, case variants, etc.)
- */
--(NSNumber*) getWordWithCompletionBlock :(NSString*) word 
-        useCanonical:(NSString*) useCanonical 
-        includeSuggestions:(NSString*) includeSuggestions 
-        completionHandler: (void (^)(SWGWordObject* output, NSError* error))completionBlock;
-
-/**
-
- Return definitions for a word
- 
- @param word Word to return definitions for
- @param partOfSpeech CSV list of part-of-speech types
- @param sourceDictionaries Source dictionary to return definitions from.  If 'all' is received, results are returned from all sources. If multiple values are received (e.g. 'century,wiktionary'), results are returned from the first specified dictionary that has definitions. If left blank, results are returned from the first dictionary that has definitions. By default, dictionaries are searched in this order: ahd, wiktionary, webster, century, wordnet
- @param limit Maximum number of results to return
- @param includeRelated Return related words with definitions
- @param useCanonical If true will try to return the correct word root ('cats' -&gt; 'cat'). If false returns exactly what was requested.
- @param includeTags Return a closed set of XML tags in response
- */
--(NSNumber*) getDefinitionsWithCompletionBlock :(NSString*) word 
-        partOfSpeech:(NSString*) partOfSpeech 
-        sourceDictionaries:(NSString*) sourceDictionaries 
-        limit:(NSNumber*) limit 
-        includeRelated:(NSString*) includeRelated 
-        useCanonical:(NSString*) useCanonical 
-        includeTags:(NSString*) includeTags 
-        completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock;
-
-/**
-
- Returns a top example for a word
- 
- @param word Word to fetch examples for
- @param useCanonical If true will try to return the correct word root ('cats' -&gt; 'cat'). If false returns exactly what was requested.
- */
--(NSNumber*) getTopExampleWithCompletionBlock :(NSString*) word 
-        useCanonical:(NSString*) useCanonical 
-        completionHandler: (void (^)(SWGExample* output, NSError* error))completionBlock;
-
-/**
-
- Given a word as a string, returns relationships from the Word Graph
- 
- @param word Word to fetch relationships for
- @param relationshipTypes Limits the total results per type of relationship type
- @param useCanonical If true will try to return the correct word root ('cats' -&gt; 'cat'). If false returns exactly what was requested.
- @param limitPerRelationshipType Restrict to the supplied relatinship types
- */
--(NSNumber*) getRelatedWordsWithCompletionBlock :(NSString*) word 
-        relationshipTypes:(NSString*) relationshipTypes 
-        useCanonical:(NSString*) useCanonical 
-        limitPerRelationshipType:(NSNumber*) limitPerRelationshipType 
-        completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock;
-
-/**
-
- Returns text pronunciations for a given word
- 
- @param word Word to get pronunciations for
- @param sourceDictionary Get from a single dictionary
- @param typeFormat Text pronunciation type
- @param useCanonical If true will try to return a correct word root ('cats' -&gt; 'cat'). If false returns exactly what was requested.
- @param limit Maximum number of results to return
- */
--(NSNumber*) getTextPronunciationsWithCompletionBlock :(NSString*) word 
-        sourceDictionary:(NSString*) sourceDictionary 
-        typeFormat:(NSString*) typeFormat 
-        useCanonical:(NSString*) useCanonical 
-        limit:(NSNumber*) limit 
-        completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock;
-
-/**
-
- Returns syllable information for a word
- 
- @param word Word to get syllables for
- @param sourceDictionary Get from a single dictionary. Valid options: ahd, century, wiktionary, webster, and wordnet.
- @param useCanonical If true will try to return a correct word root ('cats' -&gt; 'cat'). If false returns exactly what was requested.
- @param limit Maximum number of results to return
- */
--(NSNumber*) getHyphenationWithCompletionBlock :(NSString*) word 
-        sourceDictionary:(NSString*) sourceDictionary 
-        useCanonical:(NSString*) useCanonical 
-        limit:(NSNumber*) limit 
-        completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock;
-
-/**
-
- Returns word usage over time
- 
- @param word Word to return
- @param useCanonical If true will try to return the correct word root ('cats' -&gt; 'cat'). If false returns exactly what was requested.
- @param startYear Starting Year
- @param endYear Ending Year
- */
--(NSNumber*) getWordFrequencyWithCompletionBlock :(NSString*) word 
-        useCanonical:(NSString*) useCanonical 
-        startYear:(NSNumber*) startYear 
-        endYear:(NSNumber*) endYear 
-        completionHandler: (void (^)(SWGFrequencySummary* output, NSError* error))completionBlock;
-
-/**
-
- Fetches bi-gram phrases for a word
- 
- @param word Word to fetch phrases for
- @param limit Maximum number of results to return
- @param wlmi Minimum WLMI for the phrase
- @param useCanonical If true will try to return the correct word root ('cats' -&gt; 'cat'). If false returns exactly what was requested.
- */
--(NSNumber*) getPhrasesWithCompletionBlock :(NSString*) word 
-        limit:(NSNumber*) limit 
-        wlmi:(NSNumber*) wlmi 
-        useCanonical:(NSString*) useCanonical 
-        completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock;
-
-/**
-
- Fetches etymology data
- 
- @param word Word to return
- @param useCanonical If true will try to return the correct word root ('cats' -&gt; 'cat'). If false returns exactly what was requested.
- */
--(NSNumber*) getEtymologiesWithCompletionBlock :(NSString*) word 
-        useCanonical:(NSString*) useCanonical 
-        completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock;
-
-/**
-
- Fetches audio metadata for a word.
- The metadata includes a time-expiring fileUrl which allows reading the audio file directly from the API.  Currently only audio pronunciations from the American Heritage Dictionary in mp3 format are supported.
- @param word Word to get audio for.
- @param useCanonical Use the canonical form of the word
- @param limit Maximum number of results to return
- */
--(NSNumber*) getAudioWithCompletionBlock :(NSString*) word 
-        useCanonical:(NSString*) useCanonical 
-        limit:(NSNumber*) limit 
-        completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock;
-
-/**
-
- Returns the Scrabble score for a word
- 
- @param word Word to get scrabble score for.
- */
--(NSNumber*) getScrabbleScoreWithCompletionBlock :(NSString*) word 
-        completionHandler: (void (^)(SWGScrabbleScoreResult* output, NSError* error))completionBlock;
-
-@end
diff --git a/samples/client/wordnik-api-objc/client/SWGWordApi.m b/samples/client/wordnik-api-objc/client/SWGWordApi.m
deleted file mode 100644
index 3a65ccc62a1..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGWordApi.m
+++ /dev/null
@@ -1,691 +0,0 @@
-#import "SWGWordApi.h"
-#import "SWGFile.h"
-#import "SWGApiClient.h"
-#import "SWGFrequencySummary.h"
-#import "SWGBigram.h"
-#import "SWGWordObject.h"
-#import "SWGExampleSearchResults.h"
-#import "SWGExample.h"
-#import "SWGScrabbleScoreResult.h"
-#import "SWGTextPron.h"
-#import "SWGSyllable.h"
-#import "SWGRelated.h"
-#import "SWGDefinition.h"
-#import "SWGAudioFile.h"
-
-
-
-
-@implementation SWGWordApi
-static NSString * basePath = @"http://api.wordnik.com/v4";
-
-+(SWGWordApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key {
-    static SWGWordApi* singletonAPI = nil;
-
-    if (singletonAPI == nil) {
-        singletonAPI = [[SWGWordApi alloc] init];
-        [singletonAPI addHeader:headerValue forKey:key];
-    }
-    return singletonAPI;
-}
-
-+(void) setBasePath:(NSString*)path {
-    basePath = path;
-}
-
-+(NSString*) getBasePath {
-    return basePath;
-}
-
--(SWGApiClient*) apiClient {
-    return [SWGApiClient sharedClientFromPool:basePath];
-}
-
--(void) addHeader:(NSString*)value forKey:(NSString*)key {
-    [[self apiClient] setHeaderValue:value forKey:key];
-}
-
--(id) init {
-    self = [super init];
-    [self apiClient];
-    return self;
-}
-
--(void) setHeaderValue:(NSString*) value
-           forKey:(NSString*)key {
-    [[self apiClient] setHeaderValue:value forKey:key];
-}
-
--(unsigned long) requestQueueSize {
-    return [SWGApiClient requestQueueSize];
-}
-
-
--(NSNumber*) getExamplesWithCompletionBlock:(NSString*) word
-        includeDuplicates:(NSString*) includeDuplicates
-        useCanonical:(NSString*) useCanonical
-        skip:(NSNumber*) skip
-        limit:(NSNumber*) limit
-        completionHandler: (void (^)(SWGExampleSearchResults* output, NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/word.{format}/{word}/examples", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"word", @"}"]] withString: [SWGApiClient escape:word]];
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(includeDuplicates != nil)
-        queryParams[@"includeDuplicates"] = includeDuplicates;
-    if(useCanonical != nil)
-        queryParams[@"useCanonical"] = useCanonical;
-    if(skip != nil)
-        queryParams[@"skip"] = skip;
-    if(limit != nil)
-        queryParams[@"limit"] = limit;
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    id bodyDictionary = nil;
-        if(word == nil) {
-        // error
-    }
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client dictionary:requestUrl 
-                              method:@"GET" 
-                         queryParams:queryParams 
-                                body:bodyDictionary 
-                        headerParams:headerParams
-                  requestContentType:requestContentType
-                 responseContentType:responseContentType
-                     completionBlock:^(NSDictionary *data, NSError *error) {
-                        if (error) {
-                            completionBlock(nil, error);return;
-                        }
-                        SWGExampleSearchResults *result = nil;
-                        if (data) {
-                            result = [[SWGExampleSearchResults alloc]initWithValues: data];
-                        }
-                        completionBlock(result , nil);}];
-    
-
-}
-
--(NSNumber*) getWordWithCompletionBlock:(NSString*) word
-        useCanonical:(NSString*) useCanonical
-        includeSuggestions:(NSString*) includeSuggestions
-        completionHandler: (void (^)(SWGWordObject* output, NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/word.{format}/{word}", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"word", @"}"]] withString: [SWGApiClient escape:word]];
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(useCanonical != nil)
-        queryParams[@"useCanonical"] = useCanonical;
-    if(includeSuggestions != nil)
-        queryParams[@"includeSuggestions"] = includeSuggestions;
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    id bodyDictionary = nil;
-        if(word == nil) {
-        // error
-    }
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client dictionary:requestUrl 
-                              method:@"GET" 
-                         queryParams:queryParams 
-                                body:bodyDictionary 
-                        headerParams:headerParams
-                  requestContentType:requestContentType
-                 responseContentType:responseContentType
-                     completionBlock:^(NSDictionary *data, NSError *error) {
-                        if (error) {
-                            completionBlock(nil, error);return;
-                        }
-                        SWGWordObject *result = nil;
-                        if (data) {
-                            result = [[SWGWordObject alloc]initWithValues: data];
-                        }
-                        completionBlock(result , nil);}];
-    
-
-}
-
--(NSNumber*) getDefinitionsWithCompletionBlock:(NSString*) word
-        partOfSpeech:(NSString*) partOfSpeech
-        sourceDictionaries:(NSString*) sourceDictionaries
-        limit:(NSNumber*) limit
-        includeRelated:(NSString*) includeRelated
-        useCanonical:(NSString*) useCanonical
-        includeTags:(NSString*) includeTags
-        completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/word.{format}/{word}/definitions", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"word", @"}"]] withString: [SWGApiClient escape:word]];
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(limit != nil)
-        queryParams[@"limit"] = limit;
-    if(partOfSpeech != nil)
-        queryParams[@"partOfSpeech"] = partOfSpeech;
-    if(includeRelated != nil)
-        queryParams[@"includeRelated"] = includeRelated;
-    if(sourceDictionaries != nil)
-        queryParams[@"sourceDictionaries"] = sourceDictionaries;
-    if(useCanonical != nil)
-        queryParams[@"useCanonical"] = useCanonical;
-    if(includeTags != nil)
-        queryParams[@"includeTags"] = includeTags;
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    id bodyDictionary = nil;
-        if(word == nil) {
-        // error
-    }
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client dictionary: requestUrl 
-                               method: @"GET" 
-                          queryParams: queryParams 
-                                 body: bodyDictionary 
-                         headerParams: headerParams
-                   requestContentType: requestContentType
-                  responseContentType: responseContentType
-                      completionBlock: ^(NSDictionary *data, NSError *error) {
-                         if (error) {
-                             completionBlock(nil, error);return;
-                         }
-                         
-                         if([data isKindOfClass:[NSArray class]]){
-                             NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[data count]];
-                             for (NSDictionary* dict in (NSArray*)data) {
-                                SWGDefinition* d = [[SWGDefinition alloc]initWithValues: dict];
-                                [objs addObject:d];
-                             }
-                             completionBlock(objs, nil);
-                         }
-                        }];
-    
-
-}
-
--(NSNumber*) getTopExampleWithCompletionBlock:(NSString*) word
-        useCanonical:(NSString*) useCanonical
-        completionHandler: (void (^)(SWGExample* output, NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/word.{format}/{word}/topExample", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"word", @"}"]] withString: [SWGApiClient escape:word]];
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(useCanonical != nil)
-        queryParams[@"useCanonical"] = useCanonical;
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    id bodyDictionary = nil;
-        if(word == nil) {
-        // error
-    }
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client dictionary:requestUrl 
-                              method:@"GET" 
-                         queryParams:queryParams 
-                                body:bodyDictionary 
-                        headerParams:headerParams
-                  requestContentType:requestContentType
-                 responseContentType:responseContentType
-                     completionBlock:^(NSDictionary *data, NSError *error) {
-                        if (error) {
-                            completionBlock(nil, error);return;
-                        }
-                        SWGExample *result = nil;
-                        if (data) {
-                            result = [[SWGExample alloc]initWithValues: data];
-                        }
-                        completionBlock(result , nil);}];
-    
-
-}
-
--(NSNumber*) getRelatedWordsWithCompletionBlock:(NSString*) word
-        relationshipTypes:(NSString*) relationshipTypes
-        useCanonical:(NSString*) useCanonical
-        limitPerRelationshipType:(NSNumber*) limitPerRelationshipType
-        completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/word.{format}/{word}/relatedWords", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"word", @"}"]] withString: [SWGApiClient escape:word]];
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(useCanonical != nil)
-        queryParams[@"useCanonical"] = useCanonical;
-    if(relationshipTypes != nil)
-        queryParams[@"relationshipTypes"] = relationshipTypes;
-    if(limitPerRelationshipType != nil)
-        queryParams[@"limitPerRelationshipType"] = limitPerRelationshipType;
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    id bodyDictionary = nil;
-        if(word == nil) {
-        // error
-    }
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client dictionary: requestUrl 
-                               method: @"GET" 
-                          queryParams: queryParams 
-                                 body: bodyDictionary 
-                         headerParams: headerParams
-                   requestContentType: requestContentType
-                  responseContentType: responseContentType
-                      completionBlock: ^(NSDictionary *data, NSError *error) {
-                         if (error) {
-                             completionBlock(nil, error);return;
-                         }
-                         
-                         if([data isKindOfClass:[NSArray class]]){
-                             NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[data count]];
-                             for (NSDictionary* dict in (NSArray*)data) {
-                                SWGRelated* d = [[SWGRelated alloc]initWithValues: dict];
-                                [objs addObject:d];
-                             }
-                             completionBlock(objs, nil);
-                         }
-                        }];
-    
-
-}
-
--(NSNumber*) getTextPronunciationsWithCompletionBlock:(NSString*) word
-        sourceDictionary:(NSString*) sourceDictionary
-        typeFormat:(NSString*) typeFormat
-        useCanonical:(NSString*) useCanonical
-        limit:(NSNumber*) limit
-        completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/word.{format}/{word}/pronunciations", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"word", @"}"]] withString: [SWGApiClient escape:word]];
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(useCanonical != nil)
-        queryParams[@"useCanonical"] = useCanonical;
-    if(sourceDictionary != nil)
-        queryParams[@"sourceDictionary"] = sourceDictionary;
-    if(typeFormat != nil)
-        queryParams[@"typeFormat"] = typeFormat;
-    if(limit != nil)
-        queryParams[@"limit"] = limit;
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    id bodyDictionary = nil;
-        if(word == nil) {
-        // error
-    }
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client dictionary: requestUrl 
-                               method: @"GET" 
-                          queryParams: queryParams 
-                                 body: bodyDictionary 
-                         headerParams: headerParams
-                   requestContentType: requestContentType
-                  responseContentType: responseContentType
-                      completionBlock: ^(NSDictionary *data, NSError *error) {
-                         if (error) {
-                             completionBlock(nil, error);return;
-                         }
-                         
-                         if([data isKindOfClass:[NSArray class]]){
-                             NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[data count]];
-                             for (NSDictionary* dict in (NSArray*)data) {
-                                SWGTextPron* d = [[SWGTextPron alloc]initWithValues: dict];
-                                [objs addObject:d];
-                             }
-                             completionBlock(objs, nil);
-                         }
-                        }];
-    
-
-}
-
--(NSNumber*) getHyphenationWithCompletionBlock:(NSString*) word
-        sourceDictionary:(NSString*) sourceDictionary
-        useCanonical:(NSString*) useCanonical
-        limit:(NSNumber*) limit
-        completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/word.{format}/{word}/hyphenation", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"word", @"}"]] withString: [SWGApiClient escape:word]];
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(useCanonical != nil)
-        queryParams[@"useCanonical"] = useCanonical;
-    if(sourceDictionary != nil)
-        queryParams[@"sourceDictionary"] = sourceDictionary;
-    if(limit != nil)
-        queryParams[@"limit"] = limit;
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    id bodyDictionary = nil;
-        if(word == nil) {
-        // error
-    }
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client dictionary: requestUrl 
-                               method: @"GET" 
-                          queryParams: queryParams 
-                                 body: bodyDictionary 
-                         headerParams: headerParams
-                   requestContentType: requestContentType
-                  responseContentType: responseContentType
-                      completionBlock: ^(NSDictionary *data, NSError *error) {
-                         if (error) {
-                             completionBlock(nil, error);return;
-                         }
-                         
-                         if([data isKindOfClass:[NSArray class]]){
-                             NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[data count]];
-                             for (NSDictionary* dict in (NSArray*)data) {
-                                SWGSyllable* d = [[SWGSyllable alloc]initWithValues: dict];
-                                [objs addObject:d];
-                             }
-                             completionBlock(objs, nil);
-                         }
-                        }];
-    
-
-}
-
--(NSNumber*) getWordFrequencyWithCompletionBlock:(NSString*) word
-        useCanonical:(NSString*) useCanonical
-        startYear:(NSNumber*) startYear
-        endYear:(NSNumber*) endYear
-        completionHandler: (void (^)(SWGFrequencySummary* output, NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/word.{format}/{word}/frequency", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"word", @"}"]] withString: [SWGApiClient escape:word]];
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(useCanonical != nil)
-        queryParams[@"useCanonical"] = useCanonical;
-    if(startYear != nil)
-        queryParams[@"startYear"] = startYear;
-    if(endYear != nil)
-        queryParams[@"endYear"] = endYear;
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    id bodyDictionary = nil;
-        if(word == nil) {
-        // error
-    }
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client dictionary:requestUrl 
-                              method:@"GET" 
-                         queryParams:queryParams 
-                                body:bodyDictionary 
-                        headerParams:headerParams
-                  requestContentType:requestContentType
-                 responseContentType:responseContentType
-                     completionBlock:^(NSDictionary *data, NSError *error) {
-                        if (error) {
-                            completionBlock(nil, error);return;
-                        }
-                        SWGFrequencySummary *result = nil;
-                        if (data) {
-                            result = [[SWGFrequencySummary alloc]initWithValues: data];
-                        }
-                        completionBlock(result , nil);}];
-    
-
-}
-
--(NSNumber*) getPhrasesWithCompletionBlock:(NSString*) word
-        limit:(NSNumber*) limit
-        wlmi:(NSNumber*) wlmi
-        useCanonical:(NSString*) useCanonical
-        completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/word.{format}/{word}/phrases", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"word", @"}"]] withString: [SWGApiClient escape:word]];
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(limit != nil)
-        queryParams[@"limit"] = limit;
-    if(wlmi != nil)
-        queryParams[@"wlmi"] = wlmi;
-    if(useCanonical != nil)
-        queryParams[@"useCanonical"] = useCanonical;
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    id bodyDictionary = nil;
-        if(word == nil) {
-        // error
-    }
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client dictionary: requestUrl 
-                               method: @"GET" 
-                          queryParams: queryParams 
-                                 body: bodyDictionary 
-                         headerParams: headerParams
-                   requestContentType: requestContentType
-                  responseContentType: responseContentType
-                      completionBlock: ^(NSDictionary *data, NSError *error) {
-                         if (error) {
-                             completionBlock(nil, error);return;
-                         }
-                         
-                         if([data isKindOfClass:[NSArray class]]){
-                             NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[data count]];
-                             for (NSDictionary* dict in (NSArray*)data) {
-                                SWGBigram* d = [[SWGBigram alloc]initWithValues: dict];
-                                [objs addObject:d];
-                             }
-                             completionBlock(objs, nil);
-                         }
-                        }];
-    
-
-}
-
--(NSNumber*) getEtymologiesWithCompletionBlock:(NSString*) word
-        useCanonical:(NSString*) useCanonical
-        completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/word.{format}/{word}/etymologies", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"word", @"}"]] withString: [SWGApiClient escape:word]];
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(useCanonical != nil)
-        queryParams[@"useCanonical"] = useCanonical;
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    id bodyDictionary = nil;
-        if(word == nil) {
-        // error
-    }
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client dictionary: requestUrl 
-                               method: @"GET" 
-                          queryParams: queryParams 
-                                 body: bodyDictionary 
-                         headerParams: headerParams
-                   requestContentType: requestContentType
-                  responseContentType: responseContentType
-                      completionBlock: ^(NSDictionary *data, NSError *error) {
-                         if (error) {
-                             completionBlock(nil, error);return;
-                         }
-                         
-                         if([data isKindOfClass:[NSArray class]]){
-                             NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[data count]];
-                             for (NSDictionary* dict in (NSArray*)data) {
-                                // NSString
-
-                                NSString* d = [[NSString alloc]initWithString: data];
-                                [objs addObject:d];
-                             }
-                             completionBlock(objs, nil);
-                         }
-                        }];
-    
-
-}
-
--(NSNumber*) getAudioWithCompletionBlock:(NSString*) word
-        useCanonical:(NSString*) useCanonical
-        limit:(NSNumber*) limit
-        completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/word.{format}/{word}/audio", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"word", @"}"]] withString: [SWGApiClient escape:word]];
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(useCanonical != nil)
-        queryParams[@"useCanonical"] = useCanonical;
-    if(limit != nil)
-        queryParams[@"limit"] = limit;
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    id bodyDictionary = nil;
-        if(word == nil) {
-        // error
-    }
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client dictionary: requestUrl 
-                               method: @"GET" 
-                          queryParams: queryParams 
-                                 body: bodyDictionary 
-                         headerParams: headerParams
-                   requestContentType: requestContentType
-                  responseContentType: responseContentType
-                      completionBlock: ^(NSDictionary *data, NSError *error) {
-                         if (error) {
-                             completionBlock(nil, error);return;
-                         }
-                         
-                         if([data isKindOfClass:[NSArray class]]){
-                             NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[data count]];
-                             for (NSDictionary* dict in (NSArray*)data) {
-                                SWGAudioFile* d = [[SWGAudioFile alloc]initWithValues: dict];
-                                [objs addObject:d];
-                             }
-                             completionBlock(objs, nil);
-                         }
-                        }];
-    
-
-}
-
--(NSNumber*) getScrabbleScoreWithCompletionBlock:(NSString*) word
-        completionHandler: (void (^)(SWGScrabbleScoreResult* output, NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/word.{format}/{word}/scrabbleScore", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"word", @"}"]] withString: [SWGApiClient escape:word]];
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    id bodyDictionary = nil;
-        if(word == nil) {
-        // error
-    }
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client dictionary:requestUrl 
-                              method:@"GET" 
-                         queryParams:queryParams 
-                                body:bodyDictionary 
-                        headerParams:headerParams
-                  requestContentType:requestContentType
-                 responseContentType:responseContentType
-                     completionBlock:^(NSDictionary *data, NSError *error) {
-                        if (error) {
-                            completionBlock(nil, error);return;
-                        }
-                        SWGScrabbleScoreResult *result = nil;
-                        if (data) {
-                            result = [[SWGScrabbleScoreResult alloc]initWithValues: data];
-                        }
-                        completionBlock(result , nil);}];
-    
-
-}
-
-
-
-@end
diff --git a/samples/client/wordnik-api-objc/client/SWGWordList.h b/samples/client/wordnik-api-objc/client/SWGWordList.h
deleted file mode 100644
index d444672f193..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGWordList.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-#import "SWGDate.h"
-
-
-@interface SWGWordList : SWGObject
-
-@property(nonatomic) NSNumber* _id;  
-
-@property(nonatomic) NSString* permalink;  
-
-@property(nonatomic) NSString* name;  
-
-@property(nonatomic) SWGDate* createdAt;  
-
-@property(nonatomic) SWGDate* updatedAt;  
-
-@property(nonatomic) SWGDate* lastActivityAt;  
-
-@property(nonatomic) NSString* username;  
-
-@property(nonatomic) NSNumber* userId;  
-
-@property(nonatomic) NSString* description;  
-
-@property(nonatomic) NSNumber* numberWordsInList;  
-
-@property(nonatomic) NSString* type;  
-
-- (id) _id: (NSNumber*) _id
-     permalink: (NSString*) permalink
-     name: (NSString*) name
-     createdAt: (SWGDate*) createdAt
-     updatedAt: (SWGDate*) updatedAt
-     lastActivityAt: (SWGDate*) lastActivityAt
-     username: (NSString*) username
-     userId: (NSNumber*) userId
-     description: (NSString*) description
-     numberWordsInList: (NSNumber*) numberWordsInList
-     type: (NSString*) type;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGWordList.m b/samples/client/wordnik-api-objc/client/SWGWordList.m
deleted file mode 100644
index e0dddb94b32..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGWordList.m
+++ /dev/null
@@ -1,128 +0,0 @@
-#import "SWGDate.h"
-#import "SWGWordList.h"
-
-@implementation SWGWordList
-
--(id)_id: (NSNumber*) _id
-    permalink: (NSString*) permalink
-    name: (NSString*) name
-    createdAt: (SWGDate*) createdAt
-    updatedAt: (SWGDate*) updatedAt
-    lastActivityAt: (SWGDate*) lastActivityAt
-    username: (NSString*) username
-    userId: (NSNumber*) userId
-    description: (NSString*) description
-    numberWordsInList: (NSNumber*) numberWordsInList
-    type: (NSString*) type
-{
-  __id = _id;
-  _permalink = permalink;
-  _name = name;
-  _createdAt = createdAt;
-  _updatedAt = updatedAt;
-  _lastActivityAt = lastActivityAt;
-  _username = username;
-  _userId = userId;
-  _description = description;
-  _numberWordsInList = numberWordsInList;
-  _type = type;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        __id = dict[@"id"]; 
-        _permalink = dict[@"permalink"]; 
-        _name = dict[@"name"]; 
-        id createdAt_dict = dict[@"createdAt"];
-        if(createdAt_dict != nil)
-            _createdAt = [[SWGDate alloc]initWithValues:createdAt_dict];
-        id updatedAt_dict = dict[@"updatedAt"];
-        if(updatedAt_dict != nil)
-            _updatedAt = [[SWGDate alloc]initWithValues:updatedAt_dict];
-        id lastActivityAt_dict = dict[@"lastActivityAt"];
-        if(lastActivityAt_dict != nil)
-            _lastActivityAt = [[SWGDate alloc]initWithValues:lastActivityAt_dict];
-        _username = dict[@"username"]; 
-        _userId = dict[@"userId"]; 
-        _description = dict[@"description"]; 
-        _numberWordsInList = dict[@"numberWordsInList"]; 
-        _type = dict[@"type"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(__id != nil) dict[@"id"] = __id ;
-        if(_permalink != nil) dict[@"permalink"] = _permalink ;
-        if(_name != nil) dict[@"name"] = _name ;
-        if(_createdAt != nil){
-        if([_createdAt isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGDate *createdAt in (NSArray*)_createdAt) {
-                [array addObject:[(SWGObject*)createdAt asDictionary]];
-            }
-            dict[@"createdAt"] = array;
-        }
-        else if(_createdAt && [_createdAt isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_createdAt toString];
-            if(dateString){
-                dict[@"createdAt"] = dateString;
-            }
-        }
-        else {
-        if(_createdAt != nil) dict[@"createdAt"] = [(SWGObject*)_createdAt asDictionary];
-        }
-    }
-    if(_updatedAt != nil){
-        if([_updatedAt isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGDate *updatedAt in (NSArray*)_updatedAt) {
-                [array addObject:[(SWGObject*)updatedAt asDictionary]];
-            }
-            dict[@"updatedAt"] = array;
-        }
-        else if(_updatedAt && [_updatedAt isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_updatedAt toString];
-            if(dateString){
-                dict[@"updatedAt"] = dateString;
-            }
-        }
-        else {
-        if(_updatedAt != nil) dict[@"updatedAt"] = [(SWGObject*)_updatedAt asDictionary];
-        }
-    }
-    if(_lastActivityAt != nil){
-        if([_lastActivityAt isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGDate *lastActivityAt in (NSArray*)_lastActivityAt) {
-                [array addObject:[(SWGObject*)lastActivityAt asDictionary]];
-            }
-            dict[@"lastActivityAt"] = array;
-        }
-        else if(_lastActivityAt && [_lastActivityAt isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_lastActivityAt toString];
-            if(dateString){
-                dict[@"lastActivityAt"] = dateString;
-            }
-        }
-        else {
-        if(_lastActivityAt != nil) dict[@"lastActivityAt"] = [(SWGObject*)_lastActivityAt asDictionary];
-        }
-    }
-    if(_username != nil) dict[@"username"] = _username ;
-        if(_userId != nil) dict[@"userId"] = _userId ;
-        if(_description != nil) dict[@"description"] = _description ;
-        if(_numberWordsInList != nil) dict[@"numberWordsInList"] = _numberWordsInList ;
-        if(_type != nil) dict[@"type"] = _type ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGWordListApi.h b/samples/client/wordnik-api-objc/client/SWGWordListApi.h
deleted file mode 100644
index 37345846180..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGWordListApi.h
+++ /dev/null
@@ -1,95 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGWordListWord.h"
-#import "SWGWordList.h"
-#import "SWGStringValue.h"
-
-
-
-@interface SWGWordListApi: NSObject
-
--(void) addHeader:(NSString*)value forKey:(NSString*)key;
--(unsigned long) requestQueueSize;
-+(SWGWordListApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key;
-+(void) setBasePath:(NSString*)basePath;
-+(NSString*) getBasePath;
-/**
-
- Updates an existing WordList
- 
- @param permalink permalink of WordList to update
- @param body Updated WordList
- @param auth_token The auth token of the logged-in user, obtained by calling /account.{format}/authenticate/{username} (described above)
- */
--(NSNumber*) updateWordListWithCompletionBlock :(NSString*) permalink 
-        body:(SWGWordList*) body 
-        auth_token:(NSString*) auth_token 
-        completionHandler: (void (^)(NSError* error))completionBlock;
-
-/**
-
- Deletes an existing WordList
- 
- @param permalink ID of WordList to delete
- @param auth_token The auth token of the logged-in user, obtained by calling /account.{format}/authenticate/{username} (described above)
- */
--(NSNumber*) deleteWordListWithCompletionBlock :(NSString*) permalink 
-        auth_token:(NSString*) auth_token 
-        completionHandler: (void (^)(NSError* error))completionBlock;
-
-/**
-
- Fetches a WordList by ID
- 
- @param permalink permalink of WordList to fetch
- @param auth_token The auth token of the logged-in user, obtained by calling /account.{format}/authenticate/{username} (described above)
- */
--(NSNumber*) getWordListByPermalinkWithCompletionBlock :(NSString*) permalink 
-        auth_token:(NSString*) auth_token 
-        completionHandler: (void (^)(SWGWordList* output, NSError* error))completionBlock;
-
-/**
-
- Adds words to a WordList
- 
- @param permalink permalink of WordList to user
- @param body Array of words to add to WordList
- @param auth_token The auth token of the logged-in user, obtained by calling /account.{format}/authenticate/{username} (described above)
- */
--(NSNumber*) addWordsToWordListWithCompletionBlock :(NSString*) permalink 
-        body:(NSArray*) body 
-        auth_token:(NSString*) auth_token 
-        completionHandler: (void (^)(NSError* error))completionBlock;
-
-/**
-
- Fetches words in a WordList
- 
- @param permalink ID of WordList to use
- @param auth_token The auth token of the logged-in user, obtained by calling /account.{format}/authenticate/{username} (described above)
- @param sortBy Field to sort by
- @param sortOrder Direction to sort
- @param skip Results to skip
- @param limit Maximum number of results to return
- */
--(NSNumber*) getWordListWordsWithCompletionBlock :(NSString*) permalink 
-        auth_token:(NSString*) auth_token 
-        sortBy:(NSString*) sortBy 
-        sortOrder:(NSString*) sortOrder 
-        skip:(NSNumber*) skip 
-        limit:(NSNumber*) limit 
-        completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock;
-
-/**
-
- Removes words from a WordList
- 
- @param permalink permalink of WordList to use
- @param body Words to remove from WordList
- @param auth_token The auth token of the logged-in user, obtained by calling /account.{format}/authenticate/{username} (described above)
- */
--(NSNumber*) deleteWordsFromWordListWithCompletionBlock :(NSString*) permalink 
-        body:(NSArray*) body 
-        auth_token:(NSString*) auth_token 
-        completionHandler: (void (^)(NSError* error))completionBlock;
-
-@end
diff --git a/samples/client/wordnik-api-objc/client/SWGWordListApi.m b/samples/client/wordnik-api-objc/client/SWGWordListApi.m
deleted file mode 100644
index b96b0f7e052..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGWordListApi.m
+++ /dev/null
@@ -1,451 +0,0 @@
-#import "SWGWordListApi.h"
-#import "SWGFile.h"
-#import "SWGApiClient.h"
-#import "SWGWordListWord.h"
-#import "SWGWordList.h"
-#import "SWGStringValue.h"
-
-
-
-
-@implementation SWGWordListApi
-static NSString * basePath = @"http://api.wordnik.com/v4";
-
-+(SWGWordListApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key {
-    static SWGWordListApi* singletonAPI = nil;
-
-    if (singletonAPI == nil) {
-        singletonAPI = [[SWGWordListApi alloc] init];
-        [singletonAPI addHeader:headerValue forKey:key];
-    }
-    return singletonAPI;
-}
-
-+(void) setBasePath:(NSString*)path {
-    basePath = path;
-}
-
-+(NSString*) getBasePath {
-    return basePath;
-}
-
--(SWGApiClient*) apiClient {
-    return [SWGApiClient sharedClientFromPool:basePath];
-}
-
--(void) addHeader:(NSString*)value forKey:(NSString*)key {
-    [[self apiClient] setHeaderValue:value forKey:key];
-}
-
--(id) init {
-    self = [super init];
-    [self apiClient];
-    return self;
-}
-
--(void) setHeaderValue:(NSString*) value
-           forKey:(NSString*)key {
-    [[self apiClient] setHeaderValue:value forKey:key];
-}
-
--(unsigned long) requestQueueSize {
-    return [SWGApiClient requestQueueSize];
-}
-
-
--(NSNumber*) updateWordListWithCompletionBlock:(NSString*) permalink
-        body:(SWGWordList*) body
-        auth_token:(NSString*) auth_token
-        completionHandler: (void (^)(NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/wordList.{format}/{permalink}", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"permalink", @"}"]] withString: [SWGApiClient escape:permalink]];
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    if(auth_token != nil)
-        headerParams[@"auth_token"] = auth_token;
-    id bodyDictionary = nil;
-        if(body != nil && [body isKindOfClass:[NSArray class]]){
-        NSMutableArray * objs = [[NSMutableArray alloc] init];
-        for (id dict in (NSArray*)body) {
-            if([dict respondsToSelector:@selector(asDictionary)]) {
-                [objs addObject:[(SWGObject*)dict asDictionary]];
-            }
-            else{
-                [objs addObject:dict];
-            }
-        }
-        bodyDictionary = objs;
-    }
-    else if([body respondsToSelector:@selector(asDictionary)]) {
-        bodyDictionary = [(SWGObject*)body asDictionary];
-    }
-    else if([body isKindOfClass:[NSString class]]) {
-        // convert it to a dictionary
-        NSError * error;
-        NSString * str = (NSString*)body;
-        NSDictionary *JSON =
-            [NSJSONSerialization JSONObjectWithData:[str dataUsingEncoding:NSUTF8StringEncoding]
-                                            options:NSJSONReadingMutableContainers
-                                              error:&error];
-        bodyDictionary = JSON;
-    }
-    else if([body isKindOfClass: [SWGFile class]]) {
-        requestContentType = @"form-data";
-        bodyDictionary = body;
-    }
-    else{
-        NSLog(@"don't know what to do with %@", body);
-    }
-
-    if(permalink == nil) {
-        // error
-    }
-    if(auth_token == nil) {
-        // error
-    }
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client stringWithCompletionBlock:requestUrl 
-                                             method:@"PUT" 
-                                        queryParams:queryParams 
-                                               body:bodyDictionary 
-                                       headerParams:headerParams
-                                 requestContentType: requestContentType
-                                responseContentType: responseContentType
-                                    completionBlock:^(NSString *data, NSError *error) {
-                        if (error) {
-                            completionBlock(error);
-                            return;
-                        }
-                        completionBlock(nil);
-                    }];
-    
-
-}
-
--(NSNumber*) deleteWordListWithCompletionBlock:(NSString*) permalink
-        auth_token:(NSString*) auth_token
-        completionHandler: (void (^)(NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/wordList.{format}/{permalink}", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"permalink", @"}"]] withString: [SWGApiClient escape:permalink]];
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    if(auth_token != nil)
-        headerParams[@"auth_token"] = auth_token;
-    id bodyDictionary = nil;
-        if(permalink == nil) {
-        // error
-    }
-    if(auth_token == nil) {
-        // error
-    }
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client stringWithCompletionBlock:requestUrl 
-                                             method:@"DELETE" 
-                                        queryParams:queryParams 
-                                               body:bodyDictionary 
-                                       headerParams:headerParams
-                                 requestContentType: requestContentType
-                                responseContentType: responseContentType
-                                    completionBlock:^(NSString *data, NSError *error) {
-                        if (error) {
-                            completionBlock(error);
-                            return;
-                        }
-                        completionBlock(nil);
-                    }];
-    
-
-}
-
--(NSNumber*) getWordListByPermalinkWithCompletionBlock:(NSString*) permalink
-        auth_token:(NSString*) auth_token
-        completionHandler: (void (^)(SWGWordList* output, NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/wordList.{format}/{permalink}", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"permalink", @"}"]] withString: [SWGApiClient escape:permalink]];
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    if(auth_token != nil)
-        headerParams[@"auth_token"] = auth_token;
-    id bodyDictionary = nil;
-        if(permalink == nil) {
-        // error
-    }
-    if(auth_token == nil) {
-        // error
-    }
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client dictionary:requestUrl 
-                              method:@"GET" 
-                         queryParams:queryParams 
-                                body:bodyDictionary 
-                        headerParams:headerParams
-                  requestContentType:requestContentType
-                 responseContentType:responseContentType
-                     completionBlock:^(NSDictionary *data, NSError *error) {
-                        if (error) {
-                            completionBlock(nil, error);return;
-                        }
-                        SWGWordList *result = nil;
-                        if (data) {
-                            result = [[SWGWordList alloc]initWithValues: data];
-                        }
-                        completionBlock(result , nil);}];
-    
-
-}
-
--(NSNumber*) addWordsToWordListWithCompletionBlock:(NSString*) permalink
-        body:(NSArray*) body
-        auth_token:(NSString*) auth_token
-        completionHandler: (void (^)(NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/wordList.{format}/{permalink}/words", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"permalink", @"}"]] withString: [SWGApiClient escape:permalink]];
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    if(auth_token != nil)
-        headerParams[@"auth_token"] = auth_token;
-    id bodyDictionary = nil;
-        if(body != nil && [body isKindOfClass:[NSArray class]]){
-        NSMutableArray * objs = [[NSMutableArray alloc] init];
-        for (id dict in (NSArray*)body) {
-            if([dict respondsToSelector:@selector(asDictionary)]) {
-                [objs addObject:[(SWGObject*)dict asDictionary]];
-            }
-            else{
-                [objs addObject:dict];
-            }
-        }
-        bodyDictionary = objs;
-    }
-    else if([body respondsToSelector:@selector(asDictionary)]) {
-        bodyDictionary = [(SWGObject*)body asDictionary];
-    }
-    else if([body isKindOfClass:[NSString class]]) {
-        // convert it to a dictionary
-        NSError * error;
-        NSString * str = (NSString*)body;
-        NSDictionary *JSON =
-            [NSJSONSerialization JSONObjectWithData:[str dataUsingEncoding:NSUTF8StringEncoding]
-                                            options:NSJSONReadingMutableContainers
-                                              error:&error];
-        bodyDictionary = JSON;
-    }
-    else if([body isKindOfClass: [SWGFile class]]) {
-        requestContentType = @"form-data";
-        bodyDictionary = body;
-    }
-    else{
-        NSLog(@"don't know what to do with %@", body);
-    }
-
-    if(permalink == nil) {
-        // error
-    }
-    if(auth_token == nil) {
-        // error
-    }
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client stringWithCompletionBlock:requestUrl 
-                                             method:@"POST" 
-                                        queryParams:queryParams 
-                                               body:bodyDictionary 
-                                       headerParams:headerParams
-                                 requestContentType: requestContentType
-                                responseContentType: responseContentType
-                                    completionBlock:^(NSString *data, NSError *error) {
-                        if (error) {
-                            completionBlock(error);
-                            return;
-                        }
-                        completionBlock(nil);
-                    }];
-    
-
-}
-
--(NSNumber*) getWordListWordsWithCompletionBlock:(NSString*) permalink
-        auth_token:(NSString*) auth_token
-        sortBy:(NSString*) sortBy
-        sortOrder:(NSString*) sortOrder
-        skip:(NSNumber*) skip
-        limit:(NSNumber*) limit
-        completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/wordList.{format}/{permalink}/words", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"permalink", @"}"]] withString: [SWGApiClient escape:permalink]];
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(sortBy != nil)
-        queryParams[@"sortBy"] = sortBy;
-    if(sortOrder != nil)
-        queryParams[@"sortOrder"] = sortOrder;
-    if(skip != nil)
-        queryParams[@"skip"] = skip;
-    if(limit != nil)
-        queryParams[@"limit"] = limit;
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    if(auth_token != nil)
-        headerParams[@"auth_token"] = auth_token;
-    id bodyDictionary = nil;
-        if(permalink == nil) {
-        // error
-    }
-    if(auth_token == nil) {
-        // error
-    }
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client dictionary: requestUrl 
-                               method: @"GET" 
-                          queryParams: queryParams 
-                                 body: bodyDictionary 
-                         headerParams: headerParams
-                   requestContentType: requestContentType
-                  responseContentType: responseContentType
-                      completionBlock: ^(NSDictionary *data, NSError *error) {
-                         if (error) {
-                             completionBlock(nil, error);return;
-                         }
-                         
-                         if([data isKindOfClass:[NSArray class]]){
-                             NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[data count]];
-                             for (NSDictionary* dict in (NSArray*)data) {
-                                SWGWordListWord* d = [[SWGWordListWord alloc]initWithValues: dict];
-                                [objs addObject:d];
-                             }
-                             completionBlock(objs, nil);
-                         }
-                        }];
-    
-
-}
-
--(NSNumber*) deleteWordsFromWordListWithCompletionBlock:(NSString*) permalink
-        body:(NSArray*) body
-        auth_token:(NSString*) auth_token
-        completionHandler: (void (^)(NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/wordList.{format}/{permalink}/deleteWords", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"permalink", @"}"]] withString: [SWGApiClient escape:permalink]];
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    if(auth_token != nil)
-        headerParams[@"auth_token"] = auth_token;
-    id bodyDictionary = nil;
-        if(body != nil && [body isKindOfClass:[NSArray class]]){
-        NSMutableArray * objs = [[NSMutableArray alloc] init];
-        for (id dict in (NSArray*)body) {
-            if([dict respondsToSelector:@selector(asDictionary)]) {
-                [objs addObject:[(SWGObject*)dict asDictionary]];
-            }
-            else{
-                [objs addObject:dict];
-            }
-        }
-        bodyDictionary = objs;
-    }
-    else if([body respondsToSelector:@selector(asDictionary)]) {
-        bodyDictionary = [(SWGObject*)body asDictionary];
-    }
-    else if([body isKindOfClass:[NSString class]]) {
-        // convert it to a dictionary
-        NSError * error;
-        NSString * str = (NSString*)body;
-        NSDictionary *JSON =
-            [NSJSONSerialization JSONObjectWithData:[str dataUsingEncoding:NSUTF8StringEncoding]
-                                            options:NSJSONReadingMutableContainers
-                                              error:&error];
-        bodyDictionary = JSON;
-    }
-    else if([body isKindOfClass: [SWGFile class]]) {
-        requestContentType = @"form-data";
-        bodyDictionary = body;
-    }
-    else{
-        NSLog(@"don't know what to do with %@", body);
-    }
-
-    if(permalink == nil) {
-        // error
-    }
-    if(auth_token == nil) {
-        // error
-    }
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client stringWithCompletionBlock:requestUrl 
-                                             method:@"POST" 
-                                        queryParams:queryParams 
-                                               body:bodyDictionary 
-                                       headerParams:headerParams
-                                 requestContentType: requestContentType
-                                responseContentType: responseContentType
-                                    completionBlock:^(NSString *data, NSError *error) {
-                        if (error) {
-                            completionBlock(error);
-                            return;
-                        }
-                        completionBlock(nil);
-                    }];
-    
-
-}
-
-
-
-@end
diff --git a/samples/client/wordnik-api-objc/client/SWGWordListWord.h b/samples/client/wordnik-api-objc/client/SWGWordListWord.h
deleted file mode 100644
index dbb9f3a88ae..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGWordListWord.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-#import "SWGDate.h"
-
-
-@interface SWGWordListWord : SWGObject
-
-@property(nonatomic) NSNumber* _id;  
-
-@property(nonatomic) NSString* word;  
-
-@property(nonatomic) NSString* username;  
-
-@property(nonatomic) NSNumber* userId;  
-
-@property(nonatomic) SWGDate* createdAt;  
-
-@property(nonatomic) NSNumber* numberCommentsOnWord;  
-
-@property(nonatomic) NSNumber* numberLists;  
-
-- (id) _id: (NSNumber*) _id
-     word: (NSString*) word
-     username: (NSString*) username
-     userId: (NSNumber*) userId
-     createdAt: (SWGDate*) createdAt
-     numberCommentsOnWord: (NSNumber*) numberCommentsOnWord
-     numberLists: (NSNumber*) numberLists;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGWordListWord.m b/samples/client/wordnik-api-objc/client/SWGWordListWord.m
deleted file mode 100644
index 27f63ee701c..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGWordListWord.m
+++ /dev/null
@@ -1,74 +0,0 @@
-#import "SWGDate.h"
-#import "SWGWordListWord.h"
-
-@implementation SWGWordListWord
-
--(id)_id: (NSNumber*) _id
-    word: (NSString*) word
-    username: (NSString*) username
-    userId: (NSNumber*) userId
-    createdAt: (SWGDate*) createdAt
-    numberCommentsOnWord: (NSNumber*) numberCommentsOnWord
-    numberLists: (NSNumber*) numberLists
-{
-  __id = _id;
-  _word = word;
-  _username = username;
-  _userId = userId;
-  _createdAt = createdAt;
-  _numberCommentsOnWord = numberCommentsOnWord;
-  _numberLists = numberLists;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        __id = dict[@"id"]; 
-        _word = dict[@"word"]; 
-        _username = dict[@"username"]; 
-        _userId = dict[@"userId"]; 
-        id createdAt_dict = dict[@"createdAt"];
-        if(createdAt_dict != nil)
-            _createdAt = [[SWGDate alloc]initWithValues:createdAt_dict];
-        _numberCommentsOnWord = dict[@"numberCommentsOnWord"]; 
-        _numberLists = dict[@"numberLists"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(__id != nil) dict[@"id"] = __id ;
-        if(_word != nil) dict[@"word"] = _word ;
-        if(_username != nil) dict[@"username"] = _username ;
-        if(_userId != nil) dict[@"userId"] = _userId ;
-        if(_createdAt != nil){
-        if([_createdAt isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGDate *createdAt in (NSArray*)_createdAt) {
-                [array addObject:[(SWGObject*)createdAt asDictionary]];
-            }
-            dict[@"createdAt"] = array;
-        }
-        else if(_createdAt && [_createdAt isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_createdAt toString];
-            if(dateString){
-                dict[@"createdAt"] = dateString;
-            }
-        }
-        else {
-        if(_createdAt != nil) dict[@"createdAt"] = [(SWGObject*)_createdAt asDictionary];
-        }
-    }
-    if(_numberCommentsOnWord != nil) dict[@"numberCommentsOnWord"] = _numberCommentsOnWord ;
-        if(_numberLists != nil) dict[@"numberLists"] = _numberLists ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGWordListsApi.h b/samples/client/wordnik-api-objc/client/SWGWordListsApi.h
deleted file mode 100644
index 8717887867e..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGWordListsApi.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGWordList.h"
-
-
-
-@interface SWGWordListsApi: NSObject
-
--(void) addHeader:(NSString*)value forKey:(NSString*)key;
--(unsigned long) requestQueueSize;
-+(SWGWordListsApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key;
-+(void) setBasePath:(NSString*)basePath;
-+(NSString*) getBasePath;
-/**
-
- Creates a WordList.
- 
- @param body WordList to create
- @param auth_token The auth token of the logged-in user, obtained by calling /account.{format}/authenticate/{username} (described above)
- */
--(NSNumber*) createWordListWithCompletionBlock :(SWGWordList*) body 
-        auth_token:(NSString*) auth_token 
-        completionHandler: (void (^)(SWGWordList* output, NSError* error))completionBlock;
-
-@end
diff --git a/samples/client/wordnik-api-objc/client/SWGWordListsApi.m b/samples/client/wordnik-api-objc/client/SWGWordListsApi.m
deleted file mode 100644
index 4b15a6a2b41..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGWordListsApi.m
+++ /dev/null
@@ -1,132 +0,0 @@
-#import "SWGWordListsApi.h"
-#import "SWGFile.h"
-#import "SWGApiClient.h"
-#import "SWGWordList.h"
-
-
-
-
-@implementation SWGWordListsApi
-static NSString * basePath = @"http://api.wordnik.com/v4";
-
-+(SWGWordListsApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key {
-    static SWGWordListsApi* singletonAPI = nil;
-
-    if (singletonAPI == nil) {
-        singletonAPI = [[SWGWordListsApi alloc] init];
-        [singletonAPI addHeader:headerValue forKey:key];
-    }
-    return singletonAPI;
-}
-
-+(void) setBasePath:(NSString*)path {
-    basePath = path;
-}
-
-+(NSString*) getBasePath {
-    return basePath;
-}
-
--(SWGApiClient*) apiClient {
-    return [SWGApiClient sharedClientFromPool:basePath];
-}
-
--(void) addHeader:(NSString*)value forKey:(NSString*)key {
-    [[self apiClient] setHeaderValue:value forKey:key];
-}
-
--(id) init {
-    self = [super init];
-    [self apiClient];
-    return self;
-}
-
--(void) setHeaderValue:(NSString*) value
-           forKey:(NSString*)key {
-    [[self apiClient] setHeaderValue:value forKey:key];
-}
-
--(unsigned long) requestQueueSize {
-    return [SWGApiClient requestQueueSize];
-}
-
-
--(NSNumber*) createWordListWithCompletionBlock:(SWGWordList*) body
-        auth_token:(NSString*) auth_token
-        completionHandler: (void (^)(SWGWordList* output, NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/wordLists.{format}", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    if(auth_token != nil)
-        headerParams[@"auth_token"] = auth_token;
-    id bodyDictionary = nil;
-        if(body != nil && [body isKindOfClass:[NSArray class]]){
-        NSMutableArray * objs = [[NSMutableArray alloc] init];
-        for (id dict in (NSArray*)body) {
-            if([dict respondsToSelector:@selector(asDictionary)]) {
-                [objs addObject:[(SWGObject*)dict asDictionary]];
-            }
-            else{
-                [objs addObject:dict];
-            }
-        }
-        bodyDictionary = objs;
-    }
-    else if([body respondsToSelector:@selector(asDictionary)]) {
-        bodyDictionary = [(SWGObject*)body asDictionary];
-    }
-    else if([body isKindOfClass:[NSString class]]) {
-        // convert it to a dictionary
-        NSError * error;
-        NSString * str = (NSString*)body;
-        NSDictionary *JSON =
-            [NSJSONSerialization JSONObjectWithData:[str dataUsingEncoding:NSUTF8StringEncoding]
-                                            options:NSJSONReadingMutableContainers
-                                              error:&error];
-        bodyDictionary = JSON;
-    }
-    else if([body isKindOfClass: [SWGFile class]]) {
-        requestContentType = @"form-data";
-        bodyDictionary = body;
-    }
-    else{
-        NSLog(@"don't know what to do with %@", body);
-    }
-
-    if(auth_token == nil) {
-        // error
-    }
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client dictionary:requestUrl 
-                              method:@"POST" 
-                         queryParams:queryParams 
-                                body:bodyDictionary 
-                        headerParams:headerParams
-                  requestContentType:requestContentType
-                 responseContentType:responseContentType
-                     completionBlock:^(NSDictionary *data, NSError *error) {
-                        if (error) {
-                            completionBlock(nil, error);return;
-                        }
-                        SWGWordList *result = nil;
-                        if (data) {
-                            result = [[SWGWordList alloc]initWithValues: data];
-                        }
-                        completionBlock(result , nil);}];
-    
-
-}
-
-
-
-@end
diff --git a/samples/client/wordnik-api-objc/client/SWGWordObject.h b/samples/client/wordnik-api-objc/client/SWGWordObject.h
deleted file mode 100644
index 2dff129e2bf..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGWordObject.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGWordObject : SWGObject
-
-@property(nonatomic) NSNumber* _id;  
-
-@property(nonatomic) NSString* word;  
-
-@property(nonatomic) NSString* originalWord;  
-
-@property(nonatomic) NSArray* suggestions;  
-
-@property(nonatomic) NSString* canonicalForm;  
-
-@property(nonatomic) NSString* vulgar;  
-
-- (id) _id: (NSNumber*) _id
-     word: (NSString*) word
-     originalWord: (NSString*) originalWord
-     suggestions: (NSArray*) suggestions
-     canonicalForm: (NSString*) canonicalForm
-     vulgar: (NSString*) vulgar;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGWordObject.m b/samples/client/wordnik-api-objc/client/SWGWordObject.m
deleted file mode 100644
index f1af8371a3a..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGWordObject.m
+++ /dev/null
@@ -1,51 +0,0 @@
-#import "SWGDate.h"
-#import "SWGWordObject.h"
-
-@implementation SWGWordObject
-
--(id)_id: (NSNumber*) _id
-    word: (NSString*) word
-    originalWord: (NSString*) originalWord
-    suggestions: (NSArray*) suggestions
-    canonicalForm: (NSString*) canonicalForm
-    vulgar: (NSString*) vulgar
-{
-  __id = _id;
-  _word = word;
-  _originalWord = originalWord;
-  _suggestions = suggestions;
-  _canonicalForm = canonicalForm;
-  _vulgar = vulgar;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        __id = dict[@"id"]; 
-        _word = dict[@"word"]; 
-        _originalWord = dict[@"originalWord"]; 
-        _suggestions = dict[@"suggestions"]; 
-        _canonicalForm = dict[@"canonicalForm"]; 
-        _vulgar = dict[@"vulgar"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(__id != nil) dict[@"id"] = __id ;
-        if(_word != nil) dict[@"word"] = _word ;
-        if(_originalWord != nil) dict[@"originalWord"] = _originalWord ;
-        if(_suggestions != nil) dict[@"suggestions"] = _suggestions ;
-        if(_canonicalForm != nil) dict[@"canonicalForm"] = _canonicalForm ;
-        if(_vulgar != nil) dict[@"vulgar"] = _vulgar ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGWordOfTheDay.h b/samples/client/wordnik-api-objc/client/SWGWordOfTheDay.h
deleted file mode 100644
index c47646fb58a..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGWordOfTheDay.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-#import "SWGDate.h"
-#import "SWGSimpleExample.h"
-#import "SWGSimpleDefinition.h"
-#import "SWGContentProvider.h"
-
-
-@interface SWGWordOfTheDay : SWGObject
-
-@property(nonatomic) NSNumber* _id;  
-
-@property(nonatomic) NSString* parentId;  
-
-@property(nonatomic) NSString* category;  
-
-@property(nonatomic) NSString* createdBy;  
-
-@property(nonatomic) SWGDate* createdAt;  
-
-@property(nonatomic) SWGContentProvider* contentProvider;  
-
-@property(nonatomic) NSString* htmlExtra;  
-
-@property(nonatomic) NSString* word;  
-
-@property(nonatomic) NSArray* definitions;  
-
-@property(nonatomic) NSArray* examples;  
-
-@property(nonatomic) NSString* note;  
-
-@property(nonatomic) SWGDate* publishDate;  
-
-- (id) _id: (NSNumber*) _id
-     parentId: (NSString*) parentId
-     category: (NSString*) category
-     createdBy: (NSString*) createdBy
-     createdAt: (SWGDate*) createdAt
-     contentProvider: (SWGContentProvider*) contentProvider
-     htmlExtra: (NSString*) htmlExtra
-     word: (NSString*) word
-     definitions: (NSArray*) definitions
-     examples: (NSArray*) examples
-     note: (NSString*) note
-     publishDate: (SWGDate*) publishDate;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGWordOfTheDay.m b/samples/client/wordnik-api-objc/client/SWGWordOfTheDay.m
deleted file mode 100644
index 5d1d8ee90e3..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGWordOfTheDay.m
+++ /dev/null
@@ -1,204 +0,0 @@
-#import "SWGDate.h"
-#import "SWGWordOfTheDay.h"
-
-@implementation SWGWordOfTheDay
-
--(id)_id: (NSNumber*) _id
-    parentId: (NSString*) parentId
-    category: (NSString*) category
-    createdBy: (NSString*) createdBy
-    createdAt: (SWGDate*) createdAt
-    contentProvider: (SWGContentProvider*) contentProvider
-    htmlExtra: (NSString*) htmlExtra
-    word: (NSString*) word
-    definitions: (NSArray*) definitions
-    examples: (NSArray*) examples
-    note: (NSString*) note
-    publishDate: (SWGDate*) publishDate
-{
-  __id = _id;
-  _parentId = parentId;
-  _category = category;
-  _createdBy = createdBy;
-  _createdAt = createdAt;
-  _contentProvider = contentProvider;
-  _htmlExtra = htmlExtra;
-  _word = word;
-  _definitions = definitions;
-  _examples = examples;
-  _note = note;
-  _publishDate = publishDate;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        __id = dict[@"id"]; 
-        _parentId = dict[@"parentId"]; 
-        _category = dict[@"category"]; 
-        _createdBy = dict[@"createdBy"]; 
-        id createdAt_dict = dict[@"createdAt"];
-        if(createdAt_dict != nil)
-            _createdAt = [[SWGDate alloc]initWithValues:createdAt_dict];
-        id contentProvider_dict = dict[@"contentProvider"];
-        if(contentProvider_dict != nil)
-            _contentProvider = [[SWGContentProvider alloc]initWithValues:contentProvider_dict];
-        _htmlExtra = dict[@"htmlExtra"]; 
-        _word = dict[@"word"]; 
-        id definitions_dict = dict[@"definitions"];
-        if([definitions_dict isKindOfClass:[NSArray class]]) {
-
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)definitions_dict count]];
-
-            if([(NSArray*)definitions_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)definitions_dict) {
-                    SWGSimpleDefinition* d = [[SWGSimpleDefinition alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                
-                _definitions = [[NSArray alloc] initWithArray:objs];
-            }
-            else {
-                _definitions = [[NSArray alloc] init];
-            }
-        }
-        else {
-            _definitions = [[NSArray alloc] init];
-        }
-        id examples_dict = dict[@"examples"];
-        if([examples_dict isKindOfClass:[NSArray class]]) {
-
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)examples_dict count]];
-
-            if([(NSArray*)examples_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)examples_dict) {
-                    SWGSimpleExample* d = [[SWGSimpleExample alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                
-                _examples = [[NSArray alloc] initWithArray:objs];
-            }
-            else {
-                _examples = [[NSArray alloc] init];
-            }
-        }
-        else {
-            _examples = [[NSArray alloc] init];
-        }
-        _note = dict[@"note"]; 
-        id publishDate_dict = dict[@"publishDate"];
-        if(publishDate_dict != nil)
-            _publishDate = [[SWGDate alloc]initWithValues:publishDate_dict];
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(__id != nil) dict[@"id"] = __id ;
-        if(_parentId != nil) dict[@"parentId"] = _parentId ;
-        if(_category != nil) dict[@"category"] = _category ;
-        if(_createdBy != nil) dict[@"createdBy"] = _createdBy ;
-        if(_createdAt != nil){
-        if([_createdAt isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGDate *createdAt in (NSArray*)_createdAt) {
-                [array addObject:[(SWGObject*)createdAt asDictionary]];
-            }
-            dict[@"createdAt"] = array;
-        }
-        else if(_createdAt && [_createdAt isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_createdAt toString];
-            if(dateString){
-                dict[@"createdAt"] = dateString;
-            }
-        }
-        else {
-        if(_createdAt != nil) dict[@"createdAt"] = [(SWGObject*)_createdAt asDictionary];
-        }
-    }
-    if(_contentProvider != nil){
-        if([_contentProvider isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGContentProvider *contentProvider in (NSArray*)_contentProvider) {
-                [array addObject:[(SWGObject*)contentProvider asDictionary]];
-            }
-            dict[@"contentProvider"] = array;
-        }
-        else if(_contentProvider && [_contentProvider isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_contentProvider toString];
-            if(dateString){
-                dict[@"contentProvider"] = dateString;
-            }
-        }
-        else {
-        if(_contentProvider != nil) dict[@"contentProvider"] = [(SWGObject*)_contentProvider asDictionary];
-        }
-    }
-    if(_htmlExtra != nil) dict[@"htmlExtra"] = _htmlExtra ;
-        if(_word != nil) dict[@"word"] = _word ;
-        if(_definitions != nil){
-        if([_definitions isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGSimpleDefinition *definitions in (NSArray*)_definitions) {
-                [array addObject:[(SWGObject*)definitions asDictionary]];
-            }
-            dict[@"definitions"] = array;
-        }
-        else if(_definitions && [_definitions isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_definitions toString];
-            if(dateString){
-                dict[@"definitions"] = dateString;
-            }
-        }
-        else {
-        if(_definitions != nil) dict[@"definitions"] = [(SWGObject*)_definitions asDictionary];
-        }
-    }
-    if(_examples != nil){
-        if([_examples isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGSimpleExample *examples in (NSArray*)_examples) {
-                [array addObject:[(SWGObject*)examples asDictionary]];
-            }
-            dict[@"examples"] = array;
-        }
-        else if(_examples && [_examples isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_examples toString];
-            if(dateString){
-                dict[@"examples"] = dateString;
-            }
-        }
-        else {
-        if(_examples != nil) dict[@"examples"] = [(SWGObject*)_examples asDictionary];
-        }
-    }
-    if(_note != nil) dict[@"note"] = _note ;
-        if(_publishDate != nil){
-        if([_publishDate isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGDate *publishDate in (NSArray*)_publishDate) {
-                [array addObject:[(SWGObject*)publishDate asDictionary]];
-            }
-            dict[@"publishDate"] = array;
-        }
-        else if(_publishDate && [_publishDate isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_publishDate toString];
-            if(dateString){
-                dict[@"publishDate"] = dateString;
-            }
-        }
-        else {
-        if(_publishDate != nil) dict[@"publishDate"] = [(SWGObject*)_publishDate asDictionary];
-        }
-    }
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGWordSearchResult.h b/samples/client/wordnik-api-objc/client/SWGWordSearchResult.h
deleted file mode 100644
index 9dde43803c1..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGWordSearchResult.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGWordSearchResult : SWGObject
-
-@property(nonatomic) NSNumber* count;  
-
-@property(nonatomic) NSNumber* lexicality;  
-
-@property(nonatomic) NSString* word;  
-
-- (id) count: (NSNumber*) count
-     lexicality: (NSNumber*) lexicality
-     word: (NSString*) word;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGWordSearchResult.m b/samples/client/wordnik-api-objc/client/SWGWordSearchResult.m
deleted file mode 100644
index 73e3f4c7b88..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGWordSearchResult.m
+++ /dev/null
@@ -1,39 +0,0 @@
-#import "SWGDate.h"
-#import "SWGWordSearchResult.h"
-
-@implementation SWGWordSearchResult
-
--(id)count: (NSNumber*) count
-    lexicality: (NSNumber*) lexicality
-    word: (NSString*) word
-{
-  _count = count;
-  _lexicality = lexicality;
-  _word = word;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _count = dict[@"count"]; 
-        _lexicality = dict[@"lexicality"]; 
-        _word = dict[@"word"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(_count != nil) dict[@"count"] = _count ;
-        if(_lexicality != nil) dict[@"lexicality"] = _lexicality ;
-        if(_word != nil) dict[@"word"] = _word ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGWordSearchResults.h b/samples/client/wordnik-api-objc/client/SWGWordSearchResults.h
deleted file mode 100644
index 2e74b77e2e0..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGWordSearchResults.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-#import "SWGWordSearchResult.h"
-
-
-@interface SWGWordSearchResults : SWGObject
-
-@property(nonatomic) NSArray* searchResults;  
-
-@property(nonatomic) NSNumber* totalResults;  
-
-- (id) searchResults: (NSArray*) searchResults
-     totalResults: (NSNumber*) totalResults;
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGWordSearchResults.m b/samples/client/wordnik-api-objc/client/SWGWordSearchResults.m
deleted file mode 100644
index 697542ca111..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGWordSearchResults.m
+++ /dev/null
@@ -1,71 +0,0 @@
-#import "SWGDate.h"
-#import "SWGWordSearchResults.h"
-
-@implementation SWGWordSearchResults
-
--(id)searchResults: (NSArray*) searchResults
-    totalResults: (NSNumber*) totalResults
-{
-  _searchResults = searchResults;
-  _totalResults = totalResults;
-  return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        id searchResults_dict = dict[@"searchResults"];
-        if([searchResults_dict isKindOfClass:[NSArray class]]) {
-
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)searchResults_dict count]];
-
-            if([(NSArray*)searchResults_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)searchResults_dict) {
-                    SWGWordSearchResult* d = [[SWGWordSearchResult alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                
-                _searchResults = [[NSArray alloc] initWithArray:objs];
-            }
-            else {
-                _searchResults = [[NSArray alloc] init];
-            }
-        }
-        else {
-            _searchResults = [[NSArray alloc] init];
-        }
-        _totalResults = dict[@"totalResults"]; 
-        
-
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    if(_searchResults != nil){
-        if([_searchResults isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGWordSearchResult *searchResults in (NSArray*)_searchResults) {
-                [array addObject:[(SWGObject*)searchResults asDictionary]];
-            }
-            dict[@"searchResults"] = array;
-        }
-        else if(_searchResults && [_searchResults isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_searchResults toString];
-            if(dateString){
-                dict[@"searchResults"] = dateString;
-            }
-        }
-        else {
-        if(_searchResults != nil) dict[@"searchResults"] = [(SWGObject*)_searchResults asDictionary];
-        }
-    }
-    if(_totalResults != nil) dict[@"totalResults"] = _totalResults ;
-        NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
-
diff --git a/samples/client/wordnik-api-objc/client/SWGWordsApi.h b/samples/client/wordnik-api-objc/client/SWGWordsApi.h
deleted file mode 100644
index 24d421ef174..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGWordsApi.h
+++ /dev/null
@@ -1,151 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGDefinitionSearchResults.h"
-#import "SWGWordObject.h"
-#import "SWGWordOfTheDay.h"
-#import "SWGWordSearchResults.h"
-
-
-
-@interface SWGWordsApi: NSObject
-
--(void) addHeader:(NSString*)value forKey:(NSString*)key;
--(unsigned long) requestQueueSize;
-+(SWGWordsApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key;
-+(void) setBasePath:(NSString*)basePath;
-+(NSString*) getBasePath;
-/**
-
- Searches words
- 
- @param query Search query
- @param includePartOfSpeech Only include these comma-delimited parts of speech
- @param excludePartOfSpeech Exclude these comma-delimited parts of speech
- @param caseSensitive Search case sensitive
- @param minCorpusCount Minimum corpus frequency for terms
- @param maxCorpusCount Maximum corpus frequency for terms
- @param minDictionaryCount Minimum number of dictionary entries for words returned
- @param maxDictionaryCount Maximum dictionary definition count
- @param minLength Minimum word length
- @param maxLength Maximum word length
- @param skip Results to skip
- @param limit Maximum number of results to return
- */
--(NSNumber*) searchWordsWithCompletionBlock :(NSString*) query 
-        includePartOfSpeech:(NSString*) includePartOfSpeech 
-        excludePartOfSpeech:(NSString*) excludePartOfSpeech 
-        caseSensitive:(NSString*) caseSensitive 
-        minCorpusCount:(NSNumber*) minCorpusCount 
-        maxCorpusCount:(NSNumber*) maxCorpusCount 
-        minDictionaryCount:(NSNumber*) minDictionaryCount 
-        maxDictionaryCount:(NSNumber*) maxDictionaryCount 
-        minLength:(NSNumber*) minLength 
-        maxLength:(NSNumber*) maxLength 
-        skip:(NSNumber*) skip 
-        limit:(NSNumber*) limit 
-        completionHandler: (void (^)(SWGWordSearchResults* output, NSError* error))completionBlock;
-
-/**
-
- Returns a specific WordOfTheDay
- 
- @param date Fetches by date in yyyy-MM-dd
- */
--(NSNumber*) getWordOfTheDayWithCompletionBlock :(NSString*) date 
-        completionHandler: (void (^)(SWGWordOfTheDay* output, NSError* error))completionBlock;
-
-/**
-
- Reverse dictionary search
- 
- @param query Search term
- @param findSenseForWord Restricts words and finds closest sense
- @param includeSourceDictionaries Only include these comma-delimited source dictionaries
- @param excludeSourceDictionaries Exclude these comma-delimited source dictionaries
- @param includePartOfSpeech Only include these comma-delimited parts of speech
- @param excludePartOfSpeech Exclude these comma-delimited parts of speech
- @param expandTerms Expand terms
- @param sortBy Attribute to sort by
- @param sortOrder Sort direction
- @param minCorpusCount Minimum corpus frequency for terms
- @param maxCorpusCount Maximum corpus frequency for terms
- @param minLength Minimum word length
- @param maxLength Maximum word length
- @param includeTags Return a closed set of XML tags in response
- @param skip Results to skip
- @param limit Maximum number of results to return
- */
--(NSNumber*) reverseDictionaryWithCompletionBlock :(NSString*) query 
-        findSenseForWord:(NSString*) findSenseForWord 
-        includeSourceDictionaries:(NSString*) includeSourceDictionaries 
-        excludeSourceDictionaries:(NSString*) excludeSourceDictionaries 
-        includePartOfSpeech:(NSString*) includePartOfSpeech 
-        excludePartOfSpeech:(NSString*) excludePartOfSpeech 
-        expandTerms:(NSString*) expandTerms 
-        sortBy:(NSString*) sortBy 
-        sortOrder:(NSString*) sortOrder 
-        minCorpusCount:(NSNumber*) minCorpusCount 
-        maxCorpusCount:(NSNumber*) maxCorpusCount 
-        minLength:(NSNumber*) minLength 
-        maxLength:(NSNumber*) maxLength 
-        includeTags:(NSString*) includeTags 
-        skip:(NSString*) skip 
-        limit:(NSNumber*) limit 
-        completionHandler: (void (^)(SWGDefinitionSearchResults* output, NSError* error))completionBlock;
-
-/**
-
- Returns an array of random WordObjects
- 
- @param includePartOfSpeech CSV part-of-speech values to include
- @param excludePartOfSpeech CSV part-of-speech values to exclude
- @param sortBy Attribute to sort by
- @param sortOrder Sort direction
- @param hasDictionaryDef Only return words with dictionary definitions
- @param minCorpusCount Minimum corpus frequency for terms
- @param maxCorpusCount Maximum corpus frequency for terms
- @param minDictionaryCount Minimum dictionary count
- @param maxDictionaryCount Maximum dictionary count
- @param minLength Minimum word length
- @param maxLength Maximum word length
- @param limit Maximum number of results to return
- */
--(NSNumber*) getRandomWordsWithCompletionBlock :(NSString*) includePartOfSpeech 
-        excludePartOfSpeech:(NSString*) excludePartOfSpeech 
-        sortBy:(NSString*) sortBy 
-        sortOrder:(NSString*) sortOrder 
-        hasDictionaryDef:(NSString*) hasDictionaryDef 
-        minCorpusCount:(NSNumber*) minCorpusCount 
-        maxCorpusCount:(NSNumber*) maxCorpusCount 
-        minDictionaryCount:(NSNumber*) minDictionaryCount 
-        maxDictionaryCount:(NSNumber*) maxDictionaryCount 
-        minLength:(NSNumber*) minLength 
-        maxLength:(NSNumber*) maxLength 
-        limit:(NSNumber*) limit 
-        completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock;
-
-/**
-
- Returns a single random WordObject
- 
- @param includePartOfSpeech CSV part-of-speech values to include
- @param excludePartOfSpeech CSV part-of-speech values to exclude
- @param hasDictionaryDef Only return words with dictionary definitions
- @param minCorpusCount Minimum corpus frequency for terms
- @param maxCorpusCount Maximum corpus frequency for terms
- @param minDictionaryCount Minimum dictionary count
- @param maxDictionaryCount Maximum dictionary count
- @param minLength Minimum word length
- @param maxLength Maximum word length
- */
--(NSNumber*) getRandomWordWithCompletionBlock :(NSString*) includePartOfSpeech 
-        excludePartOfSpeech:(NSString*) excludePartOfSpeech 
-        hasDictionaryDef:(NSString*) hasDictionaryDef 
-        minCorpusCount:(NSNumber*) minCorpusCount 
-        maxCorpusCount:(NSNumber*) maxCorpusCount 
-        minDictionaryCount:(NSNumber*) minDictionaryCount 
-        maxDictionaryCount:(NSNumber*) maxDictionaryCount 
-        minLength:(NSNumber*) minLength 
-        maxLength:(NSNumber*) maxLength 
-        completionHandler: (void (^)(SWGWordObject* output, NSError* error))completionBlock;
-
-@end
diff --git a/samples/client/wordnik-api-objc/client/SWGWordsApi.m b/samples/client/wordnik-api-objc/client/SWGWordsApi.m
deleted file mode 100644
index 6d8ad8fdcfc..00000000000
--- a/samples/client/wordnik-api-objc/client/SWGWordsApi.m
+++ /dev/null
@@ -1,399 +0,0 @@
-#import "SWGWordsApi.h"
-#import "SWGFile.h"
-#import "SWGApiClient.h"
-#import "SWGDefinitionSearchResults.h"
-#import "SWGWordObject.h"
-#import "SWGWordOfTheDay.h"
-#import "SWGWordSearchResults.h"
-
-
-
-
-@implementation SWGWordsApi
-static NSString * basePath = @"http://api.wordnik.com/v4";
-
-+(SWGWordsApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key {
-    static SWGWordsApi* singletonAPI = nil;
-
-    if (singletonAPI == nil) {
-        singletonAPI = [[SWGWordsApi alloc] init];
-        [singletonAPI addHeader:headerValue forKey:key];
-    }
-    return singletonAPI;
-}
-
-+(void) setBasePath:(NSString*)path {
-    basePath = path;
-}
-
-+(NSString*) getBasePath {
-    return basePath;
-}
-
--(SWGApiClient*) apiClient {
-    return [SWGApiClient sharedClientFromPool:basePath];
-}
-
--(void) addHeader:(NSString*)value forKey:(NSString*)key {
-    [[self apiClient] setHeaderValue:value forKey:key];
-}
-
--(id) init {
-    self = [super init];
-    [self apiClient];
-    return self;
-}
-
--(void) setHeaderValue:(NSString*) value
-           forKey:(NSString*)key {
-    [[self apiClient] setHeaderValue:value forKey:key];
-}
-
--(unsigned long) requestQueueSize {
-    return [SWGApiClient requestQueueSize];
-}
-
-
--(NSNumber*) searchWordsWithCompletionBlock:(NSString*) query
-        includePartOfSpeech:(NSString*) includePartOfSpeech
-        excludePartOfSpeech:(NSString*) excludePartOfSpeech
-        caseSensitive:(NSString*) caseSensitive
-        minCorpusCount:(NSNumber*) minCorpusCount
-        maxCorpusCount:(NSNumber*) maxCorpusCount
-        minDictionaryCount:(NSNumber*) minDictionaryCount
-        maxDictionaryCount:(NSNumber*) maxDictionaryCount
-        minLength:(NSNumber*) minLength
-        maxLength:(NSNumber*) maxLength
-        skip:(NSNumber*) skip
-        limit:(NSNumber*) limit
-        completionHandler: (void (^)(SWGWordSearchResults* output, NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/words.{format}/search/{query}", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"query", @"}"]] withString: [SWGApiClient escape:query]];
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(caseSensitive != nil)
-        queryParams[@"caseSensitive"] = caseSensitive;
-    if(includePartOfSpeech != nil)
-        queryParams[@"includePartOfSpeech"] = includePartOfSpeech;
-    if(excludePartOfSpeech != nil)
-        queryParams[@"excludePartOfSpeech"] = excludePartOfSpeech;
-    if(minCorpusCount != nil)
-        queryParams[@"minCorpusCount"] = minCorpusCount;
-    if(maxCorpusCount != nil)
-        queryParams[@"maxCorpusCount"] = maxCorpusCount;
-    if(minDictionaryCount != nil)
-        queryParams[@"minDictionaryCount"] = minDictionaryCount;
-    if(maxDictionaryCount != nil)
-        queryParams[@"maxDictionaryCount"] = maxDictionaryCount;
-    if(minLength != nil)
-        queryParams[@"minLength"] = minLength;
-    if(maxLength != nil)
-        queryParams[@"maxLength"] = maxLength;
-    if(skip != nil)
-        queryParams[@"skip"] = skip;
-    if(limit != nil)
-        queryParams[@"limit"] = limit;
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    id bodyDictionary = nil;
-        if(query == nil) {
-        // error
-    }
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client dictionary:requestUrl 
-                              method:@"GET" 
-                         queryParams:queryParams 
-                                body:bodyDictionary 
-                        headerParams:headerParams
-                  requestContentType:requestContentType
-                 responseContentType:responseContentType
-                     completionBlock:^(NSDictionary *data, NSError *error) {
-                        if (error) {
-                            completionBlock(nil, error);return;
-                        }
-                        SWGWordSearchResults *result = nil;
-                        if (data) {
-                            result = [[SWGWordSearchResults alloc]initWithValues: data];
-                        }
-                        completionBlock(result , nil);}];
-    
-
-}
-
--(NSNumber*) getWordOfTheDayWithCompletionBlock:(NSString*) date
-        completionHandler: (void (^)(SWGWordOfTheDay* output, NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/words.{format}/wordOfTheDay", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(date != nil)
-        queryParams[@"date"] = date;
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    id bodyDictionary = nil;
-        SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client dictionary:requestUrl 
-                              method:@"GET" 
-                         queryParams:queryParams 
-                                body:bodyDictionary 
-                        headerParams:headerParams
-                  requestContentType:requestContentType
-                 responseContentType:responseContentType
-                     completionBlock:^(NSDictionary *data, NSError *error) {
-                        if (error) {
-                            completionBlock(nil, error);return;
-                        }
-                        SWGWordOfTheDay *result = nil;
-                        if (data) {
-                            result = [[SWGWordOfTheDay alloc]initWithValues: data];
-                        }
-                        completionBlock(result , nil);}];
-    
-
-}
-
--(NSNumber*) reverseDictionaryWithCompletionBlock:(NSString*) query
-        findSenseForWord:(NSString*) findSenseForWord
-        includeSourceDictionaries:(NSString*) includeSourceDictionaries
-        excludeSourceDictionaries:(NSString*) excludeSourceDictionaries
-        includePartOfSpeech:(NSString*) includePartOfSpeech
-        excludePartOfSpeech:(NSString*) excludePartOfSpeech
-        expandTerms:(NSString*) expandTerms
-        sortBy:(NSString*) sortBy
-        sortOrder:(NSString*) sortOrder
-        minCorpusCount:(NSNumber*) minCorpusCount
-        maxCorpusCount:(NSNumber*) maxCorpusCount
-        minLength:(NSNumber*) minLength
-        maxLength:(NSNumber*) maxLength
-        includeTags:(NSString*) includeTags
-        skip:(NSString*) skip
-        limit:(NSNumber*) limit
-        completionHandler: (void (^)(SWGDefinitionSearchResults* output, NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/words.{format}/reverseDictionary", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(query != nil)
-        queryParams[@"query"] = query;
-    if(findSenseForWord != nil)
-        queryParams[@"findSenseForWord"] = findSenseForWord;
-    if(includeSourceDictionaries != nil)
-        queryParams[@"includeSourceDictionaries"] = includeSourceDictionaries;
-    if(excludeSourceDictionaries != nil)
-        queryParams[@"excludeSourceDictionaries"] = excludeSourceDictionaries;
-    if(includePartOfSpeech != nil)
-        queryParams[@"includePartOfSpeech"] = includePartOfSpeech;
-    if(excludePartOfSpeech != nil)
-        queryParams[@"excludePartOfSpeech"] = excludePartOfSpeech;
-    if(minCorpusCount != nil)
-        queryParams[@"minCorpusCount"] = minCorpusCount;
-    if(maxCorpusCount != nil)
-        queryParams[@"maxCorpusCount"] = maxCorpusCount;
-    if(minLength != nil)
-        queryParams[@"minLength"] = minLength;
-    if(maxLength != nil)
-        queryParams[@"maxLength"] = maxLength;
-    if(expandTerms != nil)
-        queryParams[@"expandTerms"] = expandTerms;
-    if(includeTags != nil)
-        queryParams[@"includeTags"] = includeTags;
-    if(sortBy != nil)
-        queryParams[@"sortBy"] = sortBy;
-    if(sortOrder != nil)
-        queryParams[@"sortOrder"] = sortOrder;
-    if(skip != nil)
-        queryParams[@"skip"] = skip;
-    if(limit != nil)
-        queryParams[@"limit"] = limit;
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    id bodyDictionary = nil;
-        if(query == nil) {
-        // error
-    }
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client dictionary:requestUrl 
-                              method:@"GET" 
-                         queryParams:queryParams 
-                                body:bodyDictionary 
-                        headerParams:headerParams
-                  requestContentType:requestContentType
-                 responseContentType:responseContentType
-                     completionBlock:^(NSDictionary *data, NSError *error) {
-                        if (error) {
-                            completionBlock(nil, error);return;
-                        }
-                        SWGDefinitionSearchResults *result = nil;
-                        if (data) {
-                            result = [[SWGDefinitionSearchResults alloc]initWithValues: data];
-                        }
-                        completionBlock(result , nil);}];
-    
-
-}
-
--(NSNumber*) getRandomWordsWithCompletionBlock:(NSString*) includePartOfSpeech
-        excludePartOfSpeech:(NSString*) excludePartOfSpeech
-        sortBy:(NSString*) sortBy
-        sortOrder:(NSString*) sortOrder
-        hasDictionaryDef:(NSString*) hasDictionaryDef
-        minCorpusCount:(NSNumber*) minCorpusCount
-        maxCorpusCount:(NSNumber*) maxCorpusCount
-        minDictionaryCount:(NSNumber*) minDictionaryCount
-        maxDictionaryCount:(NSNumber*) maxDictionaryCount
-        minLength:(NSNumber*) minLength
-        maxLength:(NSNumber*) maxLength
-        limit:(NSNumber*) limit
-        completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/words.{format}/randomWords", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(hasDictionaryDef != nil)
-        queryParams[@"hasDictionaryDef"] = hasDictionaryDef;
-    if(includePartOfSpeech != nil)
-        queryParams[@"includePartOfSpeech"] = includePartOfSpeech;
-    if(excludePartOfSpeech != nil)
-        queryParams[@"excludePartOfSpeech"] = excludePartOfSpeech;
-    if(minCorpusCount != nil)
-        queryParams[@"minCorpusCount"] = minCorpusCount;
-    if(maxCorpusCount != nil)
-        queryParams[@"maxCorpusCount"] = maxCorpusCount;
-    if(minDictionaryCount != nil)
-        queryParams[@"minDictionaryCount"] = minDictionaryCount;
-    if(maxDictionaryCount != nil)
-        queryParams[@"maxDictionaryCount"] = maxDictionaryCount;
-    if(minLength != nil)
-        queryParams[@"minLength"] = minLength;
-    if(maxLength != nil)
-        queryParams[@"maxLength"] = maxLength;
-    if(sortBy != nil)
-        queryParams[@"sortBy"] = sortBy;
-    if(sortOrder != nil)
-        queryParams[@"sortOrder"] = sortOrder;
-    if(limit != nil)
-        queryParams[@"limit"] = limit;
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    id bodyDictionary = nil;
-        SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client dictionary: requestUrl 
-                               method: @"GET" 
-                          queryParams: queryParams 
-                                 body: bodyDictionary 
-                         headerParams: headerParams
-                   requestContentType: requestContentType
-                  responseContentType: responseContentType
-                      completionBlock: ^(NSDictionary *data, NSError *error) {
-                         if (error) {
-                             completionBlock(nil, error);return;
-                         }
-                         
-                         if([data isKindOfClass:[NSArray class]]){
-                             NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[data count]];
-                             for (NSDictionary* dict in (NSArray*)data) {
-                                SWGWordObject* d = [[SWGWordObject alloc]initWithValues: dict];
-                                [objs addObject:d];
-                             }
-                             completionBlock(objs, nil);
-                         }
-                        }];
-    
-
-}
-
--(NSNumber*) getRandomWordWithCompletionBlock:(NSString*) includePartOfSpeech
-        excludePartOfSpeech:(NSString*) excludePartOfSpeech
-        hasDictionaryDef:(NSString*) hasDictionaryDef
-        minCorpusCount:(NSNumber*) minCorpusCount
-        maxCorpusCount:(NSNumber*) maxCorpusCount
-        minDictionaryCount:(NSNumber*) minDictionaryCount
-        maxDictionaryCount:(NSNumber*) maxDictionaryCount
-        minLength:(NSNumber*) minLength
-        maxLength:(NSNumber*) maxLength
-        completionHandler: (void (^)(SWGWordObject* output, NSError* error))completionBlock{
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/words.{format}/randomWord", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-        NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(hasDictionaryDef != nil)
-        queryParams[@"hasDictionaryDef"] = hasDictionaryDef;
-    if(includePartOfSpeech != nil)
-        queryParams[@"includePartOfSpeech"] = includePartOfSpeech;
-    if(excludePartOfSpeech != nil)
-        queryParams[@"excludePartOfSpeech"] = excludePartOfSpeech;
-    if(minCorpusCount != nil)
-        queryParams[@"minCorpusCount"] = minCorpusCount;
-    if(maxCorpusCount != nil)
-        queryParams[@"maxCorpusCount"] = maxCorpusCount;
-    if(minDictionaryCount != nil)
-        queryParams[@"minDictionaryCount"] = minDictionaryCount;
-    if(maxDictionaryCount != nil)
-        queryParams[@"maxDictionaryCount"] = maxDictionaryCount;
-    if(minLength != nil)
-        queryParams[@"minLength"] = minLength;
-    if(maxLength != nil)
-        queryParams[@"maxLength"] = maxLength;
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    id bodyDictionary = nil;
-        SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    return [client dictionary:requestUrl 
-                              method:@"GET" 
-                         queryParams:queryParams 
-                                body:bodyDictionary 
-                        headerParams:headerParams
-                  requestContentType:requestContentType
-                 responseContentType:responseContentType
-                     completionBlock:^(NSDictionary *data, NSError *error) {
-                        if (error) {
-                            completionBlock(nil, error);return;
-                        }
-                        SWGWordObject *result = nil;
-                        if (data) {
-                            result = [[SWGWordObject alloc]initWithValues: data];
-                        }
-                        completionBlock(result , nil);}];
-    
-
-}
-
-
-
-@end
diff --git a/samples/client/wordnik-api-php/PHPWordnikApiCodegen.scala b/samples/client/wordnik-api-php/PHPWordnikApiCodegen.scala
deleted file mode 100644
index 91573211cb9..00000000000
--- a/samples/client/wordnik-api-php/PHPWordnikApiCodegen.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright 2014 Wordnik, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.io.File
-
-object PHPWordnikApiCodegen extends BasicPHPGenerator {
-  def main(args: Array[String]) = generateClient(args)
-
-  override def supportingFiles = List(
-    ("Swagger.mustache", destinationDir + File.separator + apiPackage.get, "Swagger.php")
-  )
-
-  override def destinationDir = "samples/client/wordnik-api/php/wordnik"
-}
diff --git a/samples/client/wordnik-api-php/README.md b/samples/client/wordnik-api-php/README.md
deleted file mode 100644
index 9455aaf04da..00000000000
--- a/samples/client/wordnik-api-php/README.md
+++ /dev/null
@@ -1,47 +0,0 @@
-# PHP client for Wordnik.com API
-
-## Overview
-
-This is a PHP client for the Wordnik.com v4 API. For more information, see http://developer.wordnik.com/ .
-
-## Generation
-
-This client was generated using the provided script:
-
-```
-/bin/php-wordnik-api.sh
-```
-
-## Testing
-
-These tests require PHPUnit. If you require PHPUnit to be installed, first get PEAR:
-
-```sh
-wget http://pear.php.net/go-pear.phar
-php -d detect_unicode=0 go-pear.phar
-```
-
-Then install PHPUnit:
-
-```sh
-pear config-set auto_discover 1
-pear install pear.phpunit.de/PHPUnit
-```
-
-The tests require you to set three environment varibales:
-
-```sh
-export API_KEY=your api key
-export USER_NAME=some wordnik.com username
-export PASSWORD=the user's password
-```
-
-The tests can be run as follows:
-
-```sh
-phpunit tests/AccountApiTest.php
-phpunit tests/WordApiTest.php
-phpunit tests/WordsApiTest.php
-phpunit tests/WordListApiTest.php
-phpunit tests/WordListsApiTest.php
-```
diff --git a/samples/client/wordnik-api-php/tests/BaseApiTest.php b/samples/client/wordnik-api-php/tests/BaseApiTest.php
deleted file mode 100644
index ac32b689778..00000000000
--- a/samples/client/wordnik-api-php/tests/BaseApiTest.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-// Unit tests for PHP Wordnik API client.
-//
-// Requires you to set three environment varibales:
-//     API_KEY      your API key
-//     USER_NAME    the username of a user
-//     PASSWORD     the user's password
-
-// Run all tests:
-//
-//     phpunit tests/AccountApiTest.php
-//     phpunit tests/WordApiTest.php
-//     phpunit tests/WordsApiTest.php
-//     phpunit tests/WordListApiTest.php
-//     phpunit tests/WordListsApiTest.php
-
-// If you require PHPUnit to be installed, first get PEAR:
-//
-// $ wget http://pear.php.net/go-pear.phar
-// $ php -d detect_unicode=0 go-pear.phar
-//
-// Then install PHPUnit:
-//
-// $ pear config-set auto_discover
-// $ pear install pear.phpunit.de/PHPUnit
-
-
-require_once 'wordnik/Swagger.php';
-// This used to be required, but now gives an error:
-// Cannot redeclare phpunit_autoload()
-// require_once '/usr/lib/php/PHPUnit/Autoload.php';
-
-class BaseApiTest extends PHPUnit_Framework_TestCase {
-
-  public function setUp() {
-    $this->apiUrl = 'https://api.wordnik.com/v4';
-    $this->apiKey = getenv('API_KEY');
-    $this->username = getenv('USER_NAME');
-    $this->password = getenv('PASSWORD');
-    $this->client = new APIClient($this->apiKey, $this->apiUrl);
-    $this->accountApi = new AccountApi($this->client);
-    $this->wordApi = new WordApi($this->client);
-    $this->wordListApi = new WordListApi($this->client);
-    $this->wordListsApi = new WordListsApi($this->client);
-    $this->wordsApi = new WordsApi($this->client);
-  }
-
-  public function tearDown() {
-      unset($this->client);
-  }
-
-}
-
-
-?>
diff --git a/samples/client/wordnik-api-php/wordnik/AccountApi.php b/samples/client/wordnik-api-php/wordnik/AccountApi.php
deleted file mode 100644
index 6b77a5fe01c..00000000000
--- a/samples/client/wordnik-api-php/wordnik/AccountApi.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-/**
- *  Copyright 2014 SmartBear Software
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-/**
- *
- * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
- */
-class AccountApi {
-
-	function __construct($apiClient) {
-	  $this->apiClient = $apiClient;
-	}
-
-  /**
-	 * authenticate
-	 * Authenticates a User
-   * username, string: A confirmed Wordnik username (required)
-
-   * password, string: The user's password (required)
-
-   * @return AuthenticationToken
-	 */
-
-   public function authenticate($username, $password) {
-
-  		//parse inputs
-  		$resourcePath = "/account.{format}/authenticate/{username}";
-  		$resourcePath = str_replace("{format}", "json", $resourcePath);
-  		$method = "GET";
-      $queryParams = array();
-      $headerParams = array();
-      $headerParams['Accept'] = 'application/json';
-      $headerParams['Content-Type'] = 'application/json';
-
-      if($password != null) {
-  		  $queryParams['password'] = $this->apiClient->toQueryValue($password);
-  		}
-  		if($username != null) {
-  			$resourcePath = str_replace("{" . "username" . "}",
-  			                            $this->apiClient->toPathValue($username), $resourcePath);
-  		}
-  		//make the API Call
-      if (! isset($body)) {
-        $body = null;
-      }
-  		$response = $this->apiClient->callAPI($resourcePath, $method,
-  		                                      $queryParams, $body,
-  		                                      $headerParams);
-
-
-      if(! $response){
-          return null;
-        }
-
-  		$responseObject = $this->apiClient->deserialize($response,
-  		                                                'AuthenticationToken');
-  		return $responseObject;
-
-      }
-  /**
-	 * authenticatePost
-	 * Authenticates a user
-   * username, string: A confirmed Wordnik username (required)
-
-   * body, string: The user's password (required)
-
-   * @return AuthenticationToken
-	 */
-
-   public function authenticatePost($username, $body) {
-
-  		//parse inputs
-  		$resourcePath = "/account.{format}/authenticate/{username}";
-  		$resourcePath = str_replace("{format}", "json", $resourcePath);
-  		$method = "POST";
-      $queryParams = array();
-      $headerParams = array();
-      $headerParams['Accept'] = 'application/json';
-      $headerParams['Content-Type'] = 'application/json';
-
-      if($username != null) {
-  			$resourcePath = str_replace("{" . "username" . "}",
-  			                            $this->apiClient->toPathValue($username), $resourcePath);
-  		}
-  		//make the API Call
-      if (! isset($body)) {
-        $body = null;
-      }
-  		$response = $this->apiClient->callAPI($resourcePath, $method,
-  		                                      $queryParams, $body,
-  		                                      $headerParams);
-
-
-      if(! $response){
-          return null;
-        }
-
-  		$responseObject = $this->apiClient->deserialize($response,
-  		                                                'AuthenticationToken');
-  		return $responseObject;
-
-      }
-  /**
-	 * getWordListsForLoggedInUser
-	 * Fetches WordList objects for the logged-in user.
-   * auth_token, string: auth_token of logged-in user (required)
-
-   * skip, int: Results to skip (optional)
-
-   * limit, int: Maximum number of results to return (optional)
-
-   * @return array[WordList]
-	 */
-
-   public function getWordListsForLoggedInUser($auth_token, $skip=null, $limit=null) {
-
-  		//parse inputs
-  		$resourcePath = "/account.{format}/wordLists";
-  		$resourcePath = str_replace("{format}", "json", $resourcePath);
-  		$method = "GET";
-      $queryParams = array();
-      $headerParams = array();
-      $headerParams['Accept'] = 'application/json';
-      $headerParams['Content-Type'] = 'application/json';
-
-      if($skip != null) {
-  		  $queryParams['skip'] = $this->apiClient->toQueryValue($skip);
-  		}
-  		if($limit != null) {
-  		  $queryParams['limit'] = $this->apiClient->toQueryValue($limit);
-  		}
-  		if($auth_token != null) {
-  		 	$headerParams['auth_token'] = $this->apiClient->toHeaderValue($auth_token);
-  		}
-      //make the API Call
-      if (! isset($body)) {
-        $body = null;
-      }
-  		$response = $this->apiClient->callAPI($resourcePath, $method,
-  		                                      $queryParams, $body,
-  		                                      $headerParams);
-
-
-      if(! $response){
-          return null;
-        }
-
-  		$responseObject = $this->apiClient->deserialize($response,
-  		                                                'array[WordList]');
-  		return $responseObject;
-
-      }
-  /**
-	 * getApiTokenStatus
-	 * Returns usage statistics for the API account.
-   * api_key, string: Wordnik authentication token (optional)
-
-   * @return ApiTokenStatus
-	 */
-
-   public function getApiTokenStatus($api_key=null) {
-
-  		//parse inputs
-  		$resourcePath = "/account.{format}/apiTokenStatus";
-  		$resourcePath = str_replace("{format}", "json", $resourcePath);
-  		$method = "GET";
-      $queryParams = array();
-      $headerParams = array();
-      $headerParams['Accept'] = 'application/json';
-      $headerParams['Content-Type'] = 'application/json';
-
-      if($api_key != null) {
-  		 	$headerParams['api_key'] = $this->apiClient->toHeaderValue($api_key);
-  		}
-      //make the API Call
-      if (! isset($body)) {
-        $body = null;
-      }
-  		$response = $this->apiClient->callAPI($resourcePath, $method,
-  		                                      $queryParams, $body,
-  		                                      $headerParams);
-
-
-      if(! $response){
-          return null;
-        }
-
-  		$responseObject = $this->apiClient->deserialize($response,
-  		                                                'ApiTokenStatus');
-  		return $responseObject;
-
-      }
-  /**
-	 * getLoggedInUser
-	 * Returns the logged-in User
-   * auth_token, string: The auth token of the logged-in user, obtained by calling /account.{format}/authenticate/{username} (described above) (required)
-
-   * @return User
-	 */
-
-   public function getLoggedInUser($auth_token) {
-
-  		//parse inputs
-  		$resourcePath = "/account.{format}/user";
-  		$resourcePath = str_replace("{format}", "json", $resourcePath);
-  		$method = "GET";
-      $queryParams = array();
-      $headerParams = array();
-      $headerParams['Accept'] = 'application/json';
-      $headerParams['Content-Type'] = 'application/json';
-
-      if($auth_token != null) {
-  		 	$headerParams['auth_token'] = $this->apiClient->toHeaderValue($auth_token);
-  		}
-      //make the API Call
-      if (! isset($body)) {
-        $body = null;
-      }
-  		$response = $this->apiClient->callAPI($resourcePath, $method,
-  		                                      $queryParams, $body,
-  		                                      $headerParams);
-
-
-      if(! $response){
-          return null;
-        }
-
-  		$responseObject = $this->apiClient->deserialize($response,
-  		                                                'User');
-  		return $responseObject;
-
-      }
-  
-
-}
-
diff --git a/samples/client/wordnik-api/scala/src/test/scala/AccountApiTest.scala b/samples/client/wordnik-api/scala/src/test/scala/AccountApiTest.scala
deleted file mode 100644
index 474406fd229..00000000000
--- a/samples/client/wordnik-api/scala/src/test/scala/AccountApiTest.scala
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-@RunWith(classOf[JUnitRunner])
-class AccountApiTest extends FlatSpec with Matchers with BaseApiTest {
-  behavior of "AccountApi"
-  val api = new AccountApi
-
-  api.addHeader("api_key", API_KEY)
-
-  val auth = api.authenticate(USER_NAME, PASSWORD).get
-
-  it should "authenticate" in {
-    api.authenticate(USER_NAME, PASSWORD) match {
-      case Some(key) => {
-        key.token should not be (null)
-        key.userId should not be (0)
-        key.userSignature should not be null
-      }
-      case None => fail("couldn't authenticate")
-    }
-  }
-
-  it should "authenticate with post" in {
-    api.authenticatePost(USER_NAME, PASSWORD) match {
-      case Some(key) => {
-        key.token should not be (null)
-        key.userId should not be (0)
-        key.userSignature should not be null
-      }
-      case None => fail("couldn't authenticate")
-    }
-  }
-
-  it should "fetch word lists for the current user" in {
-    api.getWordListsForLoggedInUser(auth.token, 0, 15) match {
-      case Some(lists) => {
-        lists.size should not be (0)
-      }
-      case None => fail("didn't fetch lists for user")
-    }
-  }
-
-  it should "fetch api token status" in {
-    api.getApiTokenStatus(API_KEY) match {
-      case Some(status) => {
-        status.valid should be(true)
-        status.token should not be (null)
-        status.remainingCalls should not be (0)
-      }
-      case None => fail("ooops")
-    }
-  }
-
-  it should "get the logged in user" in {
-    api.getLoggedInUser(auth.token) match {
-      case Some(user) => {
-        user.id should not be (0)
-        user.username should be(USER_NAME)
-        user.status should be(0)
-        user.email should not be (null)
-      }
-      case None => fail("didn't get user")
-    }
-  }
-}
\ No newline at end of file
diff --git a/samples/client/wordnik-api/scala/src/test/scala/WordApiTest.scala b/samples/client/wordnik-api/scala/src/test/scala/WordApiTest.scala
deleted file mode 100644
index 58401c904d5..00000000000
--- a/samples/client/wordnik-api/scala/src/test/scala/WordApiTest.scala
+++ /dev/null
@@ -1,131 +0,0 @@
-import scala.io.Source
-
-@RunWith(classOf[JUnitRunner])
-class WordApiTest extends FlatSpec with Matchers with BaseApiTest {
-  behavior of "WordApi"
-  val api = new WordApi
-
-  api.addHeader("api_key", API_KEY)
-
-  it should "verify the word apis" in {
-    val json = Source.fromURL("http://api.wordnik.com/v4/word.json").mkString
-    val doc = JsonUtil.getJsonMapper.readValue(json, classOf[Documentation])
-    assert(doc.getApis.size === 12)
-  }
-
-  it should "fetch a word" in {
-    api.getWord("cat") match {
-      case Some(word) => {
-        word.word should be("cat")
-        word should not be (null)
-      }
-      case None => fail("didn't find word cat")
-    }
-  }
-
-  it should "fetch a word with suggestions" in {
-    api.getWord("cAt", "false", "true") match {
-      case Some(word) => {
-        word.word should be("cAt")
-        word.suggestions.size should be(1)
-        word.suggestions(0) should be("cat")
-        word should not be (null)
-      }
-      case None => fail("didn't find word cAt")
-    }
-  }
-
-  it should "fetch a word with canonical form" in {
-    api.getWord("cAt", "true") match {
-      case Some(word) => {
-        word.word should be("cat")
-        word should not be (null)
-      }
-      case None => fail("didn't find word cat")
-    }
-  }
-
-  it should "fetch definitions for a word" in {
-    api.getDefinitions("cat", null, null, 10) match {
-      case Some(definitions) => {
-        definitions.size should be(10)
-      }
-      case None => fail("didn't find definitions for cat")
-    }
-  }
-
-  it should "fetch examples for a word" in {
-    api.getExamples("cat", "false", "false", 0, 5) match {
-      case Some(examples) => {
-        examples.examples.size should be(5)
-      }
-      case None => fail("didn't find examples for cat")
-    }
-  }
-
-  it should "fetch a top example for a word" in {
-    api.getTopExample("cat") match {
-      case Some(example) => {
-        example.word should be("cat")
-      }
-      case None => fail("didn't find examples for cat")
-    }
-  }
-
-  it should "get text pronunciations for a word" in {
-    api.getTextPronunciations("cat", null, null, null, 2) match {
-      case Some(prons) => {
-        prons.size should be(2)
-      }
-      case None => fail("didn't find prons for cat")
-    }
-  }
-
-  it should "get hyphenation for a word" in {
-    api.getHyphenation("catalog", null, null) match {
-      case Some(hyphenation) => {
-        hyphenation.size should be(3)
-      }
-      case None => fail("didn't find hyphenation for catalog")
-    }
-  }
-
-  it should "get word frequency for a word" in {
-    api.getWordFrequency("cat") match {
-      case Some(frequency) => {
-        frequency.totalCount should not be (0)
-      }
-      case None => fail("didn't find frequency for cat")
-    }
-  }
-
-  it should "get word phrases for a word" in {
-    api.getPhrases("money", 10, 0) match {
-      case Some(phrases) => {
-        phrases.size should not be (0)
-      }
-      case None => fail("didn't find phrases for money")
-    }
-  }
-
-  it should "get related words" in {
-    api.getRelatedWords("cat", null, null) match {
-      case Some(relateds) => {
-        var count = 0
-        relateds.foreach(related => {
-          related.words.size should (be <= 10)
-        })
-      }
-      case None => fail("didn't find related words")
-    }
-  }
-
-  it should "get audio for a word" in {
-    api.getAudio("cat", "true", 2) match {
-      case Some(audio) => {
-        audio.size should be(2)
-      }
-      case None => fail("didn't find audio")
-    }
-  }
-}
diff --git a/samples/client/wordnik-api/scala/src/test/scala/WordListApiTest.scala b/samples/client/wordnik-api/scala/src/test/scala/WordListApiTest.scala
deleted file mode 100644
index 1c5adaa871b..00000000000
--- a/samples/client/wordnik-api/scala/src/test/scala/WordListApiTest.scala
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-@RunWith(classOf[JUnitRunner])
-class WordListApiTest extends FlatSpec with Matchers with BaseApiTest {
-  behavior of "WordListApi"
-  val api = new WordListApi
-
-  api.addHeader("api_key", API_KEY)
-
-  val accountApi = new AccountApi
-  val auth = accountApi.authenticate(USER_NAME, PASSWORD).get
-  val existingList = accountApi.getWordListsForLoggedInUser(auth.token, 0, 1).get.head
-
-  val wordListsApi = new WordListsApi
-
-  val wordList = WordList(
-    0, //  id
-    null, //  permalink
-    "my test list", // name
-    new java.util.Date, //created at
-    null, // updated at
-    null, //  lastActivityAt
-    null, //  username
-    0, //  user id
-    "some words I want to play with", // description
-    0, //  words in list
-    "PUBLIC") //  type
-
-  var sampleList = wordListsApi.createWordList(wordList, auth.token) match {
-    case Some(wl) => wl
-    case None => throw new Exception("can't create test list to run tests with")
-  }
-
-  it should "get a word list by permalink" in {
-    api.getWordListByPermalink(existingList.permalink, auth.token) match {
-      case Some(list) => {
-        list should not be (null)
-      }
-      case None => fail("didn't get existing word list")
-    }
-  }
-
-  it should "update a word list" in {
-    val description = "list updated at " + new java.util.Date
-
-    val updatedList = existingList.copy(description = description)
-    api.updateWordList(updatedList.permalink, updatedList, auth.token)
-
-    api.getWordListByPermalink(updatedList.permalink, auth.token) match {
-      case Some(list) => list.description should be(description)
-      case None => fail("didn't update word list")
-    }
-  }
-
-  it should "add words to a list" in {
-    val wordsToAdd = List(
-      StringValue("delicious"),
-      StringValue("tasty"),
-      StringValue("scrumptious")
-    )
-
-    api.addWordsToWordList(sampleList.permalink, wordsToAdd, auth.token)
-  }
-
-  it should "get word list words" in {
-    api.getWordListWords(sampleList.permalink, auth.token) match {
-      case Some(words) => {
-        ((words.map(w => w.word)).toSet & Set("delicious", "tasty", "scrumptious")).size should be(3)
-      }
-      case None => fail("didn't get word list")
-    }
-  }
-
-  it should "remove words from a list" in {
-    val wordsToRemove = List(
-      StringValue("delicious"),
-      StringValue("tasty")
-    )
-
-    api.deleteWordsFromWordList(sampleList.permalink, wordsToRemove, auth.token)
-    api.getWordListWords(sampleList.permalink, auth.token).get.size should be(1)
-  }
-
-  it should "delete a word list" in {
-    api.deleteWordList(sampleList.permalink, auth.token)
-  }
-}
\ No newline at end of file
diff --git a/samples/client/wordnik-api/scala/src/test/scala/WordsApiTest.scala b/samples/client/wordnik-api/scala/src/test/scala/WordsApiTest.scala
deleted file mode 100644
index 1f518940bcb..00000000000
--- a/samples/client/wordnik-api/scala/src/test/scala/WordsApiTest.scala
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-@RunWith(classOf[JUnitRunner])
-class WordsApiTest extends FlatSpec with Matchers with BaseApiTest {
-  behavior of "WordsApi"
-  val api = new WordsApi
-
-  api.addHeader("api_key", API_KEY)
-
-  it should "search words by path" in {
-    api.searchWords("ca", null, null) match {
-      case Some(words) => {
-        words should not be (null)
-        words.searchResults(0).word should be("ca")
-        words.searchResults.size should be(11)
-        words.totalResults should not be (0)
-      }
-      case None => fail("didn't find word cat")
-    }
-  }
-
-  it should "get word of the day" in {
-    api.getWordOfTheDay(null) match {
-      case Some(wotd) => {
-        wotd.word should not be (null)
-      }
-      case None => fail("didn't get wotd")
-    }
-  }
-
-  it should "call the reverse dictionary" in {
-    api.reverseDictionary("hairy", null, null, null, null, null, null, null, null) match {
-      case Some(search) => {
-        search.totalResults should not be (0)
-        search.results.size should not be (0)
-      }
-      case None => fail("failed to get words")
-    }
-  }
-
-  it should "get 10 random words" in {
-    api.getRandomWords(null, null, null, null) match {
-      case Some(words) => {
-        words.size should be(10)
-      }
-      case None => fail("didn't get random words")
-    }
-  }
-
-  it should "get one random words" in {
-    api.getRandomWord(null, null) match {
-      case Some(word) => {
-        word should not be (null)
-      }
-      case None => fail("didn't get random word")
-    }
-  }
-}
\ No newline at end of file
diff --git a/samples/client/wordnik/akka-scala/pom.xml b/samples/client/wordnik/akka-scala/pom.xml
deleted file mode 100644
index 07ba600a902..00000000000
--- a/samples/client/wordnik/akka-scala/pom.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.wordnik</groupId>
-    <artifactId>swagger-client</artifactId>
-    <packaging>jar</packaging>
-    <name>swagger-client</name>
-    <version>1.0.0</version>
-    <prerequisites>
-        <maven>2.2.0</maven>
-    </prerequisites>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>maven-mongodb-plugin-repo</id>
-            <name>maven mongodb plugin repository</name>
-            <url>http://maven-mongodb-plugin.googlecode.com/svn/maven/repo</url>
-            <layout>default</layout>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.12</version>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>loggerPath</name>
-                            <value>conf/log4j.properties</value>
-                        </property>
-                    </systemProperties>
-                    <argLine>-Xms512m -Xmx1500m</argLine>
-                    <parallel>methods</parallel>
-                    <forkMode>pertest</forkMode>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- attach test jar -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.2</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>jar</goal>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add_sources</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>
-                                    src/main/java
-                                </source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>add_test_sources</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>
-                                    src/test/java
-                                </source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>
-                        1.6
-                    </source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>net.alchim31.maven</groupId>
-                <artifactId>scala-maven-plugin</artifactId>
-                <version>${scala-maven-plugin-version}</version>
-                <executions>
-                    <execution>
-                        <id>scala-compile-first</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                            <goal>compile</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>scala-test-compile</id>
-                        <phase>process-test-resources</phase>
-                        <goals>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <args>
-                        <arg>-feature</arg>
-                    </args>
-                    <jvmArgs>
-                        <jvmArg>-Xms128m</jvmArg>
-                        <jvmArg>-Xmx1500m</jvmArg>
-                    </jvmArgs>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.scala-tools</groupId>
-                <artifactId>maven-scala-plugin</artifactId>
-                <configuration>
-                    <scalaVersion>${scala-version}</scalaVersion>
-                </configuration>
-            </plugin>
-        </plugins>
-    </reporting>
-    <dependencies>
-        <dependency>
-            <groupId>org.scala-lang</groupId>
-            <artifactId>scala-library</artifactId>
-            <version>${scala-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.wordnik</groupId>
-            <artifactId>swagger-core</artifactId>
-            <version>${swagger-core-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.scalatest</groupId>
-            <artifactId>scalatest_2.10</artifactId>
-            <version>${scala-test-version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit-version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>${joda-time-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.joda</groupId>
-            <artifactId>joda-convert</artifactId>
-            <version>${joda-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.typesafe</groupId>
-            <artifactId>config</artifactId>
-            <version>1.2.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-actor_2.10</artifactId>
-            <version>${akka-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.spray</groupId>
-            <artifactId>spray-client</artifactId>
-            <version>${spray-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.json4s</groupId>
-            <artifactId>json4s-jackson_2.10</artifactId>
-            <version>${json4s-jackson-version}</version>
-        </dependency>
-    </dependencies>
-    <properties>
-        <scala-version>2.10.4</scala-version>
-        <json4s-jackson-version>3.2.11</json4s-jackson-version>
-        <json4s-ext-version>3.2.11</json4s-ext-version>
-        <spray-version>1.3.1</spray-version>
-        <akka-version>2.3.9</akka-version>
-        <joda-version>1.2</joda-version>
-        <joda-time-version>2.2</joda-time-version>
-        <swagger-core-version>1.5.0-M1</swagger-core-version>
-        <maven-plugin.version>1.0.0</maven-plugin.version>
-
-        <junit-version>4.8.1</junit-version>
-        <scala-maven-plugin-version>3.1.5</scala-maven-plugin-version>
-        <scala-test-version>2.1.3</scala-test-version>
-    </properties>
-</project>
diff --git a/samples/client/wordnik/akka-scala/src/main/resources/reference.conf b/samples/client/wordnik/akka-scala/src/main/resources/reference.conf
deleted file mode 100644
index 41f5f4a60cc..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/resources/reference.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-io.swagger.client {
-
-  apiRequest {
-
-    compression {
-      enabled: false
-      size-threshold: 0
-    }
-
-    trust-certificates: true
-
-    connection-timeout: 5000ms
-
-    default-headers {
-      "userAgent": "swagger-client_1.0.0"
-    }
-
-    // let you define custom http status code, as in :
-    // { code: 601, reason: "some custom http status code", success: false }
-    custom-codes: []
-  }
-}
-
-spray.can.host-connector.max-redirects = 10
\ No newline at end of file
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/AccountApi.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/AccountApi.scala
deleted file mode 100644
index 0b722750b24..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/AccountApi.scala
+++ /dev/null
@@ -1,100 +0,0 @@
-package io.swagger.client.api
-
-object AccountApi {
-
-  /**
-   *
-   *
-   * Expected answers:
-   * code 200 : ApiTokenStatus (Usage statistics for the supplied API key)
-   * code 400 :  (No token supplied.)
-   * code 404 :  (No API account with supplied token.)
-   *
-   * @param apiKey Wordnik authentication token
-   */
-  def getApiTokenStatus(apiKey: Option[String] = None): ApiRequest[ApiTokenStatus] =
-    ApiRequest[ApiTokenStatus](ApiMethods.GET, "https://api.wordnik.com/v4", "/account.json/apiTokenStatus", "application/json")
-      .withHeaderParam("api_key", apiKey)
-      .withSuccessResponse[ApiTokenStatus](200)
-      .withErrorResponse[Unit](400)
-      .withErrorResponse[Unit](404)
-
-  /**
-   *
-   *
-   * Expected answers:
-   * code 200 : AuthenticationToken (A valid authentication token)
-   * code 403 :  (Account not available.)
-   * code 404 :  (User not found.)
-   *
-   * @param username A confirmed Wordnik username
-   * @param password The user&#39;s password
-   */
-  def authenticate(username: String, password: String): ApiRequest[AuthenticationToken] =
-    ApiRequest[AuthenticationToken](ApiMethods.GET, "https://api.wordnik.com/v4", "/account.json/authenticate/{username}", "application/json")
-      .withQueryParam("password", password)
-      .withPathParam("username", username)
-      .withSuccessResponse[AuthenticationToken](200)
-      .withErrorResponse[Unit](403)
-      .withErrorResponse[Unit](404)
-
-  /**
-   *
-   *
-   * Expected answers:
-   * code 200 : AuthenticationToken (A valid authentication token)
-   * code 403 :  (Account not available.)
-   * code 404 :  (User not found.)
-   *
-   * @param username A confirmed Wordnik username
-   * @param body The user&#39;s password
-   */
-  def authenticatePost(username: String, body: String): ApiRequest[AuthenticationToken] =
-    ApiRequest[AuthenticationToken](ApiMethods.POST, "https://api.wordnik.com/v4", "/account.json/authenticate/{username}", "application/json")
-      .withBody(body)
-      .withPathParam("username", username)
-      .withSuccessResponse[AuthenticationToken](200)
-      .withErrorResponse[Unit](403)
-      .withErrorResponse[Unit](404)
-
-  /**
-   * Requires a valid auth_token to be set.
-   *
-   * Expected answers:
-   * code 200 : User (The logged-in user)
-   * code 403 :  (Not logged in.)
-   * code 404 :  (User not found.)
-   *
-   * @param authToken The auth token of the logged-in user, obtained by calling /account.json/authenticate/{username} (described above)
-   */
-  def getLoggedInUser(authToken: String): ApiRequest[User] =
-    ApiRequest[User](ApiMethods.GET, "https://api.wordnik.com/v4", "/account.json/user", "application/json")
-      .withHeaderParam("auth_token", authToken)
-      .withSuccessResponse[User](200)
-      .withErrorResponse[Unit](403)
-      .withErrorResponse[Unit](404)
-
-  /**
-   *
-   *
-   * Expected answers:
-   * code 200 : Seq[WordList] (success)
-   * code 403 :  (Not authenticated.)
-   * code 404 :  (User account not found.)
-   *
-   * @param authToken auth_token of logged-in user
-   * @param skip Results to skip
-   * @param limit Maximum number of results to return
-   */
-  def getWordListsForLoggedInUser(authToken: String, skip: Option[Int] = None, limit: Option[Int] = None): ApiRequest[Seq[WordList]] =
-    ApiRequest[Seq[WordList]](ApiMethods.GET, "https://api.wordnik.com/v4", "/account.json/wordLists", "application/json")
-      .withQueryParam("skip", skip)
-      .withQueryParam("limit", limit)
-      .withHeaderParam("auth_token", authToken)
-      .withSuccessResponse[Seq[WordList]](200)
-      .withErrorResponse[Unit](403)
-      .withErrorResponse[Unit](404)
-
-
-}
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/EnumsSerializers.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/EnumsSerializers.scala
deleted file mode 100644
index 43b0284db57..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/EnumsSerializers.scala
+++ /dev/null
@@ -1,37 +0,0 @@
-package io.swagger.client.api
-
-import scala.reflect.ClassTag
-
-object EnumsSerializers {
-
-  def all = Seq[Serializer[_]]()
-
-
-  private class EnumNameSerializer[E <: Enumeration : ClassTag](enum: E)
-    extends Serializer[E#Value] {
-
-    val EnumerationClass = classOf[E#Value]
-
-    def deserialize(implicit format: Formats):
-    PartialFunction[(TypeInfo, JValue), E#Value] = {
-      case (t@TypeInfo(EnumerationClass, _), json) if isValid(json) => {
-        json match {
-          case JString(value) =>
-            enum.withName(value)
-          case value =>
-            throw new MappingException(s"Can't convert $value to $EnumerationClass")
-        }
-      }
-    }
-
-    private[this] def isValid(json: JValue) = json match {
-      case JString(value) if enum.values.exists(_.toString == value) => true
-      case _ => false
-    }
-
-    def serialize(implicit format: Formats): PartialFunction[Any, JValue] = {
-      case i: E#Value => i.toString
-    }
-  }
-
-}
\ No newline at end of file
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/WordApi.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/WordApi.scala
deleted file mode 100644
index 04c0a046750..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/WordApi.scala
+++ /dev/null
@@ -1,242 +0,0 @@
-package io.swagger.client.api
-
-object WordApi {
-
-  /**
-   *
-   *
-   * Expected answers:
-   * code 200 : WordObject (success)
-   * code 400 :  (Invalid word supplied.)
-   *
-   * @param word String value of WordObject to return
-   * @param useCanonical If true will try to return the correct word root (&#39;cats&#39; -&gt; &#39;cat&#39;). If false returns exactly what was requested.
-   * @param includeSuggestions Return suggestions (for correct spelling, case variants, etc.)
-   */
-  def getWord(word: String, useCanonical: Option[String] = None, includeSuggestions: Option[String] = None): ApiRequest[WordObject] =
-    ApiRequest[WordObject](ApiMethods.GET, "https://api.wordnik.com/v4", "/word.json/{word}", "application/json")
-      .withQueryParam("useCanonical", useCanonical)
-      .withQueryParam("includeSuggestions", includeSuggestions)
-      .withPathParam("word", word)
-      .withSuccessResponse[WordObject](200)
-      .withErrorResponse[Unit](400)
-
-  /**
-   * The metadata includes a time-expiring fileUrl which allows reading the audio file directly from the API.  Currently only audio pronunciations from the American Heritage Dictionary in mp3 format are supported.
-   *
-   * Expected answers:
-   * code 200 : Seq[AudioFile] (success)
-   * code 400 :  (Invalid word supplied.)
-   *
-   * @param word Word to get audio for.
-   * @param useCanonical Use the canonical form of the word
-   * @param limit Maximum number of results to return
-   */
-  def getAudio(word: String, useCanonical: Option[String] = None, limit: Option[Int] = None): ApiRequest[Seq[AudioFile]] =
-    ApiRequest[Seq[AudioFile]](ApiMethods.GET, "https://api.wordnik.com/v4", "/word.json/{word}/audio", "application/json")
-      .withQueryParam("useCanonical", useCanonical)
-      .withQueryParam("limit", limit)
-      .withPathParam("word", word)
-      .withSuccessResponse[Seq[AudioFile]](200)
-      .withErrorResponse[Unit](400)
-
-  /**
-   *
-   *
-   * Expected answers:
-   * code 200 : Seq[Definition] (success)
-   * code 400 :  (Invalid word supplied.)
-   * code 404 :  (No definitions found.)
-   *
-   * @param word Word to return definitions for
-   * @param limit Maximum number of results to return
-   * @param partOfSpeech CSV list of part-of-speech types
-   * @param includeRelated Return related words with definitions
-   * @param sourceDictionaries Source dictionary to return definitions from.  If &#39;all&#39; is received, results are returned from all sources. If multiple values are received (e.g. &#39;century,wiktionary&#39;), results are returned from the first specified dictionary that has definitions. If left blank, results are returned from the first dictionary that has definitions. By default, dictionaries are searched in this order: ahd, wiktionary, webster, century, wordnet
-   * @param useCanonical If true will try to return the correct word root (&#39;cats&#39; -&gt; &#39;cat&#39;). If false returns exactly what was requested.
-   * @param includeTags Return a closed set of XML tags in response
-   */
-  def getDefinitions(word: String, limit: Option[Int] = None, partOfSpeech: Option[String] = None, includeRelated: Option[String] = None, sourceDictionaries: Seq[String], useCanonical: Option[String] = None, includeTags: Option[String] = None): ApiRequest[Seq[Definition]] =
-    ApiRequest[Seq[Definition]](ApiMethods.GET, "https://api.wordnik.com/v4", "/word.json/{word}/definitions", "application/json")
-      .withQueryParam("limit", limit)
-      .withQueryParam("partOfSpeech", partOfSpeech)
-      .withQueryParam("includeRelated", includeRelated)
-      .withQueryParam("sourceDictionaries", ArrayValues(sourceDictionaries, CSV))
-      .withQueryParam("useCanonical", useCanonical)
-      .withQueryParam("includeTags", includeTags)
-      .withPathParam("word", word)
-      .withSuccessResponse[Seq[Definition]](200)
-      .withErrorResponse[Unit](400)
-      .withErrorResponse[Unit](404)
-
-  /**
-   *
-   *
-   * Expected answers:
-   * code 200 : Seq[String] (success)
-   * code 400 :  (Invalid word supplied.)
-   * code 404 :  (No definitions found.)
-   *
-   * @param word Word to return
-   * @param useCanonical If true will try to return the correct word root (&#39;cats&#39; -&gt; &#39;cat&#39;). If false returns exactly what was requested.
-   */
-  def getEtymologies(word: String, useCanonical: Option[String] = None): ApiRequest[Seq[String]] =
-    ApiRequest[Seq[String]](ApiMethods.GET, "https://api.wordnik.com/v4", "/word.json/{word}/etymologies", "application/json")
-      .withQueryParam("useCanonical", useCanonical)
-      .withPathParam("word", word)
-      .withSuccessResponse[Seq[String]](200)
-      .withErrorResponse[Unit](400)
-      .withErrorResponse[Unit](404)
-
-  /**
-   *
-   *
-   * Expected answers:
-   * code 200 :  (success)
-   * code 400 :  (Invalid word supplied.)
-   *
-   * @param word Word to return examples for
-   * @param includeDuplicates Show duplicate examples from different sources
-   * @param useCanonical If true will try to return the correct word root (&#39;cats&#39; -&gt; &#39;cat&#39;). If false returns exactly what was requested.
-   * @param skip Results to skip
-   * @param limit Maximum number of results to return
-   */
-  def getExamples(word: String, includeDuplicates: Option[String] = None, useCanonical: Option[String] = None, skip: Option[Int] = None, limit: Option[Int] = None): ApiRequest[Unit] =
-    ApiRequest[Unit](ApiMethods.GET, "https://api.wordnik.com/v4", "/word.json/{word}/examples", "application/json")
-      .withQueryParam("includeDuplicates", includeDuplicates)
-      .withQueryParam("useCanonical", useCanonical)
-      .withQueryParam("skip", skip)
-      .withQueryParam("limit", limit)
-      .withPathParam("word", word)
-      .withSuccessResponse[Unit](200)
-      .withErrorResponse[Unit](400)
-
-  /**
-   *
-   *
-   * Expected answers:
-   * code 200 : FrequencySummary (success)
-   * code 400 :  (Invalid word supplied.)
-   * code 404 :  (No results.)
-   *
-   * @param word Word to return
-   * @param useCanonical If true will try to return the correct word root (&#39;cats&#39; -&gt; &#39;cat&#39;). If false returns exactly what was requested.
-   * @param startYear Starting Year
-   * @param endYear Ending Year
-   */
-  def getWordFrequency(word: String, useCanonical: Option[String] = None, startYear: Option[Int] = None, endYear: Option[Int] = None): ApiRequest[FrequencySummary] =
-    ApiRequest[FrequencySummary](ApiMethods.GET, "https://api.wordnik.com/v4", "/word.json/{word}/frequency", "application/json")
-      .withQueryParam("useCanonical", useCanonical)
-      .withQueryParam("startYear", startYear)
-      .withQueryParam("endYear", endYear)
-      .withPathParam("word", word)
-      .withSuccessResponse[FrequencySummary](200)
-      .withErrorResponse[Unit](400)
-      .withErrorResponse[Unit](404)
-
-  /**
-   *
-   *
-   * Expected answers:
-   * code 200 :  (success)
-   * code 400 :  (Invalid word supplied.)
-   *
-   * @param word Word to get syllables for
-   * @param useCanonical If true will try to return a correct word root (&#39;cats&#39; -&gt; &#39;cat&#39;). If false returns exactly what was requested.
-   * @param sourceDictionary Get from a single dictionary. Valid options: ahd, century, wiktionary, webster, and wordnet.
-   * @param limit Maximum number of results to return
-   */
-  def getHyphenation(word: String, useCanonical: Option[String] = None, sourceDictionary: Option[String] = None, limit: Option[Int] = None): ApiRequest[Unit] =
-    ApiRequest[Unit](ApiMethods.GET, "https://api.wordnik.com/v4", "/word.json/{word}/hyphenation", "application/json")
-      .withQueryParam("useCanonical", useCanonical)
-      .withQueryParam("sourceDictionary", sourceDictionary)
-      .withQueryParam("limit", limit)
-      .withPathParam("word", word)
-      .withSuccessResponse[Unit](200)
-      .withErrorResponse[Unit](400)
-
-  /**
-   *
-   *
-   * Expected answers:
-   * code 200 : Seq[Bigram] (success)
-   * code 400 :  (Invalid word supplied.)
-   *
-   * @param word Word to fetch phrases for
-   * @param limit Maximum number of results to return
-   * @param wlmi Minimum WLMI for the phrase
-   * @param useCanonical If true will try to return the correct word root (&#39;cats&#39; -&gt; &#39;cat&#39;). If false returns exactly what was requested.
-   */
-  def getPhrases(word: String, limit: Option[Int] = None, wlmi: Option[Int] = None, useCanonical: Option[String] = None): ApiRequest[Seq[Bigram]] =
-    ApiRequest[Seq[Bigram]](ApiMethods.GET, "https://api.wordnik.com/v4", "/word.json/{word}/phrases", "application/json")
-      .withQueryParam("limit", limit)
-      .withQueryParam("wlmi", wlmi)
-      .withQueryParam("useCanonical", useCanonical)
-      .withPathParam("word", word)
-      .withSuccessResponse[Seq[Bigram]](200)
-      .withErrorResponse[Unit](400)
-
-  /**
-   *
-   *
-   * Expected answers:
-   * code 200 :  (success)
-   * code 400 :  (Invalid word supplied.)
-   *
-   * @param word Word to get pronunciations for
-   * @param useCanonical If true will try to return a correct word root (&#39;cats&#39; -&gt; &#39;cat&#39;). If false returns exactly what was requested.
-   * @param sourceDictionary Get from a single dictionary
-   * @param typeFormat Text pronunciation type
-   * @param limit Maximum number of results to return
-   */
-  def getTextPronunciations(word: String, useCanonical: Option[String] = None, sourceDictionary: Option[String] = None, typeFormat: Option[String] = None, limit: Option[Int] = None): ApiRequest[Unit] =
-    ApiRequest[Unit](ApiMethods.GET, "https://api.wordnik.com/v4", "/word.json/{word}/pronunciations", "application/json")
-      .withQueryParam("useCanonical", useCanonical)
-      .withQueryParam("sourceDictionary", sourceDictionary)
-      .withQueryParam("typeFormat", typeFormat)
-      .withQueryParam("limit", limit)
-      .withPathParam("word", word)
-      .withSuccessResponse[Unit](200)
-      .withErrorResponse[Unit](400)
-
-  /**
-   *
-   *
-   * Expected answers:
-   * code 200 :  (success)
-   * code 400 :  (Invalid word supplied.)
-   *
-   * @param word Word to fetch relationships for
-   * @param useCanonical If true will try to return the correct word root (&#39;cats&#39; -&gt; &#39;cat&#39;). If false returns exactly what was requested.
-   * @param relationshipTypes Limits the total results per type of relationship type
-   * @param limitPerRelationshipType Restrict to the supplied relationship types
-   */
-  def getRelatedWords(word: String, useCanonical: Option[String] = None, relationshipTypes: Option[String] = None, limitPerRelationshipType: Option[Int] = None): ApiRequest[Unit] =
-    ApiRequest[Unit](ApiMethods.GET, "https://api.wordnik.com/v4", "/word.json/{word}/relatedWords", "application/json")
-      .withQueryParam("useCanonical", useCanonical)
-      .withQueryParam("relationshipTypes", relationshipTypes)
-      .withQueryParam("limitPerRelationshipType", limitPerRelationshipType)
-      .withPathParam("word", word)
-      .withSuccessResponse[Unit](200)
-      .withErrorResponse[Unit](400)
-
-  /**
-   *
-   *
-   * Expected answers:
-   * code 200 : Example (success)
-   * code 400 :  (Invalid word supplied.)
-   *
-   * @param word Word to fetch examples for
-   * @param useCanonical If true will try to return the correct word root (&#39;cats&#39; -&gt; &#39;cat&#39;). If false returns exactly what was requested.
-   */
-  def getTopExample(word: String, useCanonical: Option[String] = None): ApiRequest[Example] =
-    ApiRequest[Example](ApiMethods.GET, "https://api.wordnik.com/v4", "/word.json/{word}/topExample", "application/json")
-      .withQueryParam("useCanonical", useCanonical)
-      .withPathParam("word", word)
-      .withSuccessResponse[Example](200)
-      .withErrorResponse[Unit](400)
-
-
-}
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/WordListApi.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/WordListApi.scala
deleted file mode 100644
index e150a96ce77..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/WordListApi.scala
+++ /dev/null
@@ -1,147 +0,0 @@
-package io.swagger.client.api
-
-object WordListApi {
-
-  /**
-   *
-   *
-   * Expected answers:
-   * code 200 : WordList (success)
-   * code 400 :  (Invalid ID supplied)
-   * code 403 :  (Not Authorized to access WordList)
-   * code 404 :  (WordList not found)
-   *
-   * @param permalink permalink of WordList to fetch
-   * @param authToken The auth token of the logged-in user, obtained by calling /account.json/authenticate/{username} (described above)
-   */
-  def getWordListByPermalink(permalink: String, authToken: String): ApiRequest[WordList] =
-    ApiRequest[WordList](ApiMethods.GET, "https://api.wordnik.com/v4", "/wordList.json/{permalink}", "application/json")
-      .withPathParam("permalink", permalink)
-      .withHeaderParam("auth_token", authToken)
-      .withSuccessResponse[WordList](200)
-      .withErrorResponse[Unit](400)
-      .withErrorResponse[Unit](403)
-      .withErrorResponse[Unit](404)
-
-  /**
-   *
-   *
-   * Expected answers:
-   * code 200 :  (success)
-   * code 400 :  (Invalid ID supplied)
-   * code 403 :  (Not Authorized to update WordList)
-   * code 404 :  (WordList not found)
-   *
-   * @param permalink permalink of WordList to update
-   * @param body Updated WordList
-   * @param authToken The auth token of the logged-in user, obtained by calling /account.json/authenticate/{username} (described above)
-   */
-  def updateWordList(permalink: String, body: Option[WordList] = None, authToken: String): ApiRequest[Unit] =
-    ApiRequest[Unit](ApiMethods.PUT, "https://api.wordnik.com/v4", "/wordList.json/{permalink}", "application/json")
-      .withBody(body)
-      .withPathParam("permalink", permalink)
-      .withHeaderParam("auth_token", authToken)
-      .withSuccessResponse[Unit](200)
-      .withErrorResponse[Unit](400)
-      .withErrorResponse[Unit](403)
-      .withErrorResponse[Unit](404)
-
-  /**
-   *
-   *
-   * Expected answers:
-   * code 200 :  (success)
-   * code 400 :  (Invalid ID supplied)
-   * code 403 :  (Not Authorized to delete WordList)
-   * code 404 :  (WordList not found)
-   *
-   * @param permalink ID of WordList to delete
-   * @param authToken The auth token of the logged-in user, obtained by calling /account.json/authenticate/{username} (described above)
-   */
-  def deleteWordList(permalink: String, authToken: String): ApiRequest[Unit] =
-    ApiRequest[Unit](ApiMethods.DELETE, "https://api.wordnik.com/v4", "/wordList.json/{permalink}", "application/json")
-      .withPathParam("permalink", permalink)
-      .withHeaderParam("auth_token", authToken)
-      .withSuccessResponse[Unit](200)
-      .withErrorResponse[Unit](400)
-      .withErrorResponse[Unit](403)
-      .withErrorResponse[Unit](404)
-
-  /**
-   *
-   *
-   * Expected answers:
-   * code 200 :  (success)
-   * code 400 :  (Invalid permalink supplied)
-   * code 403 :  (Not Authorized to modify WordList)
-   * code 404 :  (WordList not found)
-   *
-   * @param permalink permalink of WordList to use
-   * @param body Words to remove from WordList
-   * @param authToken The auth token of the logged-in user, obtained by calling /account.json/authenticate/{username} (described above)
-   */
-  def deleteWordsFromWordList(permalink: String, body: Seq[StringValue], authToken: String): ApiRequest[Unit] =
-    ApiRequest[Unit](ApiMethods.POST, "https://api.wordnik.com/v4", "/wordList.json/{permalink}/deleteWords", "application/json")
-      .withBody(body)
-      .withPathParam("permalink", permalink)
-      .withHeaderParam("auth_token", authToken)
-      .withSuccessResponse[Unit](200)
-      .withErrorResponse[Unit](400)
-      .withErrorResponse[Unit](403)
-      .withErrorResponse[Unit](404)
-
-  /**
-   *
-   *
-   * Expected answers:
-   * code 200 :  (success)
-   * code 400 :  (Invalid ID supplied)
-   * code 403 :  (Not Authorized to access WordList)
-   * code 404 :  (WordList not found)
-   *
-   * @param permalink ID of WordList to use
-   * @param sortBy Field to sort by
-   * @param sortOrder Direction to sort
-   * @param skip Results to skip
-   * @param limit Maximum number of results to return
-   * @param authToken The auth token of the logged-in user, obtained by calling /account.json/authenticate/{username} (described above)
-   */
-  def getWordListWords(permalink: String, sortBy: Option[String] = None, sortOrder: Option[String] = None, skip: Option[Int] = None, limit: Option[Int] = None, authToken: String): ApiRequest[Unit] =
-    ApiRequest[Unit](ApiMethods.GET, "https://api.wordnik.com/v4", "/wordList.json/{permalink}/words", "application/json")
-      .withQueryParam("sortBy", sortBy)
-      .withQueryParam("sortOrder", sortOrder)
-      .withQueryParam("skip", skip)
-      .withQueryParam("limit", limit)
-      .withPathParam("permalink", permalink)
-      .withHeaderParam("auth_token", authToken)
-      .withSuccessResponse[Unit](200)
-      .withErrorResponse[Unit](400)
-      .withErrorResponse[Unit](403)
-      .withErrorResponse[Unit](404)
-
-  /**
-   *
-   *
-   * Expected answers:
-   * code 200 :  (success)
-   * code 400 :  (Invalid permalink supplied)
-   * code 403 :  (Not Authorized to access WordList)
-   * code 404 :  (WordList not found)
-   *
-   * @param permalink permalink of WordList to user
-   * @param body Array of words to add to WordList
-   * @param authToken The auth token of the logged-in user, obtained by calling /account.json/authenticate/{username} (described above)
-   */
-  def addWordsToWordList(permalink: String, body: Seq[StringValue], authToken: String): ApiRequest[Unit] =
-    ApiRequest[Unit](ApiMethods.POST, "https://api.wordnik.com/v4", "/wordList.json/{permalink}/words", "application/json")
-      .withBody(body)
-      .withPathParam("permalink", permalink)
-      .withHeaderParam("auth_token", authToken)
-      .withSuccessResponse[Unit](200)
-      .withErrorResponse[Unit](400)
-      .withErrorResponse[Unit](403)
-      .withErrorResponse[Unit](404)
-
-
-}
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/WordListsApi.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/WordListsApi.scala
deleted file mode 100644
index ad1e1e95877..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/WordListsApi.scala
+++ /dev/null
@@ -1,28 +0,0 @@
-package io.swagger.client.api
-
-object WordListsApi {
-
-  /**
-   *
-   *
-   * Expected answers:
-   * code 200 : WordList (success)
-   * code 400 :  (Invalid WordList supplied or mandatory fields are missing)
-   * code 403 :  (Not authenticated)
-   * code 404 :  (WordList owner not found)
-   *
-   * @param body WordList to create
-   * @param authToken The auth token of the logged-in user, obtained by calling /account.json/authenticate/{username} (described above)
-   */
-  def createWordList(body: Option[WordList] = None, authToken: String): ApiRequest[WordList] =
-    ApiRequest[WordList](ApiMethods.POST, "https://api.wordnik.com/v4", "/wordLists.json", "application/json")
-      .withBody(body)
-      .withHeaderParam("auth_token", authToken)
-      .withSuccessResponse[WordList](200)
-      .withErrorResponse[Unit](400)
-      .withErrorResponse[Unit](403)
-      .withErrorResponse[Unit](404)
-
-
-}
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/WordsApi.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/WordsApi.scala
deleted file mode 100644
index 413271f6665..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/api/WordsApi.scala
+++ /dev/null
@@ -1,172 +0,0 @@
-package io.swagger.client.api
-
-object WordsApi {
-
-  /**
-   *
-   *
-   * Expected answers:
-   * code 200 : WordObject (success)
-   * code 404 :  (No word found.)
-   *
-   * @param hasDictionaryDef Only return words with dictionary definitions
-   * @param includePartOfSpeech CSV part-of-speech values to include
-   * @param excludePartOfSpeech CSV part-of-speech values to exclude
-   * @param minCorpusCount Minimum corpus frequency for terms
-   * @param maxCorpusCount Maximum corpus frequency for terms
-   * @param minDictionaryCount Minimum dictionary count
-   * @param maxDictionaryCount Maximum dictionary count
-   * @param minLength Minimum word length
-   * @param maxLength Maximum word length
-   */
-  def getRandomWord(hasDictionaryDef: Option[String] = None, includePartOfSpeech: Option[String] = None, excludePartOfSpeech: Option[String] = None, minCorpusCount: Option[Int] = None, maxCorpusCount: Option[Int] = None, minDictionaryCount: Option[Int] = None, maxDictionaryCount: Option[Int] = None, minLength: Option[Int] = None, maxLength: Option[Int] = None): ApiRequest[WordObject] =
-    ApiRequest[WordObject](ApiMethods.GET, "https://api.wordnik.com/v4", "/words.json/randomWord", "application/json")
-      .withQueryParam("hasDictionaryDef", hasDictionaryDef)
-      .withQueryParam("includePartOfSpeech", includePartOfSpeech)
-      .withQueryParam("excludePartOfSpeech", excludePartOfSpeech)
-      .withQueryParam("minCorpusCount", minCorpusCount)
-      .withQueryParam("maxCorpusCount", maxCorpusCount)
-      .withQueryParam("minDictionaryCount", minDictionaryCount)
-      .withQueryParam("maxDictionaryCount", maxDictionaryCount)
-      .withQueryParam("minLength", minLength)
-      .withQueryParam("maxLength", maxLength)
-      .withSuccessResponse[WordObject](200)
-      .withErrorResponse[Unit](404)
-
-  /**
-   *
-   *
-   * Expected answers:
-   * code 200 :  (success)
-   * code 400 :  (Invalid term supplied.)
-   * code 404 :  (No results.)
-   *
-   * @param hasDictionaryDef Only return words with dictionary definitions
-   * @param includePartOfSpeech CSV part-of-speech values to include
-   * @param excludePartOfSpeech CSV part-of-speech values to exclude
-   * @param minCorpusCount Minimum corpus frequency for terms
-   * @param maxCorpusCount Maximum corpus frequency for terms
-   * @param minDictionaryCount Minimum dictionary count
-   * @param maxDictionaryCount Maximum dictionary count
-   * @param minLength Minimum word length
-   * @param maxLength Maximum word length
-   * @param sortBy Attribute to sort by
-   * @param sortOrder Sort direction
-   * @param limit Maximum number of results to return
-   */
-  def getRandomWords(hasDictionaryDef: Option[String] = None, includePartOfSpeech: Option[String] = None, excludePartOfSpeech: Option[String] = None, minCorpusCount: Option[Int] = None, maxCorpusCount: Option[Int] = None, minDictionaryCount: Option[Int] = None, maxDictionaryCount: Option[Int] = None, minLength: Option[Int] = None, maxLength: Option[Int] = None, sortBy: Option[String] = None, sortOrder: Option[String] = None, limit: Option[Int] = None): ApiRequest[Unit] =
-    ApiRequest[Unit](ApiMethods.GET, "https://api.wordnik.com/v4", "/words.json/randomWords", "application/json")
-      .withQueryParam("hasDictionaryDef", hasDictionaryDef)
-      .withQueryParam("includePartOfSpeech", includePartOfSpeech)
-      .withQueryParam("excludePartOfSpeech", excludePartOfSpeech)
-      .withQueryParam("minCorpusCount", minCorpusCount)
-      .withQueryParam("maxCorpusCount", maxCorpusCount)
-      .withQueryParam("minDictionaryCount", minDictionaryCount)
-      .withQueryParam("maxDictionaryCount", maxDictionaryCount)
-      .withQueryParam("minLength", minLength)
-      .withQueryParam("maxLength", maxLength)
-      .withQueryParam("sortBy", sortBy)
-      .withQueryParam("sortOrder", sortOrder)
-      .withQueryParam("limit", limit)
-      .withSuccessResponse[Unit](200)
-      .withErrorResponse[Unit](400)
-      .withErrorResponse[Unit](404)
-
-  /**
-   *
-   *
-   * Expected answers:
-   * code 200 : DefinitionSearchResults (success)
-   * code 400 :  (Invalid term supplied.)
-   *
-   * @param query Search term
-   * @param findSenseForWord Restricts words and finds closest sense
-   * @param includeSourceDictionaries Only include these comma-delimited source dictionaries
-   * @param excludeSourceDictionaries Exclude these comma-delimited source dictionaries
-   * @param includePartOfSpeech Only include these comma-delimited parts of speech
-   * @param excludePartOfSpeech Exclude these comma-delimited parts of speech
-   * @param minCorpusCount Minimum corpus frequency for terms
-   * @param maxCorpusCount Maximum corpus frequency for terms
-   * @param minLength Minimum word length
-   * @param maxLength Maximum word length
-   * @param expandTerms Expand terms
-   * @param includeTags Return a closed set of XML tags in response
-   * @param sortBy Attribute to sort by
-   * @param sortOrder Sort direction
-   * @param skip Results to skip
-   * @param limit Maximum number of results to return
-   */
-  def reverseDictionary(query: String, findSenseForWord: Option[String] = None, includeSourceDictionaries: Option[String] = None, excludeSourceDictionaries: Option[String] = None, includePartOfSpeech: Option[String] = None, excludePartOfSpeech: Option[String] = None, minCorpusCount: Option[Int] = None, maxCorpusCount: Option[Int] = None, minLength: Option[Int] = None, maxLength: Option[Int] = None, expandTerms: Option[String] = None, includeTags: Option[String] = None, sortBy: Option[String] = None, sortOrder: Option[String] = None, skip: Option[String] = None, limit: Option[Int] = None): ApiRequest[DefinitionSearchResults] =
-    ApiRequest[DefinitionSearchResults](ApiMethods.GET, "https://api.wordnik.com/v4", "/words.json/reverseDictionary", "application/json")
-      .withQueryParam("query", query)
-      .withQueryParam("findSenseForWord", findSenseForWord)
-      .withQueryParam("includeSourceDictionaries", includeSourceDictionaries)
-      .withQueryParam("excludeSourceDictionaries", excludeSourceDictionaries)
-      .withQueryParam("includePartOfSpeech", includePartOfSpeech)
-      .withQueryParam("excludePartOfSpeech", excludePartOfSpeech)
-      .withQueryParam("minCorpusCount", minCorpusCount)
-      .withQueryParam("maxCorpusCount", maxCorpusCount)
-      .withQueryParam("minLength", minLength)
-      .withQueryParam("maxLength", maxLength)
-      .withQueryParam("expandTerms", expandTerms)
-      .withQueryParam("includeTags", includeTags)
-      .withQueryParam("sortBy", sortBy)
-      .withQueryParam("sortOrder", sortOrder)
-      .withQueryParam("skip", skip)
-      .withQueryParam("limit", limit)
-      .withSuccessResponse[DefinitionSearchResults](200)
-      .withErrorResponse[Unit](400)
-
-  /**
-   *
-   *
-   * Expected answers:
-   * code 200 : WordSearchResults (success)
-   * code 400 :  (Invalid query supplied.)
-   *
-   * @param query Search query
-   * @param caseSensitive Search case sensitive
-   * @param includePartOfSpeech Only include these comma-delimited parts of speech
-   * @param excludePartOfSpeech Exclude these comma-delimited parts of speech
-   * @param minCorpusCount Minimum corpus frequency for terms
-   * @param maxCorpusCount Maximum corpus frequency for terms
-   * @param minDictionaryCount Minimum number of dictionary entries for words returned
-   * @param maxDictionaryCount Maximum dictionary definition count
-   * @param minLength Minimum word length
-   * @param maxLength Maximum word length
-   * @param skip Results to skip
-   * @param limit Maximum number of results to return
-   */
-  def searchWords(query: String, caseSensitive: Option[String] = None, includePartOfSpeech: Option[String] = None, excludePartOfSpeech: Option[String] = None, minCorpusCount: Option[Int] = None, maxCorpusCount: Option[Int] = None, minDictionaryCount: Option[Int] = None, maxDictionaryCount: Option[Int] = None, minLength: Option[Int] = None, maxLength: Option[Int] = None, skip: Option[Int] = None, limit: Option[Int] = None): ApiRequest[WordSearchResults] =
-    ApiRequest[WordSearchResults](ApiMethods.GET, "https://api.wordnik.com/v4", "/words.json/search/{query}", "application/json")
-      .withQueryParam("caseSensitive", caseSensitive)
-      .withQueryParam("includePartOfSpeech", includePartOfSpeech)
-      .withQueryParam("excludePartOfSpeech", excludePartOfSpeech)
-      .withQueryParam("minCorpusCount", minCorpusCount)
-      .withQueryParam("maxCorpusCount", maxCorpusCount)
-      .withQueryParam("minDictionaryCount", minDictionaryCount)
-      .withQueryParam("maxDictionaryCount", maxDictionaryCount)
-      .withQueryParam("minLength", minLength)
-      .withQueryParam("maxLength", maxLength)
-      .withQueryParam("skip", skip)
-      .withQueryParam("limit", limit)
-      .withPathParam("query", query)
-      .withSuccessResponse[WordSearchResults](200)
-      .withErrorResponse[Unit](400)
-
-  /**
-   *
-   *
-   * Expected answers:
-   * code 0 : WordOfTheDay (success)
-   *
-   * @param date Fetches by date in yyyy-MM-dd
-   */
-  def getWordOfTheDay(date: Option[String] = None): ApiRequest[WordOfTheDay] =
-    ApiRequest[WordOfTheDay](ApiMethods.GET, "https://api.wordnik.com/v4", "/words.json/wordOfTheDay", "application/json")
-      .withQueryParam("date", date)
-      .withDefaultSuccessResponse[WordOfTheDay]
-
-
-}
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/core/ApiInvoker.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/core/ApiInvoker.scala
deleted file mode 100644
index 01569183c48..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/core/ApiInvoker.scala
+++ /dev/null
@@ -1,297 +0,0 @@
-package io.swagger.client.core
-
-import java.io.File
-import java.security.cert.X509Certificate
-import javax.net.ssl._
-
-import scala.concurrent.{ExecutionContext, Future}
-import scala.reflect.ClassTag
-import scala.util.control.NonFatal
-
-object ApiInvoker {
-
-  def apply()(implicit system: ActorSystem): ApiInvoker =
-    apply(DefaultFormats + DateTimeSerializer)
-
-  def apply(serializers: Traversable[Serializer[_]])(implicit system: ActorSystem): ApiInvoker =
-    apply(DefaultFormats + DateTimeSerializer ++ serializers)
-
-  def apply(formats: Formats)(implicit system: ActorSystem): ApiInvoker = new ApiInvoker(formats)
-
-  def addCustomStatusCode(code: CustomStatusCode): Unit = addCustomStatusCode(code.value, code.reason, code.isSuccess)
-
-  def addCustomStatusCode(code: Int, reason: String = "Application defined code", isSuccess: Boolean = true) = {
-    StatusCodes.getForKey(code) foreach { c =>
-      StatusCodes.registerCustom(code, reason, reason, isSuccess, allowsEntity = true)
-    }
-  }
-
-  case class CustomStatusCode(value: Int, reason: String = "Application-defined status code", isSuccess: Boolean = true)
-
-  /**
-   * Allows request execution without calling apiInvoker.execute(request)
-   * request.response can be used to get a future of the ApiResponse generated.
-   * request.result can be used to get a future of the expected ApiResponse content. If content doesn't match, a
-   * Future will failed with a ClassCastException
-   * @param request the apiRequest to be executed
-   */
-  implicit class ApiRequestImprovements[T](request: ApiRequest[T]) {
-
-    def response(invoker: ApiInvoker)(implicit ec: ExecutionContext, system: ActorSystem): Future[ApiResponse[T]] =
-      response(ec, system, invoker)
-
-    def response(implicit ec: ExecutionContext, system: ActorSystem, invoker: ApiInvoker): Future[ApiResponse[T]] =
-      invoker.execute(request)
-
-    def result[U <: T](implicit c: ClassTag[U], ec: ExecutionContext, system: ActorSystem, invoker: ApiInvoker): Future[U] =
-      invoker.execute(request).map(_.content).mapTo[U]
-
-  }
-
-  /**
-   * Allows transformation from ApiMethod to spray HttpMethods
-   * @param method the ApiMethod to be converted
-   */
-  implicit class ApiMethodExtensions(val method: ApiMethod) {
-    def toSprayMethod: HttpMethod = HttpMethods.getForKey(method.value).getOrElse(HttpMethods.GET)
-  }
-
-  case object DateTimeSerializer extends CustomSerializer[DateTime](format => ( {
-    case JString(s) =>
-      ISODateTimeFormat.dateTimeParser().parseDateTime(s)
-  }, {
-    case d: DateTime =>
-      JString(ISODateTimeFormat.dateTimeParser().print(d))
-  }))
-
-}
-
-class ApiInvoker(formats: Formats)(implicit system: ActorSystem) extends UntrustedSslContext with CustomContentTypes {
-
-  implicit val ec = system.dispatcher
-  implicit val jsonFormats = formats
-  val CompressionFilter = MessagePredicate({ _ => settings.compressionEnabled }) &&
-    Encoder.DefaultFilter &&
-    minEntitySize(settings.compressionSizeThreshold)
-
-  def execute[T](r: ApiRequest[T]): Future[ApiResponse[T]] = {
-    try {
-      implicit val timeout: Timeout = settings.connectionTimeout
-
-      val uri = makeUri(r)
-
-      val connector = HostConnectorSetup(
-        uri.authority.host.toString,
-        uri.effectivePort,
-        sslEncryption = "https".equals(uri.scheme),
-        defaultHeaders = settings.defaultHeaders ++ List(`Accept-Encoding`(gzip, deflate)))
-
-      val request = createRequest(uri, r)
-
-      for {
-        Http.HostConnectorInfo(hostConnector, _) <- IO(Http) ? connector
-        response <- hostConnector.ask(request).mapTo[HttpResponse]
-      } yield {
-        response ~> decode(Deflate) ~> decode(Gzip) ~> unmarshallApiResponse(r)
-      }
-    }
-    catch {
-      case NonFatal(x) => Future.failed(x)
-    }
-  }
-
-  settings.customCodes.foreach(addCustomStatusCode)
-
-  def settings = ApiSettings(system)
-
-  private def createRequest(uri: Uri, request: ApiRequest[_]): HttpRequest = {
-
-    val builder = new RequestBuilder(request.method.toSprayMethod)
-    val httpRequest = request.method.toSprayMethod match {
-      case HttpMethods.GET | HttpMethods.DELETE => builder.apply(uri)
-      case HttpMethods.POST | HttpMethods.PUT =>
-        formDataContent(request) orElse bodyContent(request) match {
-          case Some(c: FormData) =>
-            builder.apply(uri, c)
-          case Some(c: MultipartFormData) =>
-            builder.apply(uri, c)
-          case Some(c: String) =>
-            builder.apply(uri, HttpEntity(normalizedContentType(request.contentType), c))
-          case _ =>
-            builder.apply(uri, HttpEntity(normalizedContentType(request.contentType), " "))
-        }
-      case _ => builder.apply(uri)
-    }
-
-    httpRequest ~>
-      addHeaders(request.headerParams) ~>
-      addAuthentication(request.credentials) ~>
-      encode(Gzip(CompressionFilter))
-  }
-
-  private def addAuthentication(credentialsSeq: Seq[Credentials]): pipelining.RequestTransformer =
-    request =>
-      credentialsSeq.foldLeft(request) {
-        case (req, BasicCredentials(login, password)) =>
-          req ~> addCredentials(BasicHttpCredentials(login, password))
-        case (req, ApiKeyCredentials(keyValue, keyName, ApiKeyLocations.HEADER)) =>
-          req ~> addHeader(RawHeader(keyName, keyValue.value))
-        case (req, _) => req
-      }
-
-  private def addHeaders(headers: Map[String, Any]): pipelining.RequestTransformer = { request =>
-
-    val rawHeaders = for {
-      (name, value) <- headers.asFormattedParams
-      header = RawHeader(name, String.valueOf(value))
-    } yield header
-
-    request.withHeaders(rawHeaders.toList)
-  }
-
-  private def formDataContent(request: ApiRequest[_]) = {
-    val params = request.formParams.asFormattedParams
-    if (params.isEmpty)
-      None
-    else
-      Some(
-        normalizedContentType(request.contentType).mediaType match {
-          case MediaTypes.`multipart/form-data` =>
-            MultipartFormData(params.map { case (name, value) => (name, bodyPart(name, value)) })
-          case MediaTypes.`application/x-www-form-urlencoded` =>
-            FormData(params.mapValues(String.valueOf))
-          case m: MediaType => // Default : application/x-www-form-urlencoded.
-            FormData(params.mapValues(String.valueOf))
-        }
-      )
-  }
-
-  private def bodyPart(name: String, value: Any): BodyPart = {
-    value match {
-      case f: File =>
-        BodyPart(f, name)
-      case v: String =>
-        BodyPart(HttpEntity(String.valueOf(v)))
-      case NumericValue(v) =>
-        BodyPart(HttpEntity(String.valueOf(v)))
-      case m: ApiModel =>
-        BodyPart(HttpEntity(Serialization.write(m)))
-    }
-  }
-
-  private def bodyContent(request: ApiRequest[_]): Option[Any] = {
-    request.bodyParam.map(Extraction.decompose).map(compact)
-  }
-
-  def makeUri(r: ApiRequest[_]): Uri = {
-    val opPath = r.operationPath.replaceAll("\\{format\\}", "json")
-    val opPathWithParams = r.pathParams.asFormattedParams
-      .mapValues(String.valueOf)
-      .foldLeft(opPath) {
-      case (path, (name, value)) => path.replaceAll(s"\\{$name\\}", value)
-    }
-    val query = makeQuery(r)
-
-    Uri(r.basePath + opPathWithParams).withQuery(query)
-  }
-
-  def makeQuery(r: ApiRequest[_]): Query = {
-    r.credentials.foldLeft(r.queryParams) {
-      case (params, ApiKeyCredentials(key, keyName, ApiKeyLocations.QUERY)) =>
-        params + (keyName -> key.value)
-      case (params, _) => params
-    }.asFormattedParams
-      .mapValues(String.valueOf)
-      .foldRight[Query](Uri.Query.Empty) {
-      case ((name, value), acc) => acc.+:(name, value)
-    }
-  }
-
-  def unmarshallApiResponse[T](request: ApiRequest[T])(response: HttpResponse): ApiResponse[T] = {
-    request.responseForCode(response.status.intValue) match {
-      case Some((manifest: Manifest[T], state: ResponseState)) =>
-        entityUnmarshaller(manifest)(response.entity) match {
-          case Right(value) ⇒
-            state match {
-              case ResponseState.Success =>
-                ApiResponse(response.status.intValue, value, response.headers.map(header => (header.name, header.value)).toMap)
-              case ResponseState.Error =>
-                throw new ApiError(response.status.intValue, "Error response received",
-                  Some(value),
-                  headers = response.headers.map(header => (header.name, header.value)).toMap)
-            }
-
-          case Left(MalformedContent(error, Some(cause))) ⇒
-            throw new ApiError(response.status.intValue, s"Unable to unmarshall content to [$manifest]", Some(response.entity.toString), cause)
-
-          case Left(MalformedContent(error, None)) ⇒
-            throw new ApiError(response.status.intValue, s"Unable to unmarshall content to [$manifest]", Some(response.entity.toString))
-
-          case Left(ContentExpected) ⇒
-            throw new ApiError(response.status.intValue, s"Unable to unmarshall empty response to [$manifest]", Some(response.entity.toString))
-        }
-
-      case _ => throw new ApiError(response.status.intValue, "Unexpected response code", Some(response.entity.toString))
-    }
-  }
-
-  def entityUnmarshaller[T](implicit mf: Manifest[T]): Unmarshaller[T] =
-    Unmarshaller[T](MediaTypes.`application/json`) {
-      case x: HttpEntity.NonEmpty ⇒
-        parse(x.asString(defaultCharset = HttpCharsets.`UTF-8`))
-          .noNulls
-          .camelizeKeys
-          .extract[T]
-    }
-
-}
-
-sealed trait CustomContentTypes {
-
-  def normalizedContentType(original: String): ContentType =
-    MediaTypes.forExtension(original) map (ContentType(_)) getOrElse parseContentType(original)
-
-  def parseContentType(contentType: String): ContentType = {
-    val contentTypeAsRawHeader = HttpHeaders.RawHeader("Content-Type", contentType)
-    val parsedContentTypeHeader = HttpParser.parseHeader(contentTypeAsRawHeader)
-    (parsedContentTypeHeader: @unchecked) match {
-      case Right(ct: HttpHeaders.`Content-Type`) =>
-        ct.contentType
-      case Left(error: ErrorInfo) =>
-        throw new IllegalArgumentException(
-          s"Error converting '$contentType' to a ContentType header: '${error.summary}'")
-    }
-  }
-}
-
-sealed trait UntrustedSslContext {
-  this: ApiInvoker =>
-
-  implicit lazy val trustfulSslContext: SSLContext = {
-    settings.alwaysTrustCertificates match {
-      case false =>
-        SSLContext.getDefault
-
-      case true =>
-        class IgnoreX509TrustManager extends X509TrustManager {
-          def checkClientTrusted(chain: Array[X509Certificate], authType: String): Unit = {}
-
-          def checkServerTrusted(chain: Array[X509Certificate], authType: String): Unit = {}
-
-          def getAcceptedIssuers = null
-        }
-
-        val context = SSLContext.getInstance("TLS")
-        context.init(null, Array(new IgnoreX509TrustManager), null)
-        context
-    }
-  }
-
-  implicit val clientSSLEngineProvider =
-    ClientSSLEngineProvider {
-      _ =>
-        val engine = trustfulSslContext.createSSLEngine()
-        engine.setUseClientMode(true)
-        engine
-    }
-}
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/core/ApiRequest.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/core/ApiRequest.scala
deleted file mode 100644
index 794c43f5f41..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/core/ApiRequest.scala
+++ /dev/null
@@ -1,54 +0,0 @@
-package io.swagger.client.core
-
-sealed trait ResponseState
-
-object ResponseState {
-
-  case object Success extends ResponseState
-
-  case object Error extends ResponseState
-
-}
-
-case class ApiRequest[U](
-                          // required fields
-                          method: ApiMethod,
-                          basePath: String,
-                          operationPath: String,
-                          contentType: String,
-
-                          // optional fields
-                          responses: Map[Int, (Manifest[_], ResponseState)] = Map.empty,
-                          bodyParam: Option[Any] = None,
-                          formParams: Map[String, Any] = Map.empty,
-                          pathParams: Map[String, Any] = Map.empty,
-                          queryParams: Map[String, Any] = Map.empty,
-                          headerParams: Map[String, Any] = Map.empty,
-                          credentials: Seq[Credentials] = List.empty) {
-
-  def withCredentials(cred: Credentials) = copy[U](credentials = credentials :+ cred)
-
-  def withApiKey(key: ApiKeyValue, keyName: String, location: ApiKeyLocation) = withCredentials(ApiKeyCredentials(key, keyName, location))
-
-  def withSuccessResponse[T](code: Int)(implicit m: Manifest[T]) = copy[U](responses = responses + (code ->(m, ResponseState.Success)))
-
-  def withErrorResponse[T](code: Int)(implicit m: Manifest[T]) = copy[U](responses = responses + (code ->(m, ResponseState.Error)))
-
-  def withDefaultSuccessResponse[T](implicit m: Manifest[T]) = withSuccessResponse[T](0)
-
-  def withDefaultErrorResponse[T](implicit m: Manifest[T]) = withErrorResponse[T](0)
-
-  def responseForCode(statusCode: Int): Option[(Manifest[_], ResponseState)] = responses.get(statusCode) orElse responses.get(0)
-
-  def withoutBody() = copy[U](bodyParam = None)
-
-  def withBody(body: Any) = copy[U](bodyParam = Some(body))
-
-  def withFormParam(name: String, value: Any) = copy[U](formParams = formParams + (name -> value))
-
-  def withPathParam(name: String, value: Any) = copy[U](pathParams = pathParams + (name -> value))
-
-  def withQueryParam(name: String, value: Any) = copy[U](queryParams = queryParams + (name -> value))
-
-  def withHeaderParam(name: String, value: Any) = copy[U](headerParams = headerParams + (name -> value))
-}
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/core/ApiSettings.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/core/ApiSettings.scala
deleted file mode 100644
index 0eb4fb5e09b..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/core/ApiSettings.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-package io.swagger.client.core
-
-import java.util.concurrent.TimeUnit
-
-import scala.concurrent.duration.FiniteDuration
-
-class ApiSettings(config: Config) extends Extension {
-  val alwaysTrustCertificates = cfg.getBoolean("trust-certificates")
-  val defaultHeaders = cfg.getConfig("default-headers").entrySet.toList.map(c => RawHeader(c.getKey, c.getValue.render))
-  val connectionTimeout = FiniteDuration(cfg.getDuration("connection-timeout", TimeUnit.MILLISECONDS), TimeUnit.MILLISECONDS)
-  val compressionEnabled = cfg.getBoolean("compression.enabled")
-  val compressionSizeThreshold = cfg.getBytes("compression.size-threshold").toInt
-  val customCodes = cfg.getConfigList("custom-codes").toList.map { c => CustomStatusCode(
-    c.getInt("code"),
-    c.getString("reason"),
-    c.getBoolean("success"))
-  }
-
-  def this(system: ExtendedActorSystem) = this(system.settings.config)
-
-  private def cfg = config.getConfig("io.swagger.client.apiRequest")
-
-
-}
-
-object ApiSettings extends ExtensionKey[ApiSettings]
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/core/requests.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/core/requests.scala
deleted file mode 100644
index 9ed9f6e1f3f..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/core/requests.scala
+++ /dev/null
@@ -1,181 +0,0 @@
-package io.swagger.client.core
-
-import java.io.File
-import java.net.URLEncoder
-
-import scala.util.Try
-
-sealed trait ApiReturnWithHeaders {
-  def headers: Map[String, String]
-
-  def header(name: String): Option[String] = headers.get(name)
-
-  def getStringHeader(name: String) = header(name)
-
-  def getIntHeader(name: String) = castedHeader(name, java.lang.Integer.parseInt)
-
-  def getLongHeader(name: String) = castedHeader(name, java.lang.Long.parseLong)
-
-  def getFloatHeader(name: String) = castedHeader(name, java.lang.Float.parseFloat)
-
-  def getDoubleHeader(name: String) = castedHeader(name, java.lang.Double.parseDouble)
-
-  def getBooleanHeader(name: String) = castedHeader(name, java.lang.Boolean.parseBoolean)
-
-  private def castedHeader[U](name: String, conversion: String => U): Option[U] = {
-    Try {
-      header(name).map(conversion)
-    }.get
-  }
-}
-
-sealed case class ApiResponse[T](code: Int, content: T, headers: Map[String, String] = Map.empty)
-  extends ApiReturnWithHeaders
-
-sealed case class ApiError[T](code: Int, message: String, responseContent: Option[T], cause: Throwable = null, headers: Map[String, String] = Map.empty)
-  extends Throwable(s"($code) $message.${responseContent.map(s => s" Content : $s").getOrElse("")}", cause)
-  with ApiReturnWithHeaders
-
-sealed case class ApiMethod(value: String)
-
-object ApiMethods {
-  val CONNECT = ApiMethod("CONNECT")
-  val DELETE = ApiMethod("DELETE")
-  val GET = ApiMethod("GET")
-  val HEAD = ApiMethod("HEAD")
-  val OPTIONS = ApiMethod("OPTIONS")
-  val PATCH = ApiMethod("PATCH")
-  val POST = ApiMethod("POST")
-  val PUT = ApiMethod("PUT")
-  val TRACE = ApiMethod("TRACE")
-}
-
-/**
- * This trait needs to be added to any model defined by the api.
- */
-trait ApiModel
-
-/**
- * Single trait defining a credential that can be transformed to a paramName / paramValue tupple
- */
-sealed trait Credentials {
-  def asQueryParam: Option[(String, String)] = None
-}
-
-sealed case class BasicCredentials(user: String, password: String) extends Credentials
-
-sealed case class ApiKeyCredentials(key: ApiKeyValue, keyName: String, location: ApiKeyLocation) extends Credentials {
-  override def asQueryParam: Option[(String, String)] = location match {
-    case ApiKeyLocations.QUERY => Some((keyName, key.value))
-    case _ => None
-  }
-}
-
-sealed case class ApiKeyValue(value: String)
-
-sealed trait ApiKeyLocation
-
-object ApiKeyLocations {
-
-  case object QUERY extends ApiKeyLocation
-
-  case object HEADER extends ApiKeyLocation
-
-}
-
-
-/**
- * Case class used to unapply numeric values only in pattern matching
- * @param value the string representation of the numeric value
- */
-sealed case class NumericValue(value: String) {
-  override def toString = value
-}
-
-object NumericValue {
-  def unapply(n: Any): Option[NumericValue] = n match {
-    case (_: Int | _: Long | _: Float | _: Double | _: Boolean | _: Byte) => Some(NumericValue(String.valueOf(n)))
-    case _ => None
-  }
-}
-
-/**
- * Used for params being arrays
- */
-sealed case class ArrayValues(values: Seq[Any], format: CollectionFormat = CollectionFormats.CSV)
-
-object ArrayValues {
-  def apply(values: Option[Seq[Any]], format: CollectionFormat): ArrayValues =
-    ArrayValues(values.getOrElse(Seq.empty), format)
-
-  def apply(values: Option[Seq[Any]]): ArrayValues = ArrayValues(values, CollectionFormats.CSV)
-}
-
-
-/**
- * Defines how arrays should be rendered in query strings.
- */
-sealed trait CollectionFormat
-
-trait MergedArrayFormat extends CollectionFormat {
-  def separator: String
-}
-
-object CollectionFormats {
-
-  case object CSV extends MergedArrayFormat {
-    override val separator = ","
-  }
-
-  case object TSV extends MergedArrayFormat {
-    override val separator = "\t"
-  }
-
-  case object SSV extends MergedArrayFormat {
-    override val separator = " "
-  }
-
-  case object PIPES extends MergedArrayFormat {
-    override val separator = "|"
-  }
-
-  case object MULTI extends CollectionFormat
-
-}
-
-object ParametersMap {
-
-  /**
-   * Pimp parameters maps (Map[String, Any]) in order to transform them in a sequence of String -> Any tupples,
-   * with valid url-encoding, arrays handling, files preservation, ...
-   */
-  implicit class ParametersMapImprovements(val m: Map[String, Any]) {
-
-    def asFormattedParamsList = m.toList.flatMap(formattedParams)
-
-    def asFormattedParams = m.flatMap(formattedParams)
-
-    private def urlEncode(v: Any) = URLEncoder.encode(String.valueOf(v), "utf-8").replaceAll("\\+", "%20")
-
-    private def formattedParams(tuple: (String, Any)): Seq[(String, Any)] = formattedParams(tuple._1, tuple._2)
-
-    private def formattedParams(name: String, value: Any): Seq[(String, Any)] = value match {
-      case arr: ArrayValues =>
-        arr.format match {
-          case CollectionFormats.MULTI => arr.values.flatMap(formattedParams(name, _))
-          case format: MergedArrayFormat => Seq((name, arr.values.mkString(format.separator)))
-        }
-      case None => Seq.empty
-      case Some(opt) =>
-        formattedParams(name, opt)
-      case s: Seq[Any] =>
-        formattedParams(name, ArrayValues(s))
-      case v: String => Seq((name, urlEncode(v)))
-      case NumericValue(v) => Seq((name, urlEncode(v)))
-      case f: File => Seq((name, f))
-      case m: ApiModel => Seq((name, m))
-    }
-
-  }
-
-}
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ApiTokenStatus.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ApiTokenStatus.scala
deleted file mode 100644
index 1c099f61d88..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ApiTokenStatus.scala
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.swagger.client.model
-
-
-case class ApiTokenStatus(
-                           valid: Option[Boolean],
-                           token: Option[String],
-                           resetsInMillis: Option[Long],
-                           remainingCalls: Option[Long],
-                           expiresInMillis: Option[Long],
-                           totalRequests: Option[Long])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/AudioFile.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/AudioFile.scala
deleted file mode 100644
index ae1975d3359..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/AudioFile.scala
+++ /dev/null
@@ -1,21 +0,0 @@
-package io.swagger.client.model
-
-
-case class AudioFile(
-                      attributionUrl: Option[String],
-                      commentCount: Option[Int],
-                      voteCount: Option[Int],
-                      fileUrl: Option[String],
-                      audioType: Option[String],
-                      id: Option[Long],
-                      duration: Option[Double],
-                      attributionText: Option[String],
-                      createdBy: Option[String],
-                      description: Option[String],
-                      createdAt: Option[DateTime],
-                      voteWeightedAverage: Option[Float],
-                      voteAverage: Option[Float],
-                      word: Option[String])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/AudioType.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/AudioType.scala
deleted file mode 100644
index 90984887967..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/AudioType.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.swagger.client.model
-
-
-case class AudioType(
-                      id: Option[Int],
-                      name: Option[String])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/AuthenticationToken.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/AuthenticationToken.scala
deleted file mode 100644
index c150a7b6385..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/AuthenticationToken.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-package io.swagger.client.model
-
-
-case class AuthenticationToken(
-                                token: Option[String],
-                                userId: Option[Long],
-                                userSignature: Option[String])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Bigram.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Bigram.scala
deleted file mode 100644
index ac0bb8c5f1f..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Bigram.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.swagger.client.model
-
-
-case class Bigram(
-                   count: Option[Long],
-                   gram2: Option[String],
-                   gram1: Option[String],
-                   wlmi: Option[Double],
-                   mi: Option[Double])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Category.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Category.scala
deleted file mode 100644
index d965ec4d6bd..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Category.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.swagger.client.model
-
-
-case class Category(
-                     id: Option[Long],
-                     name: Option[String])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Citation.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Citation.scala
deleted file mode 100644
index c93d8b9e2ed..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Citation.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.swagger.client.model
-
-
-case class Citation(
-                     cite: Option[String],
-                     source: Option[String])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ContentProvider.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ContentProvider.scala
deleted file mode 100644
index 3baf96be8e1..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ContentProvider.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.swagger.client.model
-
-
-case class ContentProvider(
-                            id: Option[Int],
-                            name: Option[String])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Definition.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Definition.scala
deleted file mode 100644
index f0b97f3d726..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Definition.scala
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.swagger.client.model
-
-
-case class Definition(
-                       extendedText: Option[String],
-                       text: Option[String],
-                       sourceDictionary: Option[String],
-                       citations: Option[Seq[Citation]],
-                       labels: Option[Seq[Label]],
-                       score: Option[Float],
-                       exampleUses: Option[Seq[ExampleUsage]],
-                       attributionUrl: Option[String],
-                       seqString: Option[String],
-                       attributionText: Option[String],
-                       relatedWords: Option[Seq[Related]],
-                       sequence: Option[String],
-                       word: Option[String],
-                       notes: Option[Seq[Note]],
-                       textProns: Option[Seq[TextPron]],
-                       partOfSpeech: Option[String])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/DefinitionSearchResults.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/DefinitionSearchResults.scala
deleted file mode 100644
index 4c35cec842c..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/DefinitionSearchResults.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.swagger.client.model
-
-
-case class DefinitionSearchResults(
-                                    results: Option[Seq[Definition]],
-                                    totalResults: Option[Int])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Example.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Example.scala
deleted file mode 100644
index 9557c5d8a24..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Example.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.swagger.client.model
-
-
-case class Example(
-                    id: Option[Long],
-                    exampleId: Option[Long],
-                    title: Option[String],
-                    text: Option[String],
-                    score: Option[ScoredWord],
-                    sentence: Option[Sentence],
-                    word: Option[String],
-                    provider: Option[ContentProvider],
-                    year: Option[Int],
-                    rating: Option[Float],
-                    documentId: Option[Long],
-                    url: Option[String])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ExampleSearchResults.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ExampleSearchResults.scala
deleted file mode 100644
index 51107d9e4b6..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ExampleSearchResults.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.swagger.client.model
-
-
-case class ExampleSearchResults(
-                                 facets: Option[Seq[Facet]],
-                                 examples: Option[Seq[Example]])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ExampleUsage.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ExampleUsage.scala
deleted file mode 100644
index 10706036a58..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ExampleUsage.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.swagger.client.model
-
-
-case class ExampleUsage(
-                         text: Option[String])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Facet.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Facet.scala
deleted file mode 100644
index 1feb9cd7ec6..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Facet.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.swagger.client.model
-
-
-case class Facet(
-                  facetValues: Option[Seq[FacetValue]],
-                  name: Option[String])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/FacetValue.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/FacetValue.scala
deleted file mode 100644
index 9f38118203a..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/FacetValue.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.swagger.client.model
-
-
-case class FacetValue(
-                       count: Option[Long],
-                       value: Option[String])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Frequency.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Frequency.scala
deleted file mode 100644
index 8eee02d1187..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Frequency.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.swagger.client.model
-
-
-case class Frequency(
-                      count: Option[Long],
-                      year: Option[Int])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/FrequencySummary.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/FrequencySummary.scala
deleted file mode 100644
index 7bb89bed051..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/FrequencySummary.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.swagger.client.model
-
-
-case class FrequencySummary(
-                             unknownYearCount: Option[Int],
-                             totalCount: Option[Long],
-                             frequencyString: Option[String],
-                             word: Option[String],
-                             frequency: Option[Seq[Frequency]])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Label.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Label.scala
deleted file mode 100644
index 528bf4a5763..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Label.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.swagger.client.model
-
-
-case class Label(
-                  text: Option[String],
-                  `type`: Option[String])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Note.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Note.scala
deleted file mode 100644
index d898b662a3f..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Note.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.swagger.client.model
-
-
-case class Note(
-                 noteType: Option[String],
-                 appliesTo: Option[Seq[String]],
-                 value: Option[String],
-                 pos: Option[Int])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/PartOfSpeech.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/PartOfSpeech.scala
deleted file mode 100644
index 8f1b90d974b..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/PartOfSpeech.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-package io.swagger.client.model
-
-
-case class PartOfSpeech(
-                         roots: Option[Seq[Root]],
-                         storageAbbr: Option[Seq[String]],
-                         allCategories: Option[Seq[Category]])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Related.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Related.scala
deleted file mode 100644
index c0bd46c0030..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Related.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-package io.swagger.client.model
-
-
-case class Related(
-                    label1: Option[String],
-                    relationshipType: Option[String],
-                    label2: Option[String],
-                    label3: Option[String],
-                    words: Option[Seq[String]],
-                    gram: Option[String],
-                    label4: Option[String])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Root.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Root.scala
deleted file mode 100644
index b2205936656..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Root.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-package io.swagger.client.model
-
-
-case class Root(
-                 id: Option[Long],
-                 name: Option[String],
-                 categories: Option[Seq[Category]])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ScoredWord.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ScoredWord.scala
deleted file mode 100644
index 9a37a609a3b..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/ScoredWord.scala
+++ /dev/null
@@ -1,18 +0,0 @@
-package io.swagger.client.model
-
-
-case class ScoredWord(
-                       position: Option[Int],
-                       id: Option[Long],
-                       docTermCount: Option[Int],
-                       lemma: Option[String],
-                       wordType: Option[String],
-                       score: Option[Float],
-                       sentenceId: Option[Long],
-                       word: Option[String],
-                       stopword: Option[Boolean],
-                       baseWordScore: Option[Double],
-                       partOfSpeech: Option[String])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Sentence.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Sentence.scala
deleted file mode 100644
index 401d64d012a..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Sentence.scala
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.swagger.client.model
-
-
-case class Sentence(
-                     hasScoredWords: Option[Boolean],
-                     id: Option[Long],
-                     scoredWords: Option[Seq[ScoredWord]],
-                     display: Option[String],
-                     rating: Option[Int],
-                     documentMetadataId: Option[Long])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/SimpleDefinition.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/SimpleDefinition.scala
deleted file mode 100644
index b7e7d4d49f5..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/SimpleDefinition.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.swagger.client.model
-
-
-case class SimpleDefinition(
-                             text: Option[String],
-                             source: Option[String],
-                             note: Option[String],
-                             partOfSpeech: Option[String])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/SimpleExample.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/SimpleExample.scala
deleted file mode 100644
index cfd8626465a..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/SimpleExample.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.swagger.client.model
-
-
-case class SimpleExample(
-                          id: Option[Long],
-                          title: Option[String],
-                          text: Option[String],
-                          url: Option[String])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/StringValue.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/StringValue.scala
deleted file mode 100644
index e324032e9be..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/StringValue.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.swagger.client.model
-
-
-case class StringValue(
-                        word: Option[String])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Syllable.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Syllable.scala
deleted file mode 100644
index eba455d9e8a..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/Syllable.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-package io.swagger.client.model
-
-
-case class Syllable(
-                     text: Option[String],
-                     seq: Option[Int],
-                     `type`: Option[String])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/TextPron.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/TextPron.scala
deleted file mode 100644
index 690e54f6eba..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/TextPron.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-package io.swagger.client.model
-
-
-case class TextPron(
-                     raw: Option[String],
-                     seq: Option[Int],
-                     rawType: Option[String])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/User.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/User.scala
deleted file mode 100644
index 4e2cbd1dc78..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/User.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-package io.swagger.client.model
-
-
-case class User(
-                 id: Option[Long],
-                 username: Option[String],
-                 email: Option[String],
-                 status: Option[Int],
-                 faceBookId: Option[String],
-                 userName: Option[String],
-                 displayName: Option[String],
-                 password: Option[String])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordList.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordList.scala
deleted file mode 100644
index db2a94d7052..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordList.scala
+++ /dev/null
@@ -1,18 +0,0 @@
-package io.swagger.client.model
-
-
-case class WordList(
-                     id: Option[Long],
-                     permalink: Option[String],
-                     name: Option[String],
-                     createdAt: Option[DateTime],
-                     updatedAt: Option[DateTime],
-                     lastActivityAt: Option[DateTime],
-                     username: Option[String],
-                     userId: Option[Long],
-                     description: Option[String],
-                     numberWordsInList: Option[Long],
-                     `type`: Option[String])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordListWord.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordListWord.scala
deleted file mode 100644
index 6bfce5522b8..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordListWord.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-package io.swagger.client.model
-
-
-case class WordListWord(
-                         id: Option[Long],
-                         word: Option[String],
-                         username: Option[String],
-                         userId: Option[Long],
-                         createdAt: Option[DateTime],
-                         numberCommentsOnWord: Option[Long],
-                         numberLists: Option[Long])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordObject.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordObject.scala
deleted file mode 100644
index 965bed21104..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordObject.scala
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.swagger.client.model
-
-
-case class WordObject(
-                       id: Option[Long],
-                       word: Option[String],
-                       originalWord: Option[String],
-                       suggestions: Option[Seq[String]],
-                       canonicalForm: Option[String],
-                       vulgar: Option[String])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordOfTheDay.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordOfTheDay.scala
deleted file mode 100644
index 68a41d87b62..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordOfTheDay.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.swagger.client.model
-
-
-case class WordOfTheDay(
-                         id: Option[Long],
-                         parentId: Option[String],
-                         category: Option[String],
-                         createdBy: Option[String],
-                         createdAt: Option[DateTime],
-                         contentProvider: Option[ContentProvider],
-                         htmlExtra: Option[String],
-                         word: Option[String],
-                         definitions: Option[Seq[SimpleDefinition]],
-                         examples: Option[Seq[SimpleExample]],
-                         note: Option[String],
-                         publishDate: Option[DateTime])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordSearchResult.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordSearchResult.scala
deleted file mode 100644
index 1d50c67de0e..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordSearchResult.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-package io.swagger.client.model
-
-
-case class WordSearchResult(
-                             count: Option[Long],
-                             lexicality: Option[Double],
-                             word: Option[String])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordSearchResults.scala b/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordSearchResults.scala
deleted file mode 100644
index 331ea795da2..00000000000
--- a/samples/client/wordnik/akka-scala/src/main/scala/io/swagger/client/model/WordSearchResults.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.swagger.client.model
-
-
-case class WordSearchResults(
-                              searchResults: Option[Seq[WordSearchResult]],
-                              totalResults: Option[Int])
-  extends ApiModel
-
-
diff --git a/samples/client/wordnik/android-java/pom.xml b/samples/client/wordnik/android-java/pom.xml
deleted file mode 100644
index 7dd53a8c8ea..00000000000
--- a/samples/client/wordnik/android-java/pom.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>io.swagger</groupId>
-    <artifactId>swagger-client</artifactId>
-    <packaging>jar</packaging>
-    <name>swagger-client</name>
-    <version>1.0.0</version>
-    <scm>
-        <connection>scm:git:git@github.com:wordnik/swagger-mustache.git</connection>
-        <developerConnection>scm:git:git@github.com:wordnik/swagger-codegen.git</developerConnection>
-        <url>https://github.com/wordnik/swagger-codegen</url>
-    </scm>
-    <prerequisites>
-        <maven>2.2.0</maven>
-    </prerequisites>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.12</version>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>loggerPath</name>
-                            <value>conf/log4j.properties</value>
-                        </property>
-                    </systemProperties>
-                    <argLine>-Xms512m -Xmx1500m</argLine>
-                    <parallel>methods</parallel>
-                    <forkMode>pertest</forkMode>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- attach test jar -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.2</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>jar</goal>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add_sources</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>src/main/java</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>add_test_sources</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>src/test/java</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <dependencies>
-        <dependency>
-            <groupId>com.wordnik</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-annotations-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${jackson-version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>${jackson-version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson-version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>${httpclient-version}</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit-version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <repositories>
-        <repository>
-            <id>sonatype-snapshots</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </repository>
-    </repositories>
-    <properties>
-        <swagger-annotations-version>1.5.3</swagger-annotations-version>
-        <jackson-version>2.1.5</jackson-version>
-        <junit-version>4.8.1</junit-version>
-        <maven-plugin-version>1.0.0</maven-plugin-version>
-        <junit-version>4.8.1</junit-version>
-        <httpclient-version>4.0</httpclient-version>
-    </properties>
-</project>
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/ApiException.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/ApiException.java
deleted file mode 100644
index afeba0fc7d7..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/ApiException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.swagger.client;
-
-public class ApiException extends Exception {
-    int code = 0;
-    String message = null;
-
-    public ApiException() {
-    }
-
-    public ApiException(int code, String message) {
-        this.code = code;
-        this.message = message;
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public void setCode(int code) {
-        this.code = code;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-}
\ No newline at end of file
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/ApiInvoker.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/ApiInvoker.java
deleted file mode 100644
index 709be7ccf9b..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/ApiInvoker.java
+++ /dev/null
@@ -1,248 +0,0 @@
-package io.swagger.client;
-
-
-import org.apache.http.entity.StringEntity;
-import org.apache.http.util.EntityUtils;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-import java.io.IOException;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.security.GeneralSecurityException;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.security.cert.X509Certificate;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class ApiInvoker {
-    private static ApiInvoker INSTANCE = new ApiInvoker();
-    private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
-
-    private HttpClient client = null;
-
-    private boolean ignoreSSLCertificates = false;
-
-    private ClientConnectionManager ignoreSSLConnectionManager;
-
-    public ApiInvoker() {
-        initConnectionManager();
-    }
-
-    public static ApiInvoker getInstance() {
-        return INSTANCE;
-    }
-
-    public static Object deserialize(String json, String containerType, Class cls) throws ApiException {
-        try {
-            if ("List".equals(containerType)) {
-                JavaType typeInfo = JsonUtil.getJsonMapper().getTypeFactory().constructCollectionType(List.class, cls);
-                return (List<?>) JsonUtil.getJsonMapper().readValue(json, typeInfo);
-            } else if (String.class.equals(cls)) {
-                if (json != null && json.startsWith("\"") && json.endsWith("\"") && json.length() > 1) {
-                    return json.substring(1, json.length() - 2);
-                } else {
-                    return json;
-                }
-            } else {
-                return JsonUtil.getJsonMapper().readValue(json, cls);
-            }
-        } catch (IOException e) {
-            throw new ApiException(500, e.getMessage());
-        }
-    }
-
-    public static String serialize(Object obj) throws ApiException {
-        try {
-            if (obj != null) {
-                return JsonUtil.getJsonMapper().writeValueAsString(obj);
-            } else {
-                return null;
-            }
-        } catch (Exception e) {
-            throw new ApiException(500, e.getMessage());
-        }
-    }
-
-    public void ignoreSSLCertificates(boolean ignoreSSLCertificates) {
-        this.ignoreSSLCertificates = ignoreSSLCertificates;
-    }
-
-    public void addDefaultHeader(String key, String value) {
-        defaultHeaderMap.put(key, value);
-    }
-
-    public String escapeString(String str) {
-        return str;
-    }
-
-    public String invokeAPI(String host, String path, String method, Map<String, String> queryParams, Object body, Map<String, String> headerParams, String contentType) throws ApiException {
-        HttpClient client = getClient(host);
-
-        StringBuilder b = new StringBuilder();
-        for (String key : queryParams.keySet()) {
-            String value = queryParams.get(key);
-            if (value != null) {
-                if (b.toString().length() == 0) {
-                    b.append("?");
-                } else {
-                    b.append("&");
-                }
-                b.append(escapeString(key)).append("=").append(escapeString(value));
-            }
-        }
-        String url = host + path + b.toString();
-
-        HashMap<String, String> headers = new HashMap<String, String>();
-
-        for (String key : headerParams.keySet()) {
-            headers.put(key, headerParams.get(key));
-        }
-
-        for (String key : defaultHeaderMap.keySet()) {
-            if (!headerParams.containsKey(key)) {
-                headers.put(key, defaultHeaderMap.get(key));
-            }
-        }
-        headers.put("Accept", "application/json");
-
-        HttpResponse response = null;
-        try {
-            if ("GET".equals(method)) {
-                HttpGet get = new HttpGet(url);
-                get.addHeader("Accept", "application/json");
-                for (String key : headers.keySet()) {
-                    get.setHeader(key, headers.get(key));
-                }
-                response = client.execute(get);
-            } else if ("POST".equals(method)) {
-                HttpPost post = new HttpPost(url);
-
-                if (body != null) {
-                    post.setHeader("Content-Type", contentType);
-                    post.setEntity(new StringEntity(serialize(body), "UTF-8"));
-                }
-                for (String key : headers.keySet()) {
-                    post.setHeader(key, headers.get(key));
-                }
-                response = client.execute(post);
-            } else if ("PUT".equals(method)) {
-                HttpPut put = new HttpPut(url);
-                if (body != null) {
-                    put.setHeader("Content-Type", contentType);
-                    put.setEntity(new StringEntity(serialize(body), "UTF-8"));
-                }
-                for (String key : headers.keySet()) {
-                    put.setHeader(key, headers.get(key));
-                }
-                response = client.execute(put);
-            } else if ("DELETE".equals(method)) {
-                HttpDelete delete = new HttpDelete(url);
-                for (String key : headers.keySet()) {
-                    delete.setHeader(key, headers.get(key));
-                }
-                response = client.execute(delete);
-            } else if ("PATCH".equals(method)) {
-                HttpPatch patch = new HttpPatch(url);
-
-                if (body != null) {
-                    patch.setHeader("Content-Type", contentType);
-                    patch.setEntity(new StringEntity(serialize(body), "UTF-8"));
-                }
-                for (String key : headers.keySet()) {
-                    patch.setHeader(key, headers.get(key));
-                }
-                response = client.execute(patch);
-            }
-
-            int code = response.getStatusLine().getStatusCode();
-            String responseString = null;
-            if (code == 204) {
-                responseString = "";
-            } else if (code >= 200 && code < 300) {
-                if (response.getEntity() != null) {
-                    HttpEntity resEntity = response.getEntity();
-                    responseString = EntityUtils.toString(resEntity);
-                }
-            } else {
-                if (response.getEntity() != null) {
-                    HttpEntity resEntity = response.getEntity();
-                    responseString = EntityUtils.toString(resEntity);
-                } else {
-                    responseString = "no data";
-                }
-                throw new ApiException(code, responseString);
-            }
-            return responseString;
-        } catch (IOException e) {
-            throw new ApiException(500, e.getMessage());
-        }
-    }
-
-    private HttpClient getClient(String host) {
-        if (client == null) {
-            if (ignoreSSLCertificates && ignoreSSLConnectionManager != null) {
-                // Trust self signed certificates
-                client = new DefaultHttpClient(ignoreSSLConnectionManager, new BasicHttpParams());
-            } else {
-                client = new DefaultHttpClient();
-            }
-        }
-        return client;
-    }
-
-    private void initConnectionManager() {
-        try {
-            final SSLContext sslContext = SSLContext.getInstance("SSL");
-
-            // set up a TrustManager that trusts everything
-            TrustManager[] trustManagers = new TrustManager[]{
-                    new X509TrustManager() {
-                        public X509Certificate[] getAcceptedIssuers() {
-                            return null;
-                        }
-
-                        public void checkClientTrusted(X509Certificate[] certs, String authType) {
-                        }
-
-                        public void checkServerTrusted(X509Certificate[] certs, String authType) {
-                        }
-                    }};
-
-            sslContext.init(null, trustManagers, new SecureRandom());
-
-            SSLSocketFactory sf = new SSLSocketFactory((KeyStore) null) {
-                private javax.net.ssl.SSLSocketFactory sslFactory = sslContext.getSocketFactory();
-
-                public Socket createSocket(Socket socket, String host, int port, boolean autoClose)
-                        throws IOException, UnknownHostException {
-                    return sslFactory.createSocket(socket, host, port, autoClose);
-                }
-
-                public Socket createSocket() throws IOException {
-                    return sslFactory.createSocket();
-                }
-            };
-
-            sf.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
-            Scheme httpsScheme = new Scheme("https", sf, 443);
-            SchemeRegistry schemeRegistry = new SchemeRegistry();
-            schemeRegistry.register(httpsScheme);
-            schemeRegistry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80));
-
-            ignoreSSLConnectionManager = new SingleClientConnManager(new BasicHttpParams(), schemeRegistry);
-        } catch (NoSuchAlgorithmException e) {
-            // This will only be thrown if SSL isn't available for some reason.
-        } catch (KeyManagementException e) {
-            // This might be thrown when passing a key into init(), but no key is being passed.
-        } catch (GeneralSecurityException e) {
-            // This catches anything else that might go wrong.
-            // If anything goes wrong we default to the standard connection manager.
-        }
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/HttpPatch.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/HttpPatch.java
deleted file mode 100644
index c40272a991e..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/HttpPatch.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package io.swagger.client;
-
-public class HttpPatch extends HttpPost {
-    public static final String METHOD_PATCH = "PATCH";
-
-    public HttpPatch(final String url) {
-        super(url);
-    }
-
-    @Override
-    public String getMethod() {
-        return METHOD_PATCH;
-    }
-}
\ No newline at end of file
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/JsonUtil.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/JsonUtil.java
deleted file mode 100644
index f9f47ce6f7f..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/JsonUtil.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package io.swagger.client;
-
-public class JsonUtil {
-    public static ObjectMapper mapper;
-
-    public static ObjectMapper getJsonMapper() {
-        return mapper;
-    }
-
-    static {
-        mapper = new ObjectMapper();
-        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/AccountApi.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/AccountApi.java
deleted file mode 100644
index 8931e529821..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/AccountApi.java
+++ /dev/null
@@ -1,208 +0,0 @@
-package io.swagger.client.api;
-
-import io.swagger.client.ApiException;
-import io.swagger.client.ApiInvoker;
-import io.swagger.client.model.ApiTokenStatus;
-import io.swagger.client.model.AuthenticationToken;
-import io.swagger.client.model.User;
-import io.swagger.client.model.WordList;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class AccountApi {
-    String basePath = "https://api.wordnik.com/v4";
-    ApiInvoker apiInvoker = ApiInvoker.getInstance();
-
-    public void addHeader(String key, String value) {
-        getInvoker().addDefaultHeader(key, value);
-    }
-
-    public ApiInvoker getInvoker() {
-        return apiInvoker;
-    }
-
-    public String getBasePath() {
-        return basePath;
-    }
-
-    public void setBasePath(String basePath) {
-        this.basePath = basePath;
-    }
-
-    public ApiTokenStatus getApiTokenStatus(String api_key) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/account.json/apiTokenStatus".replaceAll("\\{format\\}", "json");
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-
-        headerParams.put("api_key", api_key);
-
-
-        String contentType = "application/json";
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
-            if (response != null) {
-                return (ApiTokenStatus) ApiInvoker.deserialize(response, "", ApiTokenStatus.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public AuthenticationToken authenticate(String username, String password) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/account.json/authenticate/{username}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(password))) {
-            queryParams.put("password", String.valueOf(password));
-        }
-
-
-        String contentType = "application/json";
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
-            if (response != null) {
-                return (AuthenticationToken) ApiInvoker.deserialize(response, "", AuthenticationToken.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public AuthenticationToken authenticatePost(String username, String body) throws ApiException {
-        Object postBody = body;
-
-
-        // create path and map variables
-        String path = "/account.json/authenticate/{username}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-
-        String contentType = "application/json";
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, contentType);
-            if (response != null) {
-                return (AuthenticationToken) ApiInvoker.deserialize(response, "", AuthenticationToken.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public User getLoggedInUser(String auth_token) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/account.json/user".replaceAll("\\{format\\}", "json");
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-
-        headerParams.put("auth_token", auth_token);
-
-
-        String contentType = "application/json";
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
-            if (response != null) {
-                return (User) ApiInvoker.deserialize(response, "", User.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public List<WordList> getWordListsForLoggedInUser(String auth_token, Integer skip, Integer limit) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/account.json/wordLists".replaceAll("\\{format\\}", "json");
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(skip))) {
-            queryParams.put("skip", String.valueOf(skip));
-        }
-        if (!"null".equals(String.valueOf(limit))) {
-            queryParams.put("limit", String.valueOf(limit));
-        }
-
-
-        headerParams.put("auth_token", auth_token);
-
-
-        String contentType = "application/json";
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
-            if (response != null) {
-                return (List<WordList>) ApiInvoker.deserialize(response, "array", WordList.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordApi.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordApi.java
deleted file mode 100644
index 6d7bf89b76b..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordApi.java
+++ /dev/null
@@ -1,483 +0,0 @@
-package io.swagger.client.api;
-
-import io.swagger.client.ApiException;
-import io.swagger.client.ApiInvoker;
-import io.swagger.client.model.AudioFile;
-import io.swagger.client.model.Bigram;
-import io.swagger.client.model.Definition;
-import io.swagger.client.model.Example;
-import io.swagger.client.model.FrequencySummary;
-import io.swagger.client.model.WordObject;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class WordApi {
-    String basePath = "https://api.wordnik.com/v4";
-    ApiInvoker apiInvoker = ApiInvoker.getInstance();
-
-    public void addHeader(String key, String value) {
-        getInvoker().addDefaultHeader(key, value);
-    }
-
-    public ApiInvoker getInvoker() {
-        return apiInvoker;
-    }
-
-    public String getBasePath() {
-        return basePath;
-    }
-
-    public void setBasePath(String basePath) {
-        this.basePath = basePath;
-    }
-
-    public WordObject getWord(String word, String useCanonical, String includeSuggestions) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/word.json/{word}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(useCanonical))) {
-            queryParams.put("useCanonical", String.valueOf(useCanonical));
-        }
-        if (!"null".equals(String.valueOf(includeSuggestions))) {
-            queryParams.put("includeSuggestions", String.valueOf(includeSuggestions));
-        }
-
-
-        String contentType = "application/json";
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
-            if (response != null) {
-                return (WordObject) ApiInvoker.deserialize(response, "", WordObject.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public List<AudioFile> getAudio(String word, String useCanonical, Integer limit) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/word.json/{word}/audio".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(useCanonical))) {
-            queryParams.put("useCanonical", String.valueOf(useCanonical));
-        }
-        if (!"null".equals(String.valueOf(limit))) {
-            queryParams.put("limit", String.valueOf(limit));
-        }
-
-
-        String contentType = "application/json";
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
-            if (response != null) {
-                return (List<AudioFile>) ApiInvoker.deserialize(response, "array", AudioFile.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public List<Definition> getDefinitions(String word, Integer limit, String partOfSpeech, String includeRelated, List<String> sourceDictionaries, String useCanonical, String includeTags) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/word.json/{word}/definitions".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(limit))) {
-            queryParams.put("limit", String.valueOf(limit));
-        }
-        if (!"null".equals(String.valueOf(partOfSpeech))) {
-            queryParams.put("partOfSpeech", String.valueOf(partOfSpeech));
-        }
-        if (!"null".equals(String.valueOf(includeRelated))) {
-            queryParams.put("includeRelated", String.valueOf(includeRelated));
-        }
-        if (!"null".equals(String.valueOf(sourceDictionaries))) {
-            queryParams.put("sourceDictionaries", String.valueOf(sourceDictionaries));
-        }
-        if (!"null".equals(String.valueOf(useCanonical))) {
-            queryParams.put("useCanonical", String.valueOf(useCanonical));
-        }
-        if (!"null".equals(String.valueOf(includeTags))) {
-            queryParams.put("includeTags", String.valueOf(includeTags));
-        }
-
-
-        String contentType = "application/json";
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
-            if (response != null) {
-                return (List<Definition>) ApiInvoker.deserialize(response, "array", Definition.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public List<String> getEtymologies(String word, String useCanonical) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/word.json/{word}/etymologies".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(useCanonical))) {
-            queryParams.put("useCanonical", String.valueOf(useCanonical));
-        }
-
-
-        String contentType = "application/json";
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
-            if (response != null) {
-                return (List<String>) ApiInvoker.deserialize(response, "array", String.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public void getExamples(String word, String includeDuplicates, String useCanonical, Integer skip, Integer limit) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/word.json/{word}/examples".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(includeDuplicates))) {
-            queryParams.put("includeDuplicates", String.valueOf(includeDuplicates));
-        }
-        if (!"null".equals(String.valueOf(useCanonical))) {
-            queryParams.put("useCanonical", String.valueOf(useCanonical));
-        }
-        if (!"null".equals(String.valueOf(skip))) {
-            queryParams.put("skip", String.valueOf(skip));
-        }
-        if (!"null".equals(String.valueOf(limit))) {
-            queryParams.put("limit", String.valueOf(limit));
-        }
-
-
-        String contentType = "application/json";
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
-            if (response != null) {
-                return;
-            } else {
-                return;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public FrequencySummary getWordFrequency(String word, String useCanonical, Integer startYear, Integer endYear) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/word.json/{word}/frequency".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(useCanonical))) {
-            queryParams.put("useCanonical", String.valueOf(useCanonical));
-        }
-        if (!"null".equals(String.valueOf(startYear))) {
-            queryParams.put("startYear", String.valueOf(startYear));
-        }
-        if (!"null".equals(String.valueOf(endYear))) {
-            queryParams.put("endYear", String.valueOf(endYear));
-        }
-
-
-        String contentType = "application/json";
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
-            if (response != null) {
-                return (FrequencySummary) ApiInvoker.deserialize(response, "", FrequencySummary.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public void getHyphenation(String word, String useCanonical, String sourceDictionary, Integer limit) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/word.json/{word}/hyphenation".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(useCanonical))) {
-            queryParams.put("useCanonical", String.valueOf(useCanonical));
-        }
-        if (!"null".equals(String.valueOf(sourceDictionary))) {
-            queryParams.put("sourceDictionary", String.valueOf(sourceDictionary));
-        }
-        if (!"null".equals(String.valueOf(limit))) {
-            queryParams.put("limit", String.valueOf(limit));
-        }
-
-
-        String contentType = "application/json";
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
-            if (response != null) {
-                return;
-            } else {
-                return;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public List<Bigram> getPhrases(String word, Integer limit, Integer wlmi, String useCanonical) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/word.json/{word}/phrases".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(limit))) {
-            queryParams.put("limit", String.valueOf(limit));
-        }
-        if (!"null".equals(String.valueOf(wlmi))) {
-            queryParams.put("wlmi", String.valueOf(wlmi));
-        }
-        if (!"null".equals(String.valueOf(useCanonical))) {
-            queryParams.put("useCanonical", String.valueOf(useCanonical));
-        }
-
-
-        String contentType = "application/json";
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
-            if (response != null) {
-                return (List<Bigram>) ApiInvoker.deserialize(response, "array", Bigram.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public void getTextPronunciations(String word, String useCanonical, String sourceDictionary, String typeFormat, Integer limit) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/word.json/{word}/pronunciations".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(useCanonical))) {
-            queryParams.put("useCanonical", String.valueOf(useCanonical));
-        }
-        if (!"null".equals(String.valueOf(sourceDictionary))) {
-            queryParams.put("sourceDictionary", String.valueOf(sourceDictionary));
-        }
-        if (!"null".equals(String.valueOf(typeFormat))) {
-            queryParams.put("typeFormat", String.valueOf(typeFormat));
-        }
-        if (!"null".equals(String.valueOf(limit))) {
-            queryParams.put("limit", String.valueOf(limit));
-        }
-
-
-        String contentType = "application/json";
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
-            if (response != null) {
-                return;
-            } else {
-                return;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public void getRelatedWords(String word, String useCanonical, String relationshipTypes, Integer limitPerRelationshipType) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/word.json/{word}/relatedWords".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(useCanonical))) {
-            queryParams.put("useCanonical", String.valueOf(useCanonical));
-        }
-        if (!"null".equals(String.valueOf(relationshipTypes))) {
-            queryParams.put("relationshipTypes", String.valueOf(relationshipTypes));
-        }
-        if (!"null".equals(String.valueOf(limitPerRelationshipType))) {
-            queryParams.put("limitPerRelationshipType", String.valueOf(limitPerRelationshipType));
-        }
-
-
-        String contentType = "application/json";
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
-            if (response != null) {
-                return;
-            } else {
-                return;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public Example getTopExample(String word, String useCanonical) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/word.json/{word}/topExample".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(useCanonical))) {
-            queryParams.put("useCanonical", String.valueOf(useCanonical));
-        }
-
-
-        String contentType = "application/json";
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
-            if (response != null) {
-                return (Example) ApiInvoker.deserialize(response, "", Example.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordListApi.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordListApi.java
deleted file mode 100644
index 1d82e877b1f..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordListApi.java
+++ /dev/null
@@ -1,248 +0,0 @@
-package io.swagger.client.api;
-
-import io.swagger.client.ApiException;
-import io.swagger.client.ApiInvoker;
-import io.swagger.client.model.StringValue;
-import io.swagger.client.model.WordList;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class WordListApi {
-    String basePath = "https://api.wordnik.com/v4";
-    ApiInvoker apiInvoker = ApiInvoker.getInstance();
-
-    public void addHeader(String key, String value) {
-        getInvoker().addDefaultHeader(key, value);
-    }
-
-    public ApiInvoker getInvoker() {
-        return apiInvoker;
-    }
-
-    public String getBasePath() {
-        return basePath;
-    }
-
-    public void setBasePath(String basePath) {
-        this.basePath = basePath;
-    }
-
-    public WordList getWordListByPermalink(String permalink, String auth_token) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/wordList.json/{permalink}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escapeString(permalink.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-
-        headerParams.put("auth_token", auth_token);
-
-
-        String contentType = "application/json";
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
-            if (response != null) {
-                return (WordList) ApiInvoker.deserialize(response, "", WordList.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public void updateWordList(String permalink, WordList body, String auth_token) throws ApiException {
-        Object postBody = body;
-
-
-        // create path and map variables
-        String path = "/wordList.json/{permalink}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escapeString(permalink.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-
-        headerParams.put("auth_token", auth_token);
-
-
-        String contentType = "application/json";
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "PUT", queryParams, postBody, headerParams, contentType);
-            if (response != null) {
-                return;
-            } else {
-                return;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public void deleteWordList(String permalink, String auth_token) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/wordList.json/{permalink}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escapeString(permalink.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-
-        headerParams.put("auth_token", auth_token);
-
-
-        String contentType = "application/json";
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, postBody, headerParams, contentType);
-            if (response != null) {
-                return;
-            } else {
-                return;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public void deleteWordsFromWordList(String permalink, List<StringValue> body, String auth_token) throws ApiException {
-        Object postBody = body;
-
-
-        // create path and map variables
-        String path = "/wordList.json/{permalink}/deleteWords".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escapeString(permalink.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-
-        headerParams.put("auth_token", auth_token);
-
-
-        String contentType = "application/json";
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, contentType);
-            if (response != null) {
-                return;
-            } else {
-                return;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public void getWordListWords(String permalink, String sortBy, String sortOrder, Integer skip, Integer limit, String auth_token) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/wordList.json/{permalink}/words".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escapeString(permalink.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(sortBy))) {
-            queryParams.put("sortBy", String.valueOf(sortBy));
-        }
-        if (!"null".equals(String.valueOf(sortOrder))) {
-            queryParams.put("sortOrder", String.valueOf(sortOrder));
-        }
-        if (!"null".equals(String.valueOf(skip))) {
-            queryParams.put("skip", String.valueOf(skip));
-        }
-        if (!"null".equals(String.valueOf(limit))) {
-            queryParams.put("limit", String.valueOf(limit));
-        }
-
-
-        headerParams.put("auth_token", auth_token);
-
-
-        String contentType = "application/json";
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
-            if (response != null) {
-                return;
-            } else {
-                return;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public void addWordsToWordList(String permalink, List<StringValue> body, String auth_token) throws ApiException {
-        Object postBody = body;
-
-
-        // create path and map variables
-        String path = "/wordList.json/{permalink}/words".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escapeString(permalink.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-
-        headerParams.put("auth_token", auth_token);
-
-
-        String contentType = "application/json";
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, contentType);
-            if (response != null) {
-                return;
-            } else {
-                return;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordListsApi.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordListsApi.java
deleted file mode 100644
index 21fdf762bc7..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordListsApi.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package io.swagger.client.api;
-
-import io.swagger.client.ApiException;
-import io.swagger.client.ApiInvoker;
-import io.swagger.client.model.WordList;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class WordListsApi {
-    String basePath = "https://api.wordnik.com/v4";
-    ApiInvoker apiInvoker = ApiInvoker.getInstance();
-
-    public void addHeader(String key, String value) {
-        getInvoker().addDefaultHeader(key, value);
-    }
-
-    public ApiInvoker getInvoker() {
-        return apiInvoker;
-    }
-
-    public String getBasePath() {
-        return basePath;
-    }
-
-    public void setBasePath(String basePath) {
-        this.basePath = basePath;
-    }
-
-    public WordList createWordList(WordList body, String auth_token) throws ApiException {
-        Object postBody = body;
-
-
-        // create path and map variables
-        String path = "/wordLists.json".replaceAll("\\{format\\}", "json");
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-
-        headerParams.put("auth_token", auth_token);
-
-
-        String contentType = "application/json";
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, contentType);
-            if (response != null) {
-                return (WordList) ApiInvoker.deserialize(response, "", WordList.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordsApi.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordsApi.java
deleted file mode 100644
index 18d0f5e0df2..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordsApi.java
+++ /dev/null
@@ -1,339 +0,0 @@
-package io.swagger.client.api;
-
-import io.swagger.client.ApiException;
-import io.swagger.client.ApiInvoker;
-import io.swagger.client.model.DefinitionSearchResults;
-import io.swagger.client.model.WordObject;
-import io.swagger.client.model.WordOfTheDay;
-import io.swagger.client.model.WordSearchResults;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class WordsApi {
-    String basePath = "https://api.wordnik.com/v4";
-    ApiInvoker apiInvoker = ApiInvoker.getInstance();
-
-    public void addHeader(String key, String value) {
-        getInvoker().addDefaultHeader(key, value);
-    }
-
-    public ApiInvoker getInvoker() {
-        return apiInvoker;
-    }
-
-    public String getBasePath() {
-        return basePath;
-    }
-
-    public void setBasePath(String basePath) {
-        this.basePath = basePath;
-    }
-
-    public WordObject getRandomWord(String hasDictionaryDef, String includePartOfSpeech, String excludePartOfSpeech, Integer minCorpusCount, Integer maxCorpusCount, Integer minDictionaryCount, Integer maxDictionaryCount, Integer minLength, Integer maxLength) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/words.json/randomWord".replaceAll("\\{format\\}", "json");
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(hasDictionaryDef))) {
-            queryParams.put("hasDictionaryDef", String.valueOf(hasDictionaryDef));
-        }
-        if (!"null".equals(String.valueOf(includePartOfSpeech))) {
-            queryParams.put("includePartOfSpeech", String.valueOf(includePartOfSpeech));
-        }
-        if (!"null".equals(String.valueOf(excludePartOfSpeech))) {
-            queryParams.put("excludePartOfSpeech", String.valueOf(excludePartOfSpeech));
-        }
-        if (!"null".equals(String.valueOf(minCorpusCount))) {
-            queryParams.put("minCorpusCount", String.valueOf(minCorpusCount));
-        }
-        if (!"null".equals(String.valueOf(maxCorpusCount))) {
-            queryParams.put("maxCorpusCount", String.valueOf(maxCorpusCount));
-        }
-        if (!"null".equals(String.valueOf(minDictionaryCount))) {
-            queryParams.put("minDictionaryCount", String.valueOf(minDictionaryCount));
-        }
-        if (!"null".equals(String.valueOf(maxDictionaryCount))) {
-            queryParams.put("maxDictionaryCount", String.valueOf(maxDictionaryCount));
-        }
-        if (!"null".equals(String.valueOf(minLength))) {
-            queryParams.put("minLength", String.valueOf(minLength));
-        }
-        if (!"null".equals(String.valueOf(maxLength))) {
-            queryParams.put("maxLength", String.valueOf(maxLength));
-        }
-
-
-        String contentType = "application/json";
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
-            if (response != null) {
-                return (WordObject) ApiInvoker.deserialize(response, "", WordObject.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public void getRandomWords(String hasDictionaryDef, String includePartOfSpeech, String excludePartOfSpeech, Integer minCorpusCount, Integer maxCorpusCount, Integer minDictionaryCount, Integer maxDictionaryCount, Integer minLength, Integer maxLength, String sortBy, String sortOrder, Integer limit) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/words.json/randomWords".replaceAll("\\{format\\}", "json");
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(hasDictionaryDef))) {
-            queryParams.put("hasDictionaryDef", String.valueOf(hasDictionaryDef));
-        }
-        if (!"null".equals(String.valueOf(includePartOfSpeech))) {
-            queryParams.put("includePartOfSpeech", String.valueOf(includePartOfSpeech));
-        }
-        if (!"null".equals(String.valueOf(excludePartOfSpeech))) {
-            queryParams.put("excludePartOfSpeech", String.valueOf(excludePartOfSpeech));
-        }
-        if (!"null".equals(String.valueOf(minCorpusCount))) {
-            queryParams.put("minCorpusCount", String.valueOf(minCorpusCount));
-        }
-        if (!"null".equals(String.valueOf(maxCorpusCount))) {
-            queryParams.put("maxCorpusCount", String.valueOf(maxCorpusCount));
-        }
-        if (!"null".equals(String.valueOf(minDictionaryCount))) {
-            queryParams.put("minDictionaryCount", String.valueOf(minDictionaryCount));
-        }
-        if (!"null".equals(String.valueOf(maxDictionaryCount))) {
-            queryParams.put("maxDictionaryCount", String.valueOf(maxDictionaryCount));
-        }
-        if (!"null".equals(String.valueOf(minLength))) {
-            queryParams.put("minLength", String.valueOf(minLength));
-        }
-        if (!"null".equals(String.valueOf(maxLength))) {
-            queryParams.put("maxLength", String.valueOf(maxLength));
-        }
-        if (!"null".equals(String.valueOf(sortBy))) {
-            queryParams.put("sortBy", String.valueOf(sortBy));
-        }
-        if (!"null".equals(String.valueOf(sortOrder))) {
-            queryParams.put("sortOrder", String.valueOf(sortOrder));
-        }
-        if (!"null".equals(String.valueOf(limit))) {
-            queryParams.put("limit", String.valueOf(limit));
-        }
-
-
-        String contentType = "application/json";
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
-            if (response != null) {
-                return;
-            } else {
-                return;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public DefinitionSearchResults reverseDictionary(String query, String findSenseForWord, String includeSourceDictionaries, String excludeSourceDictionaries, String includePartOfSpeech, String excludePartOfSpeech, Integer minCorpusCount, Integer maxCorpusCount, Integer minLength, Integer maxLength, String expandTerms, String includeTags, String sortBy, String sortOrder, String skip, Integer limit) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/words.json/reverseDictionary".replaceAll("\\{format\\}", "json");
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(query))) {
-            queryParams.put("query", String.valueOf(query));
-        }
-        if (!"null".equals(String.valueOf(findSenseForWord))) {
-            queryParams.put("findSenseForWord", String.valueOf(findSenseForWord));
-        }
-        if (!"null".equals(String.valueOf(includeSourceDictionaries))) {
-            queryParams.put("includeSourceDictionaries", String.valueOf(includeSourceDictionaries));
-        }
-        if (!"null".equals(String.valueOf(excludeSourceDictionaries))) {
-            queryParams.put("excludeSourceDictionaries", String.valueOf(excludeSourceDictionaries));
-        }
-        if (!"null".equals(String.valueOf(includePartOfSpeech))) {
-            queryParams.put("includePartOfSpeech", String.valueOf(includePartOfSpeech));
-        }
-        if (!"null".equals(String.valueOf(excludePartOfSpeech))) {
-            queryParams.put("excludePartOfSpeech", String.valueOf(excludePartOfSpeech));
-        }
-        if (!"null".equals(String.valueOf(minCorpusCount))) {
-            queryParams.put("minCorpusCount", String.valueOf(minCorpusCount));
-        }
-        if (!"null".equals(String.valueOf(maxCorpusCount))) {
-            queryParams.put("maxCorpusCount", String.valueOf(maxCorpusCount));
-        }
-        if (!"null".equals(String.valueOf(minLength))) {
-            queryParams.put("minLength", String.valueOf(minLength));
-        }
-        if (!"null".equals(String.valueOf(maxLength))) {
-            queryParams.put("maxLength", String.valueOf(maxLength));
-        }
-        if (!"null".equals(String.valueOf(expandTerms))) {
-            queryParams.put("expandTerms", String.valueOf(expandTerms));
-        }
-        if (!"null".equals(String.valueOf(includeTags))) {
-            queryParams.put("includeTags", String.valueOf(includeTags));
-        }
-        if (!"null".equals(String.valueOf(sortBy))) {
-            queryParams.put("sortBy", String.valueOf(sortBy));
-        }
-        if (!"null".equals(String.valueOf(sortOrder))) {
-            queryParams.put("sortOrder", String.valueOf(sortOrder));
-        }
-        if (!"null".equals(String.valueOf(skip))) {
-            queryParams.put("skip", String.valueOf(skip));
-        }
-        if (!"null".equals(String.valueOf(limit))) {
-            queryParams.put("limit", String.valueOf(limit));
-        }
-
-
-        String contentType = "application/json";
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
-            if (response != null) {
-                return (DefinitionSearchResults) ApiInvoker.deserialize(response, "", DefinitionSearchResults.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public WordSearchResults searchWords(String query, String caseSensitive, String includePartOfSpeech, String excludePartOfSpeech, Integer minCorpusCount, Integer maxCorpusCount, Integer minDictionaryCount, Integer maxDictionaryCount, Integer minLength, Integer maxLength, Integer skip, Integer limit) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/words.json/search/{query}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "query" + "\\}", apiInvoker.escapeString(query.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(caseSensitive))) {
-            queryParams.put("caseSensitive", String.valueOf(caseSensitive));
-        }
-        if (!"null".equals(String.valueOf(includePartOfSpeech))) {
-            queryParams.put("includePartOfSpeech", String.valueOf(includePartOfSpeech));
-        }
-        if (!"null".equals(String.valueOf(excludePartOfSpeech))) {
-            queryParams.put("excludePartOfSpeech", String.valueOf(excludePartOfSpeech));
-        }
-        if (!"null".equals(String.valueOf(minCorpusCount))) {
-            queryParams.put("minCorpusCount", String.valueOf(minCorpusCount));
-        }
-        if (!"null".equals(String.valueOf(maxCorpusCount))) {
-            queryParams.put("maxCorpusCount", String.valueOf(maxCorpusCount));
-        }
-        if (!"null".equals(String.valueOf(minDictionaryCount))) {
-            queryParams.put("minDictionaryCount", String.valueOf(minDictionaryCount));
-        }
-        if (!"null".equals(String.valueOf(maxDictionaryCount))) {
-            queryParams.put("maxDictionaryCount", String.valueOf(maxDictionaryCount));
-        }
-        if (!"null".equals(String.valueOf(minLength))) {
-            queryParams.put("minLength", String.valueOf(minLength));
-        }
-        if (!"null".equals(String.valueOf(maxLength))) {
-            queryParams.put("maxLength", String.valueOf(maxLength));
-        }
-        if (!"null".equals(String.valueOf(skip))) {
-            queryParams.put("skip", String.valueOf(skip));
-        }
-        if (!"null".equals(String.valueOf(limit))) {
-            queryParams.put("limit", String.valueOf(limit));
-        }
-
-
-        String contentType = "application/json";
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
-            if (response != null) {
-                return (WordSearchResults) ApiInvoker.deserialize(response, "", WordSearchResults.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public WordOfTheDay getWordOfTheDay(String date) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/words.json/wordOfTheDay".replaceAll("\\{format\\}", "json");
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(date))) {
-            queryParams.put("date", String.valueOf(date));
-        }
-
-
-        String contentType = "application/json";
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
-            if (response != null) {
-                return (WordOfTheDay) ApiInvoker.deserialize(response, "", WordOfTheDay.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ApiTokenStatus.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ApiTokenStatus.java
deleted file mode 100644
index 60388200618..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ApiTokenStatus.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class ApiTokenStatus {
-
-    private Boolean valid = null;
-    private String token = null;
-    private Long resetsInMillis = null;
-    private Long remainingCalls = null;
-    private Long expiresInMillis = null;
-    private Long totalRequests = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("valid")
-    public Boolean getValid() {
-        return valid;
-    }
-
-    public void setValid(Boolean valid) {
-        this.valid = valid;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("token")
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("resetsInMillis")
-    public Long getResetsInMillis() {
-        return resetsInMillis;
-    }
-
-    public void setResetsInMillis(Long resetsInMillis) {
-        this.resetsInMillis = resetsInMillis;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("remainingCalls")
-    public Long getRemainingCalls() {
-        return remainingCalls;
-    }
-
-    public void setRemainingCalls(Long remainingCalls) {
-        this.remainingCalls = remainingCalls;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("expiresInMillis")
-    public Long getExpiresInMillis() {
-        return expiresInMillis;
-    }
-
-    public void setExpiresInMillis(Long expiresInMillis) {
-        this.expiresInMillis = expiresInMillis;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("totalRequests")
-    public Long getTotalRequests() {
-        return totalRequests;
-    }
-
-    public void setTotalRequests(Long totalRequests) {
-        this.totalRequests = totalRequests;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ApiTokenStatus {\n");
-
-        sb.append("  valid: ").append(valid).append("\n");
-        sb.append("  token: ").append(token).append("\n");
-        sb.append("  resetsInMillis: ").append(resetsInMillis).append("\n");
-        sb.append("  remainingCalls: ").append(remainingCalls).append("\n");
-        sb.append("  expiresInMillis: ").append(expiresInMillis).append("\n");
-        sb.append("  totalRequests: ").append(totalRequests).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AudioFile.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AudioFile.java
deleted file mode 100644
index 7c982c40a22..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AudioFile.java
+++ /dev/null
@@ -1,232 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-import java.util.Date;
-
-
-@ApiModel(description = "")
-public class AudioFile {
-
-    private String attributionUrl = null;
-    private Integer commentCount = null;
-    private Integer voteCount = null;
-    private String fileUrl = null;
-    private String audioType = null;
-    private Long id = null;
-    private Double duration = null;
-    private String attributionText = null;
-    private String createdBy = null;
-    private String description = null;
-    private Date createdAt = null;
-    private Float voteWeightedAverage = null;
-    private Float voteAverage = null;
-    private String word = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("attributionUrl")
-    public String getAttributionUrl() {
-        return attributionUrl;
-    }
-
-    public void setAttributionUrl(String attributionUrl) {
-        this.attributionUrl = attributionUrl;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("commentCount")
-    public Integer getCommentCount() {
-        return commentCount;
-    }
-
-    public void setCommentCount(Integer commentCount) {
-        this.commentCount = commentCount;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("voteCount")
-    public Integer getVoteCount() {
-        return voteCount;
-    }
-
-    public void setVoteCount(Integer voteCount) {
-        this.voteCount = voteCount;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("fileUrl")
-    public String getFileUrl() {
-        return fileUrl;
-    }
-
-    public void setFileUrl(String fileUrl) {
-        this.fileUrl = fileUrl;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("audioType")
-    public String getAudioType() {
-        return audioType;
-    }
-
-    public void setAudioType(String audioType) {
-        this.audioType = audioType;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("duration")
-    public Double getDuration() {
-        return duration;
-    }
-
-    public void setDuration(Double duration) {
-        this.duration = duration;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("attributionText")
-    public String getAttributionText() {
-        return attributionText;
-    }
-
-    public void setAttributionText(String attributionText) {
-        this.attributionText = attributionText;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("createdBy")
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("description")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("createdAt")
-    public Date getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("voteWeightedAverage")
-    public Float getVoteWeightedAverage() {
-        return voteWeightedAverage;
-    }
-
-    public void setVoteWeightedAverage(Float voteWeightedAverage) {
-        this.voteWeightedAverage = voteWeightedAverage;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("voteAverage")
-    public Float getVoteAverage() {
-        return voteAverage;
-    }
-
-    public void setVoteAverage(Float voteAverage) {
-        this.voteAverage = voteAverage;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("word")
-    public String getWord() {
-        return word;
-    }
-
-    public void setWord(String word) {
-        this.word = word;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class AudioFile {\n");
-
-        sb.append("  attributionUrl: ").append(attributionUrl).append("\n");
-        sb.append("  commentCount: ").append(commentCount).append("\n");
-        sb.append("  voteCount: ").append(voteCount).append("\n");
-        sb.append("  fileUrl: ").append(fileUrl).append("\n");
-        sb.append("  audioType: ").append(audioType).append("\n");
-        sb.append("  id: ").append(id).append("\n");
-        sb.append("  duration: ").append(duration).append("\n");
-        sb.append("  attributionText: ").append(attributionText).append("\n");
-        sb.append("  createdBy: ").append(createdBy).append("\n");
-        sb.append("  description: ").append(description).append("\n");
-        sb.append("  createdAt: ").append(createdAt).append("\n");
-        sb.append("  voteWeightedAverage: ").append(voteWeightedAverage).append("\n");
-        sb.append("  voteAverage: ").append(voteAverage).append("\n");
-        sb.append("  word: ").append(word).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AudioType.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AudioType.java
deleted file mode 100644
index 6456cb53904..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AudioType.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class AudioType {
-
-    private Integer id = null;
-    private String name = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("id")
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class AudioType {\n");
-
-        sb.append("  id: ").append(id).append("\n");
-        sb.append("  name: ").append(name).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AuthenticationToken.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AuthenticationToken.java
deleted file mode 100644
index f9d59b3a467..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AuthenticationToken.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class AuthenticationToken {
-
-    private String token = null;
-    private Long userId = null;
-    private String userSignature = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("token")
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("userId")
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("userSignature")
-    public String getUserSignature() {
-        return userSignature;
-    }
-
-    public void setUserSignature(String userSignature) {
-        this.userSignature = userSignature;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class AuthenticationToken {\n");
-
-        sb.append("  token: ").append(token).append("\n");
-        sb.append("  userId: ").append(userId).append("\n");
-        sb.append("  userSignature: ").append(userSignature).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Bigram.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Bigram.java
deleted file mode 100644
index 0465c2816cc..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Bigram.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class Bigram {
-
-    private Long count = null;
-    private String gram2 = null;
-    private String gram1 = null;
-    private Double wlmi = null;
-    private Double mi = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("count")
-    public Long getCount() {
-        return count;
-    }
-
-    public void setCount(Long count) {
-        this.count = count;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("gram2")
-    public String getGram2() {
-        return gram2;
-    }
-
-    public void setGram2(String gram2) {
-        this.gram2 = gram2;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("gram1")
-    public String getGram1() {
-        return gram1;
-    }
-
-    public void setGram1(String gram1) {
-        this.gram1 = gram1;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("wlmi")
-    public Double getWlmi() {
-        return wlmi;
-    }
-
-    public void setWlmi(Double wlmi) {
-        this.wlmi = wlmi;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("mi")
-    public Double getMi() {
-        return mi;
-    }
-
-    public void setMi(Double mi) {
-        this.mi = mi;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Bigram {\n");
-
-        sb.append("  count: ").append(count).append("\n");
-        sb.append("  gram2: ").append(gram2).append("\n");
-        sb.append("  gram1: ").append(gram1).append("\n");
-        sb.append("  wlmi: ").append(wlmi).append("\n");
-        sb.append("  mi: ").append(mi).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Category.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Category.java
deleted file mode 100644
index 5ceadd985e2..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Category.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class Category {
-
-    private Long id = null;
-    private String name = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Category {\n");
-
-        sb.append("  id: ").append(id).append("\n");
-        sb.append("  name: ").append(name).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Citation.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Citation.java
deleted file mode 100644
index 7f636dc7e02..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Citation.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class Citation {
-
-    private String cite = null;
-    private String source = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("cite")
-    public String getCite() {
-        return cite;
-    }
-
-    public void setCite(String cite) {
-        this.cite = cite;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("source")
-    public String getSource() {
-        return source;
-    }
-
-    public void setSource(String source) {
-        this.source = source;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Citation {\n");
-
-        sb.append("  cite: ").append(cite).append("\n");
-        sb.append("  source: ").append(source).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ContentProvider.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ContentProvider.java
deleted file mode 100644
index 9b56335411d..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ContentProvider.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class ContentProvider {
-
-    private Integer id = null;
-    private String name = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("id")
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ContentProvider {\n");
-
-        sb.append("  id: ").append(id).append("\n");
-        sb.append("  name: ").append(name).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Definition.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Definition.java
deleted file mode 100644
index ea0e6463ad7..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Definition.java
+++ /dev/null
@@ -1,269 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-import io.swagger.client.model.Citation;
-import io.swagger.client.model.ExampleUsage;
-import io.swagger.client.model.Label;
-import io.swagger.client.model.Note;
-import io.swagger.client.model.Related;
-import io.swagger.client.model.TextPron;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@ApiModel(description = "")
-public class Definition {
-
-    private String extendedText = null;
-    private String text = null;
-    private String sourceDictionary = null;
-    private List<Citation> citations = new ArrayList<Citation>();
-    private List<Label> labels = new ArrayList<Label>();
-    private Float score = null;
-    private List<ExampleUsage> exampleUses = new ArrayList<ExampleUsage>();
-    private String attributionUrl = null;
-    private String seqString = null;
-    private String attributionText = null;
-    private List<Related> relatedWords = new ArrayList<Related>();
-    private String sequence = null;
-    private String word = null;
-    private List<Note> notes = new ArrayList<Note>();
-    private List<TextPron> textProns = new ArrayList<TextPron>();
-    private String partOfSpeech = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("extendedText")
-    public String getExtendedText() {
-        return extendedText;
-    }
-
-    public void setExtendedText(String extendedText) {
-        this.extendedText = extendedText;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("text")
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("sourceDictionary")
-    public String getSourceDictionary() {
-        return sourceDictionary;
-    }
-
-    public void setSourceDictionary(String sourceDictionary) {
-        this.sourceDictionary = sourceDictionary;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("citations")
-    public List<Citation> getCitations() {
-        return citations;
-    }
-
-    public void setCitations(List<Citation> citations) {
-        this.citations = citations;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("labels")
-    public List<Label> getLabels() {
-        return labels;
-    }
-
-    public void setLabels(List<Label> labels) {
-        this.labels = labels;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("score")
-    public Float getScore() {
-        return score;
-    }
-
-    public void setScore(Float score) {
-        this.score = score;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("exampleUses")
-    public List<ExampleUsage> getExampleUses() {
-        return exampleUses;
-    }
-
-    public void setExampleUses(List<ExampleUsage> exampleUses) {
-        this.exampleUses = exampleUses;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("attributionUrl")
-    public String getAttributionUrl() {
-        return attributionUrl;
-    }
-
-    public void setAttributionUrl(String attributionUrl) {
-        this.attributionUrl = attributionUrl;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("seqString")
-    public String getSeqString() {
-        return seqString;
-    }
-
-    public void setSeqString(String seqString) {
-        this.seqString = seqString;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("attributionText")
-    public String getAttributionText() {
-        return attributionText;
-    }
-
-    public void setAttributionText(String attributionText) {
-        this.attributionText = attributionText;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("relatedWords")
-    public List<Related> getRelatedWords() {
-        return relatedWords;
-    }
-
-    public void setRelatedWords(List<Related> relatedWords) {
-        this.relatedWords = relatedWords;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("sequence")
-    public String getSequence() {
-        return sequence;
-    }
-
-    public void setSequence(String sequence) {
-        this.sequence = sequence;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("word")
-    public String getWord() {
-        return word;
-    }
-
-    public void setWord(String word) {
-        this.word = word;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("notes")
-    public List<Note> getNotes() {
-        return notes;
-    }
-
-    public void setNotes(List<Note> notes) {
-        this.notes = notes;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("textProns")
-    public List<TextPron> getTextProns() {
-        return textProns;
-    }
-
-    public void setTextProns(List<TextPron> textProns) {
-        this.textProns = textProns;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("partOfSpeech")
-    public String getPartOfSpeech() {
-        return partOfSpeech;
-    }
-
-    public void setPartOfSpeech(String partOfSpeech) {
-        this.partOfSpeech = partOfSpeech;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Definition {\n");
-
-        sb.append("  extendedText: ").append(extendedText).append("\n");
-        sb.append("  text: ").append(text).append("\n");
-        sb.append("  sourceDictionary: ").append(sourceDictionary).append("\n");
-        sb.append("  citations: ").append(citations).append("\n");
-        sb.append("  labels: ").append(labels).append("\n");
-        sb.append("  score: ").append(score).append("\n");
-        sb.append("  exampleUses: ").append(exampleUses).append("\n");
-        sb.append("  attributionUrl: ").append(attributionUrl).append("\n");
-        sb.append("  seqString: ").append(seqString).append("\n");
-        sb.append("  attributionText: ").append(attributionText).append("\n");
-        sb.append("  relatedWords: ").append(relatedWords).append("\n");
-        sb.append("  sequence: ").append(sequence).append("\n");
-        sb.append("  word: ").append(word).append("\n");
-        sb.append("  notes: ").append(notes).append("\n");
-        sb.append("  textProns: ").append(textProns).append("\n");
-        sb.append("  partOfSpeech: ").append(partOfSpeech).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/DefinitionSearchResults.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/DefinitionSearchResults.java
deleted file mode 100644
index 7bb0fa85c98..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/DefinitionSearchResults.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-import io.swagger.client.model.Definition;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@ApiModel(description = "")
-public class DefinitionSearchResults {
-
-    private List<Definition> results = new ArrayList<Definition>();
-    private Integer totalResults = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("results")
-    public List<Definition> getResults() {
-        return results;
-    }
-
-    public void setResults(List<Definition> results) {
-        this.results = results;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("totalResults")
-    public Integer getTotalResults() {
-        return totalResults;
-    }
-
-    public void setTotalResults(Integer totalResults) {
-        this.totalResults = totalResults;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class DefinitionSearchResults {\n");
-
-        sb.append("  results: ").append(results).append("\n");
-        sb.append("  totalResults: ").append(totalResults).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Example.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Example.java
deleted file mode 100644
index c8c421dff6b..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Example.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-import io.swagger.client.model.ContentProvider;
-import io.swagger.client.model.ScoredWord;
-import io.swagger.client.model.Sentence;
-
-
-@ApiModel(description = "")
-public class Example {
-
-    private Long id = null;
-    private Long exampleId = null;
-    private String title = null;
-    private String text = null;
-    private ScoredWord score = null;
-    private Sentence sentence = null;
-    private String word = null;
-    private ContentProvider provider = null;
-    private Integer year = null;
-    private Float rating = null;
-    private Long documentId = null;
-    private String url = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("exampleId")
-    public Long getExampleId() {
-        return exampleId;
-    }
-
-    public void setExampleId(Long exampleId) {
-        this.exampleId = exampleId;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("title")
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("text")
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("score")
-    public ScoredWord getScore() {
-        return score;
-    }
-
-    public void setScore(ScoredWord score) {
-        this.score = score;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("sentence")
-    public Sentence getSentence() {
-        return sentence;
-    }
-
-    public void setSentence(Sentence sentence) {
-        this.sentence = sentence;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("word")
-    public String getWord() {
-        return word;
-    }
-
-    public void setWord(String word) {
-        this.word = word;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("provider")
-    public ContentProvider getProvider() {
-        return provider;
-    }
-
-    public void setProvider(ContentProvider provider) {
-        this.provider = provider;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("year")
-    public Integer getYear() {
-        return year;
-    }
-
-    public void setYear(Integer year) {
-        this.year = year;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("rating")
-    public Float getRating() {
-        return rating;
-    }
-
-    public void setRating(Float rating) {
-        this.rating = rating;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("documentId")
-    public Long getDocumentId() {
-        return documentId;
-    }
-
-    public void setDocumentId(Long documentId) {
-        this.documentId = documentId;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("url")
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Example {\n");
-
-        sb.append("  id: ").append(id).append("\n");
-        sb.append("  exampleId: ").append(exampleId).append("\n");
-        sb.append("  title: ").append(title).append("\n");
-        sb.append("  text: ").append(text).append("\n");
-        sb.append("  score: ").append(score).append("\n");
-        sb.append("  sentence: ").append(sentence).append("\n");
-        sb.append("  word: ").append(word).append("\n");
-        sb.append("  provider: ").append(provider).append("\n");
-        sb.append("  year: ").append(year).append("\n");
-        sb.append("  rating: ").append(rating).append("\n");
-        sb.append("  documentId: ").append(documentId).append("\n");
-        sb.append("  url: ").append(url).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ExampleSearchResults.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ExampleSearchResults.java
deleted file mode 100644
index fd2b1254de5..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ExampleSearchResults.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-import io.swagger.client.model.Example;
-import io.swagger.client.model.Facet;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@ApiModel(description = "")
-public class ExampleSearchResults {
-
-    private List<Facet> facets = new ArrayList<Facet>();
-    private List<Example> examples = new ArrayList<Example>();
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("facets")
-    public List<Facet> getFacets() {
-        return facets;
-    }
-
-    public void setFacets(List<Facet> facets) {
-        this.facets = facets;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("examples")
-    public List<Example> getExamples() {
-        return examples;
-    }
-
-    public void setExamples(List<Example> examples) {
-        this.examples = examples;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ExampleSearchResults {\n");
-
-        sb.append("  facets: ").append(facets).append("\n");
-        sb.append("  examples: ").append(examples).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ExampleUsage.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ExampleUsage.java
deleted file mode 100644
index a4cc674b48b..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ExampleUsage.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class ExampleUsage {
-
-    private String text = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("text")
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ExampleUsage {\n");
-
-        sb.append("  text: ").append(text).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Facet.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Facet.java
deleted file mode 100644
index 22afba725ec..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Facet.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-import io.swagger.client.model.FacetValue;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@ApiModel(description = "")
-public class Facet {
-
-    private List<FacetValue> facetValues = new ArrayList<FacetValue>();
-    private String name = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("facetValues")
-    public List<FacetValue> getFacetValues() {
-        return facetValues;
-    }
-
-    public void setFacetValues(List<FacetValue> facetValues) {
-        this.facetValues = facetValues;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Facet {\n");
-
-        sb.append("  facetValues: ").append(facetValues).append("\n");
-        sb.append("  name: ").append(name).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/FacetValue.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/FacetValue.java
deleted file mode 100644
index 8e7c1a7eeb8..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/FacetValue.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class FacetValue {
-
-    private Long count = null;
-    private String value = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("count")
-    public Long getCount() {
-        return count;
-    }
-
-    public void setCount(Long count) {
-        this.count = count;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class FacetValue {\n");
-
-        sb.append("  count: ").append(count).append("\n");
-        sb.append("  value: ").append(value).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Frequency.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Frequency.java
deleted file mode 100644
index e25dd4ec738..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Frequency.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class Frequency {
-
-    private Long count = null;
-    private Integer year = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("count")
-    public Long getCount() {
-        return count;
-    }
-
-    public void setCount(Long count) {
-        this.count = count;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("year")
-    public Integer getYear() {
-        return year;
-    }
-
-    public void setYear(Integer year) {
-        this.year = year;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Frequency {\n");
-
-        sb.append("  count: ").append(count).append("\n");
-        sb.append("  year: ").append(year).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/FrequencySummary.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/FrequencySummary.java
deleted file mode 100644
index 2ac98615d1f..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/FrequencySummary.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-import io.swagger.client.model.Frequency;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@ApiModel(description = "")
-public class FrequencySummary {
-
-    private Integer unknownYearCount = null;
-    private Long totalCount = null;
-    private String frequencyString = null;
-    private String word = null;
-    private List<Frequency> frequency = new ArrayList<Frequency>();
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("unknownYearCount")
-    public Integer getUnknownYearCount() {
-        return unknownYearCount;
-    }
-
-    public void setUnknownYearCount(Integer unknownYearCount) {
-        this.unknownYearCount = unknownYearCount;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("totalCount")
-    public Long getTotalCount() {
-        return totalCount;
-    }
-
-    public void setTotalCount(Long totalCount) {
-        this.totalCount = totalCount;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("frequencyString")
-    public String getFrequencyString() {
-        return frequencyString;
-    }
-
-    public void setFrequencyString(String frequencyString) {
-        this.frequencyString = frequencyString;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("word")
-    public String getWord() {
-        return word;
-    }
-
-    public void setWord(String word) {
-        this.word = word;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("frequency")
-    public List<Frequency> getFrequency() {
-        return frequency;
-    }
-
-    public void setFrequency(List<Frequency> frequency) {
-        this.frequency = frequency;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class FrequencySummary {\n");
-
-        sb.append("  unknownYearCount: ").append(unknownYearCount).append("\n");
-        sb.append("  totalCount: ").append(totalCount).append("\n");
-        sb.append("  frequencyString: ").append(frequencyString).append("\n");
-        sb.append("  word: ").append(word).append("\n");
-        sb.append("  frequency: ").append(frequency).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Label.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Label.java
deleted file mode 100644
index 95e07a644de..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Label.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class Label {
-
-    private String text = null;
-    private String type = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("text")
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Label {\n");
-
-        sb.append("  text: ").append(text).append("\n");
-        sb.append("  type: ").append(type).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Note.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Note.java
deleted file mode 100644
index d9ca7588576..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Note.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@ApiModel(description = "")
-public class Note {
-
-    private String noteType = null;
-    private List<String> appliesTo = new ArrayList<String>();
-    private String value = null;
-    private Integer pos = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("noteType")
-    public String getNoteType() {
-        return noteType;
-    }
-
-    public void setNoteType(String noteType) {
-        this.noteType = noteType;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("appliesTo")
-    public List<String> getAppliesTo() {
-        return appliesTo;
-    }
-
-    public void setAppliesTo(List<String> appliesTo) {
-        this.appliesTo = appliesTo;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("pos")
-    public Integer getPos() {
-        return pos;
-    }
-
-    public void setPos(Integer pos) {
-        this.pos = pos;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Note {\n");
-
-        sb.append("  noteType: ").append(noteType).append("\n");
-        sb.append("  appliesTo: ").append(appliesTo).append("\n");
-        sb.append("  value: ").append(value).append("\n");
-        sb.append("  pos: ").append(pos).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/PartOfSpeech.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/PartOfSpeech.java
deleted file mode 100644
index 4a242663bc8..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/PartOfSpeech.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-import io.swagger.client.model.Category;
-import io.swagger.client.model.Root;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@ApiModel(description = "")
-public class PartOfSpeech {
-
-    private List<Root> roots = new ArrayList<Root>();
-    private List<String> storageAbbr = new ArrayList<String>();
-    private List<Category> allCategories = new ArrayList<Category>();
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("roots")
-    public List<Root> getRoots() {
-        return roots;
-    }
-
-    public void setRoots(List<Root> roots) {
-        this.roots = roots;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("storageAbbr")
-    public List<String> getStorageAbbr() {
-        return storageAbbr;
-    }
-
-    public void setStorageAbbr(List<String> storageAbbr) {
-        this.storageAbbr = storageAbbr;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("allCategories")
-    public List<Category> getAllCategories() {
-        return allCategories;
-    }
-
-    public void setAllCategories(List<Category> allCategories) {
-        this.allCategories = allCategories;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PartOfSpeech {\n");
-
-        sb.append("  roots: ").append(roots).append("\n");
-        sb.append("  storageAbbr: ").append(storageAbbr).append("\n");
-        sb.append("  allCategories: ").append(allCategories).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Related.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Related.java
deleted file mode 100644
index aca2c10afa9..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Related.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@ApiModel(description = "")
-public class Related {
-
-    private String label1 = null;
-    private String relationshipType = null;
-    private String label2 = null;
-    private String label3 = null;
-    private List<String> words = new ArrayList<String>();
-    private String gram = null;
-    private String label4 = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("label1")
-    public String getLabel1() {
-        return label1;
-    }
-
-    public void setLabel1(String label1) {
-        this.label1 = label1;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("relationshipType")
-    public String getRelationshipType() {
-        return relationshipType;
-    }
-
-    public void setRelationshipType(String relationshipType) {
-        this.relationshipType = relationshipType;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("label2")
-    public String getLabel2() {
-        return label2;
-    }
-
-    public void setLabel2(String label2) {
-        this.label2 = label2;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("label3")
-    public String getLabel3() {
-        return label3;
-    }
-
-    public void setLabel3(String label3) {
-        this.label3 = label3;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("words")
-    public List<String> getWords() {
-        return words;
-    }
-
-    public void setWords(List<String> words) {
-        this.words = words;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("gram")
-    public String getGram() {
-        return gram;
-    }
-
-    public void setGram(String gram) {
-        this.gram = gram;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("label4")
-    public String getLabel4() {
-        return label4;
-    }
-
-    public void setLabel4(String label4) {
-        this.label4 = label4;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Related {\n");
-
-        sb.append("  label1: ").append(label1).append("\n");
-        sb.append("  relationshipType: ").append(relationshipType).append("\n");
-        sb.append("  label2: ").append(label2).append("\n");
-        sb.append("  label3: ").append(label3).append("\n");
-        sb.append("  words: ").append(words).append("\n");
-        sb.append("  gram: ").append(gram).append("\n");
-        sb.append("  label4: ").append(label4).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Root.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Root.java
deleted file mode 100644
index 0a1b8b2e815..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Root.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-import io.swagger.client.model.Category;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@ApiModel(description = "")
-public class Root {
-
-    private Long id = null;
-    private String name = null;
-    private List<Category> categories = new ArrayList<Category>();
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("categories")
-    public List<Category> getCategories() {
-        return categories;
-    }
-
-    public void setCategories(List<Category> categories) {
-        this.categories = categories;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Root {\n");
-
-        sb.append("  id: ").append(id).append("\n");
-        sb.append("  name: ").append(name).append("\n");
-        sb.append("  categories: ").append(categories).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ScoredWord.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ScoredWord.java
deleted file mode 100644
index 825973e4526..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ScoredWord.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class ScoredWord {
-
-    private Integer position = null;
-    private Long id = null;
-    private Integer docTermCount = null;
-    private String lemma = null;
-    private String wordType = null;
-    private Float score = null;
-    private Long sentenceId = null;
-    private String word = null;
-    private Boolean stopword = null;
-    private Double baseWordScore = null;
-    private String partOfSpeech = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("position")
-    public Integer getPosition() {
-        return position;
-    }
-
-    public void setPosition(Integer position) {
-        this.position = position;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("docTermCount")
-    public Integer getDocTermCount() {
-        return docTermCount;
-    }
-
-    public void setDocTermCount(Integer docTermCount) {
-        this.docTermCount = docTermCount;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("lemma")
-    public String getLemma() {
-        return lemma;
-    }
-
-    public void setLemma(String lemma) {
-        this.lemma = lemma;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("wordType")
-    public String getWordType() {
-        return wordType;
-    }
-
-    public void setWordType(String wordType) {
-        this.wordType = wordType;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("score")
-    public Float getScore() {
-        return score;
-    }
-
-    public void setScore(Float score) {
-        this.score = score;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("sentenceId")
-    public Long getSentenceId() {
-        return sentenceId;
-    }
-
-    public void setSentenceId(Long sentenceId) {
-        this.sentenceId = sentenceId;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("word")
-    public String getWord() {
-        return word;
-    }
-
-    public void setWord(String word) {
-        this.word = word;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("stopword")
-    public Boolean getStopword() {
-        return stopword;
-    }
-
-    public void setStopword(Boolean stopword) {
-        this.stopword = stopword;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("baseWordScore")
-    public Double getBaseWordScore() {
-        return baseWordScore;
-    }
-
-    public void setBaseWordScore(Double baseWordScore) {
-        this.baseWordScore = baseWordScore;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("partOfSpeech")
-    public String getPartOfSpeech() {
-        return partOfSpeech;
-    }
-
-    public void setPartOfSpeech(String partOfSpeech) {
-        this.partOfSpeech = partOfSpeech;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ScoredWord {\n");
-
-        sb.append("  position: ").append(position).append("\n");
-        sb.append("  id: ").append(id).append("\n");
-        sb.append("  docTermCount: ").append(docTermCount).append("\n");
-        sb.append("  lemma: ").append(lemma).append("\n");
-        sb.append("  wordType: ").append(wordType).append("\n");
-        sb.append("  score: ").append(score).append("\n");
-        sb.append("  sentenceId: ").append(sentenceId).append("\n");
-        sb.append("  word: ").append(word).append("\n");
-        sb.append("  stopword: ").append(stopword).append("\n");
-        sb.append("  baseWordScore: ").append(baseWordScore).append("\n");
-        sb.append("  partOfSpeech: ").append(partOfSpeech).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Sentence.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Sentence.java
deleted file mode 100644
index dff8d707516..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Sentence.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-import io.swagger.client.model.ScoredWord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@ApiModel(description = "")
-public class Sentence {
-
-    private Boolean hasScoredWords = null;
-    private Long id = null;
-    private List<ScoredWord> scoredWords = new ArrayList<ScoredWord>();
-    private String display = null;
-    private Integer rating = null;
-    private Long documentMetadataId = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("hasScoredWords")
-    public Boolean getHasScoredWords() {
-        return hasScoredWords;
-    }
-
-    public void setHasScoredWords(Boolean hasScoredWords) {
-        this.hasScoredWords = hasScoredWords;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("scoredWords")
-    public List<ScoredWord> getScoredWords() {
-        return scoredWords;
-    }
-
-    public void setScoredWords(List<ScoredWord> scoredWords) {
-        this.scoredWords = scoredWords;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("display")
-    public String getDisplay() {
-        return display;
-    }
-
-    public void setDisplay(String display) {
-        this.display = display;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("rating")
-    public Integer getRating() {
-        return rating;
-    }
-
-    public void setRating(Integer rating) {
-        this.rating = rating;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("documentMetadataId")
-    public Long getDocumentMetadataId() {
-        return documentMetadataId;
-    }
-
-    public void setDocumentMetadataId(Long documentMetadataId) {
-        this.documentMetadataId = documentMetadataId;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Sentence {\n");
-
-        sb.append("  hasScoredWords: ").append(hasScoredWords).append("\n");
-        sb.append("  id: ").append(id).append("\n");
-        sb.append("  scoredWords: ").append(scoredWords).append("\n");
-        sb.append("  display: ").append(display).append("\n");
-        sb.append("  rating: ").append(rating).append("\n");
-        sb.append("  documentMetadataId: ").append(documentMetadataId).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/SimpleDefinition.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/SimpleDefinition.java
deleted file mode 100644
index c38eb3057a8..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/SimpleDefinition.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class SimpleDefinition {
-
-    private String text = null;
-    private String source = null;
-    private String note = null;
-    private String partOfSpeech = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("text")
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("source")
-    public String getSource() {
-        return source;
-    }
-
-    public void setSource(String source) {
-        this.source = source;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("note")
-    public String getNote() {
-        return note;
-    }
-
-    public void setNote(String note) {
-        this.note = note;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("partOfSpeech")
-    public String getPartOfSpeech() {
-        return partOfSpeech;
-    }
-
-    public void setPartOfSpeech(String partOfSpeech) {
-        this.partOfSpeech = partOfSpeech;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SimpleDefinition {\n");
-
-        sb.append("  text: ").append(text).append("\n");
-        sb.append("  source: ").append(source).append("\n");
-        sb.append("  note: ").append(note).append("\n");
-        sb.append("  partOfSpeech: ").append(partOfSpeech).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/SimpleExample.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/SimpleExample.java
deleted file mode 100644
index fde38931bf7..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/SimpleExample.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class SimpleExample {
-
-    private Long id = null;
-    private String title = null;
-    private String text = null;
-    private String url = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("title")
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("text")
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("url")
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SimpleExample {\n");
-
-        sb.append("  id: ").append(id).append("\n");
-        sb.append("  title: ").append(title).append("\n");
-        sb.append("  text: ").append(text).append("\n");
-        sb.append("  url: ").append(url).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/StringValue.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/StringValue.java
deleted file mode 100644
index e6302fc5258..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/StringValue.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class StringValue {
-
-    private String word = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("word")
-    public String getWord() {
-        return word;
-    }
-
-    public void setWord(String word) {
-        this.word = word;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class StringValue {\n");
-
-        sb.append("  word: ").append(word).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Syllable.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Syllable.java
deleted file mode 100644
index 2cf5b10bfa5..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Syllable.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class Syllable {
-
-    private String text = null;
-    private Integer seq = null;
-    private String type = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("text")
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("seq")
-    public Integer getSeq() {
-        return seq;
-    }
-
-    public void setSeq(Integer seq) {
-        this.seq = seq;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Syllable {\n");
-
-        sb.append("  text: ").append(text).append("\n");
-        sb.append("  seq: ").append(seq).append("\n");
-        sb.append("  type: ").append(type).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/TextPron.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/TextPron.java
deleted file mode 100644
index 6139a28ed48..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/TextPron.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class TextPron {
-
-    private String raw = null;
-    private Integer seq = null;
-    private String rawType = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("raw")
-    public String getRaw() {
-        return raw;
-    }
-
-    public void setRaw(String raw) {
-        this.raw = raw;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("seq")
-    public Integer getSeq() {
-        return seq;
-    }
-
-    public void setSeq(Integer seq) {
-        this.seq = seq;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("rawType")
-    public String getRawType() {
-        return rawType;
-    }
-
-    public void setRawType(String rawType) {
-        this.rawType = rawType;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class TextPron {\n");
-
-        sb.append("  raw: ").append(raw).append("\n");
-        sb.append("  seq: ").append(seq).append("\n");
-        sb.append("  rawType: ").append(rawType).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/User.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/User.java
deleted file mode 100644
index 3f8aaff6a77..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/User.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class User {
-
-    private Long id = null;
-    private String username = null;
-    private String email = null;
-    private Integer status = null;
-    private String faceBookId = null;
-    private String userName = null;
-    private String displayName = null;
-    private String password = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("username")
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("email")
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("status")
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("faceBookId")
-    public String getFaceBookId() {
-        return faceBookId;
-    }
-
-    public void setFaceBookId(String faceBookId) {
-        this.faceBookId = faceBookId;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("userName")
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("displayName")
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("password")
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class User {\n");
-
-        sb.append("  id: ").append(id).append("\n");
-        sb.append("  username: ").append(username).append("\n");
-        sb.append("  email: ").append(email).append("\n");
-        sb.append("  status: ").append(status).append("\n");
-        sb.append("  faceBookId: ").append(faceBookId).append("\n");
-        sb.append("  userName: ").append(userName).append("\n");
-        sb.append("  displayName: ").append(displayName).append("\n");
-        sb.append("  password: ").append(password).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordList.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordList.java
deleted file mode 100644
index 5b2ee78e9a9..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordList.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-import java.util.Date;
-
-
-@ApiModel(description = "")
-public class WordList {
-
-    private Long id = null;
-    private String permalink = null;
-    private String name = null;
-    private Date createdAt = null;
-    private Date updatedAt = null;
-    private Date lastActivityAt = null;
-    private String username = null;
-    private Long userId = null;
-    private String description = null;
-    private Long numberWordsInList = null;
-    private String type = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("permalink")
-    public String getPermalink() {
-        return permalink;
-    }
-
-    public void setPermalink(String permalink) {
-        this.permalink = permalink;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("createdAt")
-    public Date getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("updatedAt")
-    public Date getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Date updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("lastActivityAt")
-    public Date getLastActivityAt() {
-        return lastActivityAt;
-    }
-
-    public void setLastActivityAt(Date lastActivityAt) {
-        this.lastActivityAt = lastActivityAt;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("username")
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("userId")
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("description")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("numberWordsInList")
-    public Long getNumberWordsInList() {
-        return numberWordsInList;
-    }
-
-    public void setNumberWordsInList(Long numberWordsInList) {
-        this.numberWordsInList = numberWordsInList;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class WordList {\n");
-
-        sb.append("  id: ").append(id).append("\n");
-        sb.append("  permalink: ").append(permalink).append("\n");
-        sb.append("  name: ").append(name).append("\n");
-        sb.append("  createdAt: ").append(createdAt).append("\n");
-        sb.append("  updatedAt: ").append(updatedAt).append("\n");
-        sb.append("  lastActivityAt: ").append(lastActivityAt).append("\n");
-        sb.append("  username: ").append(username).append("\n");
-        sb.append("  userId: ").append(userId).append("\n");
-        sb.append("  description: ").append(description).append("\n");
-        sb.append("  numberWordsInList: ").append(numberWordsInList).append("\n");
-        sb.append("  type: ").append(type).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordListWord.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordListWord.java
deleted file mode 100644
index d3c02ab5877..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordListWord.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-import java.util.Date;
-
-
-@ApiModel(description = "")
-public class WordListWord {
-
-    private Long id = null;
-    private String word = null;
-    private String username = null;
-    private Long userId = null;
-    private Date createdAt = null;
-    private Long numberCommentsOnWord = null;
-    private Long numberLists = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("word")
-    public String getWord() {
-        return word;
-    }
-
-    public void setWord(String word) {
-        this.word = word;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("username")
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("userId")
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("createdAt")
-    public Date getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("numberCommentsOnWord")
-    public Long getNumberCommentsOnWord() {
-        return numberCommentsOnWord;
-    }
-
-    public void setNumberCommentsOnWord(Long numberCommentsOnWord) {
-        this.numberCommentsOnWord = numberCommentsOnWord;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("numberLists")
-    public Long getNumberLists() {
-        return numberLists;
-    }
-
-    public void setNumberLists(Long numberLists) {
-        this.numberLists = numberLists;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class WordListWord {\n");
-
-        sb.append("  id: ").append(id).append("\n");
-        sb.append("  word: ").append(word).append("\n");
-        sb.append("  username: ").append(username).append("\n");
-        sb.append("  userId: ").append(userId).append("\n");
-        sb.append("  createdAt: ").append(createdAt).append("\n");
-        sb.append("  numberCommentsOnWord: ").append(numberCommentsOnWord).append("\n");
-        sb.append("  numberLists: ").append(numberLists).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordObject.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordObject.java
deleted file mode 100644
index 847330dec3c..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordObject.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@ApiModel(description = "")
-public class WordObject {
-
-    private Long id = null;
-    private String word = null;
-    private String originalWord = null;
-    private List<String> suggestions = new ArrayList<String>();
-    private String canonicalForm = null;
-    private String vulgar = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("word")
-    public String getWord() {
-        return word;
-    }
-
-    public void setWord(String word) {
-        this.word = word;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("originalWord")
-    public String getOriginalWord() {
-        return originalWord;
-    }
-
-    public void setOriginalWord(String originalWord) {
-        this.originalWord = originalWord;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("suggestions")
-    public List<String> getSuggestions() {
-        return suggestions;
-    }
-
-    public void setSuggestions(List<String> suggestions) {
-        this.suggestions = suggestions;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("canonicalForm")
-    public String getCanonicalForm() {
-        return canonicalForm;
-    }
-
-    public void setCanonicalForm(String canonicalForm) {
-        this.canonicalForm = canonicalForm;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("vulgar")
-    public String getVulgar() {
-        return vulgar;
-    }
-
-    public void setVulgar(String vulgar) {
-        this.vulgar = vulgar;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class WordObject {\n");
-
-        sb.append("  id: ").append(id).append("\n");
-        sb.append("  word: ").append(word).append("\n");
-        sb.append("  originalWord: ").append(originalWord).append("\n");
-        sb.append("  suggestions: ").append(suggestions).append("\n");
-        sb.append("  canonicalForm: ").append(canonicalForm).append("\n");
-        sb.append("  vulgar: ").append(vulgar).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordOfTheDay.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordOfTheDay.java
deleted file mode 100644
index cf54947aa1b..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordOfTheDay.java
+++ /dev/null
@@ -1,207 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-import io.swagger.client.model.ContentProvider;
-import io.swagger.client.model.SimpleDefinition;
-import io.swagger.client.model.SimpleExample;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-
-@ApiModel(description = "")
-public class WordOfTheDay {
-
-    private Long id = null;
-    private String parentId = null;
-    private String category = null;
-    private String createdBy = null;
-    private Date createdAt = null;
-    private ContentProvider contentProvider = null;
-    private String htmlExtra = null;
-    private String word = null;
-    private List<SimpleDefinition> definitions = new ArrayList<SimpleDefinition>();
-    private List<SimpleExample> examples = new ArrayList<SimpleExample>();
-    private String note = null;
-    private Date publishDate = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("parentId")
-    public String getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(String parentId) {
-        this.parentId = parentId;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("category")
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("createdBy")
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("createdAt")
-    public Date getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("contentProvider")
-    public ContentProvider getContentProvider() {
-        return contentProvider;
-    }
-
-    public void setContentProvider(ContentProvider contentProvider) {
-        this.contentProvider = contentProvider;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("htmlExtra")
-    public String getHtmlExtra() {
-        return htmlExtra;
-    }
-
-    public void setHtmlExtra(String htmlExtra) {
-        this.htmlExtra = htmlExtra;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("word")
-    public String getWord() {
-        return word;
-    }
-
-    public void setWord(String word) {
-        this.word = word;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("definitions")
-    public List<SimpleDefinition> getDefinitions() {
-        return definitions;
-    }
-
-    public void setDefinitions(List<SimpleDefinition> definitions) {
-        this.definitions = definitions;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("examples")
-    public List<SimpleExample> getExamples() {
-        return examples;
-    }
-
-    public void setExamples(List<SimpleExample> examples) {
-        this.examples = examples;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("note")
-    public String getNote() {
-        return note;
-    }
-
-    public void setNote(String note) {
-        this.note = note;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("publishDate")
-    public Date getPublishDate() {
-        return publishDate;
-    }
-
-    public void setPublishDate(Date publishDate) {
-        this.publishDate = publishDate;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class WordOfTheDay {\n");
-
-        sb.append("  id: ").append(id).append("\n");
-        sb.append("  parentId: ").append(parentId).append("\n");
-        sb.append("  category: ").append(category).append("\n");
-        sb.append("  createdBy: ").append(createdBy).append("\n");
-        sb.append("  createdAt: ").append(createdAt).append("\n");
-        sb.append("  contentProvider: ").append(contentProvider).append("\n");
-        sb.append("  htmlExtra: ").append(htmlExtra).append("\n");
-        sb.append("  word: ").append(word).append("\n");
-        sb.append("  definitions: ").append(definitions).append("\n");
-        sb.append("  examples: ").append(examples).append("\n");
-        sb.append("  note: ").append(note).append("\n");
-        sb.append("  publishDate: ").append(publishDate).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordSearchResult.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordSearchResult.java
deleted file mode 100644
index 57f9729c800..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordSearchResult.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class WordSearchResult {
-
-    private Long count = null;
-    private Double lexicality = null;
-    private String word = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("count")
-    public Long getCount() {
-        return count;
-    }
-
-    public void setCount(Long count) {
-        this.count = count;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("lexicality")
-    public Double getLexicality() {
-        return lexicality;
-    }
-
-    public void setLexicality(Double lexicality) {
-        this.lexicality = lexicality;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("word")
-    public String getWord() {
-        return word;
-    }
-
-    public void setWord(String word) {
-        this.word = word;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class WordSearchResult {\n");
-
-        sb.append("  count: ").append(count).append("\n");
-        sb.append("  lexicality: ").append(lexicality).append("\n");
-        sb.append("  word: ").append(word).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordSearchResults.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordSearchResults.java
deleted file mode 100644
index cb0a363fc4d..00000000000
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordSearchResults.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-import io.swagger.client.model.WordSearchResult;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@ApiModel(description = "")
-public class WordSearchResults {
-
-    private List<WordSearchResult> searchResults = new ArrayList<WordSearchResult>();
-    private Integer totalResults = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("searchResults")
-    public List<WordSearchResult> getSearchResults() {
-        return searchResults;
-    }
-
-    public void setSearchResults(List<WordSearchResult> searchResults) {
-        this.searchResults = searchResults;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("totalResults")
-    public Integer getTotalResults() {
-        return totalResults;
-    }
-
-    public void setTotalResults(Integer totalResults) {
-        this.totalResults = totalResults;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class WordSearchResults {\n");
-
-        sb.append("  searchResults: ").append(searchResults).append("\n");
-        sb.append("  totalResults: ").append(totalResults).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/pom.xml b/samples/client/wordnik/java/pom.xml
deleted file mode 100644
index 2bc0fbe5569..00000000000
--- a/samples/client/wordnik/java/pom.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>io.swagger</groupId>
-    <artifactId>swagger-client</artifactId>
-    <packaging>jar</packaging>
-    <name>swagger-client</name>
-    <version>1.0.0</version>
-    <prerequisites>
-        <maven>2.2.0</maven>
-    </prerequisites>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.12</version>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>loggerPath</name>
-                            <value>conf/log4j.properties</value>
-                        </property>
-                    </systemProperties>
-                    <argLine>-Xms512m -Xmx1500m</argLine>
-                    <parallel>methods</parallel>
-                    <forkMode>pertest</forkMode>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- attach test jar -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.2</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>jar</goal>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add_sources</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>src/main/java</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>add_test_sources</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>src/test/java</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <dependencies>
-        <dependency>
-            <groupId>com.wordnik</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-annotations-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-client</artifactId>
-            <version>${jersey-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey.contribs</groupId>
-            <artifactId>jersey-multipart</artifactId>
-            <version>${jersey-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${jackson-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>${jackson-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-joda</artifactId>
-            <version>2.1.5</version>
-        </dependency>
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>${jodatime-version}</version>
-        </dependency>
-
-        <!-- test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit-version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <properties>
-        <swagger-annotations-version>1.5.0-M1</swagger-annotations-version>
-        <jersey-version>1.7</jersey-version>
-        <jackson-version>2.1.5</jackson-version>
-        <jodatime-version>2.3</jodatime-version>
-        <junit-version>4.8.1</junit-version>
-        <maven-plugin-version>1.0.0</maven-plugin-version>
-        <junit-version>4.8.1</junit-version>
-    </properties>
-</project>
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/ApiException.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/ApiException.java
deleted file mode 100644
index afeba0fc7d7..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/ApiException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.swagger.client;
-
-public class ApiException extends Exception {
-    int code = 0;
-    String message = null;
-
-    public ApiException() {
-    }
-
-    public ApiException(int code, String message) {
-        this.code = code;
-        this.message = message;
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public void setCode(int code) {
-        this.code = code;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-}
\ No newline at end of file
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/ApiInvoker.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/ApiInvoker.java
deleted file mode 100644
index 686b98246fc..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/ApiInvoker.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package io.swagger.client;
-
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource.Builder;
-import com.sun.jersey.api.client.filter.LoggingFilter;
-import com.sun.jersey.multipart.FormDataMultiPart;
-
-import javax.ws.rs.core.Response.Status.Family;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class ApiInvoker {
-    private static ApiInvoker INSTANCE = new ApiInvoker();
-    private Map<String, Client> hostMap = new HashMap<String, Client>();
-    private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
-    private boolean isDebug = false;
-
-    public static ApiInvoker getInstance() {
-        return INSTANCE;
-    }
-
-    public static Object deserialize(String json, String containerType, Class cls) throws ApiException {
-        try {
-            if ("List".equals(containerType)) {
-                JavaType typeInfo = JsonUtil.getJsonMapper().getTypeFactory().constructCollectionType(List.class, cls);
-                return (List<?>) JsonUtil.getJsonMapper().readValue(json, typeInfo);
-            } else if (String.class.equals(cls)) {
-                if (json != null && json.startsWith("\"") && json.endsWith("\"") && json.length() > 1) {
-                    return json.substring(1, json.length() - 2);
-                } else {
-                    return json;
-                }
-            } else {
-                return JsonUtil.getJsonMapper().readValue(json, cls);
-            }
-        } catch (IOException e) {
-            throw new ApiException(500, e.getMessage());
-        }
-    }
-
-    public static String serialize(Object obj) throws ApiException {
-        try {
-            if (obj != null) {
-                return JsonUtil.getJsonMapper().writeValueAsString(obj);
-            } else {
-                return null;
-            }
-        } catch (Exception e) {
-            throw new ApiException(500, e.getMessage());
-        }
-    }
-
-    public void enableDebug() {
-        isDebug = true;
-    }
-
-    public void addDefaultHeader(String key, String value) {
-        defaultHeaderMap.put(key, value);
-    }
-
-    public String escapeString(String str) {
-        try {
-            return URLEncoder.encode(str, "utf8").replaceAll("\\+", "%20");
-        } catch (UnsupportedEncodingException e) {
-            return str;
-        }
-    }
-
-    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 {
-        Client client = getClient(host);
-
-        StringBuilder b = new StringBuilder();
-
-        for (String key : queryParams.keySet()) {
-            String value = queryParams.get(key);
-            if (value != null) {
-                if (b.toString().length() == 0) {
-                    b.append("?");
-                } else {
-                    b.append("&");
-                }
-                b.append(escapeString(key)).append("=").append(escapeString(value));
-            }
-        }
-        String querystring = b.toString();
-
-        Builder builder = client.resource(host + path + querystring).accept("application/json");
-        for (String key : headerParams.keySet()) {
-            builder.header(key, headerParams.get(key));
-        }
-
-        for (String key : defaultHeaderMap.keySet()) {
-            if (!headerParams.containsKey(key)) {
-                builder.header(key, defaultHeaderMap.get(key));
-            }
-        }
-        ClientResponse response = null;
-
-        if ("GET".equals(method)) {
-            response = (ClientResponse) builder.get(ClientResponse.class);
-        } else if ("POST".equals(method)) {
-            if (body == null) {
-                response = builder.post(ClientResponse.class, null);
-            } else if (body instanceof FormDataMultiPart) {
-                response = builder.type(contentType).post(ClientResponse.class, body);
-            } else {
-                response = builder.type(contentType).post(ClientResponse.class, serialize(body));
-            }
-        } else if ("PUT".equals(method)) {
-            if (body == null) {
-                response = builder.put(ClientResponse.class, serialize(body));
-            } else {
-                if ("application/x-www-form-urlencoded".equals(contentType)) {
-                    StringBuilder formParamBuilder = new StringBuilder();
-
-                    // encode the form params
-                    for (String key : formParams.keySet()) {
-                        String value = formParams.get(key);
-                        if (value != null && !"".equals(value.trim())) {
-                            if (formParamBuilder.length() > 0) {
-                                formParamBuilder.append("&");
-                            }
-                            try {
-                                formParamBuilder.append(URLEncoder.encode(key, "utf8")).append("=").append(URLEncoder.encode(value, "utf8"));
-                            } catch (Exception e) {
-                                // move on to next
-                            }
-                        }
-                    }
-                    response = builder.type(contentType).put(ClientResponse.class, formParamBuilder.toString());
-                } else {
-                    response = builder.type(contentType).put(ClientResponse.class, serialize(body));
-                }
-            }
-        } else if ("DELETE".equals(method)) {
-            if (body == null) {
-                response = builder.delete(ClientResponse.class, serialize(body));
-            } else {
-                response = builder.type(contentType).delete(ClientResponse.class, serialize(body));
-            }
-        } else {
-            throw new ApiException(500, "unknown method type " + method);
-        }
-        if (response.getClientResponseStatus() == ClientResponse.Status.NO_CONTENT) {
-            return null;
-        } else if (response.getClientResponseStatus().getFamily() == Family.SUCCESSFUL) {
-            return (String) response.getEntity(String.class);
-        } else {
-            throw new ApiException(
-                    response.getClientResponseStatus().getStatusCode(),
-                    response.getEntity(String.class));
-        }
-    }
-
-    private Client getClient(String host) {
-        if (!hostMap.containsKey(host)) {
-            Client client = Client.create();
-            if (isDebug) {
-                client.addFilter(new LoggingFilter());
-            }
-            hostMap.put(host, client);
-        }
-        return hostMap.get(host);
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/JsonUtil.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/JsonUtil.java
deleted file mode 100644
index 2cdd158e8a6..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/JsonUtil.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.swagger.client;
-
-public class JsonUtil {
-    public static ObjectMapper mapper;
-
-    public static ObjectMapper getJsonMapper() {
-        return mapper;
-    }
-
-    static {
-        mapper = new ObjectMapper();
-        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-        mapper.registerModule(new JodaModule());
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/api/AccountApi.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/api/AccountApi.java
deleted file mode 100644
index 21cf2ebeee9..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/api/AccountApi.java
+++ /dev/null
@@ -1,283 +0,0 @@
-package io.swagger.client.api;
-
-import com.sun.jersey.multipart.FormDataMultiPart;
-import io.swagger.client.ApiException;
-import io.swagger.client.ApiInvoker;
-import io.swagger.client.model.ApiTokenStatus;
-import io.swagger.client.model.AuthenticationToken;
-import io.swagger.client.model.User;
-import io.swagger.client.model.WordList;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class AccountApi {
-    String basePath = "https://api.wordnik.com/v4";
-    ApiInvoker apiInvoker = ApiInvoker.getInstance();
-
-    public ApiInvoker getInvoker() {
-        return apiInvoker;
-    }
-
-    public String getBasePath() {
-        return basePath;
-    }
-
-    public void setBasePath(String basePath) {
-        this.basePath = basePath;
-    }
-
-    public ApiTokenStatus getApiTokenStatus(String api_key) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/account.json/apiTokenStatus".replaceAll("\\{format\\}", "json");
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> formParams = new HashMap<String, String>();
-
-
-        headerParams.put("api_key", api_key);
-
-        String[] contentTypes = {
-
-        };
-
-        String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-        if (contentType.startsWith("multipart/form-data")) {
-            boolean hasFields = false;
-            FormDataMultiPart mp = new FormDataMultiPart();
-
-            if (hasFields) {
-                postBody = mp;
-            }
-        } else {
-
-        }
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-            if (response != null) {
-                return (ApiTokenStatus) ApiInvoker.deserialize(response, "", ApiTokenStatus.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public AuthenticationToken authenticate(String username, String password) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/account.json/authenticate/{username}".replaceAll("\\{format\\}", "json")
-                .replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> formParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(password))) {
-            queryParams.put("password", String.valueOf(password));
-        }
-
-
-        String[] contentTypes = {
-
-        };
-
-        String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-        if (contentType.startsWith("multipart/form-data")) {
-            boolean hasFields = false;
-            FormDataMultiPart mp = new FormDataMultiPart();
-
-            if (hasFields) {
-                postBody = mp;
-            }
-        } else {
-
-        }
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-            if (response != null) {
-                return (AuthenticationToken) ApiInvoker.deserialize(response, "", AuthenticationToken.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public AuthenticationToken authenticatePost(String username, String body) throws ApiException {
-        Object postBody = body;
-
-
-        // create path and map variables
-        String path = "/account.json/authenticate/{username}".replaceAll("\\{format\\}", "json")
-                .replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> formParams = new HashMap<String, String>();
-
-
-        String[] contentTypes = {
-
-        };
-
-        String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-        if (contentType.startsWith("multipart/form-data")) {
-            boolean hasFields = false;
-            FormDataMultiPart mp = new FormDataMultiPart();
-
-            if (hasFields) {
-                postBody = mp;
-            }
-        } else {
-
-        }
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType);
-            if (response != null) {
-                return (AuthenticationToken) ApiInvoker.deserialize(response, "", AuthenticationToken.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public User getLoggedInUser(String auth_token) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/account.json/user".replaceAll("\\{format\\}", "json");
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> formParams = new HashMap<String, String>();
-
-
-        headerParams.put("auth_token", auth_token);
-
-        String[] contentTypes = {
-
-        };
-
-        String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-        if (contentType.startsWith("multipart/form-data")) {
-            boolean hasFields = false;
-            FormDataMultiPart mp = new FormDataMultiPart();
-
-            if (hasFields) {
-                postBody = mp;
-            }
-        } else {
-
-        }
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-            if (response != null) {
-                return (User) ApiInvoker.deserialize(response, "", User.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public List<WordList> getWordListsForLoggedInUser(String auth_token, Integer skip, Integer limit) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/account.json/wordLists".replaceAll("\\{format\\}", "json");
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> formParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(skip))) {
-            queryParams.put("skip", String.valueOf(skip));
-        }
-        if (!"null".equals(String.valueOf(limit))) {
-            queryParams.put("limit", String.valueOf(limit));
-        }
-
-        headerParams.put("auth_token", auth_token);
-
-        String[] contentTypes = {
-
-        };
-
-        String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-        if (contentType.startsWith("multipart/form-data")) {
-            boolean hasFields = false;
-            FormDataMultiPart mp = new FormDataMultiPart();
-
-            if (hasFields) {
-                postBody = mp;
-            }
-        } else {
-
-        }
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-            if (response != null) {
-                return (List<WordList>) ApiInvoker.deserialize(response, "array", WordList.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/api/WordApi.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/api/WordApi.java
deleted file mode 100644
index 78f03c5bf3b..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/api/WordApi.java
+++ /dev/null
@@ -1,667 +0,0 @@
-package io.swagger.client.api;
-
-import com.sun.jersey.multipart.FormDataMultiPart;
-import io.swagger.client.ApiException;
-import io.swagger.client.ApiInvoker;
-import io.swagger.client.model.AudioFile;
-import io.swagger.client.model.Bigram;
-import io.swagger.client.model.Definition;
-import io.swagger.client.model.Example;
-import io.swagger.client.model.FrequencySummary;
-import io.swagger.client.model.WordObject;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class WordApi {
-    String basePath = "https://api.wordnik.com/v4";
-    ApiInvoker apiInvoker = ApiInvoker.getInstance();
-
-    public ApiInvoker getInvoker() {
-        return apiInvoker;
-    }
-
-    public String getBasePath() {
-        return basePath;
-    }
-
-    public void setBasePath(String basePath) {
-        this.basePath = basePath;
-    }
-
-    public WordObject getWord(String word, String useCanonical, String includeSuggestions) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/word.json/{word}".replaceAll("\\{format\\}", "json")
-                .replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> formParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(useCanonical))) {
-            queryParams.put("useCanonical", String.valueOf(useCanonical));
-        }
-        if (!"null".equals(String.valueOf(includeSuggestions))) {
-            queryParams.put("includeSuggestions", String.valueOf(includeSuggestions));
-        }
-
-
-        String[] contentTypes = {
-
-        };
-
-        String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-        if (contentType.startsWith("multipart/form-data")) {
-            boolean hasFields = false;
-            FormDataMultiPart mp = new FormDataMultiPart();
-
-            if (hasFields) {
-                postBody = mp;
-            }
-        } else {
-
-        }
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-            if (response != null) {
-                return (WordObject) ApiInvoker.deserialize(response, "", WordObject.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public List<AudioFile> getAudio(String word, String useCanonical, Integer limit) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/word.json/{word}/audio".replaceAll("\\{format\\}", "json")
-                .replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> formParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(useCanonical))) {
-            queryParams.put("useCanonical", String.valueOf(useCanonical));
-        }
-        if (!"null".equals(String.valueOf(limit))) {
-            queryParams.put("limit", String.valueOf(limit));
-        }
-
-
-        String[] contentTypes = {
-
-        };
-
-        String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-        if (contentType.startsWith("multipart/form-data")) {
-            boolean hasFields = false;
-            FormDataMultiPart mp = new FormDataMultiPart();
-
-            if (hasFields) {
-                postBody = mp;
-            }
-        } else {
-
-        }
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-            if (response != null) {
-                return (List<AudioFile>) ApiInvoker.deserialize(response, "array", AudioFile.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public List<Definition> getDefinitions(String word, Integer limit, String partOfSpeech, String includeRelated, List<String> sourceDictionaries, String useCanonical, String includeTags) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/word.json/{word}/definitions".replaceAll("\\{format\\}", "json")
-                .replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> formParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(limit))) {
-            queryParams.put("limit", String.valueOf(limit));
-        }
-        if (!"null".equals(String.valueOf(partOfSpeech))) {
-            queryParams.put("partOfSpeech", String.valueOf(partOfSpeech));
-        }
-        if (!"null".equals(String.valueOf(includeRelated))) {
-            queryParams.put("includeRelated", String.valueOf(includeRelated));
-        }
-        if (!"null".equals(String.valueOf(sourceDictionaries))) {
-            queryParams.put("sourceDictionaries", String.valueOf(sourceDictionaries));
-        }
-        if (!"null".equals(String.valueOf(useCanonical))) {
-            queryParams.put("useCanonical", String.valueOf(useCanonical));
-        }
-        if (!"null".equals(String.valueOf(includeTags))) {
-            queryParams.put("includeTags", String.valueOf(includeTags));
-        }
-
-
-        String[] contentTypes = {
-
-        };
-
-        String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-        if (contentType.startsWith("multipart/form-data")) {
-            boolean hasFields = false;
-            FormDataMultiPart mp = new FormDataMultiPart();
-
-            if (hasFields) {
-                postBody = mp;
-            }
-        } else {
-
-        }
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-            if (response != null) {
-                return (List<Definition>) ApiInvoker.deserialize(response, "array", Definition.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public List<String> getEtymologies(String word, String useCanonical) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/word.json/{word}/etymologies".replaceAll("\\{format\\}", "json")
-                .replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> formParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(useCanonical))) {
-            queryParams.put("useCanonical", String.valueOf(useCanonical));
-        }
-
-
-        String[] contentTypes = {
-
-        };
-
-        String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-        if (contentType.startsWith("multipart/form-data")) {
-            boolean hasFields = false;
-            FormDataMultiPart mp = new FormDataMultiPart();
-
-            if (hasFields) {
-                postBody = mp;
-            }
-        } else {
-
-        }
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-            if (response != null) {
-                return (List<String>) ApiInvoker.deserialize(response, "array", String.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public void getExamples(String word, String includeDuplicates, String useCanonical, Integer skip, Integer limit) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/word.json/{word}/examples".replaceAll("\\{format\\}", "json")
-                .replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> formParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(includeDuplicates))) {
-            queryParams.put("includeDuplicates", String.valueOf(includeDuplicates));
-        }
-        if (!"null".equals(String.valueOf(useCanonical))) {
-            queryParams.put("useCanonical", String.valueOf(useCanonical));
-        }
-        if (!"null".equals(String.valueOf(skip))) {
-            queryParams.put("skip", String.valueOf(skip));
-        }
-        if (!"null".equals(String.valueOf(limit))) {
-            queryParams.put("limit", String.valueOf(limit));
-        }
-
-
-        String[] contentTypes = {
-
-        };
-
-        String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-        if (contentType.startsWith("multipart/form-data")) {
-            boolean hasFields = false;
-            FormDataMultiPart mp = new FormDataMultiPart();
-
-            if (hasFields) {
-                postBody = mp;
-            }
-        } else {
-
-        }
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-            if (response != null) {
-                return;
-            } else {
-                return;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public FrequencySummary getWordFrequency(String word, String useCanonical, Integer startYear, Integer endYear) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/word.json/{word}/frequency".replaceAll("\\{format\\}", "json")
-                .replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> formParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(useCanonical))) {
-            queryParams.put("useCanonical", String.valueOf(useCanonical));
-        }
-        if (!"null".equals(String.valueOf(startYear))) {
-            queryParams.put("startYear", String.valueOf(startYear));
-        }
-        if (!"null".equals(String.valueOf(endYear))) {
-            queryParams.put("endYear", String.valueOf(endYear));
-        }
-
-
-        String[] contentTypes = {
-
-        };
-
-        String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-        if (contentType.startsWith("multipart/form-data")) {
-            boolean hasFields = false;
-            FormDataMultiPart mp = new FormDataMultiPart();
-
-            if (hasFields) {
-                postBody = mp;
-            }
-        } else {
-
-        }
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-            if (response != null) {
-                return (FrequencySummary) ApiInvoker.deserialize(response, "", FrequencySummary.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public void getHyphenation(String word, String useCanonical, String sourceDictionary, Integer limit) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/word.json/{word}/hyphenation".replaceAll("\\{format\\}", "json")
-                .replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> formParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(useCanonical))) {
-            queryParams.put("useCanonical", String.valueOf(useCanonical));
-        }
-        if (!"null".equals(String.valueOf(sourceDictionary))) {
-            queryParams.put("sourceDictionary", String.valueOf(sourceDictionary));
-        }
-        if (!"null".equals(String.valueOf(limit))) {
-            queryParams.put("limit", String.valueOf(limit));
-        }
-
-
-        String[] contentTypes = {
-
-        };
-
-        String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-        if (contentType.startsWith("multipart/form-data")) {
-            boolean hasFields = false;
-            FormDataMultiPart mp = new FormDataMultiPart();
-
-            if (hasFields) {
-                postBody = mp;
-            }
-        } else {
-
-        }
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-            if (response != null) {
-                return;
-            } else {
-                return;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public List<Bigram> getPhrases(String word, Integer limit, Integer wlmi, String useCanonical) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/word.json/{word}/phrases".replaceAll("\\{format\\}", "json")
-                .replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> formParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(limit))) {
-            queryParams.put("limit", String.valueOf(limit));
-        }
-        if (!"null".equals(String.valueOf(wlmi))) {
-            queryParams.put("wlmi", String.valueOf(wlmi));
-        }
-        if (!"null".equals(String.valueOf(useCanonical))) {
-            queryParams.put("useCanonical", String.valueOf(useCanonical));
-        }
-
-
-        String[] contentTypes = {
-
-        };
-
-        String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-        if (contentType.startsWith("multipart/form-data")) {
-            boolean hasFields = false;
-            FormDataMultiPart mp = new FormDataMultiPart();
-
-            if (hasFields) {
-                postBody = mp;
-            }
-        } else {
-
-        }
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-            if (response != null) {
-                return (List<Bigram>) ApiInvoker.deserialize(response, "array", Bigram.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public void getTextPronunciations(String word, String useCanonical, String sourceDictionary, String typeFormat, Integer limit) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/word.json/{word}/pronunciations".replaceAll("\\{format\\}", "json")
-                .replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> formParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(useCanonical))) {
-            queryParams.put("useCanonical", String.valueOf(useCanonical));
-        }
-        if (!"null".equals(String.valueOf(sourceDictionary))) {
-            queryParams.put("sourceDictionary", String.valueOf(sourceDictionary));
-        }
-        if (!"null".equals(String.valueOf(typeFormat))) {
-            queryParams.put("typeFormat", String.valueOf(typeFormat));
-        }
-        if (!"null".equals(String.valueOf(limit))) {
-            queryParams.put("limit", String.valueOf(limit));
-        }
-
-
-        String[] contentTypes = {
-
-        };
-
-        String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-        if (contentType.startsWith("multipart/form-data")) {
-            boolean hasFields = false;
-            FormDataMultiPart mp = new FormDataMultiPart();
-
-            if (hasFields) {
-                postBody = mp;
-            }
-        } else {
-
-        }
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-            if (response != null) {
-                return;
-            } else {
-                return;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public void getRelatedWords(String word, String useCanonical, String relationshipTypes, Integer limitPerRelationshipType) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/word.json/{word}/relatedWords".replaceAll("\\{format\\}", "json")
-                .replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> formParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(useCanonical))) {
-            queryParams.put("useCanonical", String.valueOf(useCanonical));
-        }
-        if (!"null".equals(String.valueOf(relationshipTypes))) {
-            queryParams.put("relationshipTypes", String.valueOf(relationshipTypes));
-        }
-        if (!"null".equals(String.valueOf(limitPerRelationshipType))) {
-            queryParams.put("limitPerRelationshipType", String.valueOf(limitPerRelationshipType));
-        }
-
-
-        String[] contentTypes = {
-
-        };
-
-        String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-        if (contentType.startsWith("multipart/form-data")) {
-            boolean hasFields = false;
-            FormDataMultiPart mp = new FormDataMultiPart();
-
-            if (hasFields) {
-                postBody = mp;
-            }
-        } else {
-
-        }
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-            if (response != null) {
-                return;
-            } else {
-                return;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public Example getTopExample(String word, String useCanonical) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/word.json/{word}/topExample".replaceAll("\\{format\\}", "json")
-                .replaceAll("\\{" + "word" + "\\}", apiInvoker.escapeString(word.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> formParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(useCanonical))) {
-            queryParams.put("useCanonical", String.valueOf(useCanonical));
-        }
-
-
-        String[] contentTypes = {
-
-        };
-
-        String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-        if (contentType.startsWith("multipart/form-data")) {
-            boolean hasFields = false;
-            FormDataMultiPart mp = new FormDataMultiPart();
-
-            if (hasFields) {
-                postBody = mp;
-            }
-        } else {
-
-        }
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-            if (response != null) {
-                return (Example) ApiInvoker.deserialize(response, "", Example.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/api/WordListApi.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/api/WordListApi.java
deleted file mode 100644
index 4fb78a4a39f..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/api/WordListApi.java
+++ /dev/null
@@ -1,340 +0,0 @@
-package io.swagger.client.api;
-
-import com.sun.jersey.multipart.FormDataMultiPart;
-import io.swagger.client.ApiException;
-import io.swagger.client.ApiInvoker;
-import io.swagger.client.model.StringValue;
-import io.swagger.client.model.WordList;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class WordListApi {
-    String basePath = "https://api.wordnik.com/v4";
-    ApiInvoker apiInvoker = ApiInvoker.getInstance();
-
-    public ApiInvoker getInvoker() {
-        return apiInvoker;
-    }
-
-    public String getBasePath() {
-        return basePath;
-    }
-
-    public void setBasePath(String basePath) {
-        this.basePath = basePath;
-    }
-
-    public WordList getWordListByPermalink(String permalink, String auth_token) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/wordList.json/{permalink}".replaceAll("\\{format\\}", "json")
-                .replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escapeString(permalink.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> formParams = new HashMap<String, String>();
-
-
-        headerParams.put("auth_token", auth_token);
-
-        String[] contentTypes = {
-
-        };
-
-        String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-        if (contentType.startsWith("multipart/form-data")) {
-            boolean hasFields = false;
-            FormDataMultiPart mp = new FormDataMultiPart();
-
-            if (hasFields) {
-                postBody = mp;
-            }
-        } else {
-
-        }
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-            if (response != null) {
-                return (WordList) ApiInvoker.deserialize(response, "", WordList.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public void updateWordList(String permalink, WordList body, String auth_token) throws ApiException {
-        Object postBody = body;
-
-
-        // create path and map variables
-        String path = "/wordList.json/{permalink}".replaceAll("\\{format\\}", "json")
-                .replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escapeString(permalink.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> formParams = new HashMap<String, String>();
-
-
-        headerParams.put("auth_token", auth_token);
-
-        String[] contentTypes = {
-
-        };
-
-        String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-        if (contentType.startsWith("multipart/form-data")) {
-            boolean hasFields = false;
-            FormDataMultiPart mp = new FormDataMultiPart();
-
-            if (hasFields) {
-                postBody = mp;
-            }
-        } else {
-
-        }
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "PUT", queryParams, postBody, headerParams, formParams, contentType);
-            if (response != null) {
-                return;
-            } else {
-                return;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public void deleteWordList(String permalink, String auth_token) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/wordList.json/{permalink}".replaceAll("\\{format\\}", "json")
-                .replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escapeString(permalink.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> formParams = new HashMap<String, String>();
-
-
-        headerParams.put("auth_token", auth_token);
-
-        String[] contentTypes = {
-
-        };
-
-        String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-        if (contentType.startsWith("multipart/form-data")) {
-            boolean hasFields = false;
-            FormDataMultiPart mp = new FormDataMultiPart();
-
-            if (hasFields) {
-                postBody = mp;
-            }
-        } else {
-
-        }
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, postBody, headerParams, formParams, contentType);
-            if (response != null) {
-                return;
-            } else {
-                return;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public void deleteWordsFromWordList(String permalink, List<StringValue> body, String auth_token) throws ApiException {
-        Object postBody = body;
-
-
-        // create path and map variables
-        String path = "/wordList.json/{permalink}/deleteWords".replaceAll("\\{format\\}", "json")
-                .replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escapeString(permalink.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> formParams = new HashMap<String, String>();
-
-
-        headerParams.put("auth_token", auth_token);
-
-        String[] contentTypes = {
-
-        };
-
-        String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-        if (contentType.startsWith("multipart/form-data")) {
-            boolean hasFields = false;
-            FormDataMultiPart mp = new FormDataMultiPart();
-
-            if (hasFields) {
-                postBody = mp;
-            }
-        } else {
-
-        }
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType);
-            if (response != null) {
-                return;
-            } else {
-                return;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public void getWordListWords(String permalink, String sortBy, String sortOrder, Integer skip, Integer limit, String auth_token) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/wordList.json/{permalink}/words".replaceAll("\\{format\\}", "json")
-                .replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escapeString(permalink.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> formParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(sortBy))) {
-            queryParams.put("sortBy", String.valueOf(sortBy));
-        }
-        if (!"null".equals(String.valueOf(sortOrder))) {
-            queryParams.put("sortOrder", String.valueOf(sortOrder));
-        }
-        if (!"null".equals(String.valueOf(skip))) {
-            queryParams.put("skip", String.valueOf(skip));
-        }
-        if (!"null".equals(String.valueOf(limit))) {
-            queryParams.put("limit", String.valueOf(limit));
-        }
-
-        headerParams.put("auth_token", auth_token);
-
-        String[] contentTypes = {
-
-        };
-
-        String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-        if (contentType.startsWith("multipart/form-data")) {
-            boolean hasFields = false;
-            FormDataMultiPart mp = new FormDataMultiPart();
-
-            if (hasFields) {
-                postBody = mp;
-            }
-        } else {
-
-        }
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-            if (response != null) {
-                return;
-            } else {
-                return;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public void addWordsToWordList(String permalink, List<StringValue> body, String auth_token) throws ApiException {
-        Object postBody = body;
-
-
-        // create path and map variables
-        String path = "/wordList.json/{permalink}/words".replaceAll("\\{format\\}", "json")
-                .replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escapeString(permalink.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> formParams = new HashMap<String, String>();
-
-
-        headerParams.put("auth_token", auth_token);
-
-        String[] contentTypes = {
-
-        };
-
-        String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-        if (contentType.startsWith("multipart/form-data")) {
-            boolean hasFields = false;
-            FormDataMultiPart mp = new FormDataMultiPart();
-
-            if (hasFields) {
-                postBody = mp;
-            }
-        } else {
-
-        }
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType);
-            if (response != null) {
-                return;
-            } else {
-                return;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/api/WordListsApi.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/api/WordListsApi.java
deleted file mode 100644
index 1bdf38bfbda..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/api/WordListsApi.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package io.swagger.client.api;
-
-import com.sun.jersey.multipart.FormDataMultiPart;
-import io.swagger.client.ApiException;
-import io.swagger.client.ApiInvoker;
-import io.swagger.client.model.WordList;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class WordListsApi {
-    String basePath = "https://api.wordnik.com/v4";
-    ApiInvoker apiInvoker = ApiInvoker.getInstance();
-
-    public ApiInvoker getInvoker() {
-        return apiInvoker;
-    }
-
-    public String getBasePath() {
-        return basePath;
-    }
-
-    public void setBasePath(String basePath) {
-        this.basePath = basePath;
-    }
-
-    public WordList createWordList(WordList body, String auth_token) throws ApiException {
-        Object postBody = body;
-
-
-        // create path and map variables
-        String path = "/wordLists.json".replaceAll("\\{format\\}", "json");
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> formParams = new HashMap<String, String>();
-
-
-        headerParams.put("auth_token", auth_token);
-
-        String[] contentTypes = {
-
-        };
-
-        String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-        if (contentType.startsWith("multipart/form-data")) {
-            boolean hasFields = false;
-            FormDataMultiPart mp = new FormDataMultiPart();
-
-            if (hasFields) {
-                postBody = mp;
-            }
-        } else {
-
-        }
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType);
-            if (response != null) {
-                return (WordList) ApiInvoker.deserialize(response, "", WordList.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/api/WordsApi.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/api/WordsApi.java
deleted file mode 100644
index 1f108daf78c..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/api/WordsApi.java
+++ /dev/null
@@ -1,417 +0,0 @@
-package io.swagger.client.api;
-
-import com.sun.jersey.multipart.FormDataMultiPart;
-import io.swagger.client.ApiException;
-import io.swagger.client.ApiInvoker;
-import io.swagger.client.model.DefinitionSearchResults;
-import io.swagger.client.model.WordObject;
-import io.swagger.client.model.WordOfTheDay;
-import io.swagger.client.model.WordSearchResults;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class WordsApi {
-    String basePath = "https://api.wordnik.com/v4";
-    ApiInvoker apiInvoker = ApiInvoker.getInstance();
-
-    public ApiInvoker getInvoker() {
-        return apiInvoker;
-    }
-
-    public String getBasePath() {
-        return basePath;
-    }
-
-    public void setBasePath(String basePath) {
-        this.basePath = basePath;
-    }
-
-    public WordObject getRandomWord(String hasDictionaryDef, String includePartOfSpeech, String excludePartOfSpeech, Integer minCorpusCount, Integer maxCorpusCount, Integer minDictionaryCount, Integer maxDictionaryCount, Integer minLength, Integer maxLength) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/words.json/randomWord".replaceAll("\\{format\\}", "json");
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> formParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(hasDictionaryDef))) {
-            queryParams.put("hasDictionaryDef", String.valueOf(hasDictionaryDef));
-        }
-        if (!"null".equals(String.valueOf(includePartOfSpeech))) {
-            queryParams.put("includePartOfSpeech", String.valueOf(includePartOfSpeech));
-        }
-        if (!"null".equals(String.valueOf(excludePartOfSpeech))) {
-            queryParams.put("excludePartOfSpeech", String.valueOf(excludePartOfSpeech));
-        }
-        if (!"null".equals(String.valueOf(minCorpusCount))) {
-            queryParams.put("minCorpusCount", String.valueOf(minCorpusCount));
-        }
-        if (!"null".equals(String.valueOf(maxCorpusCount))) {
-            queryParams.put("maxCorpusCount", String.valueOf(maxCorpusCount));
-        }
-        if (!"null".equals(String.valueOf(minDictionaryCount))) {
-            queryParams.put("minDictionaryCount", String.valueOf(minDictionaryCount));
-        }
-        if (!"null".equals(String.valueOf(maxDictionaryCount))) {
-            queryParams.put("maxDictionaryCount", String.valueOf(maxDictionaryCount));
-        }
-        if (!"null".equals(String.valueOf(minLength))) {
-            queryParams.put("minLength", String.valueOf(minLength));
-        }
-        if (!"null".equals(String.valueOf(maxLength))) {
-            queryParams.put("maxLength", String.valueOf(maxLength));
-        }
-
-
-        String[] contentTypes = {
-
-        };
-
-        String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-        if (contentType.startsWith("multipart/form-data")) {
-            boolean hasFields = false;
-            FormDataMultiPart mp = new FormDataMultiPart();
-
-            if (hasFields) {
-                postBody = mp;
-            }
-        } else {
-
-        }
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-            if (response != null) {
-                return (WordObject) ApiInvoker.deserialize(response, "", WordObject.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public void getRandomWords(String hasDictionaryDef, String includePartOfSpeech, String excludePartOfSpeech, Integer minCorpusCount, Integer maxCorpusCount, Integer minDictionaryCount, Integer maxDictionaryCount, Integer minLength, Integer maxLength, String sortBy, String sortOrder, Integer limit) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/words.json/randomWords".replaceAll("\\{format\\}", "json");
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> formParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(hasDictionaryDef))) {
-            queryParams.put("hasDictionaryDef", String.valueOf(hasDictionaryDef));
-        }
-        if (!"null".equals(String.valueOf(includePartOfSpeech))) {
-            queryParams.put("includePartOfSpeech", String.valueOf(includePartOfSpeech));
-        }
-        if (!"null".equals(String.valueOf(excludePartOfSpeech))) {
-            queryParams.put("excludePartOfSpeech", String.valueOf(excludePartOfSpeech));
-        }
-        if (!"null".equals(String.valueOf(minCorpusCount))) {
-            queryParams.put("minCorpusCount", String.valueOf(minCorpusCount));
-        }
-        if (!"null".equals(String.valueOf(maxCorpusCount))) {
-            queryParams.put("maxCorpusCount", String.valueOf(maxCorpusCount));
-        }
-        if (!"null".equals(String.valueOf(minDictionaryCount))) {
-            queryParams.put("minDictionaryCount", String.valueOf(minDictionaryCount));
-        }
-        if (!"null".equals(String.valueOf(maxDictionaryCount))) {
-            queryParams.put("maxDictionaryCount", String.valueOf(maxDictionaryCount));
-        }
-        if (!"null".equals(String.valueOf(minLength))) {
-            queryParams.put("minLength", String.valueOf(minLength));
-        }
-        if (!"null".equals(String.valueOf(maxLength))) {
-            queryParams.put("maxLength", String.valueOf(maxLength));
-        }
-        if (!"null".equals(String.valueOf(sortBy))) {
-            queryParams.put("sortBy", String.valueOf(sortBy));
-        }
-        if (!"null".equals(String.valueOf(sortOrder))) {
-            queryParams.put("sortOrder", String.valueOf(sortOrder));
-        }
-        if (!"null".equals(String.valueOf(limit))) {
-            queryParams.put("limit", String.valueOf(limit));
-        }
-
-
-        String[] contentTypes = {
-
-        };
-
-        String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-        if (contentType.startsWith("multipart/form-data")) {
-            boolean hasFields = false;
-            FormDataMultiPart mp = new FormDataMultiPart();
-
-            if (hasFields) {
-                postBody = mp;
-            }
-        } else {
-
-        }
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-            if (response != null) {
-                return;
-            } else {
-                return;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public DefinitionSearchResults reverseDictionary(String query, String findSenseForWord, String includeSourceDictionaries, String excludeSourceDictionaries, String includePartOfSpeech, String excludePartOfSpeech, Integer minCorpusCount, Integer maxCorpusCount, Integer minLength, Integer maxLength, String expandTerms, String includeTags, String sortBy, String sortOrder, String skip, Integer limit) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/words.json/reverseDictionary".replaceAll("\\{format\\}", "json");
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> formParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(query))) {
-            queryParams.put("query", String.valueOf(query));
-        }
-        if (!"null".equals(String.valueOf(findSenseForWord))) {
-            queryParams.put("findSenseForWord", String.valueOf(findSenseForWord));
-        }
-        if (!"null".equals(String.valueOf(includeSourceDictionaries))) {
-            queryParams.put("includeSourceDictionaries", String.valueOf(includeSourceDictionaries));
-        }
-        if (!"null".equals(String.valueOf(excludeSourceDictionaries))) {
-            queryParams.put("excludeSourceDictionaries", String.valueOf(excludeSourceDictionaries));
-        }
-        if (!"null".equals(String.valueOf(includePartOfSpeech))) {
-            queryParams.put("includePartOfSpeech", String.valueOf(includePartOfSpeech));
-        }
-        if (!"null".equals(String.valueOf(excludePartOfSpeech))) {
-            queryParams.put("excludePartOfSpeech", String.valueOf(excludePartOfSpeech));
-        }
-        if (!"null".equals(String.valueOf(minCorpusCount))) {
-            queryParams.put("minCorpusCount", String.valueOf(minCorpusCount));
-        }
-        if (!"null".equals(String.valueOf(maxCorpusCount))) {
-            queryParams.put("maxCorpusCount", String.valueOf(maxCorpusCount));
-        }
-        if (!"null".equals(String.valueOf(minLength))) {
-            queryParams.put("minLength", String.valueOf(minLength));
-        }
-        if (!"null".equals(String.valueOf(maxLength))) {
-            queryParams.put("maxLength", String.valueOf(maxLength));
-        }
-        if (!"null".equals(String.valueOf(expandTerms))) {
-            queryParams.put("expandTerms", String.valueOf(expandTerms));
-        }
-        if (!"null".equals(String.valueOf(includeTags))) {
-            queryParams.put("includeTags", String.valueOf(includeTags));
-        }
-        if (!"null".equals(String.valueOf(sortBy))) {
-            queryParams.put("sortBy", String.valueOf(sortBy));
-        }
-        if (!"null".equals(String.valueOf(sortOrder))) {
-            queryParams.put("sortOrder", String.valueOf(sortOrder));
-        }
-        if (!"null".equals(String.valueOf(skip))) {
-            queryParams.put("skip", String.valueOf(skip));
-        }
-        if (!"null".equals(String.valueOf(limit))) {
-            queryParams.put("limit", String.valueOf(limit));
-        }
-
-
-        String[] contentTypes = {
-
-        };
-
-        String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-        if (contentType.startsWith("multipart/form-data")) {
-            boolean hasFields = false;
-            FormDataMultiPart mp = new FormDataMultiPart();
-
-            if (hasFields) {
-                postBody = mp;
-            }
-        } else {
-
-        }
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-            if (response != null) {
-                return (DefinitionSearchResults) ApiInvoker.deserialize(response, "", DefinitionSearchResults.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public WordSearchResults searchWords(String query, String caseSensitive, String includePartOfSpeech, String excludePartOfSpeech, Integer minCorpusCount, Integer maxCorpusCount, Integer minDictionaryCount, Integer maxDictionaryCount, Integer minLength, Integer maxLength, Integer skip, Integer limit) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/words.json/search/{query}".replaceAll("\\{format\\}", "json")
-                .replaceAll("\\{" + "query" + "\\}", apiInvoker.escapeString(query.toString()));
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> formParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(caseSensitive))) {
-            queryParams.put("caseSensitive", String.valueOf(caseSensitive));
-        }
-        if (!"null".equals(String.valueOf(includePartOfSpeech))) {
-            queryParams.put("includePartOfSpeech", String.valueOf(includePartOfSpeech));
-        }
-        if (!"null".equals(String.valueOf(excludePartOfSpeech))) {
-            queryParams.put("excludePartOfSpeech", String.valueOf(excludePartOfSpeech));
-        }
-        if (!"null".equals(String.valueOf(minCorpusCount))) {
-            queryParams.put("minCorpusCount", String.valueOf(minCorpusCount));
-        }
-        if (!"null".equals(String.valueOf(maxCorpusCount))) {
-            queryParams.put("maxCorpusCount", String.valueOf(maxCorpusCount));
-        }
-        if (!"null".equals(String.valueOf(minDictionaryCount))) {
-            queryParams.put("minDictionaryCount", String.valueOf(minDictionaryCount));
-        }
-        if (!"null".equals(String.valueOf(maxDictionaryCount))) {
-            queryParams.put("maxDictionaryCount", String.valueOf(maxDictionaryCount));
-        }
-        if (!"null".equals(String.valueOf(minLength))) {
-            queryParams.put("minLength", String.valueOf(minLength));
-        }
-        if (!"null".equals(String.valueOf(maxLength))) {
-            queryParams.put("maxLength", String.valueOf(maxLength));
-        }
-        if (!"null".equals(String.valueOf(skip))) {
-            queryParams.put("skip", String.valueOf(skip));
-        }
-        if (!"null".equals(String.valueOf(limit))) {
-            queryParams.put("limit", String.valueOf(limit));
-        }
-
-
-        String[] contentTypes = {
-
-        };
-
-        String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-        if (contentType.startsWith("multipart/form-data")) {
-            boolean hasFields = false;
-            FormDataMultiPart mp = new FormDataMultiPart();
-
-            if (hasFields) {
-                postBody = mp;
-            }
-        } else {
-
-        }
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-            if (response != null) {
-                return (WordSearchResults) ApiInvoker.deserialize(response, "", WordSearchResults.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-
-    public WordOfTheDay getWordOfTheDay(String date) throws ApiException {
-        Object postBody = null;
-
-
-        // create path and map variables
-        String path = "/words.json/wordOfTheDay".replaceAll("\\{format\\}", "json");
-
-        // query params
-        Map<String, String> queryParams = new HashMap<String, String>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> formParams = new HashMap<String, String>();
-
-        if (!"null".equals(String.valueOf(date))) {
-            queryParams.put("date", String.valueOf(date));
-        }
-
-
-        String[] contentTypes = {
-
-        };
-
-        String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-
-        if (contentType.startsWith("multipart/form-data")) {
-            boolean hasFields = false;
-            FormDataMultiPart mp = new FormDataMultiPart();
-
-            if (hasFields) {
-                postBody = mp;
-            }
-        } else {
-
-        }
-
-        try {
-            String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType);
-            if (response != null) {
-                return (WordOfTheDay) ApiInvoker.deserialize(response, "", WordOfTheDay.class);
-            } else {
-                return null;
-            }
-        } catch (ApiException ex) {
-            if (ex.getCode() == 404) {
-                return null;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/ApiTokenStatus.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/ApiTokenStatus.java
deleted file mode 100644
index 60388200618..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/ApiTokenStatus.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class ApiTokenStatus {
-
-    private Boolean valid = null;
-    private String token = null;
-    private Long resetsInMillis = null;
-    private Long remainingCalls = null;
-    private Long expiresInMillis = null;
-    private Long totalRequests = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("valid")
-    public Boolean getValid() {
-        return valid;
-    }
-
-    public void setValid(Boolean valid) {
-        this.valid = valid;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("token")
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("resetsInMillis")
-    public Long getResetsInMillis() {
-        return resetsInMillis;
-    }
-
-    public void setResetsInMillis(Long resetsInMillis) {
-        this.resetsInMillis = resetsInMillis;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("remainingCalls")
-    public Long getRemainingCalls() {
-        return remainingCalls;
-    }
-
-    public void setRemainingCalls(Long remainingCalls) {
-        this.remainingCalls = remainingCalls;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("expiresInMillis")
-    public Long getExpiresInMillis() {
-        return expiresInMillis;
-    }
-
-    public void setExpiresInMillis(Long expiresInMillis) {
-        this.expiresInMillis = expiresInMillis;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("totalRequests")
-    public Long getTotalRequests() {
-        return totalRequests;
-    }
-
-    public void setTotalRequests(Long totalRequests) {
-        this.totalRequests = totalRequests;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ApiTokenStatus {\n");
-
-        sb.append("  valid: ").append(valid).append("\n");
-        sb.append("  token: ").append(token).append("\n");
-        sb.append("  resetsInMillis: ").append(resetsInMillis).append("\n");
-        sb.append("  remainingCalls: ").append(remainingCalls).append("\n");
-        sb.append("  expiresInMillis: ").append(expiresInMillis).append("\n");
-        sb.append("  totalRequests: ").append(totalRequests).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/AudioFile.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/AudioFile.java
deleted file mode 100644
index 7c982c40a22..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/AudioFile.java
+++ /dev/null
@@ -1,232 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-import java.util.Date;
-
-
-@ApiModel(description = "")
-public class AudioFile {
-
-    private String attributionUrl = null;
-    private Integer commentCount = null;
-    private Integer voteCount = null;
-    private String fileUrl = null;
-    private String audioType = null;
-    private Long id = null;
-    private Double duration = null;
-    private String attributionText = null;
-    private String createdBy = null;
-    private String description = null;
-    private Date createdAt = null;
-    private Float voteWeightedAverage = null;
-    private Float voteAverage = null;
-    private String word = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("attributionUrl")
-    public String getAttributionUrl() {
-        return attributionUrl;
-    }
-
-    public void setAttributionUrl(String attributionUrl) {
-        this.attributionUrl = attributionUrl;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("commentCount")
-    public Integer getCommentCount() {
-        return commentCount;
-    }
-
-    public void setCommentCount(Integer commentCount) {
-        this.commentCount = commentCount;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("voteCount")
-    public Integer getVoteCount() {
-        return voteCount;
-    }
-
-    public void setVoteCount(Integer voteCount) {
-        this.voteCount = voteCount;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("fileUrl")
-    public String getFileUrl() {
-        return fileUrl;
-    }
-
-    public void setFileUrl(String fileUrl) {
-        this.fileUrl = fileUrl;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("audioType")
-    public String getAudioType() {
-        return audioType;
-    }
-
-    public void setAudioType(String audioType) {
-        this.audioType = audioType;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("duration")
-    public Double getDuration() {
-        return duration;
-    }
-
-    public void setDuration(Double duration) {
-        this.duration = duration;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("attributionText")
-    public String getAttributionText() {
-        return attributionText;
-    }
-
-    public void setAttributionText(String attributionText) {
-        this.attributionText = attributionText;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("createdBy")
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("description")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("createdAt")
-    public Date getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("voteWeightedAverage")
-    public Float getVoteWeightedAverage() {
-        return voteWeightedAverage;
-    }
-
-    public void setVoteWeightedAverage(Float voteWeightedAverage) {
-        this.voteWeightedAverage = voteWeightedAverage;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("voteAverage")
-    public Float getVoteAverage() {
-        return voteAverage;
-    }
-
-    public void setVoteAverage(Float voteAverage) {
-        this.voteAverage = voteAverage;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("word")
-    public String getWord() {
-        return word;
-    }
-
-    public void setWord(String word) {
-        this.word = word;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class AudioFile {\n");
-
-        sb.append("  attributionUrl: ").append(attributionUrl).append("\n");
-        sb.append("  commentCount: ").append(commentCount).append("\n");
-        sb.append("  voteCount: ").append(voteCount).append("\n");
-        sb.append("  fileUrl: ").append(fileUrl).append("\n");
-        sb.append("  audioType: ").append(audioType).append("\n");
-        sb.append("  id: ").append(id).append("\n");
-        sb.append("  duration: ").append(duration).append("\n");
-        sb.append("  attributionText: ").append(attributionText).append("\n");
-        sb.append("  createdBy: ").append(createdBy).append("\n");
-        sb.append("  description: ").append(description).append("\n");
-        sb.append("  createdAt: ").append(createdAt).append("\n");
-        sb.append("  voteWeightedAverage: ").append(voteWeightedAverage).append("\n");
-        sb.append("  voteAverage: ").append(voteAverage).append("\n");
-        sb.append("  word: ").append(word).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/AudioType.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/AudioType.java
deleted file mode 100644
index 6456cb53904..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/AudioType.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class AudioType {
-
-    private Integer id = null;
-    private String name = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("id")
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class AudioType {\n");
-
-        sb.append("  id: ").append(id).append("\n");
-        sb.append("  name: ").append(name).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/AuthenticationToken.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/AuthenticationToken.java
deleted file mode 100644
index f9d59b3a467..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/AuthenticationToken.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class AuthenticationToken {
-
-    private String token = null;
-    private Long userId = null;
-    private String userSignature = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("token")
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("userId")
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("userSignature")
-    public String getUserSignature() {
-        return userSignature;
-    }
-
-    public void setUserSignature(String userSignature) {
-        this.userSignature = userSignature;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class AuthenticationToken {\n");
-
-        sb.append("  token: ").append(token).append("\n");
-        sb.append("  userId: ").append(userId).append("\n");
-        sb.append("  userSignature: ").append(userSignature).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Bigram.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Bigram.java
deleted file mode 100644
index 0465c2816cc..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Bigram.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class Bigram {
-
-    private Long count = null;
-    private String gram2 = null;
-    private String gram1 = null;
-    private Double wlmi = null;
-    private Double mi = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("count")
-    public Long getCount() {
-        return count;
-    }
-
-    public void setCount(Long count) {
-        this.count = count;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("gram2")
-    public String getGram2() {
-        return gram2;
-    }
-
-    public void setGram2(String gram2) {
-        this.gram2 = gram2;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("gram1")
-    public String getGram1() {
-        return gram1;
-    }
-
-    public void setGram1(String gram1) {
-        this.gram1 = gram1;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("wlmi")
-    public Double getWlmi() {
-        return wlmi;
-    }
-
-    public void setWlmi(Double wlmi) {
-        this.wlmi = wlmi;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("mi")
-    public Double getMi() {
-        return mi;
-    }
-
-    public void setMi(Double mi) {
-        this.mi = mi;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Bigram {\n");
-
-        sb.append("  count: ").append(count).append("\n");
-        sb.append("  gram2: ").append(gram2).append("\n");
-        sb.append("  gram1: ").append(gram1).append("\n");
-        sb.append("  wlmi: ").append(wlmi).append("\n");
-        sb.append("  mi: ").append(mi).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Category.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Category.java
deleted file mode 100644
index 5ceadd985e2..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Category.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class Category {
-
-    private Long id = null;
-    private String name = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Category {\n");
-
-        sb.append("  id: ").append(id).append("\n");
-        sb.append("  name: ").append(name).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Citation.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Citation.java
deleted file mode 100644
index 7f636dc7e02..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Citation.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class Citation {
-
-    private String cite = null;
-    private String source = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("cite")
-    public String getCite() {
-        return cite;
-    }
-
-    public void setCite(String cite) {
-        this.cite = cite;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("source")
-    public String getSource() {
-        return source;
-    }
-
-    public void setSource(String source) {
-        this.source = source;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Citation {\n");
-
-        sb.append("  cite: ").append(cite).append("\n");
-        sb.append("  source: ").append(source).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/ContentProvider.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/ContentProvider.java
deleted file mode 100644
index 9b56335411d..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/ContentProvider.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class ContentProvider {
-
-    private Integer id = null;
-    private String name = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("id")
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ContentProvider {\n");
-
-        sb.append("  id: ").append(id).append("\n");
-        sb.append("  name: ").append(name).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Definition.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Definition.java
deleted file mode 100644
index ea0e6463ad7..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Definition.java
+++ /dev/null
@@ -1,269 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-import io.swagger.client.model.Citation;
-import io.swagger.client.model.ExampleUsage;
-import io.swagger.client.model.Label;
-import io.swagger.client.model.Note;
-import io.swagger.client.model.Related;
-import io.swagger.client.model.TextPron;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@ApiModel(description = "")
-public class Definition {
-
-    private String extendedText = null;
-    private String text = null;
-    private String sourceDictionary = null;
-    private List<Citation> citations = new ArrayList<Citation>();
-    private List<Label> labels = new ArrayList<Label>();
-    private Float score = null;
-    private List<ExampleUsage> exampleUses = new ArrayList<ExampleUsage>();
-    private String attributionUrl = null;
-    private String seqString = null;
-    private String attributionText = null;
-    private List<Related> relatedWords = new ArrayList<Related>();
-    private String sequence = null;
-    private String word = null;
-    private List<Note> notes = new ArrayList<Note>();
-    private List<TextPron> textProns = new ArrayList<TextPron>();
-    private String partOfSpeech = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("extendedText")
-    public String getExtendedText() {
-        return extendedText;
-    }
-
-    public void setExtendedText(String extendedText) {
-        this.extendedText = extendedText;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("text")
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("sourceDictionary")
-    public String getSourceDictionary() {
-        return sourceDictionary;
-    }
-
-    public void setSourceDictionary(String sourceDictionary) {
-        this.sourceDictionary = sourceDictionary;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("citations")
-    public List<Citation> getCitations() {
-        return citations;
-    }
-
-    public void setCitations(List<Citation> citations) {
-        this.citations = citations;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("labels")
-    public List<Label> getLabels() {
-        return labels;
-    }
-
-    public void setLabels(List<Label> labels) {
-        this.labels = labels;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("score")
-    public Float getScore() {
-        return score;
-    }
-
-    public void setScore(Float score) {
-        this.score = score;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("exampleUses")
-    public List<ExampleUsage> getExampleUses() {
-        return exampleUses;
-    }
-
-    public void setExampleUses(List<ExampleUsage> exampleUses) {
-        this.exampleUses = exampleUses;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("attributionUrl")
-    public String getAttributionUrl() {
-        return attributionUrl;
-    }
-
-    public void setAttributionUrl(String attributionUrl) {
-        this.attributionUrl = attributionUrl;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("seqString")
-    public String getSeqString() {
-        return seqString;
-    }
-
-    public void setSeqString(String seqString) {
-        this.seqString = seqString;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("attributionText")
-    public String getAttributionText() {
-        return attributionText;
-    }
-
-    public void setAttributionText(String attributionText) {
-        this.attributionText = attributionText;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("relatedWords")
-    public List<Related> getRelatedWords() {
-        return relatedWords;
-    }
-
-    public void setRelatedWords(List<Related> relatedWords) {
-        this.relatedWords = relatedWords;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("sequence")
-    public String getSequence() {
-        return sequence;
-    }
-
-    public void setSequence(String sequence) {
-        this.sequence = sequence;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("word")
-    public String getWord() {
-        return word;
-    }
-
-    public void setWord(String word) {
-        this.word = word;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("notes")
-    public List<Note> getNotes() {
-        return notes;
-    }
-
-    public void setNotes(List<Note> notes) {
-        this.notes = notes;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("textProns")
-    public List<TextPron> getTextProns() {
-        return textProns;
-    }
-
-    public void setTextProns(List<TextPron> textProns) {
-        this.textProns = textProns;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("partOfSpeech")
-    public String getPartOfSpeech() {
-        return partOfSpeech;
-    }
-
-    public void setPartOfSpeech(String partOfSpeech) {
-        this.partOfSpeech = partOfSpeech;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Definition {\n");
-
-        sb.append("  extendedText: ").append(extendedText).append("\n");
-        sb.append("  text: ").append(text).append("\n");
-        sb.append("  sourceDictionary: ").append(sourceDictionary).append("\n");
-        sb.append("  citations: ").append(citations).append("\n");
-        sb.append("  labels: ").append(labels).append("\n");
-        sb.append("  score: ").append(score).append("\n");
-        sb.append("  exampleUses: ").append(exampleUses).append("\n");
-        sb.append("  attributionUrl: ").append(attributionUrl).append("\n");
-        sb.append("  seqString: ").append(seqString).append("\n");
-        sb.append("  attributionText: ").append(attributionText).append("\n");
-        sb.append("  relatedWords: ").append(relatedWords).append("\n");
-        sb.append("  sequence: ").append(sequence).append("\n");
-        sb.append("  word: ").append(word).append("\n");
-        sb.append("  notes: ").append(notes).append("\n");
-        sb.append("  textProns: ").append(textProns).append("\n");
-        sb.append("  partOfSpeech: ").append(partOfSpeech).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/DefinitionSearchResults.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/DefinitionSearchResults.java
deleted file mode 100644
index 7bb0fa85c98..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/DefinitionSearchResults.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-import io.swagger.client.model.Definition;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@ApiModel(description = "")
-public class DefinitionSearchResults {
-
-    private List<Definition> results = new ArrayList<Definition>();
-    private Integer totalResults = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("results")
-    public List<Definition> getResults() {
-        return results;
-    }
-
-    public void setResults(List<Definition> results) {
-        this.results = results;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("totalResults")
-    public Integer getTotalResults() {
-        return totalResults;
-    }
-
-    public void setTotalResults(Integer totalResults) {
-        this.totalResults = totalResults;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class DefinitionSearchResults {\n");
-
-        sb.append("  results: ").append(results).append("\n");
-        sb.append("  totalResults: ").append(totalResults).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Example.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Example.java
deleted file mode 100644
index c8c421dff6b..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Example.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-import io.swagger.client.model.ContentProvider;
-import io.swagger.client.model.ScoredWord;
-import io.swagger.client.model.Sentence;
-
-
-@ApiModel(description = "")
-public class Example {
-
-    private Long id = null;
-    private Long exampleId = null;
-    private String title = null;
-    private String text = null;
-    private ScoredWord score = null;
-    private Sentence sentence = null;
-    private String word = null;
-    private ContentProvider provider = null;
-    private Integer year = null;
-    private Float rating = null;
-    private Long documentId = null;
-    private String url = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("exampleId")
-    public Long getExampleId() {
-        return exampleId;
-    }
-
-    public void setExampleId(Long exampleId) {
-        this.exampleId = exampleId;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("title")
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("text")
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("score")
-    public ScoredWord getScore() {
-        return score;
-    }
-
-    public void setScore(ScoredWord score) {
-        this.score = score;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("sentence")
-    public Sentence getSentence() {
-        return sentence;
-    }
-
-    public void setSentence(Sentence sentence) {
-        this.sentence = sentence;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("word")
-    public String getWord() {
-        return word;
-    }
-
-    public void setWord(String word) {
-        this.word = word;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("provider")
-    public ContentProvider getProvider() {
-        return provider;
-    }
-
-    public void setProvider(ContentProvider provider) {
-        this.provider = provider;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("year")
-    public Integer getYear() {
-        return year;
-    }
-
-    public void setYear(Integer year) {
-        this.year = year;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("rating")
-    public Float getRating() {
-        return rating;
-    }
-
-    public void setRating(Float rating) {
-        this.rating = rating;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("documentId")
-    public Long getDocumentId() {
-        return documentId;
-    }
-
-    public void setDocumentId(Long documentId) {
-        this.documentId = documentId;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("url")
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Example {\n");
-
-        sb.append("  id: ").append(id).append("\n");
-        sb.append("  exampleId: ").append(exampleId).append("\n");
-        sb.append("  title: ").append(title).append("\n");
-        sb.append("  text: ").append(text).append("\n");
-        sb.append("  score: ").append(score).append("\n");
-        sb.append("  sentence: ").append(sentence).append("\n");
-        sb.append("  word: ").append(word).append("\n");
-        sb.append("  provider: ").append(provider).append("\n");
-        sb.append("  year: ").append(year).append("\n");
-        sb.append("  rating: ").append(rating).append("\n");
-        sb.append("  documentId: ").append(documentId).append("\n");
-        sb.append("  url: ").append(url).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/ExampleSearchResults.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/ExampleSearchResults.java
deleted file mode 100644
index fd2b1254de5..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/ExampleSearchResults.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-import io.swagger.client.model.Example;
-import io.swagger.client.model.Facet;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@ApiModel(description = "")
-public class ExampleSearchResults {
-
-    private List<Facet> facets = new ArrayList<Facet>();
-    private List<Example> examples = new ArrayList<Example>();
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("facets")
-    public List<Facet> getFacets() {
-        return facets;
-    }
-
-    public void setFacets(List<Facet> facets) {
-        this.facets = facets;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("examples")
-    public List<Example> getExamples() {
-        return examples;
-    }
-
-    public void setExamples(List<Example> examples) {
-        this.examples = examples;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ExampleSearchResults {\n");
-
-        sb.append("  facets: ").append(facets).append("\n");
-        sb.append("  examples: ").append(examples).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/ExampleUsage.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/ExampleUsage.java
deleted file mode 100644
index a4cc674b48b..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/ExampleUsage.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class ExampleUsage {
-
-    private String text = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("text")
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ExampleUsage {\n");
-
-        sb.append("  text: ").append(text).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Facet.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Facet.java
deleted file mode 100644
index 22afba725ec..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Facet.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-import io.swagger.client.model.FacetValue;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@ApiModel(description = "")
-public class Facet {
-
-    private List<FacetValue> facetValues = new ArrayList<FacetValue>();
-    private String name = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("facetValues")
-    public List<FacetValue> getFacetValues() {
-        return facetValues;
-    }
-
-    public void setFacetValues(List<FacetValue> facetValues) {
-        this.facetValues = facetValues;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Facet {\n");
-
-        sb.append("  facetValues: ").append(facetValues).append("\n");
-        sb.append("  name: ").append(name).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/FacetValue.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/FacetValue.java
deleted file mode 100644
index 8e7c1a7eeb8..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/FacetValue.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class FacetValue {
-
-    private Long count = null;
-    private String value = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("count")
-    public Long getCount() {
-        return count;
-    }
-
-    public void setCount(Long count) {
-        this.count = count;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class FacetValue {\n");
-
-        sb.append("  count: ").append(count).append("\n");
-        sb.append("  value: ").append(value).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Frequency.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Frequency.java
deleted file mode 100644
index e25dd4ec738..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Frequency.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class Frequency {
-
-    private Long count = null;
-    private Integer year = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("count")
-    public Long getCount() {
-        return count;
-    }
-
-    public void setCount(Long count) {
-        this.count = count;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("year")
-    public Integer getYear() {
-        return year;
-    }
-
-    public void setYear(Integer year) {
-        this.year = year;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Frequency {\n");
-
-        sb.append("  count: ").append(count).append("\n");
-        sb.append("  year: ").append(year).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/FrequencySummary.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/FrequencySummary.java
deleted file mode 100644
index 2ac98615d1f..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/FrequencySummary.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-import io.swagger.client.model.Frequency;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@ApiModel(description = "")
-public class FrequencySummary {
-
-    private Integer unknownYearCount = null;
-    private Long totalCount = null;
-    private String frequencyString = null;
-    private String word = null;
-    private List<Frequency> frequency = new ArrayList<Frequency>();
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("unknownYearCount")
-    public Integer getUnknownYearCount() {
-        return unknownYearCount;
-    }
-
-    public void setUnknownYearCount(Integer unknownYearCount) {
-        this.unknownYearCount = unknownYearCount;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("totalCount")
-    public Long getTotalCount() {
-        return totalCount;
-    }
-
-    public void setTotalCount(Long totalCount) {
-        this.totalCount = totalCount;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("frequencyString")
-    public String getFrequencyString() {
-        return frequencyString;
-    }
-
-    public void setFrequencyString(String frequencyString) {
-        this.frequencyString = frequencyString;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("word")
-    public String getWord() {
-        return word;
-    }
-
-    public void setWord(String word) {
-        this.word = word;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("frequency")
-    public List<Frequency> getFrequency() {
-        return frequency;
-    }
-
-    public void setFrequency(List<Frequency> frequency) {
-        this.frequency = frequency;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class FrequencySummary {\n");
-
-        sb.append("  unknownYearCount: ").append(unknownYearCount).append("\n");
-        sb.append("  totalCount: ").append(totalCount).append("\n");
-        sb.append("  frequencyString: ").append(frequencyString).append("\n");
-        sb.append("  word: ").append(word).append("\n");
-        sb.append("  frequency: ").append(frequency).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Label.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Label.java
deleted file mode 100644
index 95e07a644de..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Label.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class Label {
-
-    private String text = null;
-    private String type = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("text")
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Label {\n");
-
-        sb.append("  text: ").append(text).append("\n");
-        sb.append("  type: ").append(type).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Note.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Note.java
deleted file mode 100644
index d9ca7588576..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Note.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@ApiModel(description = "")
-public class Note {
-
-    private String noteType = null;
-    private List<String> appliesTo = new ArrayList<String>();
-    private String value = null;
-    private Integer pos = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("noteType")
-    public String getNoteType() {
-        return noteType;
-    }
-
-    public void setNoteType(String noteType) {
-        this.noteType = noteType;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("appliesTo")
-    public List<String> getAppliesTo() {
-        return appliesTo;
-    }
-
-    public void setAppliesTo(List<String> appliesTo) {
-        this.appliesTo = appliesTo;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("pos")
-    public Integer getPos() {
-        return pos;
-    }
-
-    public void setPos(Integer pos) {
-        this.pos = pos;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Note {\n");
-
-        sb.append("  noteType: ").append(noteType).append("\n");
-        sb.append("  appliesTo: ").append(appliesTo).append("\n");
-        sb.append("  value: ").append(value).append("\n");
-        sb.append("  pos: ").append(pos).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/PartOfSpeech.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/PartOfSpeech.java
deleted file mode 100644
index 4a242663bc8..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/PartOfSpeech.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-import io.swagger.client.model.Category;
-import io.swagger.client.model.Root;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@ApiModel(description = "")
-public class PartOfSpeech {
-
-    private List<Root> roots = new ArrayList<Root>();
-    private List<String> storageAbbr = new ArrayList<String>();
-    private List<Category> allCategories = new ArrayList<Category>();
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("roots")
-    public List<Root> getRoots() {
-        return roots;
-    }
-
-    public void setRoots(List<Root> roots) {
-        this.roots = roots;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("storageAbbr")
-    public List<String> getStorageAbbr() {
-        return storageAbbr;
-    }
-
-    public void setStorageAbbr(List<String> storageAbbr) {
-        this.storageAbbr = storageAbbr;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("allCategories")
-    public List<Category> getAllCategories() {
-        return allCategories;
-    }
-
-    public void setAllCategories(List<Category> allCategories) {
-        this.allCategories = allCategories;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PartOfSpeech {\n");
-
-        sb.append("  roots: ").append(roots).append("\n");
-        sb.append("  storageAbbr: ").append(storageAbbr).append("\n");
-        sb.append("  allCategories: ").append(allCategories).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Related.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Related.java
deleted file mode 100644
index aca2c10afa9..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Related.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@ApiModel(description = "")
-public class Related {
-
-    private String label1 = null;
-    private String relationshipType = null;
-    private String label2 = null;
-    private String label3 = null;
-    private List<String> words = new ArrayList<String>();
-    private String gram = null;
-    private String label4 = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("label1")
-    public String getLabel1() {
-        return label1;
-    }
-
-    public void setLabel1(String label1) {
-        this.label1 = label1;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("relationshipType")
-    public String getRelationshipType() {
-        return relationshipType;
-    }
-
-    public void setRelationshipType(String relationshipType) {
-        this.relationshipType = relationshipType;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("label2")
-    public String getLabel2() {
-        return label2;
-    }
-
-    public void setLabel2(String label2) {
-        this.label2 = label2;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("label3")
-    public String getLabel3() {
-        return label3;
-    }
-
-    public void setLabel3(String label3) {
-        this.label3 = label3;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("words")
-    public List<String> getWords() {
-        return words;
-    }
-
-    public void setWords(List<String> words) {
-        this.words = words;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("gram")
-    public String getGram() {
-        return gram;
-    }
-
-    public void setGram(String gram) {
-        this.gram = gram;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("label4")
-    public String getLabel4() {
-        return label4;
-    }
-
-    public void setLabel4(String label4) {
-        this.label4 = label4;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Related {\n");
-
-        sb.append("  label1: ").append(label1).append("\n");
-        sb.append("  relationshipType: ").append(relationshipType).append("\n");
-        sb.append("  label2: ").append(label2).append("\n");
-        sb.append("  label3: ").append(label3).append("\n");
-        sb.append("  words: ").append(words).append("\n");
-        sb.append("  gram: ").append(gram).append("\n");
-        sb.append("  label4: ").append(label4).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Root.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Root.java
deleted file mode 100644
index 0a1b8b2e815..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Root.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-import io.swagger.client.model.Category;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@ApiModel(description = "")
-public class Root {
-
-    private Long id = null;
-    private String name = null;
-    private List<Category> categories = new ArrayList<Category>();
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("categories")
-    public List<Category> getCategories() {
-        return categories;
-    }
-
-    public void setCategories(List<Category> categories) {
-        this.categories = categories;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Root {\n");
-
-        sb.append("  id: ").append(id).append("\n");
-        sb.append("  name: ").append(name).append("\n");
-        sb.append("  categories: ").append(categories).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/ScoredWord.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/ScoredWord.java
deleted file mode 100644
index 825973e4526..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/ScoredWord.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class ScoredWord {
-
-    private Integer position = null;
-    private Long id = null;
-    private Integer docTermCount = null;
-    private String lemma = null;
-    private String wordType = null;
-    private Float score = null;
-    private Long sentenceId = null;
-    private String word = null;
-    private Boolean stopword = null;
-    private Double baseWordScore = null;
-    private String partOfSpeech = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("position")
-    public Integer getPosition() {
-        return position;
-    }
-
-    public void setPosition(Integer position) {
-        this.position = position;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("docTermCount")
-    public Integer getDocTermCount() {
-        return docTermCount;
-    }
-
-    public void setDocTermCount(Integer docTermCount) {
-        this.docTermCount = docTermCount;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("lemma")
-    public String getLemma() {
-        return lemma;
-    }
-
-    public void setLemma(String lemma) {
-        this.lemma = lemma;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("wordType")
-    public String getWordType() {
-        return wordType;
-    }
-
-    public void setWordType(String wordType) {
-        this.wordType = wordType;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("score")
-    public Float getScore() {
-        return score;
-    }
-
-    public void setScore(Float score) {
-        this.score = score;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("sentenceId")
-    public Long getSentenceId() {
-        return sentenceId;
-    }
-
-    public void setSentenceId(Long sentenceId) {
-        this.sentenceId = sentenceId;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("word")
-    public String getWord() {
-        return word;
-    }
-
-    public void setWord(String word) {
-        this.word = word;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("stopword")
-    public Boolean getStopword() {
-        return stopword;
-    }
-
-    public void setStopword(Boolean stopword) {
-        this.stopword = stopword;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("baseWordScore")
-    public Double getBaseWordScore() {
-        return baseWordScore;
-    }
-
-    public void setBaseWordScore(Double baseWordScore) {
-        this.baseWordScore = baseWordScore;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("partOfSpeech")
-    public String getPartOfSpeech() {
-        return partOfSpeech;
-    }
-
-    public void setPartOfSpeech(String partOfSpeech) {
-        this.partOfSpeech = partOfSpeech;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ScoredWord {\n");
-
-        sb.append("  position: ").append(position).append("\n");
-        sb.append("  id: ").append(id).append("\n");
-        sb.append("  docTermCount: ").append(docTermCount).append("\n");
-        sb.append("  lemma: ").append(lemma).append("\n");
-        sb.append("  wordType: ").append(wordType).append("\n");
-        sb.append("  score: ").append(score).append("\n");
-        sb.append("  sentenceId: ").append(sentenceId).append("\n");
-        sb.append("  word: ").append(word).append("\n");
-        sb.append("  stopword: ").append(stopword).append("\n");
-        sb.append("  baseWordScore: ").append(baseWordScore).append("\n");
-        sb.append("  partOfSpeech: ").append(partOfSpeech).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Sentence.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Sentence.java
deleted file mode 100644
index dff8d707516..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Sentence.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-import io.swagger.client.model.ScoredWord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@ApiModel(description = "")
-public class Sentence {
-
-    private Boolean hasScoredWords = null;
-    private Long id = null;
-    private List<ScoredWord> scoredWords = new ArrayList<ScoredWord>();
-    private String display = null;
-    private Integer rating = null;
-    private Long documentMetadataId = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("hasScoredWords")
-    public Boolean getHasScoredWords() {
-        return hasScoredWords;
-    }
-
-    public void setHasScoredWords(Boolean hasScoredWords) {
-        this.hasScoredWords = hasScoredWords;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("scoredWords")
-    public List<ScoredWord> getScoredWords() {
-        return scoredWords;
-    }
-
-    public void setScoredWords(List<ScoredWord> scoredWords) {
-        this.scoredWords = scoredWords;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("display")
-    public String getDisplay() {
-        return display;
-    }
-
-    public void setDisplay(String display) {
-        this.display = display;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("rating")
-    public Integer getRating() {
-        return rating;
-    }
-
-    public void setRating(Integer rating) {
-        this.rating = rating;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("documentMetadataId")
-    public Long getDocumentMetadataId() {
-        return documentMetadataId;
-    }
-
-    public void setDocumentMetadataId(Long documentMetadataId) {
-        this.documentMetadataId = documentMetadataId;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Sentence {\n");
-
-        sb.append("  hasScoredWords: ").append(hasScoredWords).append("\n");
-        sb.append("  id: ").append(id).append("\n");
-        sb.append("  scoredWords: ").append(scoredWords).append("\n");
-        sb.append("  display: ").append(display).append("\n");
-        sb.append("  rating: ").append(rating).append("\n");
-        sb.append("  documentMetadataId: ").append(documentMetadataId).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/SimpleDefinition.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/SimpleDefinition.java
deleted file mode 100644
index c38eb3057a8..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/SimpleDefinition.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class SimpleDefinition {
-
-    private String text = null;
-    private String source = null;
-    private String note = null;
-    private String partOfSpeech = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("text")
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("source")
-    public String getSource() {
-        return source;
-    }
-
-    public void setSource(String source) {
-        this.source = source;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("note")
-    public String getNote() {
-        return note;
-    }
-
-    public void setNote(String note) {
-        this.note = note;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("partOfSpeech")
-    public String getPartOfSpeech() {
-        return partOfSpeech;
-    }
-
-    public void setPartOfSpeech(String partOfSpeech) {
-        this.partOfSpeech = partOfSpeech;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SimpleDefinition {\n");
-
-        sb.append("  text: ").append(text).append("\n");
-        sb.append("  source: ").append(source).append("\n");
-        sb.append("  note: ").append(note).append("\n");
-        sb.append("  partOfSpeech: ").append(partOfSpeech).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/SimpleExample.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/SimpleExample.java
deleted file mode 100644
index fde38931bf7..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/SimpleExample.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class SimpleExample {
-
-    private Long id = null;
-    private String title = null;
-    private String text = null;
-    private String url = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("title")
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("text")
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("url")
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SimpleExample {\n");
-
-        sb.append("  id: ").append(id).append("\n");
-        sb.append("  title: ").append(title).append("\n");
-        sb.append("  text: ").append(text).append("\n");
-        sb.append("  url: ").append(url).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/StringValue.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/StringValue.java
deleted file mode 100644
index e6302fc5258..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/StringValue.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class StringValue {
-
-    private String word = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("word")
-    public String getWord() {
-        return word;
-    }
-
-    public void setWord(String word) {
-        this.word = word;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class StringValue {\n");
-
-        sb.append("  word: ").append(word).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Syllable.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Syllable.java
deleted file mode 100644
index 2cf5b10bfa5..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/Syllable.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class Syllable {
-
-    private String text = null;
-    private Integer seq = null;
-    private String type = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("text")
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("seq")
-    public Integer getSeq() {
-        return seq;
-    }
-
-    public void setSeq(Integer seq) {
-        this.seq = seq;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Syllable {\n");
-
-        sb.append("  text: ").append(text).append("\n");
-        sb.append("  seq: ").append(seq).append("\n");
-        sb.append("  type: ").append(type).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/TextPron.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/TextPron.java
deleted file mode 100644
index 6139a28ed48..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/TextPron.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class TextPron {
-
-    private String raw = null;
-    private Integer seq = null;
-    private String rawType = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("raw")
-    public String getRaw() {
-        return raw;
-    }
-
-    public void setRaw(String raw) {
-        this.raw = raw;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("seq")
-    public Integer getSeq() {
-        return seq;
-    }
-
-    public void setSeq(Integer seq) {
-        this.seq = seq;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("rawType")
-    public String getRawType() {
-        return rawType;
-    }
-
-    public void setRawType(String rawType) {
-        this.rawType = rawType;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class TextPron {\n");
-
-        sb.append("  raw: ").append(raw).append("\n");
-        sb.append("  seq: ").append(seq).append("\n");
-        sb.append("  rawType: ").append(rawType).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/User.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/User.java
deleted file mode 100644
index 3f8aaff6a77..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/User.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class User {
-
-    private Long id = null;
-    private String username = null;
-    private String email = null;
-    private Integer status = null;
-    private String faceBookId = null;
-    private String userName = null;
-    private String displayName = null;
-    private String password = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("username")
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("email")
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("status")
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("faceBookId")
-    public String getFaceBookId() {
-        return faceBookId;
-    }
-
-    public void setFaceBookId(String faceBookId) {
-        this.faceBookId = faceBookId;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("userName")
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("displayName")
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("password")
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class User {\n");
-
-        sb.append("  id: ").append(id).append("\n");
-        sb.append("  username: ").append(username).append("\n");
-        sb.append("  email: ").append(email).append("\n");
-        sb.append("  status: ").append(status).append("\n");
-        sb.append("  faceBookId: ").append(faceBookId).append("\n");
-        sb.append("  userName: ").append(userName).append("\n");
-        sb.append("  displayName: ").append(displayName).append("\n");
-        sb.append("  password: ").append(password).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/WordList.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/WordList.java
deleted file mode 100644
index 5b2ee78e9a9..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/WordList.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-import java.util.Date;
-
-
-@ApiModel(description = "")
-public class WordList {
-
-    private Long id = null;
-    private String permalink = null;
-    private String name = null;
-    private Date createdAt = null;
-    private Date updatedAt = null;
-    private Date lastActivityAt = null;
-    private String username = null;
-    private Long userId = null;
-    private String description = null;
-    private Long numberWordsInList = null;
-    private String type = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("permalink")
-    public String getPermalink() {
-        return permalink;
-    }
-
-    public void setPermalink(String permalink) {
-        this.permalink = permalink;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("createdAt")
-    public Date getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("updatedAt")
-    public Date getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Date updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("lastActivityAt")
-    public Date getLastActivityAt() {
-        return lastActivityAt;
-    }
-
-    public void setLastActivityAt(Date lastActivityAt) {
-        this.lastActivityAt = lastActivityAt;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("username")
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("userId")
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("description")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("numberWordsInList")
-    public Long getNumberWordsInList() {
-        return numberWordsInList;
-    }
-
-    public void setNumberWordsInList(Long numberWordsInList) {
-        this.numberWordsInList = numberWordsInList;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class WordList {\n");
-
-        sb.append("  id: ").append(id).append("\n");
-        sb.append("  permalink: ").append(permalink).append("\n");
-        sb.append("  name: ").append(name).append("\n");
-        sb.append("  createdAt: ").append(createdAt).append("\n");
-        sb.append("  updatedAt: ").append(updatedAt).append("\n");
-        sb.append("  lastActivityAt: ").append(lastActivityAt).append("\n");
-        sb.append("  username: ").append(username).append("\n");
-        sb.append("  userId: ").append(userId).append("\n");
-        sb.append("  description: ").append(description).append("\n");
-        sb.append("  numberWordsInList: ").append(numberWordsInList).append("\n");
-        sb.append("  type: ").append(type).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/WordListWord.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/WordListWord.java
deleted file mode 100644
index d3c02ab5877..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/WordListWord.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-import java.util.Date;
-
-
-@ApiModel(description = "")
-public class WordListWord {
-
-    private Long id = null;
-    private String word = null;
-    private String username = null;
-    private Long userId = null;
-    private Date createdAt = null;
-    private Long numberCommentsOnWord = null;
-    private Long numberLists = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("word")
-    public String getWord() {
-        return word;
-    }
-
-    public void setWord(String word) {
-        this.word = word;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("username")
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("userId")
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("createdAt")
-    public Date getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("numberCommentsOnWord")
-    public Long getNumberCommentsOnWord() {
-        return numberCommentsOnWord;
-    }
-
-    public void setNumberCommentsOnWord(Long numberCommentsOnWord) {
-        this.numberCommentsOnWord = numberCommentsOnWord;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("numberLists")
-    public Long getNumberLists() {
-        return numberLists;
-    }
-
-    public void setNumberLists(Long numberLists) {
-        this.numberLists = numberLists;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class WordListWord {\n");
-
-        sb.append("  id: ").append(id).append("\n");
-        sb.append("  word: ").append(word).append("\n");
-        sb.append("  username: ").append(username).append("\n");
-        sb.append("  userId: ").append(userId).append("\n");
-        sb.append("  createdAt: ").append(createdAt).append("\n");
-        sb.append("  numberCommentsOnWord: ").append(numberCommentsOnWord).append("\n");
-        sb.append("  numberLists: ").append(numberLists).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/WordObject.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/WordObject.java
deleted file mode 100644
index 847330dec3c..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/WordObject.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@ApiModel(description = "")
-public class WordObject {
-
-    private Long id = null;
-    private String word = null;
-    private String originalWord = null;
-    private List<String> suggestions = new ArrayList<String>();
-    private String canonicalForm = null;
-    private String vulgar = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("word")
-    public String getWord() {
-        return word;
-    }
-
-    public void setWord(String word) {
-        this.word = word;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("originalWord")
-    public String getOriginalWord() {
-        return originalWord;
-    }
-
-    public void setOriginalWord(String originalWord) {
-        this.originalWord = originalWord;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("suggestions")
-    public List<String> getSuggestions() {
-        return suggestions;
-    }
-
-    public void setSuggestions(List<String> suggestions) {
-        this.suggestions = suggestions;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("canonicalForm")
-    public String getCanonicalForm() {
-        return canonicalForm;
-    }
-
-    public void setCanonicalForm(String canonicalForm) {
-        this.canonicalForm = canonicalForm;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("vulgar")
-    public String getVulgar() {
-        return vulgar;
-    }
-
-    public void setVulgar(String vulgar) {
-        this.vulgar = vulgar;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class WordObject {\n");
-
-        sb.append("  id: ").append(id).append("\n");
-        sb.append("  word: ").append(word).append("\n");
-        sb.append("  originalWord: ").append(originalWord).append("\n");
-        sb.append("  suggestions: ").append(suggestions).append("\n");
-        sb.append("  canonicalForm: ").append(canonicalForm).append("\n");
-        sb.append("  vulgar: ").append(vulgar).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/WordOfTheDay.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/WordOfTheDay.java
deleted file mode 100644
index cf54947aa1b..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/WordOfTheDay.java
+++ /dev/null
@@ -1,207 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-import io.swagger.client.model.ContentProvider;
-import io.swagger.client.model.SimpleDefinition;
-import io.swagger.client.model.SimpleExample;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-
-@ApiModel(description = "")
-public class WordOfTheDay {
-
-    private Long id = null;
-    private String parentId = null;
-    private String category = null;
-    private String createdBy = null;
-    private Date createdAt = null;
-    private ContentProvider contentProvider = null;
-    private String htmlExtra = null;
-    private String word = null;
-    private List<SimpleDefinition> definitions = new ArrayList<SimpleDefinition>();
-    private List<SimpleExample> examples = new ArrayList<SimpleExample>();
-    private String note = null;
-    private Date publishDate = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("parentId")
-    public String getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(String parentId) {
-        this.parentId = parentId;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("category")
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("createdBy")
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("createdAt")
-    public Date getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("contentProvider")
-    public ContentProvider getContentProvider() {
-        return contentProvider;
-    }
-
-    public void setContentProvider(ContentProvider contentProvider) {
-        this.contentProvider = contentProvider;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("htmlExtra")
-    public String getHtmlExtra() {
-        return htmlExtra;
-    }
-
-    public void setHtmlExtra(String htmlExtra) {
-        this.htmlExtra = htmlExtra;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("word")
-    public String getWord() {
-        return word;
-    }
-
-    public void setWord(String word) {
-        this.word = word;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("definitions")
-    public List<SimpleDefinition> getDefinitions() {
-        return definitions;
-    }
-
-    public void setDefinitions(List<SimpleDefinition> definitions) {
-        this.definitions = definitions;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("examples")
-    public List<SimpleExample> getExamples() {
-        return examples;
-    }
-
-    public void setExamples(List<SimpleExample> examples) {
-        this.examples = examples;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("note")
-    public String getNote() {
-        return note;
-    }
-
-    public void setNote(String note) {
-        this.note = note;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("publishDate")
-    public Date getPublishDate() {
-        return publishDate;
-    }
-
-    public void setPublishDate(Date publishDate) {
-        this.publishDate = publishDate;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class WordOfTheDay {\n");
-
-        sb.append("  id: ").append(id).append("\n");
-        sb.append("  parentId: ").append(parentId).append("\n");
-        sb.append("  category: ").append(category).append("\n");
-        sb.append("  createdBy: ").append(createdBy).append("\n");
-        sb.append("  createdAt: ").append(createdAt).append("\n");
-        sb.append("  contentProvider: ").append(contentProvider).append("\n");
-        sb.append("  htmlExtra: ").append(htmlExtra).append("\n");
-        sb.append("  word: ").append(word).append("\n");
-        sb.append("  definitions: ").append(definitions).append("\n");
-        sb.append("  examples: ").append(examples).append("\n");
-        sb.append("  note: ").append(note).append("\n");
-        sb.append("  publishDate: ").append(publishDate).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/WordSearchResult.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/WordSearchResult.java
deleted file mode 100644
index 57f9729c800..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/WordSearchResult.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package io.swagger.client.model;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-
-
-@ApiModel(description = "")
-public class WordSearchResult {
-
-    private Long count = null;
-    private Double lexicality = null;
-    private String word = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("count")
-    public Long getCount() {
-        return count;
-    }
-
-    public void setCount(Long count) {
-        this.count = count;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("lexicality")
-    public Double getLexicality() {
-        return lexicality;
-    }
-
-    public void setLexicality(Double lexicality) {
-        this.lexicality = lexicality;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("word")
-    public String getWord() {
-        return word;
-    }
-
-    public void setWord(String word) {
-        this.word = word;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class WordSearchResult {\n");
-
-        sb.append("  count: ").append(count).append("\n");
-        sb.append("  lexicality: ").append(lexicality).append("\n");
-        sb.append("  word: ").append(word).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/WordSearchResults.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/model/WordSearchResults.java
deleted file mode 100644
index cb0a363fc4d..00000000000
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/model/WordSearchResults.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package io.swagger.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.*;
-import io.swagger.client.model.WordSearchResult;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@ApiModel(description = "")
-public class WordSearchResults {
-
-    private List<WordSearchResult> searchResults = new ArrayList<WordSearchResult>();
-    private Integer totalResults = null;
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("searchResults")
-    public List<WordSearchResult> getSearchResults() {
-        return searchResults;
-    }
-
-    public void setSearchResults(List<WordSearchResult> searchResults) {
-        this.searchResults = searchResults;
-    }
-
-
-    /**
-     **/
-    @ApiModelProperty(required = false, value = "")
-    @JsonProperty("totalResults")
-    public Integer getTotalResults() {
-        return totalResults;
-    }
-
-    public void setTotalResults(Integer totalResults) {
-        this.totalResults = totalResults;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class WordSearchResults {\n");
-
-        sb.append("  searchResults: ").append(searchResults).append("\n");
-        sb.append("  totalResults: ").append(totalResults).append("\n");
-        sb.append("}\n");
-        return sb.toString();
-    }
-}
diff --git a/samples/client/wordnik/objc/Podfile b/samples/client/wordnik/objc/Podfile
deleted file mode 100644
index e6b8aab6518..00000000000
--- a/samples/client/wordnik/objc/Podfile
+++ /dev/null
@@ -1,3 +0,0 @@
-platform :ios, '6.0'
-xcodeproj 'swaggerClient/swaggerClient.xcodeproj'
-pod 'AFNetworking', '~> 2.1'
diff --git a/samples/client/wordnik/objc/client/SWGAccountApi.h b/samples/client/wordnik/objc/client/SWGAccountApi.h
deleted file mode 100644
index a023a4985e0..00000000000
--- a/samples/client/wordnik/objc/client/SWGAccountApi.h
+++ /dev/null
@@ -1,116 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGApiTokenStatus.h"
-#import "SWGAuthenticationToken.h"
-#import "SWGUser.h"
-#import "SWGWordList.h"
-#import "SWGObject.h"
-
-
-@interface SWGAccountApi: NSObject
-
--(void) addHeader:(NSString*)value forKey:(NSString*)key;
--(unsigned long) requestQueueSize;
-+(SWGAccountApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key;
-+(void) setBasePath:(NSString*)basePath;
-+(NSString*) getBasePath;
-/**
-
- Returns usage statistics for the API account.
- 
-
- 
- @param api_key Wordnik authentication token
- 
-
- return type: SWGApiTokenStatus*
- */
--(NSNumber*) getApiTokenStatusWithCompletionBlock :(NSString*) api_key 
-    
-    completionHandler: (void (^)(SWGApiTokenStatus* output, NSError* error))completionBlock;
-    
-
-
-/**
-
- Authenticates a User
- 
-
- 
- @param username A confirmed Wordnik username
- 
- @param password The user&#39;s password
- 
-
- return type: SWGAuthenticationToken*
- */
--(NSNumber*) authenticateWithCompletionBlock :(NSString*) username 
-     password:(NSString*) password 
-    
-    completionHandler: (void (^)(SWGAuthenticationToken* output, NSError* error))completionBlock;
-    
-
-
-/**
-
- Authenticates a user
- 
-
- 
- @param username A confirmed Wordnik username
- 
- @param body The user&#39;s password
- 
-
- return type: SWGAuthenticationToken*
- */
--(NSNumber*) authenticatePostWithCompletionBlock :(NSString*) username 
-     body:(NSString*) body 
-    
-    completionHandler: (void (^)(SWGAuthenticationToken* output, NSError* error))completionBlock;
-    
-
-
-/**
-
- Returns the logged-in User
- 
- Requires a valid auth_token to be set.
- 
-
- 
- @param auth_token The auth token of the logged-in user, obtained by calling /account.json/authenticate/{username} (described above)
- 
-
- return type: SWGUser*
- */
--(NSNumber*) getLoggedInUserWithCompletionBlock :(NSString*) auth_token 
-    
-    completionHandler: (void (^)(SWGUser* output, NSError* error))completionBlock;
-    
-
-
-/**
-
- Fetches WordList objects for the logged-in user.
- 
-
- 
- @param auth_token auth_token of logged-in user
- 
- @param skip Results to skip
- 
- @param limit Maximum number of results to return
- 
-
- return type: NSArray*
- */
--(NSNumber*) getWordListsForLoggedInUserWithCompletionBlock :(NSString*) auth_token 
-     skip:(NSNumber*) skip 
-     limit:(NSNumber*) limit 
-    
-    completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock;
-    
-
-
-
-@end
\ No newline at end of file
diff --git a/samples/client/wordnik/objc/client/SWGAccountApi.m b/samples/client/wordnik/objc/client/SWGAccountApi.m
deleted file mode 100644
index a641ad689d9..00000000000
--- a/samples/client/wordnik/objc/client/SWGAccountApi.m
+++ /dev/null
@@ -1,405 +0,0 @@
-#import "SWGAccountApi.h"
-#import "SWGFile.h"
-#import "SWGApiClient.h"
-#import "SWGApiTokenStatus.h"
-#import "SWGAuthenticationToken.h"
-#import "SWGUser.h"
-#import "SWGWordList.h"
-
-
-
-@implementation SWGAccountApi
-static NSString * basePath = @"https://api.wordnik.com/v4";
-
-+(SWGAccountApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key {
-    static SWGAccountApi* singletonAPI = nil;
-
-    if (singletonAPI == nil) {
-        singletonAPI = [[SWGAccountApi alloc] init];
-        [singletonAPI addHeader:headerValue forKey:key];
-    }
-    return singletonAPI;
-}
-
-+(void) setBasePath:(NSString*)path {
-    basePath = path;
-}
-
-+(NSString*) getBasePath {
-    return basePath;
-}
-
--(SWGApiClient*) apiClient {
-    return [SWGApiClient sharedClientFromPool:basePath];
-}
-
--(void) addHeader:(NSString*)value forKey:(NSString*)key {
-    [[self apiClient] setHeaderValue:value forKey:key];
-}
-
--(id) init {
-    self = [super init];
-    [self apiClient];
-    return self;
-}
-
--(void) setHeaderValue:(NSString*) value
-           forKey:(NSString*)key {
-    [[self apiClient] setHeaderValue:value forKey:key];
-}
-
--(unsigned long) requestQueueSize {
-    return [SWGApiClient requestQueueSize];
-}
-
-
--(NSNumber*) getApiTokenStatusWithCompletionBlock:(NSString*) api_key
-        
-        completionHandler: (void (^)(SWGApiTokenStatus* output, NSError* error))completionBlock
-         {
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/account.json/apiTokenStatus", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    if(api_key != nil)
-        headerParams[@"api_key"] = api_key;
-    
-
-    id bodyDictionary = nil;
-    
-    
-    
-
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    
-    
-    
-        
-    // comples response type
-    return [client dictionary:requestUrl 
-                       method:@"GET" 
-                  queryParams:queryParams 
-                         body:bodyDictionary 
-                 headerParams:headerParams
-           requestContentType:requestContentType
-          responseContentType:responseContentType
-              completionBlock:^(NSDictionary *data, NSError *error) {
-                if (error) {
-                    completionBlock(nil, error);
-                    
-                    return;
-                }
-                
-                SWGApiTokenStatus *result = nil;
-                if (data) {
-                    result = [[SWGApiTokenStatus    alloc]initWithValues: data];
-                }
-                completionBlock(result , nil);
-                
-              }];
-    
-    
-}
-
--(NSNumber*) authenticateWithCompletionBlock:(NSString*) username
-         password:(NSString*) password
-        
-        completionHandler: (void (^)(SWGAuthenticationToken* output, NSError* error))completionBlock
-         {
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/account.json/authenticate/{username}", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"username", @"}"]] withString: [SWGApiClient escape:username]];
-    
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(password != nil)
-        queryParams[@"password"] = password;
-    
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    
-
-    id bodyDictionary = nil;
-    
-    
-    
-
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    
-    
-    
-        
-    // comples response type
-    return [client dictionary:requestUrl 
-                       method:@"GET" 
-                  queryParams:queryParams 
-                         body:bodyDictionary 
-                 headerParams:headerParams
-           requestContentType:requestContentType
-          responseContentType:responseContentType
-              completionBlock:^(NSDictionary *data, NSError *error) {
-                if (error) {
-                    completionBlock(nil, error);
-                    
-                    return;
-                }
-                
-                SWGAuthenticationToken *result = nil;
-                if (data) {
-                    result = [[SWGAuthenticationToken    alloc]initWithValues: data];
-                }
-                completionBlock(result , nil);
-                
-              }];
-    
-    
-}
-
--(NSNumber*) authenticatePostWithCompletionBlock:(NSString*) username
-         body:(NSString*) body
-        
-        completionHandler: (void (^)(SWGAuthenticationToken* output, NSError* error))completionBlock
-         {
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/account.json/authenticate/{username}", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"username", @"}"]] withString: [SWGApiClient escape:username]];
-    
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    
-
-    id bodyDictionary = nil;
-    
-    id __body = body;
-
-    if(__body != nil && [__body isKindOfClass:[NSArray class]]){
-        NSMutableArray * objs = [[NSMutableArray alloc] init];
-        for (id dict in (NSArray*)__body) {
-            if([dict respondsToSelector:@selector(asDictionary)]) {
-                [objs addObject:[(SWGObject*)dict asDictionary]];
-            }
-            else{
-                [objs addObject:dict];
-            }
-        }
-        bodyDictionary = objs;
-    }
-    else if([__body respondsToSelector:@selector(asDictionary)]) {
-        bodyDictionary = [(SWGObject*)__body asDictionary];
-    }
-    else if([__body isKindOfClass:[NSString class]]) {
-        // convert it to a dictionary
-        NSError * error;
-        NSString * str = (NSString*)__body;
-        NSDictionary *JSON =
-            [NSJSONSerialization JSONObjectWithData:[str dataUsingEncoding:NSUTF8StringEncoding]
-                                            options:NSJSONReadingMutableContainers
-                                              error:&error];
-        bodyDictionary = JSON;
-    }
-    else if([__body isKindOfClass: [SWGFile class]]) {
-        requestContentType = @"form-data";
-        bodyDictionary = __body;
-    }
-    else{
-        NSLog(@"don't know what to do with %@", __body);
-    }
-    
-    
-    
-
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    
-    
-    
-        
-    // comples response type
-    return [client dictionary:requestUrl 
-                       method:@"POST" 
-                  queryParams:queryParams 
-                         body:bodyDictionary 
-                 headerParams:headerParams
-           requestContentType:requestContentType
-          responseContentType:responseContentType
-              completionBlock:^(NSDictionary *data, NSError *error) {
-                if (error) {
-                    completionBlock(nil, error);
-                    
-                    return;
-                }
-                
-                SWGAuthenticationToken *result = nil;
-                if (data) {
-                    result = [[SWGAuthenticationToken    alloc]initWithValues: data];
-                }
-                completionBlock(result , nil);
-                
-              }];
-    
-    
-}
-
--(NSNumber*) getLoggedInUserWithCompletionBlock:(NSString*) auth_token
-        
-        completionHandler: (void (^)(SWGUser* output, NSError* error))completionBlock
-         {
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/account.json/user", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    if(auth_token != nil)
-        headerParams[@"auth_token"] = auth_token;
-    
-
-    id bodyDictionary = nil;
-    
-    
-    
-
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    
-    
-    
-        
-    // comples response type
-    return [client dictionary:requestUrl 
-                       method:@"GET" 
-                  queryParams:queryParams 
-                         body:bodyDictionary 
-                 headerParams:headerParams
-           requestContentType:requestContentType
-          responseContentType:responseContentType
-              completionBlock:^(NSDictionary *data, NSError *error) {
-                if (error) {
-                    completionBlock(nil, error);
-                    
-                    return;
-                }
-                
-                SWGUser *result = nil;
-                if (data) {
-                    result = [[SWGUser    alloc]initWithValues: data];
-                }
-                completionBlock(result , nil);
-                
-              }];
-    
-    
-}
-
--(NSNumber*) getWordListsForLoggedInUserWithCompletionBlock:(NSString*) auth_token
-         skip:(NSNumber*) skip
-         limit:(NSNumber*) limit
-        
-        completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock
-         {
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/account.json/wordLists", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(skip != nil)
-        queryParams[@"skip"] = skip;
-    if(limit != nil)
-        queryParams[@"limit"] = limit;
-    
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    if(auth_token != nil)
-        headerParams[@"auth_token"] = auth_token;
-    
-
-    id bodyDictionary = nil;
-    
-    
-    
-
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-        // array container response type
-    return [client dictionary: requestUrl 
-                       method: @"GET" 
-                  queryParams: queryParams 
-                         body: bodyDictionary 
-                 headerParams: headerParams
-           requestContentType: requestContentType
-          responseContentType: responseContentType
-              completionBlock: ^(NSDictionary *data, NSError *error) {
-                 if (error) {
-                     completionBlock(nil, error);
-                     
-                     return;
-                 }
-                 
-                 if([data isKindOfClass:[NSArray class]]){
-                     NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[data count]];
-                     for (NSDictionary* dict in (NSArray*)data) {
-                        
-                        
-                        SWGWordList* d = [[SWGWordList alloc]initWithValues: dict];
-                        
-                        [objs addObject:d];
-                     }
-                     completionBlock(objs, nil);
-                 }
-                
-
-                
-            }];
-    
-    
-}
-
-
-
-@end
\ No newline at end of file
diff --git a/samples/client/wordnik/objc/client/SWGApiClient.h b/samples/client/wordnik/objc/client/SWGApiClient.h
deleted file mode 100644
index 300cd859778..00000000000
--- a/samples/client/wordnik/objc/client/SWGApiClient.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "AFHTTPRequestOperationManager.h"
-
-/**
- * A key for `NSError` user info dictionaries.
- * 
- * The corresponding value is the parsed response body for an HTTP error.
- */
-extern NSString *const SWGResponseObjectErrorKey;
-
-
-@interface SWGApiClient : AFHTTPRequestOperationManager
-
-@property(nonatomic, assign) NSURLRequestCachePolicy cachePolicy;
-@property(nonatomic, assign) NSTimeInterval timeoutInterval;
-@property(nonatomic, assign) BOOL logRequests;
-@property(nonatomic, assign) BOOL logCacheHits;
-@property(nonatomic, assign) BOOL logServerResponses;
-@property(nonatomic, assign) BOOL logJSON;
-@property(nonatomic, assign) BOOL logHTTP;
-@property(nonatomic, readonly) NSOperationQueue* queue;
-
-+(SWGApiClient *)sharedClientFromPool:(NSString *)baseUrl;
-
-+(NSOperationQueue*) sharedQueue;
-
-+(void)setLoggingEnabled:(bool) state;
-
-+(void)clearCache;
-
-+(void)setCacheEnabled:(BOOL) enabled;
-
-+(unsigned long)requestQueueSize;
-
-+(void) setOfflineState:(BOOL) state;
-
-+(AFNetworkReachabilityStatus) getReachabilityStatus;
-
-+(NSNumber*) nextRequestId;
-
-+(NSNumber*) queueRequest;
-
-+(void) cancelRequest:(NSNumber*)requestId;
-
-+(NSString*) escape:(id)unescaped;
-
-+(void) setReachabilityChangeBlock:(void(^)(int))changeBlock;
-
-+(void) configureCacheReachibilityForHost:(NSString*)host;
-
--(void)setHeaderValue:(NSString*) value
-                forKey:(NSString*) forKey;
-
--(NSNumber*)  dictionary:(NSString*) path
-                  method:(NSString*) method
-             queryParams:(NSDictionary*) queryParams
-                    body:(id) body
-            headerParams:(NSDictionary*) headerParams
-      requestContentType:(NSString*) requestContentType
-     responseContentType:(NSString*) responseContentType
-         completionBlock:(void (^)(NSDictionary*, NSError *))completionBlock;
-
--(NSNumber*)  stringWithCompletionBlock:(NSString*) path
-                                 method:(NSString*) method
-                            queryParams:(NSDictionary*) queryParams
-                                   body:(id) body
-                           headerParams:(NSDictionary*) headerParams
-                     requestContentType:(NSString*) requestContentType
-                    responseContentType:(NSString*) responseContentType
-                        completionBlock:(void (^)(NSString*, NSError *))completionBlock;
-@end
-
diff --git a/samples/client/wordnik/objc/client/SWGApiClient.m b/samples/client/wordnik/objc/client/SWGApiClient.m
deleted file mode 100644
index 570a4c83088..00000000000
--- a/samples/client/wordnik/objc/client/SWGApiClient.m
+++ /dev/null
@@ -1,439 +0,0 @@
-#import "SWGApiClient.h"
-#import "SWGFile.h"
-
-@implementation SWGApiClient
-
-NSString *const SWGResponseObjectErrorKey = @"SWGResponseObject";
-
-static long requestId = 0;
-static bool offlineState = false;
-static NSMutableSet * queuedRequests = nil;
-static bool cacheEnabled = false;
-static AFNetworkReachabilityStatus reachabilityStatus = AFNetworkReachabilityStatusNotReachable;
-static NSOperationQueue* sharedQueue;
-static void (^reachabilityChangeBlock)(int);
-static bool loggingEnabled = false;
-
-+(void)setLoggingEnabled:(bool) state {
-    loggingEnabled = state;
-}
-
-+(void)clearCache {
-    [[NSURLCache sharedURLCache] removeAllCachedResponses];
-}
-
-+(void)setCacheEnabled:(BOOL)enabled {
-    cacheEnabled = enabled;
-}
-
-+(void)configureCacheWithMemoryAndDiskCapacity:(unsigned long) memorySize
-                                      diskSize:(unsigned long) diskSize {
-    NSAssert(memorySize > 0, @"invalid in-memory cache size");
-    NSAssert(diskSize >= 0, @"invalid disk cache size");
-    
-    NSURLCache *cache =
-    [[NSURLCache alloc]
-     initWithMemoryCapacity:memorySize
-     diskCapacity:diskSize
-     diskPath:@"swagger_url_cache"];
-    
-    [NSURLCache setSharedURLCache:cache];
-}
-
-+(NSOperationQueue*) sharedQueue {
-    return sharedQueue;
-}
-
-+(SWGApiClient *)sharedClientFromPool:(NSString *)baseUrl {
-    static NSMutableDictionary *_pool = nil;
-    if (queuedRequests == nil) {
-        queuedRequests = [[NSMutableSet alloc]init];
-    }
-    if(_pool == nil) {
-        // setup static vars
-        // create queue
-        sharedQueue = [[NSOperationQueue alloc] init];
-        
-        // create pool
-        _pool = [[NSMutableDictionary alloc] init];
-        
-        // initialize URL cache
-        [SWGApiClient configureCacheWithMemoryAndDiskCapacity:4*1024*1024 diskSize:32*1024*1024];
-        
-        // configure reachability
-        [SWGApiClient configureCacheReachibilityForHost:baseUrl];
-    }
-    
-    @synchronized(self) {
-        SWGApiClient * client = [_pool objectForKey:baseUrl];
-        if (client == nil) {
-            client = [[SWGApiClient alloc] initWithBaseURL:[NSURL URLWithString:baseUrl]];
-            [_pool setValue:client forKey:baseUrl ];
-            if(loggingEnabled)
-                NSLog(@"new client for path %@", baseUrl);
-        }
-        if(loggingEnabled)
-            NSLog(@"returning client for path %@", baseUrl);
-        return client;
-    }
-}
-
--(void)setHeaderValue:(NSString*) value
-               forKey:(NSString*) forKey {
-    [self.requestSerializer setValue:value forHTTPHeaderField:forKey];
-}
-
-+(unsigned long)requestQueueSize {
-    return [queuedRequests count];
-}
-
-+(NSNumber*) nextRequestId {
-    long nextId = ++requestId;
-    if(loggingEnabled)
-        NSLog(@"got id %ld", nextId);
-    return [NSNumber numberWithLong:nextId];
-}
-
-+(NSNumber*) queueRequest {
-    NSNumber* requestId = [SWGApiClient nextRequestId];
-    if(loggingEnabled)
-        NSLog(@"added %@ to request queue", requestId);
-    [queuedRequests addObject:requestId];
-    return requestId;
-}
-
-+(void) cancelRequest:(NSNumber*)requestId {
-    [queuedRequests removeObject:requestId];
-}
-
-+(NSString*) escape:(id)unescaped {
-    if([unescaped isKindOfClass:[NSString class]]){
-        return (NSString *)CFBridgingRelease
-        (CFURLCreateStringByAddingPercentEscapes(
-                                                 NULL,
-                                                 (__bridge CFStringRef) unescaped,
-                                                 NULL,
-                                                 (CFStringRef)@"!*'();:@&=+$,/?%#[]",
-                                                 kCFStringEncodingUTF8));
-    }
-    else {
-        return [NSString stringWithFormat:@"%@", unescaped];
-    }
-}
-
--(Boolean) executeRequestWithId:(NSNumber*) requestId {
-    NSSet* matchingItems = [queuedRequests objectsPassingTest:^BOOL(id obj, BOOL *stop) {
-        if([obj intValue]  == [requestId intValue])
-            return TRUE;
-        else return FALSE;
-    }];
-    
-    if(matchingItems.count == 1) {
-        if(loggingEnabled)
-            NSLog(@"removing request id %@", requestId);
-        [queuedRequests removeObject:requestId];
-        return true;
-    }
-    else
-        return false;
-}
-
--(id)initWithBaseURL:(NSURL *)url {
-    self = [super initWithBaseURL:url];
-    self.requestSerializer = [AFJSONRequestSerializer serializer];
-    self.responseSerializer = [AFJSONResponseSerializer serializer];
-    if (!self)
-        return nil;
-    return self;
-}
-
-+(AFNetworkReachabilityStatus) getReachabilityStatus {
-    return reachabilityStatus;
-}
-
-+(void) setReachabilityChangeBlock:(void(^)(int))changeBlock {
-    reachabilityChangeBlock = changeBlock;
-}
-
-+(void) setOfflineState:(BOOL) state {
-    offlineState = state;
-}
-
-+(void) configureCacheReachibilityForHost:(NSString*)host {
-    [[SWGApiClient sharedClientFromPool:host].reachabilityManager setReachabilityStatusChangeBlock:^(AFNetworkReachabilityStatus status) {
-        reachabilityStatus = status;
-        switch (status) {
-            case AFNetworkReachabilityStatusUnknown:
-                if(loggingEnabled)
-                    NSLog(@"reachability changed to AFNetworkReachabilityStatusUnknown");
-                [SWGApiClient setOfflineState:true];
-                break;
-                
-            case AFNetworkReachabilityStatusNotReachable:
-                if(loggingEnabled)
-                    NSLog(@"reachability changed to AFNetworkReachabilityStatusNotReachable");
-                [SWGApiClient setOfflineState:true];
-                break;
-                
-            case AFNetworkReachabilityStatusReachableViaWWAN:
-                if(loggingEnabled)
-                    NSLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWWAN");
-                [SWGApiClient setOfflineState:false];
-                break;
-                
-            case AFNetworkReachabilityStatusReachableViaWiFi:
-                if(loggingEnabled)
-                    NSLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWiFi");
-                [SWGApiClient setOfflineState:false];
-                break;
-            default:
-                break;
-        }
-        // call the reachability block, if configured
-        if(reachabilityChangeBlock != nil) {
-            reachabilityChangeBlock(status);
-        }
-    }];
-    [[SWGApiClient sharedClientFromPool:host].reachabilityManager startMonitoring];
-}
-
--(NSString*) pathWithQueryParamsToString:(NSString*) path
-                             queryParams:(NSDictionary*) queryParams {
-    NSString * separator = nil;
-    int counter = 0;
-    
-    NSMutableString * requestUrl = [NSMutableString stringWithFormat:@"%@", path];
-    if(queryParams != nil){
-        for(NSString * key in [queryParams keyEnumerator]){
-            if(counter == 0) separator = @"?";
-            else separator = @"&";
-            NSString * value;
-            if([[queryParams valueForKey:key] isKindOfClass:[NSString class]]){
-                value = [SWGApiClient escape:[queryParams valueForKey:key]];
-            }
-            else {
-                value = [NSString stringWithFormat:@"%@", [queryParams valueForKey:key]];
-            }
-            [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
-                                      [SWGApiClient escape:key], value]];
-            counter += 1;
-        }
-    }
-    return requestUrl;
-}
-
-- (NSString*)descriptionForRequest:(NSURLRequest*)request {
-    return [[request URL] absoluteString];
-}
-
-- (void)logRequest:(NSURLRequest*)request {
-    NSLog(@"request: %@", [self descriptionForRequest:request]);
-}
-
-- (void)logResponse:(id)data forRequest:(NSURLRequest*)request error:(NSError*)error {
-    NSLog(@"request: %@  response: %@ ",  [self descriptionForRequest:request], data );
-}
-
-
--(NSNumber*)  dictionary:(NSString*) path
-                  method:(NSString*) method
-             queryParams:(NSDictionary*) queryParams
-                    body:(id) body
-            headerParams:(NSDictionary*) headerParams
-      requestContentType:(NSString*) requestContentType
-     responseContentType:(NSString*) responseContentType
-         completionBlock:(void (^)(NSDictionary*, NSError *))completionBlock {
-    
-    NSMutableURLRequest * request = nil;
-    
-    if ([body isKindOfClass:[SWGFile class]]){
-        SWGFile * file = (SWGFile*) body;
-        NSString * urlString = [[NSURL URLWithString:path relativeToURL:self.baseURL] absoluteString];
-        
-        request = [self.requestSerializer multipartFormRequestWithMethod:@"POST"
-                                                               URLString:urlString
-                                                              parameters:nil
-                                               constructingBodyWithBlock:^(id<AFMultipartFormData> formData) {
-                                                   [formData appendPartWithFileData:[file data]
-                                                                               name:@"image"
-                                                                           fileName:[file name]
-                                                                           mimeType:[file mimeType]];
-                                               }
-                                                                   error:nil];
-    }
-    else {
-        NSString * pathWithQueryParams = [self pathWithQueryParamsToString:path queryParams:queryParams];
-        NSString * urlString = [[NSURL URLWithString:pathWithQueryParams relativeToURL:self.baseURL] absoluteString];
-        
-        request = [self.requestSerializer requestWithMethod:method
-                                                  URLString:urlString
-                                                 parameters:body
-                                                      error:nil];
-    }
-    BOOL hasHeaderParams = false;
-    if(headerParams != nil && [headerParams count] > 0)
-        hasHeaderParams = true;
-    if(offlineState) {
-        NSLog(@"%@ cache forced", path);
-        [request setCachePolicy:NSURLRequestReturnCacheDataDontLoad];
-    }
-    else if(!hasHeaderParams && [method isEqualToString:@"GET"] && cacheEnabled) {
-        NSLog(@"%@ cache enabled", path);
-        [request setCachePolicy:NSURLRequestUseProtocolCachePolicy];
-    }
-    else {
-        NSLog(@"%@ cache disabled", path);
-        [request setCachePolicy:NSURLRequestReloadIgnoringLocalCacheData];
-    }
-
-    if(body != nil) {
-        if([body isKindOfClass:[NSDictionary class]] || [body isKindOfClass:[NSArray class]]){
-            [request setValue:requestContentType forHTTPHeaderField:@"Content-Type"];
-        }
-        else if ([body isKindOfClass:[SWGFile class]]) {}
-        else {
-            NSAssert(false, @"unsupported post type!");
-        }
-    }
-    if(headerParams != nil){
-        for(NSString * key in [headerParams keyEnumerator]){
-            [request setValue:[headerParams valueForKey:key] forHTTPHeaderField:key];
-        }
-    }
-    [request setValue:[headerParams valueForKey:responseContentType] forHTTPHeaderField:@"Accept"];
-    
-    // Always disable cookies!
-    [request setHTTPShouldHandleCookies:NO];
-    
-    
-    if (self.logRequests) {
-        [self logRequest:request];
-    }
-    
-    NSNumber* requestId = [SWGApiClient queueRequest];
-    AFHTTPRequestOperation *op =
-    [self HTTPRequestOperationWithRequest:request
-     success:^(AFHTTPRequestOperation *operation, id JSON) {
-         if([self executeRequestWithId:requestId]) {
-             if(self.logServerResponses)
-                 [self logResponse:JSON forRequest:request error:nil];
-             completionBlock(JSON, nil);
-         }
-     } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
-         if([self executeRequestWithId:requestId]) {
-             NSMutableDictionary *userInfo = [error.userInfo mutableCopy];
-             if(operation.responseObject) {
-                 // Add in the (parsed) response body.
-                 userInfo[SWGResponseObjectErrorKey] = operation.responseObject;
-             }
-             NSError *augmentedError = [error initWithDomain:error.domain code:error.code userInfo:userInfo];
-             
-             if(self.logServerResponses)
-                 [self logResponse:nil forRequest:request error:augmentedError];
-             completionBlock(nil, augmentedError);
-         }
-     }
-     ];
-    
-    [self.operationQueue addOperation:op];
-    return requestId;
-}
-
--(NSNumber*)  stringWithCompletionBlock:(NSString*) path
-                                 method:(NSString*) method
-                            queryParams:(NSDictionary*) queryParams
-                                   body:(id) body
-                           headerParams:(NSDictionary*) headerParams
-                     requestContentType:(NSString*) requestContentType
-                    responseContentType:(NSString*) responseContentType
-                        completionBlock:(void (^)(NSString*, NSError *))completionBlock {
-    NSMutableURLRequest * request = nil;
-    
-    if ([body isKindOfClass:[SWGFile class]]){
-        SWGFile * file = (SWGFile*) body;
-        NSString * urlString = [[NSURL URLWithString:path relativeToURL:self.baseURL] absoluteString];
-        
-        request = [self.requestSerializer multipartFormRequestWithMethod:@"POST"
-                                                               URLString:urlString
-                                                              parameters:nil
-                                               constructingBodyWithBlock:^(id<AFMultipartFormData> formData) {
-                                                   [formData appendPartWithFileData:[file data]
-                                                                               name:@"image"
-                                                                           fileName:[file name]
-                                                                           mimeType:[file mimeType]];
-                                               }
-                                                                   error:nil];
-    }
-    else {
-        NSString * pathWithQueryParams = [self pathWithQueryParamsToString:path queryParams:queryParams];
-        NSString * urlString = [[NSURL URLWithString:pathWithQueryParams relativeToURL:self.baseURL] absoluteString];
-        
-        request = [self.requestSerializer requestWithMethod:method
-                                                  URLString:urlString
-                                                 parameters:body
-                                                      error:nil];
-    }
-    BOOL hasHeaderParams = false;
-    if(headerParams != nil && [headerParams count] > 0)
-        hasHeaderParams = true;
-    if(offlineState) {
-        NSLog(@"%@ cache forced", path);
-        [request setCachePolicy:NSURLRequestReturnCacheDataDontLoad];
-    }
-    else if(!hasHeaderParams && [method isEqualToString:@"GET"] && cacheEnabled) {
-        NSLog(@"%@ cache enabled", path);
-        [request setCachePolicy:NSURLRequestUseProtocolCachePolicy];
-    }
-    else {
-        NSLog(@"%@ cache disabled", path);
-        [request setCachePolicy:NSURLRequestReloadIgnoringLocalCacheData];
-    }
-    
-    if(body != nil) {
-        if([body isKindOfClass:[NSDictionary class]]){
-            [request setValue:requestContentType forHTTPHeaderField:@"Content-Type"];
-        }
-        else if ([body isKindOfClass:[SWGFile class]]){}
-        else {
-            NSAssert(false, @"unsupported post type!");
-        }
-    }
-    if(headerParams != nil){
-        for(NSString * key in [headerParams keyEnumerator]){
-            [request setValue:[headerParams valueForKey:key] forHTTPHeaderField:key];
-        }
-    }
-    [request setValue:[headerParams valueForKey:responseContentType] forHTTPHeaderField:@"Accept"];
-    
-    // Always disable cookies!
-    [request setHTTPShouldHandleCookies:NO];
-    
-    NSNumber* requestId = [SWGApiClient queueRequest];
-    AFHTTPRequestOperation *op = [self HTTPRequestOperationWithRequest:request
-     success:^(AFHTTPRequestOperation *operation, id responseObject) {
-         NSString *response = [operation responseString];
-         if([self executeRequestWithId:requestId]) {
-             if(self.logServerResponses)
-                 [self logResponse:responseObject forRequest:request error:nil];
-             completionBlock(response, nil);
-         }
-     } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
-         if([self executeRequestWithId:requestId]) {
-             NSMutableDictionary *userInfo = [error.userInfo mutableCopy];
-             if(operation.responseObject) {
-                 // Add in the (parsed) response body.
-                 userInfo[SWGResponseObjectErrorKey] = operation.responseObject;
-             }
-             NSError *augmentedError = [error initWithDomain:error.domain code:error.code userInfo:userInfo];
-             
-             if(self.logServerResponses)
-                 [self logResponse:nil forRequest:request error:augmentedError];
-             completionBlock(nil, augmentedError);
-         }
-     }];
-    
-    [self.operationQueue addOperation:op];
-    return requestId;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGApiTokenStatus.h b/samples/client/wordnik/objc/client/SWGApiTokenStatus.h
deleted file mode 100644
index 3e38538c10c..00000000000
--- a/samples/client/wordnik/objc/client/SWGApiTokenStatus.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGApiTokenStatus : SWGObject
-
-@property(nonatomic) NSNumber* valid;  
-@property(nonatomic) NSString* token;  
-@property(nonatomic) NSNumber* resetsInMillis;  
-@property(nonatomic) NSNumber* remainingCalls;  
-@property(nonatomic) NSNumber* expiresInMillis;  
-@property(nonatomic) NSNumber* totalRequests;  
-- (id) valid: (NSNumber*) valid     
-    token: (NSString*) token     
-    resetsInMillis: (NSNumber*) resetsInMillis     
-    remainingCalls: (NSNumber*) remainingCalls     
-    expiresInMillis: (NSNumber*) expiresInMillis     
-    totalRequests: (NSNumber*) totalRequests;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGApiTokenStatus.m b/samples/client/wordnik/objc/client/SWGApiTokenStatus.m
deleted file mode 100644
index 999a8d3c9f1..00000000000
--- a/samples/client/wordnik/objc/client/SWGApiTokenStatus.m
+++ /dev/null
@@ -1,78 +0,0 @@
-#import "SWGDate.h"
-#import "SWGApiTokenStatus.h"
-
-@implementation SWGApiTokenStatus
-
--(id)valid: (NSNumber*) valid
-    token: (NSString*) token
-    resetsInMillis: (NSNumber*) resetsInMillis
-    remainingCalls: (NSNumber*) remainingCalls
-    expiresInMillis: (NSNumber*) expiresInMillis
-    totalRequests: (NSNumber*) totalRequests
-    
-{
-    _valid = valid;
-    _token = token;
-    _resetsInMillis = resetsInMillis;
-    _remainingCalls = remainingCalls;
-    _expiresInMillis = expiresInMillis;
-    _totalRequests = totalRequests;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _valid = dict[@"valid"];
-        
-        _token = dict[@"token"];
-        
-        _resetsInMillis = dict[@"resetsInMillis"];
-        
-        _remainingCalls = dict[@"remainingCalls"];
-        
-        _expiresInMillis = dict[@"expiresInMillis"];
-        
-        _totalRequests = dict[@"totalRequests"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(_valid != nil) dict[@"valid"] = _valid ;
-        
-    
-    
-            if(_token != nil) dict[@"token"] = _token ;
-        
-    
-    
-            if(_resetsInMillis != nil) dict[@"resetsInMillis"] = _resetsInMillis ;
-        
-    
-    
-            if(_remainingCalls != nil) dict[@"remainingCalls"] = _remainingCalls ;
-        
-    
-    
-            if(_expiresInMillis != nil) dict[@"expiresInMillis"] = _expiresInMillis ;
-        
-    
-    
-            if(_totalRequests != nil) dict[@"totalRequests"] = _totalRequests ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGAudioFile.h b/samples/client/wordnik/objc/client/SWGAudioFile.h
deleted file mode 100644
index 2d51975c2bc..00000000000
--- a/samples/client/wordnik/objc/client/SWGAudioFile.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-#import "SWGDate.h"
-
-
-@interface SWGAudioFile : SWGObject
-
-@property(nonatomic) NSString* attributionUrl;  
-@property(nonatomic) NSNumber* commentCount;  
-@property(nonatomic) NSNumber* voteCount;  
-@property(nonatomic) NSString* fileUrl;  
-@property(nonatomic) NSString* audioType;  
-@property(nonatomic) NSNumber* _id;  
-@property(nonatomic) NSNumber* duration;  
-@property(nonatomic) NSString* attributionText;  
-@property(nonatomic) NSString* createdBy;  
-@property(nonatomic) NSString* _description;  
-@property(nonatomic) SWGDate* createdAt;  
-@property(nonatomic) NSNumber* voteWeightedAverage;  
-@property(nonatomic) NSNumber* voteAverage;  
-@property(nonatomic) NSString* word;  
-- (id) attributionUrl: (NSString*) attributionUrl     
-    commentCount: (NSNumber*) commentCount     
-    voteCount: (NSNumber*) voteCount     
-    fileUrl: (NSString*) fileUrl     
-    audioType: (NSString*) audioType     
-    _id: (NSNumber*) _id     
-    duration: (NSNumber*) duration     
-    attributionText: (NSString*) attributionText     
-    createdBy: (NSString*) createdBy     
-    _description: (NSString*) _description     
-    createdAt: (SWGDate*) createdAt     
-    voteWeightedAverage: (NSNumber*) voteWeightedAverage     
-    voteAverage: (NSNumber*) voteAverage     
-    word: (NSString*) word;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGAudioFile.m b/samples/client/wordnik/objc/client/SWGAudioFile.m
deleted file mode 100644
index b56372bd6be..00000000000
--- a/samples/client/wordnik/objc/client/SWGAudioFile.m
+++ /dev/null
@@ -1,167 +0,0 @@
-#import "SWGDate.h"
-#import "SWGAudioFile.h"
-
-@implementation SWGAudioFile
-
--(id)attributionUrl: (NSString*) attributionUrl
-    commentCount: (NSNumber*) commentCount
-    voteCount: (NSNumber*) voteCount
-    fileUrl: (NSString*) fileUrl
-    audioType: (NSString*) audioType
-    _id: (NSNumber*) _id
-    duration: (NSNumber*) duration
-    attributionText: (NSString*) attributionText
-    createdBy: (NSString*) createdBy
-    _description: (NSString*) _description
-    createdAt: (SWGDate*) createdAt
-    voteWeightedAverage: (NSNumber*) voteWeightedAverage
-    voteAverage: (NSNumber*) voteAverage
-    word: (NSString*) word
-    
-{
-    _attributionUrl = attributionUrl;
-    _commentCount = commentCount;
-    _voteCount = voteCount;
-    _fileUrl = fileUrl;
-    _audioType = audioType;
-    __id = _id;
-    _duration = duration;
-    _attributionText = attributionText;
-    _createdBy = createdBy;
-    __description = _description;
-    _createdAt = createdAt;
-    _voteWeightedAverage = voteWeightedAverage;
-    _voteAverage = voteAverage;
-    _word = word;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _attributionUrl = dict[@"attributionUrl"];
-        
-        _commentCount = dict[@"commentCount"];
-        
-        _voteCount = dict[@"voteCount"];
-        
-        _fileUrl = dict[@"fileUrl"];
-        
-        _audioType = dict[@"audioType"];
-        
-        __id = dict[@"id"];
-        
-        _duration = dict[@"duration"];
-        
-        _attributionText = dict[@"attributionText"];
-        
-        _createdBy = dict[@"createdBy"];
-        
-        __description = dict[@"description"];
-        
-        
-        
-        id createdAt_dict = dict[@"createdAt"];
-        
-        if(createdAt_dict != nil)
-            _createdAt = [[SWGDate  alloc]initWithValues:createdAt_dict];
-        
-        
-        _voteWeightedAverage = dict[@"voteWeightedAverage"];
-        
-        _voteAverage = dict[@"voteAverage"];
-        
-        _word = dict[@"word"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(_attributionUrl != nil) dict[@"attributionUrl"] = _attributionUrl ;
-        
-    
-    
-            if(_commentCount != nil) dict[@"commentCount"] = _commentCount ;
-        
-    
-    
-            if(_voteCount != nil) dict[@"voteCount"] = _voteCount ;
-        
-    
-    
-            if(_fileUrl != nil) dict[@"fileUrl"] = _fileUrl ;
-        
-    
-    
-            if(_audioType != nil) dict[@"audioType"] = _audioType ;
-        
-    
-    
-            if(__id != nil) dict[@"id"] = __id ;
-        
-    
-    
-            if(_duration != nil) dict[@"duration"] = _duration ;
-        
-    
-    
-            if(_attributionText != nil) dict[@"attributionText"] = _attributionText ;
-        
-    
-    
-            if(_createdBy != nil) dict[@"createdBy"] = _createdBy ;
-        
-    
-    
-            if(__description != nil) dict[@"description"] = __description ;
-        
-    
-    
-    if(_createdAt != nil){
-        if([_createdAt isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGDate *createdAt in (NSArray*)_createdAt) {
-                [array addObject:[(SWGObject*)createdAt asDictionary]];
-            }
-            dict[@"createdAt"] = array;
-        }
-        else if(_createdAt && [_createdAt isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_createdAt toString];
-            if(dateString){
-                dict[@"createdAt"] = dateString;
-            }
-        }
-        else {
-        
-            if(_createdAt != nil) dict[@"createdAt"] = [(SWGObject*)_createdAt asDictionary];
-        
-        }
-    }
-    
-    
-    
-            if(_voteWeightedAverage != nil) dict[@"voteWeightedAverage"] = _voteWeightedAverage ;
-        
-    
-    
-            if(_voteAverage != nil) dict[@"voteAverage"] = _voteAverage ;
-        
-    
-    
-            if(_word != nil) dict[@"word"] = _word ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGAudioType.h b/samples/client/wordnik/objc/client/SWGAudioType.h
deleted file mode 100644
index 1dde0557adc..00000000000
--- a/samples/client/wordnik/objc/client/SWGAudioType.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGAudioType : SWGObject
-
-@property(nonatomic) NSNumber* _id;  
-@property(nonatomic) NSString* name;  
-- (id) _id: (NSNumber*) _id     
-    name: (NSString*) name;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGAudioType.m b/samples/client/wordnik/objc/client/SWGAudioType.m
deleted file mode 100644
index ebe9c18ec27..00000000000
--- a/samples/client/wordnik/objc/client/SWGAudioType.m
+++ /dev/null
@@ -1,46 +0,0 @@
-#import "SWGDate.h"
-#import "SWGAudioType.h"
-
-@implementation SWGAudioType
-
--(id)_id: (NSNumber*) _id
-    name: (NSString*) name
-    
-{
-    __id = _id;
-    _name = name;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        __id = dict[@"id"];
-        
-        _name = dict[@"name"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(__id != nil) dict[@"id"] = __id ;
-        
-    
-    
-            if(_name != nil) dict[@"name"] = _name ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGAuthenticationToken.h b/samples/client/wordnik/objc/client/SWGAuthenticationToken.h
deleted file mode 100644
index 39d85b35887..00000000000
--- a/samples/client/wordnik/objc/client/SWGAuthenticationToken.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGAuthenticationToken : SWGObject
-
-@property(nonatomic) NSString* token;  
-@property(nonatomic) NSNumber* userId;  
-@property(nonatomic) NSString* userSignature;  
-- (id) token: (NSString*) token     
-    userId: (NSNumber*) userId     
-    userSignature: (NSString*) userSignature;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGAuthenticationToken.m b/samples/client/wordnik/objc/client/SWGAuthenticationToken.m
deleted file mode 100644
index c55ebdf27d1..00000000000
--- a/samples/client/wordnik/objc/client/SWGAuthenticationToken.m
+++ /dev/null
@@ -1,54 +0,0 @@
-#import "SWGDate.h"
-#import "SWGAuthenticationToken.h"
-
-@implementation SWGAuthenticationToken
-
--(id)token: (NSString*) token
-    userId: (NSNumber*) userId
-    userSignature: (NSString*) userSignature
-    
-{
-    _token = token;
-    _userId = userId;
-    _userSignature = userSignature;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _token = dict[@"token"];
-        
-        _userId = dict[@"userId"];
-        
-        _userSignature = dict[@"userSignature"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(_token != nil) dict[@"token"] = _token ;
-        
-    
-    
-            if(_userId != nil) dict[@"userId"] = _userId ;
-        
-    
-    
-            if(_userSignature != nil) dict[@"userSignature"] = _userSignature ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGBigram.h b/samples/client/wordnik/objc/client/SWGBigram.h
deleted file mode 100644
index 49d04ce69d9..00000000000
--- a/samples/client/wordnik/objc/client/SWGBigram.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGBigram : SWGObject
-
-@property(nonatomic) NSNumber* count;  
-@property(nonatomic) NSString* gram2;  
-@property(nonatomic) NSString* gram1;  
-@property(nonatomic) NSNumber* wlmi;  
-@property(nonatomic) NSNumber* mi;  
-- (id) count: (NSNumber*) count     
-    gram2: (NSString*) gram2     
-    gram1: (NSString*) gram1     
-    wlmi: (NSNumber*) wlmi     
-    mi: (NSNumber*) mi;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGBigram.m b/samples/client/wordnik/objc/client/SWGBigram.m
deleted file mode 100644
index 83842a39643..00000000000
--- a/samples/client/wordnik/objc/client/SWGBigram.m
+++ /dev/null
@@ -1,70 +0,0 @@
-#import "SWGDate.h"
-#import "SWGBigram.h"
-
-@implementation SWGBigram
-
--(id)count: (NSNumber*) count
-    gram2: (NSString*) gram2
-    gram1: (NSString*) gram1
-    wlmi: (NSNumber*) wlmi
-    mi: (NSNumber*) mi
-    
-{
-    _count = count;
-    _gram2 = gram2;
-    _gram1 = gram1;
-    _wlmi = wlmi;
-    _mi = mi;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _count = dict[@"count"];
-        
-        _gram2 = dict[@"gram2"];
-        
-        _gram1 = dict[@"gram1"];
-        
-        _wlmi = dict[@"wlmi"];
-        
-        _mi = dict[@"mi"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(_count != nil) dict[@"count"] = _count ;
-        
-    
-    
-            if(_gram2 != nil) dict[@"gram2"] = _gram2 ;
-        
-    
-    
-            if(_gram1 != nil) dict[@"gram1"] = _gram1 ;
-        
-    
-    
-            if(_wlmi != nil) dict[@"wlmi"] = _wlmi ;
-        
-    
-    
-            if(_mi != nil) dict[@"mi"] = _mi ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGCategory.h b/samples/client/wordnik/objc/client/SWGCategory.h
deleted file mode 100644
index 35c27105172..00000000000
--- a/samples/client/wordnik/objc/client/SWGCategory.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGCategory : SWGObject
-
-@property(nonatomic) NSNumber* _id;  
-@property(nonatomic) NSString* name;  
-- (id) _id: (NSNumber*) _id     
-    name: (NSString*) name;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGCategory.m b/samples/client/wordnik/objc/client/SWGCategory.m
deleted file mode 100644
index 882d8a34c59..00000000000
--- a/samples/client/wordnik/objc/client/SWGCategory.m
+++ /dev/null
@@ -1,46 +0,0 @@
-#import "SWGDate.h"
-#import "SWGCategory.h"
-
-@implementation SWGCategory
-
--(id)_id: (NSNumber*) _id
-    name: (NSString*) name
-    
-{
-    __id = _id;
-    _name = name;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        __id = dict[@"id"];
-        
-        _name = dict[@"name"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(__id != nil) dict[@"id"] = __id ;
-        
-    
-    
-            if(_name != nil) dict[@"name"] = _name ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGCitation.h b/samples/client/wordnik/objc/client/SWGCitation.h
deleted file mode 100644
index 695059dfde9..00000000000
--- a/samples/client/wordnik/objc/client/SWGCitation.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGCitation : SWGObject
-
-@property(nonatomic) NSString* cite;  
-@property(nonatomic) NSString* source;  
-- (id) cite: (NSString*) cite     
-    source: (NSString*) source;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGCitation.m b/samples/client/wordnik/objc/client/SWGCitation.m
deleted file mode 100644
index 0decc263124..00000000000
--- a/samples/client/wordnik/objc/client/SWGCitation.m
+++ /dev/null
@@ -1,46 +0,0 @@
-#import "SWGDate.h"
-#import "SWGCitation.h"
-
-@implementation SWGCitation
-
--(id)cite: (NSString*) cite
-    source: (NSString*) source
-    
-{
-    _cite = cite;
-    _source = source;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _cite = dict[@"cite"];
-        
-        _source = dict[@"source"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(_cite != nil) dict[@"cite"] = _cite ;
-        
-    
-    
-            if(_source != nil) dict[@"source"] = _source ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGContentProvider.h b/samples/client/wordnik/objc/client/SWGContentProvider.h
deleted file mode 100644
index ef2fe6b174a..00000000000
--- a/samples/client/wordnik/objc/client/SWGContentProvider.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGContentProvider : SWGObject
-
-@property(nonatomic) NSNumber* _id;  
-@property(nonatomic) NSString* name;  
-- (id) _id: (NSNumber*) _id     
-    name: (NSString*) name;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGContentProvider.m b/samples/client/wordnik/objc/client/SWGContentProvider.m
deleted file mode 100644
index d663d61b8d0..00000000000
--- a/samples/client/wordnik/objc/client/SWGContentProvider.m
+++ /dev/null
@@ -1,46 +0,0 @@
-#import "SWGDate.h"
-#import "SWGContentProvider.h"
-
-@implementation SWGContentProvider
-
--(id)_id: (NSNumber*) _id
-    name: (NSString*) name
-    
-{
-    __id = _id;
-    _name = name;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        __id = dict[@"id"];
-        
-        _name = dict[@"name"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(__id != nil) dict[@"id"] = __id ;
-        
-    
-    
-            if(_name != nil) dict[@"name"] = _name ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGDate.h b/samples/client/wordnik/objc/client/SWGDate.h
deleted file mode 100644
index 2c6c7cfe01b..00000000000
--- a/samples/client/wordnik/objc/client/SWGDate.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-@interface SWGDate : SWGObject {
-@private
-    NSDate *_date;
-}
-@property(nonatomic, readonly) NSDate* date;
-
-- (id) initWithValues: (NSString*)input;
--(NSString*) toString;
-@end
\ No newline at end of file
diff --git a/samples/client/wordnik/objc/client/SWGDate.m b/samples/client/wordnik/objc/client/SWGDate.m
deleted file mode 100644
index 07a1405626b..00000000000
--- a/samples/client/wordnik/objc/client/SWGDate.m
+++ /dev/null
@@ -1,34 +0,0 @@
-#import "SWGDate.h"
-
-@implementation SWGDate
-
-@synthesize date = _date;
-
-- (id) initWithValues:(NSString*)input {
-    if([input isKindOfClass:[NSString class]]){
-        NSDateFormatter* df = [NSDateFormatter new];
-        NSLocale *locale = [[NSLocale new]                        
-                            initWithLocaleIdentifier:@"en_US_POSIX"];
-        [df setLocale:locale];
-        [df setDateFormat:@"yyyy-MM-dd'T'HH:mm:ss.SSSZ"];
-
-        _date = [df dateFromString:input];
-    }
-    else if([input isKindOfClass:[NSNumber class]]) {
-        NSTimeInterval interval = [input doubleValue];
-        _date = [[NSDate alloc] initWithTimeIntervalSince1970:interval];        
-    }
-    return self;
-}
-
--(NSString*) toString {
-    NSDateFormatter* df = [NSDateFormatter new];
-    NSLocale *locale = [[NSLocale new]                        
-                        initWithLocaleIdentifier:@"en_US_POSIX"];
-    [df setLocale:locale];
-    [df setDateFormat:@"yyyy-MM-dd'T'HH:mm:ss.SSSZ"];
-    
-    return [df stringFromDate:_date];
-}
-
-@end
\ No newline at end of file
diff --git a/samples/client/wordnik/objc/client/SWGDefinition.h b/samples/client/wordnik/objc/client/SWGDefinition.h
deleted file mode 100644
index 0922f4f7e7b..00000000000
--- a/samples/client/wordnik/objc/client/SWGDefinition.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-#import "SWGLabel.h"
-#import "SWGRelated.h"
-#import "SWGCitation.h"
-#import "SWGExampleUsage.h"
-#import "SWGNote.h"
-#import "SWGTextPron.h"
-
-
-@interface SWGDefinition : SWGObject
-
-@property(nonatomic) NSString* extendedText;  
-@property(nonatomic) NSString* text;  
-@property(nonatomic) NSString* sourceDictionary;  
-@property(nonatomic) NSArray* citations;  
-@property(nonatomic) NSArray* labels;  
-@property(nonatomic) NSNumber* score;  
-@property(nonatomic) NSArray* exampleUses;  
-@property(nonatomic) NSString* attributionUrl;  
-@property(nonatomic) NSString* seqString;  
-@property(nonatomic) NSString* attributionText;  
-@property(nonatomic) NSArray* relatedWords;  
-@property(nonatomic) NSString* sequence;  
-@property(nonatomic) NSString* word;  
-@property(nonatomic) NSArray* notes;  
-@property(nonatomic) NSArray* textProns;  
-@property(nonatomic) NSString* partOfSpeech;  
-- (id) extendedText: (NSString*) extendedText     
-    text: (NSString*) text     
-    sourceDictionary: (NSString*) sourceDictionary     
-    citations: (NSArray*) citations     
-    labels: (NSArray*) labels     
-    score: (NSNumber*) score     
-    exampleUses: (NSArray*) exampleUses     
-    attributionUrl: (NSString*) attributionUrl     
-    seqString: (NSString*) seqString     
-    attributionText: (NSString*) attributionText     
-    relatedWords: (NSArray*) relatedWords     
-    sequence: (NSString*) sequence     
-    word: (NSString*) word     
-    notes: (NSArray*) notes     
-    textProns: (NSArray*) textProns     
-    partOfSpeech: (NSString*) partOfSpeech;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGDefinition.m b/samples/client/wordnik/objc/client/SWGDefinition.m
deleted file mode 100644
index 28a0ea17b81..00000000000
--- a/samples/client/wordnik/objc/client/SWGDefinition.m
+++ /dev/null
@@ -1,386 +0,0 @@
-#import "SWGDate.h"
-#import "SWGDefinition.h"
-
-@implementation SWGDefinition
-
--(id)extendedText: (NSString*) extendedText
-    text: (NSString*) text
-    sourceDictionary: (NSString*) sourceDictionary
-    citations: (NSArray*) citations
-    labels: (NSArray*) labels
-    score: (NSNumber*) score
-    exampleUses: (NSArray*) exampleUses
-    attributionUrl: (NSString*) attributionUrl
-    seqString: (NSString*) seqString
-    attributionText: (NSString*) attributionText
-    relatedWords: (NSArray*) relatedWords
-    sequence: (NSString*) sequence
-    word: (NSString*) word
-    notes: (NSArray*) notes
-    textProns: (NSArray*) textProns
-    partOfSpeech: (NSString*) partOfSpeech
-    
-{
-    _extendedText = extendedText;
-    _text = text;
-    _sourceDictionary = sourceDictionary;
-    _citations = citations;
-    _labels = labels;
-    _score = score;
-    _exampleUses = exampleUses;
-    _attributionUrl = attributionUrl;
-    _seqString = seqString;
-    _attributionText = attributionText;
-    _relatedWords = relatedWords;
-    _sequence = sequence;
-    _word = word;
-    _notes = notes;
-    _textProns = textProns;
-    _partOfSpeech = partOfSpeech;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _extendedText = dict[@"extendedText"];
-        
-        _text = dict[@"text"];
-        
-        _sourceDictionary = dict[@"sourceDictionary"];
-        
-        
-        
-        id citations_dict = dict[@"citations"];
-        
-        if([citations_dict isKindOfClass:[NSArray class]]) {
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)citations_dict count]];
-            if([(NSArray*)citations_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)citations_dict) {
-                    SWGCitation* d = [[SWGCitation alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                _citations = [[NSArray alloc] initWithArray:objs];
-            }
-            else
-                _citations = [[NSArray alloc] init];
-        }
-        else {
-            _citations = [[NSArray alloc] init];
-        }
-        
-        
-        
-        
-        id labels_dict = dict[@"labels"];
-        
-        if([labels_dict isKindOfClass:[NSArray class]]) {
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)labels_dict count]];
-            if([(NSArray*)labels_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)labels_dict) {
-                    SWGLabel* d = [[SWGLabel alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                _labels = [[NSArray alloc] initWithArray:objs];
-            }
-            else
-                _labels = [[NSArray alloc] init];
-        }
-        else {
-            _labels = [[NSArray alloc] init];
-        }
-        
-        
-        _score = dict[@"score"];
-        
-        
-        
-        id exampleUses_dict = dict[@"exampleUses"];
-        
-        if([exampleUses_dict isKindOfClass:[NSArray class]]) {
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)exampleUses_dict count]];
-            if([(NSArray*)exampleUses_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)exampleUses_dict) {
-                    SWGExampleUsage* d = [[SWGExampleUsage alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                _exampleUses = [[NSArray alloc] initWithArray:objs];
-            }
-            else
-                _exampleUses = [[NSArray alloc] init];
-        }
-        else {
-            _exampleUses = [[NSArray alloc] init];
-        }
-        
-        
-        _attributionUrl = dict[@"attributionUrl"];
-        
-        _seqString = dict[@"seqString"];
-        
-        _attributionText = dict[@"attributionText"];
-        
-        
-        
-        id relatedWords_dict = dict[@"relatedWords"];
-        
-        if([relatedWords_dict isKindOfClass:[NSArray class]]) {
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)relatedWords_dict count]];
-            if([(NSArray*)relatedWords_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)relatedWords_dict) {
-                    SWGRelated* d = [[SWGRelated alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                _relatedWords = [[NSArray alloc] initWithArray:objs];
-            }
-            else
-                _relatedWords = [[NSArray alloc] init];
-        }
-        else {
-            _relatedWords = [[NSArray alloc] init];
-        }
-        
-        
-        _sequence = dict[@"sequence"];
-        
-        _word = dict[@"word"];
-        
-        
-        
-        id notes_dict = dict[@"notes"];
-        
-        if([notes_dict isKindOfClass:[NSArray class]]) {
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)notes_dict count]];
-            if([(NSArray*)notes_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)notes_dict) {
-                    SWGNote* d = [[SWGNote alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                _notes = [[NSArray alloc] initWithArray:objs];
-            }
-            else
-                _notes = [[NSArray alloc] init];
-        }
-        else {
-            _notes = [[NSArray alloc] init];
-        }
-        
-        
-        
-        
-        id textProns_dict = dict[@"textProns"];
-        
-        if([textProns_dict isKindOfClass:[NSArray class]]) {
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)textProns_dict count]];
-            if([(NSArray*)textProns_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)textProns_dict) {
-                    SWGTextPron* d = [[SWGTextPron alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                _textProns = [[NSArray alloc] initWithArray:objs];
-            }
-            else
-                _textProns = [[NSArray alloc] init];
-        }
-        else {
-            _textProns = [[NSArray alloc] init];
-        }
-        
-        
-        _partOfSpeech = dict[@"partOfSpeech"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(_extendedText != nil) dict[@"extendedText"] = _extendedText ;
-        
-    
-    
-            if(_text != nil) dict[@"text"] = _text ;
-        
-    
-    
-            if(_sourceDictionary != nil) dict[@"sourceDictionary"] = _sourceDictionary ;
-        
-    
-    
-    if(_citations != nil){
-        if([_citations isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGCitation *citations in (NSArray*)_citations) {
-                [array addObject:[(SWGObject*)citations asDictionary]];
-            }
-            dict[@"citations"] = array;
-        }
-        else if(_citations && [_citations isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_citations toString];
-            if(dateString){
-                dict[@"citations"] = dateString;
-            }
-        }
-        else {
-        
-            if(_citations != nil) dict[@"citations"] = [(SWGObject*)_citations asDictionary];
-        
-        }
-    }
-    
-    
-    
-    if(_labels != nil){
-        if([_labels isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGLabel *labels in (NSArray*)_labels) {
-                [array addObject:[(SWGObject*)labels asDictionary]];
-            }
-            dict[@"labels"] = array;
-        }
-        else if(_labels && [_labels isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_labels toString];
-            if(dateString){
-                dict[@"labels"] = dateString;
-            }
-        }
-        else {
-        
-            if(_labels != nil) dict[@"labels"] = [(SWGObject*)_labels asDictionary];
-        
-        }
-    }
-    
-    
-    
-            if(_score != nil) dict[@"score"] = _score ;
-        
-    
-    
-    if(_exampleUses != nil){
-        if([_exampleUses isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGExampleUsage *exampleUses in (NSArray*)_exampleUses) {
-                [array addObject:[(SWGObject*)exampleUses asDictionary]];
-            }
-            dict[@"exampleUses"] = array;
-        }
-        else if(_exampleUses && [_exampleUses isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_exampleUses toString];
-            if(dateString){
-                dict[@"exampleUses"] = dateString;
-            }
-        }
-        else {
-        
-            if(_exampleUses != nil) dict[@"exampleUses"] = [(SWGObject*)_exampleUses asDictionary];
-        
-        }
-    }
-    
-    
-    
-            if(_attributionUrl != nil) dict[@"attributionUrl"] = _attributionUrl ;
-        
-    
-    
-            if(_seqString != nil) dict[@"seqString"] = _seqString ;
-        
-    
-    
-            if(_attributionText != nil) dict[@"attributionText"] = _attributionText ;
-        
-    
-    
-    if(_relatedWords != nil){
-        if([_relatedWords isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGRelated *relatedWords in (NSArray*)_relatedWords) {
-                [array addObject:[(SWGObject*)relatedWords asDictionary]];
-            }
-            dict[@"relatedWords"] = array;
-        }
-        else if(_relatedWords && [_relatedWords isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_relatedWords toString];
-            if(dateString){
-                dict[@"relatedWords"] = dateString;
-            }
-        }
-        else {
-        
-            if(_relatedWords != nil) dict[@"relatedWords"] = [(SWGObject*)_relatedWords asDictionary];
-        
-        }
-    }
-    
-    
-    
-            if(_sequence != nil) dict[@"sequence"] = _sequence ;
-        
-    
-    
-            if(_word != nil) dict[@"word"] = _word ;
-        
-    
-    
-    if(_notes != nil){
-        if([_notes isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGNote *notes in (NSArray*)_notes) {
-                [array addObject:[(SWGObject*)notes asDictionary]];
-            }
-            dict[@"notes"] = array;
-        }
-        else if(_notes && [_notes isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_notes toString];
-            if(dateString){
-                dict[@"notes"] = dateString;
-            }
-        }
-        else {
-        
-            if(_notes != nil) dict[@"notes"] = [(SWGObject*)_notes asDictionary];
-        
-        }
-    }
-    
-    
-    
-    if(_textProns != nil){
-        if([_textProns isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGTextPron *textProns in (NSArray*)_textProns) {
-                [array addObject:[(SWGObject*)textProns asDictionary]];
-            }
-            dict[@"textProns"] = array;
-        }
-        else if(_textProns && [_textProns isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_textProns toString];
-            if(dateString){
-                dict[@"textProns"] = dateString;
-            }
-        }
-        else {
-        
-            if(_textProns != nil) dict[@"textProns"] = [(SWGObject*)_textProns asDictionary];
-        
-        }
-    }
-    
-    
-    
-            if(_partOfSpeech != nil) dict[@"partOfSpeech"] = _partOfSpeech ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGDefinitionSearchResults.h b/samples/client/wordnik/objc/client/SWGDefinitionSearchResults.h
deleted file mode 100644
index 103ff28546a..00000000000
--- a/samples/client/wordnik/objc/client/SWGDefinitionSearchResults.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-#import "SWGDefinition.h"
-
-
-@interface SWGDefinitionSearchResults : SWGObject
-
-@property(nonatomic) NSArray* results;  
-@property(nonatomic) NSNumber* totalResults;  
-- (id) results: (NSArray*) results     
-    totalResults: (NSNumber*) totalResults;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGDefinitionSearchResults.m b/samples/client/wordnik/objc/client/SWGDefinitionSearchResults.m
deleted file mode 100644
index 592a7f092d0..00000000000
--- a/samples/client/wordnik/objc/client/SWGDefinitionSearchResults.m
+++ /dev/null
@@ -1,84 +0,0 @@
-#import "SWGDate.h"
-#import "SWGDefinitionSearchResults.h"
-
-@implementation SWGDefinitionSearchResults
-
--(id)results: (NSArray*) results
-    totalResults: (NSNumber*) totalResults
-    
-{
-    _results = results;
-    _totalResults = totalResults;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        
-        
-        id results_dict = dict[@"results"];
-        
-        if([results_dict isKindOfClass:[NSArray class]]) {
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)results_dict count]];
-            if([(NSArray*)results_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)results_dict) {
-                    SWGDefinition* d = [[SWGDefinition alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                _results = [[NSArray alloc] initWithArray:objs];
-            }
-            else
-                _results = [[NSArray alloc] init];
-        }
-        else {
-            _results = [[NSArray alloc] init];
-        }
-        
-        
-        _totalResults = dict[@"totalResults"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-    if(_results != nil){
-        if([_results isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGDefinition *results in (NSArray*)_results) {
-                [array addObject:[(SWGObject*)results asDictionary]];
-            }
-            dict[@"results"] = array;
-        }
-        else if(_results && [_results isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_results toString];
-            if(dateString){
-                dict[@"results"] = dateString;
-            }
-        }
-        else {
-        
-            if(_results != nil) dict[@"results"] = [(SWGObject*)_results asDictionary];
-        
-        }
-    }
-    
-    
-    
-            if(_totalResults != nil) dict[@"totalResults"] = _totalResults ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGExample.h b/samples/client/wordnik/objc/client/SWGExample.h
deleted file mode 100644
index 4b0e35388f7..00000000000
--- a/samples/client/wordnik/objc/client/SWGExample.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-#import "SWGSentence.h"
-#import "SWGScoredWord.h"
-#import "SWGContentProvider.h"
-
-
-@interface SWGExample : SWGObject
-
-@property(nonatomic) NSNumber* _id;  
-@property(nonatomic) NSNumber* exampleId;  
-@property(nonatomic) NSString* title;  
-@property(nonatomic) NSString* text;  
-@property(nonatomic) SWGScoredWord* score;  
-@property(nonatomic) SWGSentence* sentence;  
-@property(nonatomic) NSString* word;  
-@property(nonatomic) SWGContentProvider* provider;  
-@property(nonatomic) NSNumber* year;  
-@property(nonatomic) NSNumber* rating;  
-@property(nonatomic) NSNumber* documentId;  
-@property(nonatomic) NSString* url;  
-- (id) _id: (NSNumber*) _id     
-    exampleId: (NSNumber*) exampleId     
-    title: (NSString*) title     
-    text: (NSString*) text     
-    score: (SWGScoredWord*) score     
-    sentence: (SWGSentence*) sentence     
-    word: (NSString*) word     
-    provider: (SWGContentProvider*) provider     
-    year: (NSNumber*) year     
-    rating: (NSNumber*) rating     
-    documentId: (NSNumber*) documentId     
-    url: (NSString*) url;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGExample.m b/samples/client/wordnik/objc/client/SWGExample.m
deleted file mode 100644
index f96d36a63ca..00000000000
--- a/samples/client/wordnik/objc/client/SWGExample.m
+++ /dev/null
@@ -1,201 +0,0 @@
-#import "SWGDate.h"
-#import "SWGExample.h"
-
-@implementation SWGExample
-
--(id)_id: (NSNumber*) _id
-    exampleId: (NSNumber*) exampleId
-    title: (NSString*) title
-    text: (NSString*) text
-    score: (SWGScoredWord*) score
-    sentence: (SWGSentence*) sentence
-    word: (NSString*) word
-    provider: (SWGContentProvider*) provider
-    year: (NSNumber*) year
-    rating: (NSNumber*) rating
-    documentId: (NSNumber*) documentId
-    url: (NSString*) url
-    
-{
-    __id = _id;
-    _exampleId = exampleId;
-    _title = title;
-    _text = text;
-    _score = score;
-    _sentence = sentence;
-    _word = word;
-    _provider = provider;
-    _year = year;
-    _rating = rating;
-    _documentId = documentId;
-    _url = url;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        __id = dict[@"id"];
-        
-        _exampleId = dict[@"exampleId"];
-        
-        _title = dict[@"title"];
-        
-        _text = dict[@"text"];
-        
-        
-        
-        id score_dict = dict[@"score"];
-        
-        if(score_dict != nil)
-            _score = [[SWGScoredWord  alloc]initWithValues:score_dict];
-        
-        
-        
-        
-        id sentence_dict = dict[@"sentence"];
-        
-        if(sentence_dict != nil)
-            _sentence = [[SWGSentence  alloc]initWithValues:sentence_dict];
-        
-        
-        _word = dict[@"word"];
-        
-        
-        
-        id provider_dict = dict[@"provider"];
-        
-        if(provider_dict != nil)
-            _provider = [[SWGContentProvider  alloc]initWithValues:provider_dict];
-        
-        
-        _year = dict[@"year"];
-        
-        _rating = dict[@"rating"];
-        
-        _documentId = dict[@"documentId"];
-        
-        _url = dict[@"url"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(__id != nil) dict[@"id"] = __id ;
-        
-    
-    
-            if(_exampleId != nil) dict[@"exampleId"] = _exampleId ;
-        
-    
-    
-            if(_title != nil) dict[@"title"] = _title ;
-        
-    
-    
-            if(_text != nil) dict[@"text"] = _text ;
-        
-    
-    
-    if(_score != nil){
-        if([_score isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGScoredWord *score in (NSArray*)_score) {
-                [array addObject:[(SWGObject*)score asDictionary]];
-            }
-            dict[@"score"] = array;
-        }
-        else if(_score && [_score isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_score toString];
-            if(dateString){
-                dict[@"score"] = dateString;
-            }
-        }
-        else {
-        
-            if(_score != nil) dict[@"score"] = [(SWGObject*)_score asDictionary];
-        
-        }
-    }
-    
-    
-    
-    if(_sentence != nil){
-        if([_sentence isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGSentence *sentence in (NSArray*)_sentence) {
-                [array addObject:[(SWGObject*)sentence asDictionary]];
-            }
-            dict[@"sentence"] = array;
-        }
-        else if(_sentence && [_sentence isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_sentence toString];
-            if(dateString){
-                dict[@"sentence"] = dateString;
-            }
-        }
-        else {
-        
-            if(_sentence != nil) dict[@"sentence"] = [(SWGObject*)_sentence asDictionary];
-        
-        }
-    }
-    
-    
-    
-            if(_word != nil) dict[@"word"] = _word ;
-        
-    
-    
-    if(_provider != nil){
-        if([_provider isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGContentProvider *provider in (NSArray*)_provider) {
-                [array addObject:[(SWGObject*)provider asDictionary]];
-            }
-            dict[@"provider"] = array;
-        }
-        else if(_provider && [_provider isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_provider toString];
-            if(dateString){
-                dict[@"provider"] = dateString;
-            }
-        }
-        else {
-        
-            if(_provider != nil) dict[@"provider"] = [(SWGObject*)_provider asDictionary];
-        
-        }
-    }
-    
-    
-    
-            if(_year != nil) dict[@"year"] = _year ;
-        
-    
-    
-            if(_rating != nil) dict[@"rating"] = _rating ;
-        
-    
-    
-            if(_documentId != nil) dict[@"documentId"] = _documentId ;
-        
-    
-    
-            if(_url != nil) dict[@"url"] = _url ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGExampleSearchResults.h b/samples/client/wordnik/objc/client/SWGExampleSearchResults.h
deleted file mode 100644
index 697a59da3c9..00000000000
--- a/samples/client/wordnik/objc/client/SWGExampleSearchResults.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-#import "SWGExample.h"
-#import "SWGFacet.h"
-
-
-@interface SWGExampleSearchResults : SWGObject
-
-@property(nonatomic) NSArray* facets;  
-@property(nonatomic) NSArray* examples;  
-- (id) facets: (NSArray*) facets     
-    examples: (NSArray*) examples;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGExampleSearchResults.m b/samples/client/wordnik/objc/client/SWGExampleSearchResults.m
deleted file mode 100644
index 33ad8836c21..00000000000
--- a/samples/client/wordnik/objc/client/SWGExampleSearchResults.m
+++ /dev/null
@@ -1,122 +0,0 @@
-#import "SWGDate.h"
-#import "SWGExampleSearchResults.h"
-
-@implementation SWGExampleSearchResults
-
--(id)facets: (NSArray*) facets
-    examples: (NSArray*) examples
-    
-{
-    _facets = facets;
-    _examples = examples;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        
-        
-        id facets_dict = dict[@"facets"];
-        
-        if([facets_dict isKindOfClass:[NSArray class]]) {
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)facets_dict count]];
-            if([(NSArray*)facets_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)facets_dict) {
-                    SWGFacet* d = [[SWGFacet alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                _facets = [[NSArray alloc] initWithArray:objs];
-            }
-            else
-                _facets = [[NSArray alloc] init];
-        }
-        else {
-            _facets = [[NSArray alloc] init];
-        }
-        
-        
-        
-        
-        id examples_dict = dict[@"examples"];
-        
-        if([examples_dict isKindOfClass:[NSArray class]]) {
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)examples_dict count]];
-            if([(NSArray*)examples_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)examples_dict) {
-                    SWGExample* d = [[SWGExample alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                _examples = [[NSArray alloc] initWithArray:objs];
-            }
-            else
-                _examples = [[NSArray alloc] init];
-        }
-        else {
-            _examples = [[NSArray alloc] init];
-        }
-        
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-    if(_facets != nil){
-        if([_facets isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGFacet *facets in (NSArray*)_facets) {
-                [array addObject:[(SWGObject*)facets asDictionary]];
-            }
-            dict[@"facets"] = array;
-        }
-        else if(_facets && [_facets isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_facets toString];
-            if(dateString){
-                dict[@"facets"] = dateString;
-            }
-        }
-        else {
-        
-            if(_facets != nil) dict[@"facets"] = [(SWGObject*)_facets asDictionary];
-        
-        }
-    }
-    
-    
-    
-    if(_examples != nil){
-        if([_examples isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGExample *examples in (NSArray*)_examples) {
-                [array addObject:[(SWGObject*)examples asDictionary]];
-            }
-            dict[@"examples"] = array;
-        }
-        else if(_examples && [_examples isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_examples toString];
-            if(dateString){
-                dict[@"examples"] = dateString;
-            }
-        }
-        else {
-        
-            if(_examples != nil) dict[@"examples"] = [(SWGObject*)_examples asDictionary];
-        
-        }
-    }
-    
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGExampleUsage.h b/samples/client/wordnik/objc/client/SWGExampleUsage.h
deleted file mode 100644
index 53c5c71a9e3..00000000000
--- a/samples/client/wordnik/objc/client/SWGExampleUsage.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGExampleUsage : SWGObject
-
-@property(nonatomic) NSString* text;  
-- (id) text: (NSString*) text;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGExampleUsage.m b/samples/client/wordnik/objc/client/SWGExampleUsage.m
deleted file mode 100644
index edd14f028df..00000000000
--- a/samples/client/wordnik/objc/client/SWGExampleUsage.m
+++ /dev/null
@@ -1,38 +0,0 @@
-#import "SWGDate.h"
-#import "SWGExampleUsage.h"
-
-@implementation SWGExampleUsage
-
--(id)text: (NSString*) text
-    
-{
-    _text = text;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _text = dict[@"text"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(_text != nil) dict[@"text"] = _text ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGFacet.h b/samples/client/wordnik/objc/client/SWGFacet.h
deleted file mode 100644
index 5fc3a20e63d..00000000000
--- a/samples/client/wordnik/objc/client/SWGFacet.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-#import "SWGFacetValue.h"
-
-
-@interface SWGFacet : SWGObject
-
-@property(nonatomic) NSArray* facetValues;  
-@property(nonatomic) NSString* name;  
-- (id) facetValues: (NSArray*) facetValues     
-    name: (NSString*) name;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGFacet.m b/samples/client/wordnik/objc/client/SWGFacet.m
deleted file mode 100644
index a91b56209bf..00000000000
--- a/samples/client/wordnik/objc/client/SWGFacet.m
+++ /dev/null
@@ -1,84 +0,0 @@
-#import "SWGDate.h"
-#import "SWGFacet.h"
-
-@implementation SWGFacet
-
--(id)facetValues: (NSArray*) facetValues
-    name: (NSString*) name
-    
-{
-    _facetValues = facetValues;
-    _name = name;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        
-        
-        id facetValues_dict = dict[@"facetValues"];
-        
-        if([facetValues_dict isKindOfClass:[NSArray class]]) {
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)facetValues_dict count]];
-            if([(NSArray*)facetValues_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)facetValues_dict) {
-                    SWGFacetValue* d = [[SWGFacetValue alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                _facetValues = [[NSArray alloc] initWithArray:objs];
-            }
-            else
-                _facetValues = [[NSArray alloc] init];
-        }
-        else {
-            _facetValues = [[NSArray alloc] init];
-        }
-        
-        
-        _name = dict[@"name"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-    if(_facetValues != nil){
-        if([_facetValues isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGFacetValue *facetValues in (NSArray*)_facetValues) {
-                [array addObject:[(SWGObject*)facetValues asDictionary]];
-            }
-            dict[@"facetValues"] = array;
-        }
-        else if(_facetValues && [_facetValues isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_facetValues toString];
-            if(dateString){
-                dict[@"facetValues"] = dateString;
-            }
-        }
-        else {
-        
-            if(_facetValues != nil) dict[@"facetValues"] = [(SWGObject*)_facetValues asDictionary];
-        
-        }
-    }
-    
-    
-    
-            if(_name != nil) dict[@"name"] = _name ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGFacetValue.h b/samples/client/wordnik/objc/client/SWGFacetValue.h
deleted file mode 100644
index d287e894c24..00000000000
--- a/samples/client/wordnik/objc/client/SWGFacetValue.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGFacetValue : SWGObject
-
-@property(nonatomic) NSNumber* count;  
-@property(nonatomic) NSString* value;  
-- (id) count: (NSNumber*) count     
-    value: (NSString*) value;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGFacetValue.m b/samples/client/wordnik/objc/client/SWGFacetValue.m
deleted file mode 100644
index 7c725db347c..00000000000
--- a/samples/client/wordnik/objc/client/SWGFacetValue.m
+++ /dev/null
@@ -1,46 +0,0 @@
-#import "SWGDate.h"
-#import "SWGFacetValue.h"
-
-@implementation SWGFacetValue
-
--(id)count: (NSNumber*) count
-    value: (NSString*) value
-    
-{
-    _count = count;
-    _value = value;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _count = dict[@"count"];
-        
-        _value = dict[@"value"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(_count != nil) dict[@"count"] = _count ;
-        
-    
-    
-            if(_value != nil) dict[@"value"] = _value ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGFile.h b/samples/client/wordnik/objc/client/SWGFile.h
deleted file mode 100644
index fe6e81c289d..00000000000
--- a/samples/client/wordnik/objc/client/SWGFile.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface SWGFile : NSObject
-
-@property(nonatomic, readonly) NSString* name;
-@property(nonatomic, readonly) NSString* mimeType;
-@property(nonatomic, readonly) NSData* data;
-
-- (id) initWithNameData: (NSString*) filename
-               mimeType: (NSString*) mimeType
-                   data: (NSData*) data;
-    
-    @end
\ No newline at end of file
diff --git a/samples/client/wordnik/objc/client/SWGFile.m b/samples/client/wordnik/objc/client/SWGFile.m
deleted file mode 100644
index 42552767af4..00000000000
--- a/samples/client/wordnik/objc/client/SWGFile.m
+++ /dev/null
@@ -1,26 +0,0 @@
-#import "SWGFile.h"
-
-@implementation SWGFile
-
-@synthesize name = _name;
-@synthesize mimeType = _mimeType;
-@synthesize data = _data;
-
-- (id) init {
-    self = [super init];
-    return self;
-}
-
-- (id) initWithNameData: (NSString*) filename
-               mimeType: (NSString*) fileMimeType
-                   data: (NSData*) data {
-	self = [super init];
-	if(self) {
-		_name = filename;
-		_mimeType = fileMimeType;
-		_data = data;
-	}
-	return self;
-}
-
-@end
\ No newline at end of file
diff --git a/samples/client/wordnik/objc/client/SWGFrequency.h b/samples/client/wordnik/objc/client/SWGFrequency.h
deleted file mode 100644
index 4becc131395..00000000000
--- a/samples/client/wordnik/objc/client/SWGFrequency.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGFrequency : SWGObject
-
-@property(nonatomic) NSNumber* count;  
-@property(nonatomic) NSNumber* year;  
-- (id) count: (NSNumber*) count     
-    year: (NSNumber*) year;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGFrequency.m b/samples/client/wordnik/objc/client/SWGFrequency.m
deleted file mode 100644
index cb391058a37..00000000000
--- a/samples/client/wordnik/objc/client/SWGFrequency.m
+++ /dev/null
@@ -1,46 +0,0 @@
-#import "SWGDate.h"
-#import "SWGFrequency.h"
-
-@implementation SWGFrequency
-
--(id)count: (NSNumber*) count
-    year: (NSNumber*) year
-    
-{
-    _count = count;
-    _year = year;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _count = dict[@"count"];
-        
-        _year = dict[@"year"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(_count != nil) dict[@"count"] = _count ;
-        
-    
-    
-            if(_year != nil) dict[@"year"] = _year ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGFrequencySummary.h b/samples/client/wordnik/objc/client/SWGFrequencySummary.h
deleted file mode 100644
index 52392d8d1dd..00000000000
--- a/samples/client/wordnik/objc/client/SWGFrequencySummary.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-#import "SWGFrequency.h"
-
-
-@interface SWGFrequencySummary : SWGObject
-
-@property(nonatomic) NSNumber* unknownYearCount;  
-@property(nonatomic) NSNumber* totalCount;  
-@property(nonatomic) NSString* frequencyString;  
-@property(nonatomic) NSString* word;  
-@property(nonatomic) NSArray* frequency;  
-- (id) unknownYearCount: (NSNumber*) unknownYearCount     
-    totalCount: (NSNumber*) totalCount     
-    frequencyString: (NSString*) frequencyString     
-    word: (NSString*) word     
-    frequency: (NSArray*) frequency;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGFrequencySummary.m b/samples/client/wordnik/objc/client/SWGFrequencySummary.m
deleted file mode 100644
index 5926efe95b1..00000000000
--- a/samples/client/wordnik/objc/client/SWGFrequencySummary.m
+++ /dev/null
@@ -1,108 +0,0 @@
-#import "SWGDate.h"
-#import "SWGFrequencySummary.h"
-
-@implementation SWGFrequencySummary
-
--(id)unknownYearCount: (NSNumber*) unknownYearCount
-    totalCount: (NSNumber*) totalCount
-    frequencyString: (NSString*) frequencyString
-    word: (NSString*) word
-    frequency: (NSArray*) frequency
-    
-{
-    _unknownYearCount = unknownYearCount;
-    _totalCount = totalCount;
-    _frequencyString = frequencyString;
-    _word = word;
-    _frequency = frequency;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _unknownYearCount = dict[@"unknownYearCount"];
-        
-        _totalCount = dict[@"totalCount"];
-        
-        _frequencyString = dict[@"frequencyString"];
-        
-        _word = dict[@"word"];
-        
-        
-        
-        id frequency_dict = dict[@"frequency"];
-        
-        if([frequency_dict isKindOfClass:[NSArray class]]) {
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)frequency_dict count]];
-            if([(NSArray*)frequency_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)frequency_dict) {
-                    SWGFrequency* d = [[SWGFrequency alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                _frequency = [[NSArray alloc] initWithArray:objs];
-            }
-            else
-                _frequency = [[NSArray alloc] init];
-        }
-        else {
-            _frequency = [[NSArray alloc] init];
-        }
-        
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(_unknownYearCount != nil) dict[@"unknownYearCount"] = _unknownYearCount ;
-        
-    
-    
-            if(_totalCount != nil) dict[@"totalCount"] = _totalCount ;
-        
-    
-    
-            if(_frequencyString != nil) dict[@"frequencyString"] = _frequencyString ;
-        
-    
-    
-            if(_word != nil) dict[@"word"] = _word ;
-        
-    
-    
-    if(_frequency != nil){
-        if([_frequency isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGFrequency *frequency in (NSArray*)_frequency) {
-                [array addObject:[(SWGObject*)frequency asDictionary]];
-            }
-            dict[@"frequency"] = array;
-        }
-        else if(_frequency && [_frequency isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_frequency toString];
-            if(dateString){
-                dict[@"frequency"] = dateString;
-            }
-        }
-        else {
-        
-            if(_frequency != nil) dict[@"frequency"] = [(SWGObject*)_frequency asDictionary];
-        
-        }
-    }
-    
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGLabel.h b/samples/client/wordnik/objc/client/SWGLabel.h
deleted file mode 100644
index 3cce615144d..00000000000
--- a/samples/client/wordnik/objc/client/SWGLabel.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGLabel : SWGObject
-
-@property(nonatomic) NSString* text;  
-@property(nonatomic) NSString* type;  
-- (id) text: (NSString*) text     
-    type: (NSString*) type;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGLabel.m b/samples/client/wordnik/objc/client/SWGLabel.m
deleted file mode 100644
index c448b5a92a1..00000000000
--- a/samples/client/wordnik/objc/client/SWGLabel.m
+++ /dev/null
@@ -1,46 +0,0 @@
-#import "SWGDate.h"
-#import "SWGLabel.h"
-
-@implementation SWGLabel
-
--(id)text: (NSString*) text
-    type: (NSString*) type
-    
-{
-    _text = text;
-    _type = type;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _text = dict[@"text"];
-        
-        _type = dict[@"type"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(_text != nil) dict[@"text"] = _text ;
-        
-    
-    
-            if(_type != nil) dict[@"type"] = _type ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGNote.h b/samples/client/wordnik/objc/client/SWGNote.h
deleted file mode 100644
index 8d52de6db7a..00000000000
--- a/samples/client/wordnik/objc/client/SWGNote.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGNote : SWGObject
-
-@property(nonatomic) NSString* noteType;  
-@property(nonatomic) NSArray* appliesTo;  
-@property(nonatomic) NSString* value;  
-@property(nonatomic) NSNumber* pos;  
-- (id) noteType: (NSString*) noteType     
-    appliesTo: (NSArray*) appliesTo     
-    value: (NSString*) value     
-    pos: (NSNumber*) pos;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGNote.m b/samples/client/wordnik/objc/client/SWGNote.m
deleted file mode 100644
index 31b0528812b..00000000000
--- a/samples/client/wordnik/objc/client/SWGNote.m
+++ /dev/null
@@ -1,62 +0,0 @@
-#import "SWGDate.h"
-#import "SWGNote.h"
-
-@implementation SWGNote
-
--(id)noteType: (NSString*) noteType
-    appliesTo: (NSArray*) appliesTo
-    value: (NSString*) value
-    pos: (NSNumber*) pos
-    
-{
-    _noteType = noteType;
-    _appliesTo = appliesTo;
-    _value = value;
-    _pos = pos;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _noteType = dict[@"noteType"];
-        
-        _appliesTo = dict[@"appliesTo"];
-        
-        _value = dict[@"value"];
-        
-        _pos = dict[@"pos"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(_noteType != nil) dict[@"noteType"] = _noteType ;
-        
-    
-    
-            if(_appliesTo != nil) dict[@"appliesTo"] = _appliesTo ;
-        
-    
-    
-            if(_value != nil) dict[@"value"] = _value ;
-        
-    
-    
-            if(_pos != nil) dict[@"pos"] = _pos ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGObject.h b/samples/client/wordnik/objc/client/SWGObject.h
deleted file mode 100644
index 031bae69279..00000000000
--- a/samples/client/wordnik/objc/client/SWGObject.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface SWGObject : NSObject
-- (id) initWithValues:(NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-@end
diff --git a/samples/client/wordnik/objc/client/SWGObject.m b/samples/client/wordnik/objc/client/SWGObject.m
deleted file mode 100644
index 9b37b3592b1..00000000000
--- a/samples/client/wordnik/objc/client/SWGObject.m
+++ /dev/null
@@ -1,17 +0,0 @@
-#import "SWGObject.h"
-
-@implementation SWGObject
-
-- (id) initWithValues:(NSDictionary*)dict {
-    return self;
-}
-
-- (NSDictionary*) asDictionary{
-    return [NSDictionary init];
-}
-
-- (NSString*)description {
-    return [NSString stringWithFormat:@"%@ %@", [super description], [self asDictionary]];
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGPartOfSpeech.h b/samples/client/wordnik/objc/client/SWGPartOfSpeech.h
deleted file mode 100644
index 3ece5fc8de5..00000000000
--- a/samples/client/wordnik/objc/client/SWGPartOfSpeech.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-#import "SWGCategory.h"
-#import "SWGRoot.h"
-
-
-@interface SWGPartOfSpeech : SWGObject
-
-@property(nonatomic) NSArray* roots;  
-@property(nonatomic) NSArray* storageAbbr;  
-@property(nonatomic) NSArray* allCategories;  
-- (id) roots: (NSArray*) roots     
-    storageAbbr: (NSArray*) storageAbbr     
-    allCategories: (NSArray*) allCategories;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGPartOfSpeech.m b/samples/client/wordnik/objc/client/SWGPartOfSpeech.m
deleted file mode 100644
index 05d819ab324..00000000000
--- a/samples/client/wordnik/objc/client/SWGPartOfSpeech.m
+++ /dev/null
@@ -1,130 +0,0 @@
-#import "SWGDate.h"
-#import "SWGPartOfSpeech.h"
-
-@implementation SWGPartOfSpeech
-
--(id)roots: (NSArray*) roots
-    storageAbbr: (NSArray*) storageAbbr
-    allCategories: (NSArray*) allCategories
-    
-{
-    _roots = roots;
-    _storageAbbr = storageAbbr;
-    _allCategories = allCategories;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        
-        
-        id roots_dict = dict[@"roots"];
-        
-        if([roots_dict isKindOfClass:[NSArray class]]) {
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)roots_dict count]];
-            if([(NSArray*)roots_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)roots_dict) {
-                    SWGRoot* d = [[SWGRoot alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                _roots = [[NSArray alloc] initWithArray:objs];
-            }
-            else
-                _roots = [[NSArray alloc] init];
-        }
-        else {
-            _roots = [[NSArray alloc] init];
-        }
-        
-        
-        _storageAbbr = dict[@"storageAbbr"];
-        
-        
-        
-        id allCategories_dict = dict[@"allCategories"];
-        
-        if([allCategories_dict isKindOfClass:[NSArray class]]) {
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)allCategories_dict count]];
-            if([(NSArray*)allCategories_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)allCategories_dict) {
-                    SWGCategory* d = [[SWGCategory alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                _allCategories = [[NSArray alloc] initWithArray:objs];
-            }
-            else
-                _allCategories = [[NSArray alloc] init];
-        }
-        else {
-            _allCategories = [[NSArray alloc] init];
-        }
-        
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-    if(_roots != nil){
-        if([_roots isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGRoot *roots in (NSArray*)_roots) {
-                [array addObject:[(SWGObject*)roots asDictionary]];
-            }
-            dict[@"roots"] = array;
-        }
-        else if(_roots && [_roots isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_roots toString];
-            if(dateString){
-                dict[@"roots"] = dateString;
-            }
-        }
-        else {
-        
-            if(_roots != nil) dict[@"roots"] = [(SWGObject*)_roots asDictionary];
-        
-        }
-    }
-    
-    
-    
-            if(_storageAbbr != nil) dict[@"storageAbbr"] = _storageAbbr ;
-        
-    
-    
-    if(_allCategories != nil){
-        if([_allCategories isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGCategory *allCategories in (NSArray*)_allCategories) {
-                [array addObject:[(SWGObject*)allCategories asDictionary]];
-            }
-            dict[@"allCategories"] = array;
-        }
-        else if(_allCategories && [_allCategories isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_allCategories toString];
-            if(dateString){
-                dict[@"allCategories"] = dateString;
-            }
-        }
-        else {
-        
-            if(_allCategories != nil) dict[@"allCategories"] = [(SWGObject*)_allCategories asDictionary];
-        
-        }
-    }
-    
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGRelated.h b/samples/client/wordnik/objc/client/SWGRelated.h
deleted file mode 100644
index b7bb47b8f0f..00000000000
--- a/samples/client/wordnik/objc/client/SWGRelated.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGRelated : SWGObject
-
-@property(nonatomic) NSString* label1;  
-@property(nonatomic) NSString* relationshipType;  
-@property(nonatomic) NSString* label2;  
-@property(nonatomic) NSString* label3;  
-@property(nonatomic) NSArray* words;  
-@property(nonatomic) NSString* gram;  
-@property(nonatomic) NSString* label4;  
-- (id) label1: (NSString*) label1     
-    relationshipType: (NSString*) relationshipType     
-    label2: (NSString*) label2     
-    label3: (NSString*) label3     
-    words: (NSArray*) words     
-    gram: (NSString*) gram     
-    label4: (NSString*) label4;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGRelated.m b/samples/client/wordnik/objc/client/SWGRelated.m
deleted file mode 100644
index 728952a2a3d..00000000000
--- a/samples/client/wordnik/objc/client/SWGRelated.m
+++ /dev/null
@@ -1,86 +0,0 @@
-#import "SWGDate.h"
-#import "SWGRelated.h"
-
-@implementation SWGRelated
-
--(id)label1: (NSString*) label1
-    relationshipType: (NSString*) relationshipType
-    label2: (NSString*) label2
-    label3: (NSString*) label3
-    words: (NSArray*) words
-    gram: (NSString*) gram
-    label4: (NSString*) label4
-    
-{
-    _label1 = label1;
-    _relationshipType = relationshipType;
-    _label2 = label2;
-    _label3 = label3;
-    _words = words;
-    _gram = gram;
-    _label4 = label4;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _label1 = dict[@"label1"];
-        
-        _relationshipType = dict[@"relationshipType"];
-        
-        _label2 = dict[@"label2"];
-        
-        _label3 = dict[@"label3"];
-        
-        _words = dict[@"words"];
-        
-        _gram = dict[@"gram"];
-        
-        _label4 = dict[@"label4"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(_label1 != nil) dict[@"label1"] = _label1 ;
-        
-    
-    
-            if(_relationshipType != nil) dict[@"relationshipType"] = _relationshipType ;
-        
-    
-    
-            if(_label2 != nil) dict[@"label2"] = _label2 ;
-        
-    
-    
-            if(_label3 != nil) dict[@"label3"] = _label3 ;
-        
-    
-    
-            if(_words != nil) dict[@"words"] = _words ;
-        
-    
-    
-            if(_gram != nil) dict[@"gram"] = _gram ;
-        
-    
-    
-            if(_label4 != nil) dict[@"label4"] = _label4 ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGRoot.h b/samples/client/wordnik/objc/client/SWGRoot.h
deleted file mode 100644
index e511c5b5411..00000000000
--- a/samples/client/wordnik/objc/client/SWGRoot.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-#import "SWGCategory.h"
-
-
-@interface SWGRoot : SWGObject
-
-@property(nonatomic) NSNumber* _id;  
-@property(nonatomic) NSString* name;  
-@property(nonatomic) NSArray* categories;  
-- (id) _id: (NSNumber*) _id     
-    name: (NSString*) name     
-    categories: (NSArray*) categories;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGRoot.m b/samples/client/wordnik/objc/client/SWGRoot.m
deleted file mode 100644
index 4e2a73f1691..00000000000
--- a/samples/client/wordnik/objc/client/SWGRoot.m
+++ /dev/null
@@ -1,92 +0,0 @@
-#import "SWGDate.h"
-#import "SWGRoot.h"
-
-@implementation SWGRoot
-
--(id)_id: (NSNumber*) _id
-    name: (NSString*) name
-    categories: (NSArray*) categories
-    
-{
-    __id = _id;
-    _name = name;
-    _categories = categories;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        __id = dict[@"id"];
-        
-        _name = dict[@"name"];
-        
-        
-        
-        id categories_dict = dict[@"categories"];
-        
-        if([categories_dict isKindOfClass:[NSArray class]]) {
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)categories_dict count]];
-            if([(NSArray*)categories_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)categories_dict) {
-                    SWGCategory* d = [[SWGCategory alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                _categories = [[NSArray alloc] initWithArray:objs];
-            }
-            else
-                _categories = [[NSArray alloc] init];
-        }
-        else {
-            _categories = [[NSArray alloc] init];
-        }
-        
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(__id != nil) dict[@"id"] = __id ;
-        
-    
-    
-            if(_name != nil) dict[@"name"] = _name ;
-        
-    
-    
-    if(_categories != nil){
-        if([_categories isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGCategory *categories in (NSArray*)_categories) {
-                [array addObject:[(SWGObject*)categories asDictionary]];
-            }
-            dict[@"categories"] = array;
-        }
-        else if(_categories && [_categories isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_categories toString];
-            if(dateString){
-                dict[@"categories"] = dateString;
-            }
-        }
-        else {
-        
-            if(_categories != nil) dict[@"categories"] = [(SWGObject*)_categories asDictionary];
-        
-        }
-    }
-    
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGScoredWord.h b/samples/client/wordnik/objc/client/SWGScoredWord.h
deleted file mode 100644
index 69c264bbee2..00000000000
--- a/samples/client/wordnik/objc/client/SWGScoredWord.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGScoredWord : SWGObject
-
-@property(nonatomic) NSNumber* position;  
-@property(nonatomic) NSNumber* _id;  
-@property(nonatomic) NSNumber* docTermCount;  
-@property(nonatomic) NSString* lemma;  
-@property(nonatomic) NSString* wordType;  
-@property(nonatomic) NSNumber* score;  
-@property(nonatomic) NSNumber* sentenceId;  
-@property(nonatomic) NSString* word;  
-@property(nonatomic) NSNumber* stopword;  
-@property(nonatomic) NSNumber* baseWordScore;  
-@property(nonatomic) NSString* partOfSpeech;  
-- (id) position: (NSNumber*) position     
-    _id: (NSNumber*) _id     
-    docTermCount: (NSNumber*) docTermCount     
-    lemma: (NSString*) lemma     
-    wordType: (NSString*) wordType     
-    score: (NSNumber*) score     
-    sentenceId: (NSNumber*) sentenceId     
-    word: (NSString*) word     
-    stopword: (NSNumber*) stopword     
-    baseWordScore: (NSNumber*) baseWordScore     
-    partOfSpeech: (NSString*) partOfSpeech;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGScoredWord.m b/samples/client/wordnik/objc/client/SWGScoredWord.m
deleted file mode 100644
index 059741aa538..00000000000
--- a/samples/client/wordnik/objc/client/SWGScoredWord.m
+++ /dev/null
@@ -1,118 +0,0 @@
-#import "SWGDate.h"
-#import "SWGScoredWord.h"
-
-@implementation SWGScoredWord
-
--(id)position: (NSNumber*) position
-    _id: (NSNumber*) _id
-    docTermCount: (NSNumber*) docTermCount
-    lemma: (NSString*) lemma
-    wordType: (NSString*) wordType
-    score: (NSNumber*) score
-    sentenceId: (NSNumber*) sentenceId
-    word: (NSString*) word
-    stopword: (NSNumber*) stopword
-    baseWordScore: (NSNumber*) baseWordScore
-    partOfSpeech: (NSString*) partOfSpeech
-    
-{
-    _position = position;
-    __id = _id;
-    _docTermCount = docTermCount;
-    _lemma = lemma;
-    _wordType = wordType;
-    _score = score;
-    _sentenceId = sentenceId;
-    _word = word;
-    _stopword = stopword;
-    _baseWordScore = baseWordScore;
-    _partOfSpeech = partOfSpeech;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _position = dict[@"position"];
-        
-        __id = dict[@"id"];
-        
-        _docTermCount = dict[@"docTermCount"];
-        
-        _lemma = dict[@"lemma"];
-        
-        _wordType = dict[@"wordType"];
-        
-        _score = dict[@"score"];
-        
-        _sentenceId = dict[@"sentenceId"];
-        
-        _word = dict[@"word"];
-        
-        _stopword = dict[@"stopword"];
-        
-        _baseWordScore = dict[@"baseWordScore"];
-        
-        _partOfSpeech = dict[@"partOfSpeech"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(_position != nil) dict[@"position"] = _position ;
-        
-    
-    
-            if(__id != nil) dict[@"id"] = __id ;
-        
-    
-    
-            if(_docTermCount != nil) dict[@"docTermCount"] = _docTermCount ;
-        
-    
-    
-            if(_lemma != nil) dict[@"lemma"] = _lemma ;
-        
-    
-    
-            if(_wordType != nil) dict[@"wordType"] = _wordType ;
-        
-    
-    
-            if(_score != nil) dict[@"score"] = _score ;
-        
-    
-    
-            if(_sentenceId != nil) dict[@"sentenceId"] = _sentenceId ;
-        
-    
-    
-            if(_word != nil) dict[@"word"] = _word ;
-        
-    
-    
-            if(_stopword != nil) dict[@"stopword"] = _stopword ;
-        
-    
-    
-            if(_baseWordScore != nil) dict[@"baseWordScore"] = _baseWordScore ;
-        
-    
-    
-            if(_partOfSpeech != nil) dict[@"partOfSpeech"] = _partOfSpeech ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGSentence.h b/samples/client/wordnik/objc/client/SWGSentence.h
deleted file mode 100644
index acaba2a3155..00000000000
--- a/samples/client/wordnik/objc/client/SWGSentence.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-#import "SWGScoredWord.h"
-
-
-@interface SWGSentence : SWGObject
-
-@property(nonatomic) NSNumber* hasScoredWords;  
-@property(nonatomic) NSNumber* _id;  
-@property(nonatomic) NSArray* scoredWords;  
-@property(nonatomic) NSString* display;  
-@property(nonatomic) NSNumber* rating;  
-@property(nonatomic) NSNumber* documentMetadataId;  
-- (id) hasScoredWords: (NSNumber*) hasScoredWords     
-    _id: (NSNumber*) _id     
-    scoredWords: (NSArray*) scoredWords     
-    display: (NSString*) display     
-    rating: (NSNumber*) rating     
-    documentMetadataId: (NSNumber*) documentMetadataId;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGSentence.m b/samples/client/wordnik/objc/client/SWGSentence.m
deleted file mode 100644
index ec079498a5c..00000000000
--- a/samples/client/wordnik/objc/client/SWGSentence.m
+++ /dev/null
@@ -1,116 +0,0 @@
-#import "SWGDate.h"
-#import "SWGSentence.h"
-
-@implementation SWGSentence
-
--(id)hasScoredWords: (NSNumber*) hasScoredWords
-    _id: (NSNumber*) _id
-    scoredWords: (NSArray*) scoredWords
-    display: (NSString*) display
-    rating: (NSNumber*) rating
-    documentMetadataId: (NSNumber*) documentMetadataId
-    
-{
-    _hasScoredWords = hasScoredWords;
-    __id = _id;
-    _scoredWords = scoredWords;
-    _display = display;
-    _rating = rating;
-    _documentMetadataId = documentMetadataId;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _hasScoredWords = dict[@"hasScoredWords"];
-        
-        __id = dict[@"id"];
-        
-        
-        
-        id scoredWords_dict = dict[@"scoredWords"];
-        
-        if([scoredWords_dict isKindOfClass:[NSArray class]]) {
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)scoredWords_dict count]];
-            if([(NSArray*)scoredWords_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)scoredWords_dict) {
-                    SWGScoredWord* d = [[SWGScoredWord alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                _scoredWords = [[NSArray alloc] initWithArray:objs];
-            }
-            else
-                _scoredWords = [[NSArray alloc] init];
-        }
-        else {
-            _scoredWords = [[NSArray alloc] init];
-        }
-        
-        
-        _display = dict[@"display"];
-        
-        _rating = dict[@"rating"];
-        
-        _documentMetadataId = dict[@"documentMetadataId"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(_hasScoredWords != nil) dict[@"hasScoredWords"] = _hasScoredWords ;
-        
-    
-    
-            if(__id != nil) dict[@"id"] = __id ;
-        
-    
-    
-    if(_scoredWords != nil){
-        if([_scoredWords isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGScoredWord *scoredWords in (NSArray*)_scoredWords) {
-                [array addObject:[(SWGObject*)scoredWords asDictionary]];
-            }
-            dict[@"scoredWords"] = array;
-        }
-        else if(_scoredWords && [_scoredWords isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_scoredWords toString];
-            if(dateString){
-                dict[@"scoredWords"] = dateString;
-            }
-        }
-        else {
-        
-            if(_scoredWords != nil) dict[@"scoredWords"] = [(SWGObject*)_scoredWords asDictionary];
-        
-        }
-    }
-    
-    
-    
-            if(_display != nil) dict[@"display"] = _display ;
-        
-    
-    
-            if(_rating != nil) dict[@"rating"] = _rating ;
-        
-    
-    
-            if(_documentMetadataId != nil) dict[@"documentMetadataId"] = _documentMetadataId ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGSimpleDefinition.h b/samples/client/wordnik/objc/client/SWGSimpleDefinition.h
deleted file mode 100644
index ac5c4ea88bd..00000000000
--- a/samples/client/wordnik/objc/client/SWGSimpleDefinition.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGSimpleDefinition : SWGObject
-
-@property(nonatomic) NSString* text;  
-@property(nonatomic) NSString* source;  
-@property(nonatomic) NSString* note;  
-@property(nonatomic) NSString* partOfSpeech;  
-- (id) text: (NSString*) text     
-    source: (NSString*) source     
-    note: (NSString*) note     
-    partOfSpeech: (NSString*) partOfSpeech;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGSimpleDefinition.m b/samples/client/wordnik/objc/client/SWGSimpleDefinition.m
deleted file mode 100644
index 8df534533c3..00000000000
--- a/samples/client/wordnik/objc/client/SWGSimpleDefinition.m
+++ /dev/null
@@ -1,62 +0,0 @@
-#import "SWGDate.h"
-#import "SWGSimpleDefinition.h"
-
-@implementation SWGSimpleDefinition
-
--(id)text: (NSString*) text
-    source: (NSString*) source
-    note: (NSString*) note
-    partOfSpeech: (NSString*) partOfSpeech
-    
-{
-    _text = text;
-    _source = source;
-    _note = note;
-    _partOfSpeech = partOfSpeech;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _text = dict[@"text"];
-        
-        _source = dict[@"source"];
-        
-        _note = dict[@"note"];
-        
-        _partOfSpeech = dict[@"partOfSpeech"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(_text != nil) dict[@"text"] = _text ;
-        
-    
-    
-            if(_source != nil) dict[@"source"] = _source ;
-        
-    
-    
-            if(_note != nil) dict[@"note"] = _note ;
-        
-    
-    
-            if(_partOfSpeech != nil) dict[@"partOfSpeech"] = _partOfSpeech ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGSimpleExample.h b/samples/client/wordnik/objc/client/SWGSimpleExample.h
deleted file mode 100644
index cf312339e23..00000000000
--- a/samples/client/wordnik/objc/client/SWGSimpleExample.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGSimpleExample : SWGObject
-
-@property(nonatomic) NSNumber* _id;  
-@property(nonatomic) NSString* title;  
-@property(nonatomic) NSString* text;  
-@property(nonatomic) NSString* url;  
-- (id) _id: (NSNumber*) _id     
-    title: (NSString*) title     
-    text: (NSString*) text     
-    url: (NSString*) url;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGSimpleExample.m b/samples/client/wordnik/objc/client/SWGSimpleExample.m
deleted file mode 100644
index 7075c6e8471..00000000000
--- a/samples/client/wordnik/objc/client/SWGSimpleExample.m
+++ /dev/null
@@ -1,62 +0,0 @@
-#import "SWGDate.h"
-#import "SWGSimpleExample.h"
-
-@implementation SWGSimpleExample
-
--(id)_id: (NSNumber*) _id
-    title: (NSString*) title
-    text: (NSString*) text
-    url: (NSString*) url
-    
-{
-    __id = _id;
-    _title = title;
-    _text = text;
-    _url = url;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        __id = dict[@"id"];
-        
-        _title = dict[@"title"];
-        
-        _text = dict[@"text"];
-        
-        _url = dict[@"url"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(__id != nil) dict[@"id"] = __id ;
-        
-    
-    
-            if(_title != nil) dict[@"title"] = _title ;
-        
-    
-    
-            if(_text != nil) dict[@"text"] = _text ;
-        
-    
-    
-            if(_url != nil) dict[@"url"] = _url ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGStringValue.h b/samples/client/wordnik/objc/client/SWGStringValue.h
deleted file mode 100644
index d599203095b..00000000000
--- a/samples/client/wordnik/objc/client/SWGStringValue.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGStringValue : SWGObject
-
-@property(nonatomic) NSString* word;  
-- (id) word: (NSString*) word;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGStringValue.m b/samples/client/wordnik/objc/client/SWGStringValue.m
deleted file mode 100644
index 744fd01f3fa..00000000000
--- a/samples/client/wordnik/objc/client/SWGStringValue.m
+++ /dev/null
@@ -1,38 +0,0 @@
-#import "SWGDate.h"
-#import "SWGStringValue.h"
-
-@implementation SWGStringValue
-
--(id)word: (NSString*) word
-    
-{
-    _word = word;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _word = dict[@"word"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(_word != nil) dict[@"word"] = _word ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGSyllable.h b/samples/client/wordnik/objc/client/SWGSyllable.h
deleted file mode 100644
index 78148fa2f24..00000000000
--- a/samples/client/wordnik/objc/client/SWGSyllable.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGSyllable : SWGObject
-
-@property(nonatomic) NSString* text;  
-@property(nonatomic) NSNumber* seq;  
-@property(nonatomic) NSString* type;  
-- (id) text: (NSString*) text     
-    seq: (NSNumber*) seq     
-    type: (NSString*) type;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGSyllable.m b/samples/client/wordnik/objc/client/SWGSyllable.m
deleted file mode 100644
index d75a9b1df75..00000000000
--- a/samples/client/wordnik/objc/client/SWGSyllable.m
+++ /dev/null
@@ -1,54 +0,0 @@
-#import "SWGDate.h"
-#import "SWGSyllable.h"
-
-@implementation SWGSyllable
-
--(id)text: (NSString*) text
-    seq: (NSNumber*) seq
-    type: (NSString*) type
-    
-{
-    _text = text;
-    _seq = seq;
-    _type = type;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _text = dict[@"text"];
-        
-        _seq = dict[@"seq"];
-        
-        _type = dict[@"type"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(_text != nil) dict[@"text"] = _text ;
-        
-    
-    
-            if(_seq != nil) dict[@"seq"] = _seq ;
-        
-    
-    
-            if(_type != nil) dict[@"type"] = _type ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGTextPron.h b/samples/client/wordnik/objc/client/SWGTextPron.h
deleted file mode 100644
index 6d2e78fe373..00000000000
--- a/samples/client/wordnik/objc/client/SWGTextPron.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGTextPron : SWGObject
-
-@property(nonatomic) NSString* raw;  
-@property(nonatomic) NSNumber* seq;  
-@property(nonatomic) NSString* rawType;  
-- (id) raw: (NSString*) raw     
-    seq: (NSNumber*) seq     
-    rawType: (NSString*) rawType;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGTextPron.m b/samples/client/wordnik/objc/client/SWGTextPron.m
deleted file mode 100644
index 321193fa2d7..00000000000
--- a/samples/client/wordnik/objc/client/SWGTextPron.m
+++ /dev/null
@@ -1,54 +0,0 @@
-#import "SWGDate.h"
-#import "SWGTextPron.h"
-
-@implementation SWGTextPron
-
--(id)raw: (NSString*) raw
-    seq: (NSNumber*) seq
-    rawType: (NSString*) rawType
-    
-{
-    _raw = raw;
-    _seq = seq;
-    _rawType = rawType;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _raw = dict[@"raw"];
-        
-        _seq = dict[@"seq"];
-        
-        _rawType = dict[@"rawType"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(_raw != nil) dict[@"raw"] = _raw ;
-        
-    
-    
-            if(_seq != nil) dict[@"seq"] = _seq ;
-        
-    
-    
-            if(_rawType != nil) dict[@"rawType"] = _rawType ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGUser.h b/samples/client/wordnik/objc/client/SWGUser.h
deleted file mode 100644
index 769ae489fb2..00000000000
--- a/samples/client/wordnik/objc/client/SWGUser.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGUser : SWGObject
-
-@property(nonatomic) NSNumber* _id;  
-@property(nonatomic) NSString* username;  
-@property(nonatomic) NSString* email;  
-@property(nonatomic) NSNumber* status;  
-@property(nonatomic) NSString* faceBookId;  
-@property(nonatomic) NSString* userName;  
-@property(nonatomic) NSString* displayName;  
-@property(nonatomic) NSString* password;  
-- (id) _id: (NSNumber*) _id     
-    username: (NSString*) username     
-    email: (NSString*) email     
-    status: (NSNumber*) status     
-    faceBookId: (NSString*) faceBookId     
-    userName: (NSString*) userName     
-    displayName: (NSString*) displayName     
-    password: (NSString*) password;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGUser.m b/samples/client/wordnik/objc/client/SWGUser.m
deleted file mode 100644
index 6679cf877b3..00000000000
--- a/samples/client/wordnik/objc/client/SWGUser.m
+++ /dev/null
@@ -1,94 +0,0 @@
-#import "SWGDate.h"
-#import "SWGUser.h"
-
-@implementation SWGUser
-
--(id)_id: (NSNumber*) _id
-    username: (NSString*) username
-    email: (NSString*) email
-    status: (NSNumber*) status
-    faceBookId: (NSString*) faceBookId
-    userName: (NSString*) userName
-    displayName: (NSString*) displayName
-    password: (NSString*) password
-    
-{
-    __id = _id;
-    _username = username;
-    _email = email;
-    _status = status;
-    _faceBookId = faceBookId;
-    _userName = userName;
-    _displayName = displayName;
-    _password = password;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        __id = dict[@"id"];
-        
-        _username = dict[@"username"];
-        
-        _email = dict[@"email"];
-        
-        _status = dict[@"status"];
-        
-        _faceBookId = dict[@"faceBookId"];
-        
-        _userName = dict[@"userName"];
-        
-        _displayName = dict[@"displayName"];
-        
-        _password = dict[@"password"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(__id != nil) dict[@"id"] = __id ;
-        
-    
-    
-            if(_username != nil) dict[@"username"] = _username ;
-        
-    
-    
-            if(_email != nil) dict[@"email"] = _email ;
-        
-    
-    
-            if(_status != nil) dict[@"status"] = _status ;
-        
-    
-    
-            if(_faceBookId != nil) dict[@"faceBookId"] = _faceBookId ;
-        
-    
-    
-            if(_userName != nil) dict[@"userName"] = _userName ;
-        
-    
-    
-            if(_displayName != nil) dict[@"displayName"] = _displayName ;
-        
-    
-    
-            if(_password != nil) dict[@"password"] = _password ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGWordApi.h b/samples/client/wordnik/objc/client/SWGWordApi.h
deleted file mode 100644
index 7bdd117d9b5..00000000000
--- a/samples/client/wordnik/objc/client/SWGWordApi.h
+++ /dev/null
@@ -1,304 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGWordObject.h"
-#import "SWGAudioFile.h"
-#import "SWGDefinition.h"
-#import "SWGFrequencySummary.h"
-#import "SWGBigram.h"
-#import "SWGExample.h"
-#import "SWGObject.h"
-
-
-@interface SWGWordApi: NSObject
-
--(void) addHeader:(NSString*)value forKey:(NSString*)key;
--(unsigned long) requestQueueSize;
-+(SWGWordApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key;
-+(void) setBasePath:(NSString*)basePath;
-+(NSString*) getBasePath;
-/**
-
- Given a word as a string, returns the WordObject that represents it
- 
-
- 
- @param word String value of WordObject to return
- 
- @param useCanonical If true will try to return the correct word root (&#39;cats&#39; -&gt; &#39;cat&#39;). If false returns exactly what was requested.
- 
- @param includeSuggestions Return suggestions (for correct spelling, case variants, etc.)
- 
-
- return type: SWGWordObject*
- */
--(NSNumber*) getWordWithCompletionBlock :(NSString*) word 
-     useCanonical:(NSString*) useCanonical 
-     includeSuggestions:(NSString*) includeSuggestions 
-    
-    completionHandler: (void (^)(SWGWordObject* output, NSError* error))completionBlock;
-    
-
-
-/**
-
- Fetches audio metadata for a word.
- 
- The metadata includes a time-expiring fileUrl which allows reading the audio file directly from the API.  Currently only audio pronunciations from the American Heritage Dictionary in mp3 format are supported.
- 
-
- 
- @param word Word to get audio for.
- 
- @param useCanonical Use the canonical form of the word
- 
- @param limit Maximum number of results to return
- 
-
- return type: NSArray*
- */
--(NSNumber*) getAudioWithCompletionBlock :(NSString*) word 
-     useCanonical:(NSString*) useCanonical 
-     limit:(NSNumber*) limit 
-    
-    completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock;
-    
-
-
-/**
-
- Return definitions for a word
- 
-
- 
- @param word Word to return definitions for
- 
- @param limit Maximum number of results to return
- 
- @param partOfSpeech CSV list of part-of-speech types
- 
- @param includeRelated Return related words with definitions
- 
- @param sourceDictionaries Source dictionary to return definitions from.  If &#39;all&#39; is received, results are returned from all sources. If multiple values are received (e.g. &#39;century,wiktionary&#39;), results are returned from the first specified dictionary that has definitions. If left blank, results are returned from the first dictionary that has definitions. By default, dictionaries are searched in this order: ahd, wiktionary, webster, century, wordnet
- 
- @param useCanonical If true will try to return the correct word root (&#39;cats&#39; -&gt; &#39;cat&#39;). If false returns exactly what was requested.
- 
- @param includeTags Return a closed set of XML tags in response
- 
-
- return type: NSArray*
- */
--(NSNumber*) getDefinitionsWithCompletionBlock :(NSString*) word 
-     limit:(NSNumber*) limit 
-     partOfSpeech:(NSString*) partOfSpeech 
-     includeRelated:(NSString*) includeRelated 
-     sourceDictionaries:(NSArray*) sourceDictionaries 
-     useCanonical:(NSString*) useCanonical 
-     includeTags:(NSString*) includeTags 
-    
-    completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock;
-    
-
-
-/**
-
- Fetches etymology data
- 
-
- 
- @param word Word to return
- 
- @param useCanonical If true will try to return the correct word root (&#39;cats&#39; -&gt; &#39;cat&#39;). If false returns exactly what was requested.
- 
-
- return type: NSArray*
- */
--(NSNumber*) getEtymologiesWithCompletionBlock :(NSString*) word 
-     useCanonical:(NSString*) useCanonical 
-    
-    completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock;
-    
-
-
-/**
-
- Returns examples for a word
- 
-
- 
- @param word Word to return examples for
- 
- @param includeDuplicates Show duplicate examples from different sources
- 
- @param useCanonical If true will try to return the correct word root (&#39;cats&#39; -&gt; &#39;cat&#39;). If false returns exactly what was requested.
- 
- @param skip Results to skip
- 
- @param limit Maximum number of results to return
- 
-
- return type: 
- */
--(NSNumber*) getExamplesWithCompletionBlock :(NSString*) word 
-     includeDuplicates:(NSString*) includeDuplicates 
-     useCanonical:(NSString*) useCanonical 
-     skip:(NSNumber*) skip 
-     limit:(NSNumber*) limit 
-    
-    
-    completionHandler: (void (^)(NSError* error))completionBlock;
-
-
-/**
-
- Returns word usage over time
- 
-
- 
- @param word Word to return
- 
- @param useCanonical If true will try to return the correct word root (&#39;cats&#39; -&gt; &#39;cat&#39;). If false returns exactly what was requested.
- 
- @param startYear Starting Year
- 
- @param endYear Ending Year
- 
-
- return type: SWGFrequencySummary*
- */
--(NSNumber*) getWordFrequencyWithCompletionBlock :(NSString*) word 
-     useCanonical:(NSString*) useCanonical 
-     startYear:(NSNumber*) startYear 
-     endYear:(NSNumber*) endYear 
-    
-    completionHandler: (void (^)(SWGFrequencySummary* output, NSError* error))completionBlock;
-    
-
-
-/**
-
- Returns syllable information for a word
- 
-
- 
- @param word Word to get syllables for
- 
- @param useCanonical If true will try to return a correct word root (&#39;cats&#39; -&gt; &#39;cat&#39;). If false returns exactly what was requested.
- 
- @param sourceDictionary Get from a single dictionary. Valid options: ahd, century, wiktionary, webster, and wordnet.
- 
- @param limit Maximum number of results to return
- 
-
- return type: 
- */
--(NSNumber*) getHyphenationWithCompletionBlock :(NSString*) word 
-     useCanonical:(NSString*) useCanonical 
-     sourceDictionary:(NSString*) sourceDictionary 
-     limit:(NSNumber*) limit 
-    
-    
-    completionHandler: (void (^)(NSError* error))completionBlock;
-
-
-/**
-
- Fetches bi-gram phrases for a word
- 
-
- 
- @param word Word to fetch phrases for
- 
- @param limit Maximum number of results to return
- 
- @param wlmi Minimum WLMI for the phrase
- 
- @param useCanonical If true will try to return the correct word root (&#39;cats&#39; -&gt; &#39;cat&#39;). If false returns exactly what was requested.
- 
-
- return type: NSArray*
- */
--(NSNumber*) getPhrasesWithCompletionBlock :(NSString*) word 
-     limit:(NSNumber*) limit 
-     wlmi:(NSNumber*) wlmi 
-     useCanonical:(NSString*) useCanonical 
-    
-    completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock;
-    
-
-
-/**
-
- Returns text pronunciations for a given word
- 
-
- 
- @param word Word to get pronunciations for
- 
- @param useCanonical If true will try to return a correct word root (&#39;cats&#39; -&gt; &#39;cat&#39;). If false returns exactly what was requested.
- 
- @param sourceDictionary Get from a single dictionary
- 
- @param typeFormat Text pronunciation type
- 
- @param limit Maximum number of results to return
- 
-
- return type: 
- */
--(NSNumber*) getTextPronunciationsWithCompletionBlock :(NSString*) word 
-     useCanonical:(NSString*) useCanonical 
-     sourceDictionary:(NSString*) sourceDictionary 
-     typeFormat:(NSString*) typeFormat 
-     limit:(NSNumber*) limit 
-    
-    
-    completionHandler: (void (^)(NSError* error))completionBlock;
-
-
-/**
-
- Given a word as a string, returns relationships from the Word Graph
- 
-
- 
- @param word Word to fetch relationships for
- 
- @param useCanonical If true will try to return the correct word root (&#39;cats&#39; -&gt; &#39;cat&#39;). If false returns exactly what was requested.
- 
- @param relationshipTypes Limits the total results per type of relationship type
- 
- @param limitPerRelationshipType Restrict to the supplied relationship types
- 
-
- return type: 
- */
--(NSNumber*) getRelatedWordsWithCompletionBlock :(NSString*) word 
-     useCanonical:(NSString*) useCanonical 
-     relationshipTypes:(NSString*) relationshipTypes 
-     limitPerRelationshipType:(NSNumber*) limitPerRelationshipType 
-    
-    
-    completionHandler: (void (^)(NSError* error))completionBlock;
-
-
-/**
-
- Returns a top example for a word
- 
-
- 
- @param word Word to fetch examples for
- 
- @param useCanonical If true will try to return the correct word root (&#39;cats&#39; -&gt; &#39;cat&#39;). If false returns exactly what was requested.
- 
-
- return type: SWGExample*
- */
--(NSNumber*) getTopExampleWithCompletionBlock :(NSString*) word 
-     useCanonical:(NSString*) useCanonical 
-    
-    completionHandler: (void (^)(SWGExample* output, NSError* error))completionBlock;
-    
-
-
-
-@end
\ No newline at end of file
diff --git a/samples/client/wordnik/objc/client/SWGWordApi.m b/samples/client/wordnik/objc/client/SWGWordApi.m
deleted file mode 100644
index e60ddabd67b..00000000000
--- a/samples/client/wordnik/objc/client/SWGWordApi.m
+++ /dev/null
@@ -1,805 +0,0 @@
-#import "SWGWordApi.h"
-#import "SWGFile.h"
-#import "SWGApiClient.h"
-#import "SWGWordObject.h"
-#import "SWGAudioFile.h"
-#import "SWGDefinition.h"
-#import "SWGFrequencySummary.h"
-#import "SWGBigram.h"
-#import "SWGExample.h"
-
-
-
-@implementation SWGWordApi
-static NSString * basePath = @"https://api.wordnik.com/v4";
-
-+(SWGWordApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key {
-    static SWGWordApi* singletonAPI = nil;
-
-    if (singletonAPI == nil) {
-        singletonAPI = [[SWGWordApi alloc] init];
-        [singletonAPI addHeader:headerValue forKey:key];
-    }
-    return singletonAPI;
-}
-
-+(void) setBasePath:(NSString*)path {
-    basePath = path;
-}
-
-+(NSString*) getBasePath {
-    return basePath;
-}
-
--(SWGApiClient*) apiClient {
-    return [SWGApiClient sharedClientFromPool:basePath];
-}
-
--(void) addHeader:(NSString*)value forKey:(NSString*)key {
-    [[self apiClient] setHeaderValue:value forKey:key];
-}
-
--(id) init {
-    self = [super init];
-    [self apiClient];
-    return self;
-}
-
--(void) setHeaderValue:(NSString*) value
-           forKey:(NSString*)key {
-    [[self apiClient] setHeaderValue:value forKey:key];
-}
-
--(unsigned long) requestQueueSize {
-    return [SWGApiClient requestQueueSize];
-}
-
-
--(NSNumber*) getWordWithCompletionBlock:(NSString*) word
-         useCanonical:(NSString*) useCanonical
-         includeSuggestions:(NSString*) includeSuggestions
-        
-        completionHandler: (void (^)(SWGWordObject* output, NSError* error))completionBlock
-         {
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/word.json/{word}", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"word", @"}"]] withString: [SWGApiClient escape:word]];
-    
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(useCanonical != nil)
-        queryParams[@"useCanonical"] = useCanonical;
-    if(includeSuggestions != nil)
-        queryParams[@"includeSuggestions"] = includeSuggestions;
-    
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    
-
-    id bodyDictionary = nil;
-    
-    
-    
-
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    
-    
-    
-        
-    // comples response type
-    return [client dictionary:requestUrl 
-                       method:@"GET" 
-                  queryParams:queryParams 
-                         body:bodyDictionary 
-                 headerParams:headerParams
-           requestContentType:requestContentType
-          responseContentType:responseContentType
-              completionBlock:^(NSDictionary *data, NSError *error) {
-                if (error) {
-                    completionBlock(nil, error);
-                    
-                    return;
-                }
-                
-                SWGWordObject *result = nil;
-                if (data) {
-                    result = [[SWGWordObject    alloc]initWithValues: data];
-                }
-                completionBlock(result , nil);
-                
-              }];
-    
-    
-}
-
--(NSNumber*) getAudioWithCompletionBlock:(NSString*) word
-         useCanonical:(NSString*) useCanonical
-         limit:(NSNumber*) limit
-        
-        completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock
-         {
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/word.json/{word}/audio", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"word", @"}"]] withString: [SWGApiClient escape:word]];
-    
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(useCanonical != nil)
-        queryParams[@"useCanonical"] = useCanonical;
-    if(limit != nil)
-        queryParams[@"limit"] = limit;
-    
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    
-
-    id bodyDictionary = nil;
-    
-    
-    
-
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-        // array container response type
-    return [client dictionary: requestUrl 
-                       method: @"GET" 
-                  queryParams: queryParams 
-                         body: bodyDictionary 
-                 headerParams: headerParams
-           requestContentType: requestContentType
-          responseContentType: responseContentType
-              completionBlock: ^(NSDictionary *data, NSError *error) {
-                 if (error) {
-                     completionBlock(nil, error);
-                     
-                     return;
-                 }
-                 
-                 if([data isKindOfClass:[NSArray class]]){
-                     NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[data count]];
-                     for (NSDictionary* dict in (NSArray*)data) {
-                        
-                        
-                        SWGAudioFile* d = [[SWGAudioFile alloc]initWithValues: dict];
-                        
-                        [objs addObject:d];
-                     }
-                     completionBlock(objs, nil);
-                 }
-                
-
-                
-            }];
-    
-    
-}
-
--(NSNumber*) getDefinitionsWithCompletionBlock:(NSString*) word
-         limit:(NSNumber*) limit
-         partOfSpeech:(NSString*) partOfSpeech
-         includeRelated:(NSString*) includeRelated
-         sourceDictionaries:(NSArray*) sourceDictionaries
-         useCanonical:(NSString*) useCanonical
-         includeTags:(NSString*) includeTags
-        
-        completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock
-         {
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/word.json/{word}/definitions", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"word", @"}"]] withString: [SWGApiClient escape:word]];
-    
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(limit != nil)
-        queryParams[@"limit"] = limit;
-    if(partOfSpeech != nil)
-        queryParams[@"partOfSpeech"] = partOfSpeech;
-    if(includeRelated != nil)
-        queryParams[@"includeRelated"] = includeRelated;
-    if(sourceDictionaries != nil)
-        queryParams[@"sourceDictionaries"] = sourceDictionaries;
-    if(useCanonical != nil)
-        queryParams[@"useCanonical"] = useCanonical;
-    if(includeTags != nil)
-        queryParams[@"includeTags"] = includeTags;
-    
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    
-
-    id bodyDictionary = nil;
-    
-    
-    
-
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-        // array container response type
-    return [client dictionary: requestUrl 
-                       method: @"GET" 
-                  queryParams: queryParams 
-                         body: bodyDictionary 
-                 headerParams: headerParams
-           requestContentType: requestContentType
-          responseContentType: responseContentType
-              completionBlock: ^(NSDictionary *data, NSError *error) {
-                 if (error) {
-                     completionBlock(nil, error);
-                     
-                     return;
-                 }
-                 
-                 if([data isKindOfClass:[NSArray class]]){
-                     NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[data count]];
-                     for (NSDictionary* dict in (NSArray*)data) {
-                        
-                        
-                        SWGDefinition* d = [[SWGDefinition alloc]initWithValues: dict];
-                        
-                        [objs addObject:d];
-                     }
-                     completionBlock(objs, nil);
-                 }
-                
-
-                
-            }];
-    
-    
-}
-
--(NSNumber*) getEtymologiesWithCompletionBlock:(NSString*) word
-         useCanonical:(NSString*) useCanonical
-        
-        completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock
-         {
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/word.json/{word}/etymologies", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"word", @"}"]] withString: [SWGApiClient escape:word]];
-    
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(useCanonical != nil)
-        queryParams[@"useCanonical"] = useCanonical;
-    
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    
-
-    id bodyDictionary = nil;
-    
-    
-    
-
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-        // array container response type
-    return [client dictionary: requestUrl 
-                       method: @"GET" 
-                  queryParams: queryParams 
-                         body: bodyDictionary 
-                 headerParams: headerParams
-           requestContentType: requestContentType
-          responseContentType: responseContentType
-              completionBlock: ^(NSDictionary *data, NSError *error) {
-                 if (error) {
-                     completionBlock(nil, error);
-                     
-                     return;
-                 }
-                 
-                 if([data isKindOfClass:[NSArray class]]){
-                     NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[data count]];
-                     for (NSDictionary* dict in (NSArray*)data) {
-                        
-                        NSString* d = [[NSString alloc]initWithString: dict];
-                        
-                        
-                        [objs addObject:d];
-                     }
-                     completionBlock(objs, nil);
-                 }
-                
-
-                
-            }];
-    
-    
-}
-
--(NSNumber*) getExamplesWithCompletionBlock:(NSString*) word
-         includeDuplicates:(NSString*) includeDuplicates
-         useCanonical:(NSString*) useCanonical
-         skip:(NSNumber*) skip
-         limit:(NSNumber*) limit
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock {
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/word.json/{word}/examples", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"word", @"}"]] withString: [SWGApiClient escape:word]];
-    
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(includeDuplicates != nil)
-        queryParams[@"includeDuplicates"] = includeDuplicates;
-    if(useCanonical != nil)
-        queryParams[@"useCanonical"] = useCanonical;
-    if(skip != nil)
-        queryParams[@"skip"] = skip;
-    if(limit != nil)
-        queryParams[@"limit"] = limit;
-    
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    
-
-    id bodyDictionary = nil;
-    
-    
-    
-
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    
-    
-            // primitive response type
-    
-    
-    // no return base type
-    return [client stringWithCompletionBlock:requestUrl 
-                                             method:@"GET" 
-                                        queryParams:queryParams 
-                                               body:bodyDictionary 
-                                       headerParams:headerParams
-                                 requestContentType: requestContentType
-                                responseContentType: responseContentType
-                                    completionBlock:^(NSString *data, NSError *error) {
-                        if (error) {
-                            completionBlock(error);
-                            return;
-                        }
-                        completionBlock(nil);
-                    }];
-    
-    
-    
-    
-}
-
--(NSNumber*) getWordFrequencyWithCompletionBlock:(NSString*) word
-         useCanonical:(NSString*) useCanonical
-         startYear:(NSNumber*) startYear
-         endYear:(NSNumber*) endYear
-        
-        completionHandler: (void (^)(SWGFrequencySummary* output, NSError* error))completionBlock
-         {
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/word.json/{word}/frequency", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"word", @"}"]] withString: [SWGApiClient escape:word]];
-    
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(useCanonical != nil)
-        queryParams[@"useCanonical"] = useCanonical;
-    if(startYear != nil)
-        queryParams[@"startYear"] = startYear;
-    if(endYear != nil)
-        queryParams[@"endYear"] = endYear;
-    
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    
-
-    id bodyDictionary = nil;
-    
-    
-    
-
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    
-    
-    
-        
-    // comples response type
-    return [client dictionary:requestUrl 
-                       method:@"GET" 
-                  queryParams:queryParams 
-                         body:bodyDictionary 
-                 headerParams:headerParams
-           requestContentType:requestContentType
-          responseContentType:responseContentType
-              completionBlock:^(NSDictionary *data, NSError *error) {
-                if (error) {
-                    completionBlock(nil, error);
-                    
-                    return;
-                }
-                
-                SWGFrequencySummary *result = nil;
-                if (data) {
-                    result = [[SWGFrequencySummary    alloc]initWithValues: data];
-                }
-                completionBlock(result , nil);
-                
-              }];
-    
-    
-}
-
--(NSNumber*) getHyphenationWithCompletionBlock:(NSString*) word
-         useCanonical:(NSString*) useCanonical
-         sourceDictionary:(NSString*) sourceDictionary
-         limit:(NSNumber*) limit
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock {
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/word.json/{word}/hyphenation", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"word", @"}"]] withString: [SWGApiClient escape:word]];
-    
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(useCanonical != nil)
-        queryParams[@"useCanonical"] = useCanonical;
-    if(sourceDictionary != nil)
-        queryParams[@"sourceDictionary"] = sourceDictionary;
-    if(limit != nil)
-        queryParams[@"limit"] = limit;
-    
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    
-
-    id bodyDictionary = nil;
-    
-    
-    
-
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    
-    
-            // primitive response type
-    
-    
-    // no return base type
-    return [client stringWithCompletionBlock:requestUrl 
-                                             method:@"GET" 
-                                        queryParams:queryParams 
-                                               body:bodyDictionary 
-                                       headerParams:headerParams
-                                 requestContentType: requestContentType
-                                responseContentType: responseContentType
-                                    completionBlock:^(NSString *data, NSError *error) {
-                        if (error) {
-                            completionBlock(error);
-                            return;
-                        }
-                        completionBlock(nil);
-                    }];
-    
-    
-    
-    
-}
-
--(NSNumber*) getPhrasesWithCompletionBlock:(NSString*) word
-         limit:(NSNumber*) limit
-         wlmi:(NSNumber*) wlmi
-         useCanonical:(NSString*) useCanonical
-        
-        completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock
-         {
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/word.json/{word}/phrases", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"word", @"}"]] withString: [SWGApiClient escape:word]];
-    
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(limit != nil)
-        queryParams[@"limit"] = limit;
-    if(wlmi != nil)
-        queryParams[@"wlmi"] = wlmi;
-    if(useCanonical != nil)
-        queryParams[@"useCanonical"] = useCanonical;
-    
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    
-
-    id bodyDictionary = nil;
-    
-    
-    
-
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-        // array container response type
-    return [client dictionary: requestUrl 
-                       method: @"GET" 
-                  queryParams: queryParams 
-                         body: bodyDictionary 
-                 headerParams: headerParams
-           requestContentType: requestContentType
-          responseContentType: responseContentType
-              completionBlock: ^(NSDictionary *data, NSError *error) {
-                 if (error) {
-                     completionBlock(nil, error);
-                     
-                     return;
-                 }
-                 
-                 if([data isKindOfClass:[NSArray class]]){
-                     NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[data count]];
-                     for (NSDictionary* dict in (NSArray*)data) {
-                        
-                        
-                        SWGBigram* d = [[SWGBigram alloc]initWithValues: dict];
-                        
-                        [objs addObject:d];
-                     }
-                     completionBlock(objs, nil);
-                 }
-                
-
-                
-            }];
-    
-    
-}
-
--(NSNumber*) getTextPronunciationsWithCompletionBlock:(NSString*) word
-         useCanonical:(NSString*) useCanonical
-         sourceDictionary:(NSString*) sourceDictionary
-         typeFormat:(NSString*) typeFormat
-         limit:(NSNumber*) limit
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock {
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/word.json/{word}/pronunciations", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"word", @"}"]] withString: [SWGApiClient escape:word]];
-    
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(useCanonical != nil)
-        queryParams[@"useCanonical"] = useCanonical;
-    if(sourceDictionary != nil)
-        queryParams[@"sourceDictionary"] = sourceDictionary;
-    if(typeFormat != nil)
-        queryParams[@"typeFormat"] = typeFormat;
-    if(limit != nil)
-        queryParams[@"limit"] = limit;
-    
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    
-
-    id bodyDictionary = nil;
-    
-    
-    
-
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    
-    
-            // primitive response type
-    
-    
-    // no return base type
-    return [client stringWithCompletionBlock:requestUrl 
-                                             method:@"GET" 
-                                        queryParams:queryParams 
-                                               body:bodyDictionary 
-                                       headerParams:headerParams
-                                 requestContentType: requestContentType
-                                responseContentType: responseContentType
-                                    completionBlock:^(NSString *data, NSError *error) {
-                        if (error) {
-                            completionBlock(error);
-                            return;
-                        }
-                        completionBlock(nil);
-                    }];
-    
-    
-    
-    
-}
-
--(NSNumber*) getRelatedWordsWithCompletionBlock:(NSString*) word
-         useCanonical:(NSString*) useCanonical
-         relationshipTypes:(NSString*) relationshipTypes
-         limitPerRelationshipType:(NSNumber*) limitPerRelationshipType
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock {
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/word.json/{word}/relatedWords", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"word", @"}"]] withString: [SWGApiClient escape:word]];
-    
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(useCanonical != nil)
-        queryParams[@"useCanonical"] = useCanonical;
-    if(relationshipTypes != nil)
-        queryParams[@"relationshipTypes"] = relationshipTypes;
-    if(limitPerRelationshipType != nil)
-        queryParams[@"limitPerRelationshipType"] = limitPerRelationshipType;
-    
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    
-
-    id bodyDictionary = nil;
-    
-    
-    
-
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    
-    
-            // primitive response type
-    
-    
-    // no return base type
-    return [client stringWithCompletionBlock:requestUrl 
-                                             method:@"GET" 
-                                        queryParams:queryParams 
-                                               body:bodyDictionary 
-                                       headerParams:headerParams
-                                 requestContentType: requestContentType
-                                responseContentType: responseContentType
-                                    completionBlock:^(NSString *data, NSError *error) {
-                        if (error) {
-                            completionBlock(error);
-                            return;
-                        }
-                        completionBlock(nil);
-                    }];
-    
-    
-    
-    
-}
-
--(NSNumber*) getTopExampleWithCompletionBlock:(NSString*) word
-         useCanonical:(NSString*) useCanonical
-        
-        completionHandler: (void (^)(SWGExample* output, NSError* error))completionBlock
-         {
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/word.json/{word}/topExample", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"word", @"}"]] withString: [SWGApiClient escape:word]];
-    
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(useCanonical != nil)
-        queryParams[@"useCanonical"] = useCanonical;
-    
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    
-
-    id bodyDictionary = nil;
-    
-    
-    
-
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    
-    
-    
-        
-    // comples response type
-    return [client dictionary:requestUrl 
-                       method:@"GET" 
-                  queryParams:queryParams 
-                         body:bodyDictionary 
-                 headerParams:headerParams
-           requestContentType:requestContentType
-          responseContentType:responseContentType
-              completionBlock:^(NSDictionary *data, NSError *error) {
-                if (error) {
-                    completionBlock(nil, error);
-                    
-                    return;
-                }
-                
-                SWGExample *result = nil;
-                if (data) {
-                    result = [[SWGExample    alloc]initWithValues: data];
-                }
-                completionBlock(result , nil);
-                
-              }];
-    
-    
-}
-
-
-
-@end
\ No newline at end of file
diff --git a/samples/client/wordnik/objc/client/SWGWordList.h b/samples/client/wordnik/objc/client/SWGWordList.h
deleted file mode 100644
index 73ff5fe3aa9..00000000000
--- a/samples/client/wordnik/objc/client/SWGWordList.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-#import "SWGDate.h"
-
-
-@interface SWGWordList : SWGObject
-
-@property(nonatomic) NSNumber* _id;  
-@property(nonatomic) NSString* permalink;  
-@property(nonatomic) NSString* name;  
-@property(nonatomic) SWGDate* createdAt;  
-@property(nonatomic) SWGDate* updatedAt;  
-@property(nonatomic) SWGDate* lastActivityAt;  
-@property(nonatomic) NSString* username;  
-@property(nonatomic) NSNumber* userId;  
-@property(nonatomic) NSString* _description;  
-@property(nonatomic) NSNumber* numberWordsInList;  
-@property(nonatomic) NSString* type;  
-- (id) _id: (NSNumber*) _id     
-    permalink: (NSString*) permalink     
-    name: (NSString*) name     
-    createdAt: (SWGDate*) createdAt     
-    updatedAt: (SWGDate*) updatedAt     
-    lastActivityAt: (SWGDate*) lastActivityAt     
-    username: (NSString*) username     
-    userId: (NSNumber*) userId     
-    _description: (NSString*) _description     
-    numberWordsInList: (NSNumber*) numberWordsInList     
-    type: (NSString*) type;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGWordList.m b/samples/client/wordnik/objc/client/SWGWordList.m
deleted file mode 100644
index aa362fb0247..00000000000
--- a/samples/client/wordnik/objc/client/SWGWordList.m
+++ /dev/null
@@ -1,193 +0,0 @@
-#import "SWGDate.h"
-#import "SWGWordList.h"
-
-@implementation SWGWordList
-
--(id)_id: (NSNumber*) _id
-    permalink: (NSString*) permalink
-    name: (NSString*) name
-    createdAt: (SWGDate*) createdAt
-    updatedAt: (SWGDate*) updatedAt
-    lastActivityAt: (SWGDate*) lastActivityAt
-    username: (NSString*) username
-    userId: (NSNumber*) userId
-    _description: (NSString*) _description
-    numberWordsInList: (NSNumber*) numberWordsInList
-    type: (NSString*) type
-    
-{
-    __id = _id;
-    _permalink = permalink;
-    _name = name;
-    _createdAt = createdAt;
-    _updatedAt = updatedAt;
-    _lastActivityAt = lastActivityAt;
-    _username = username;
-    _userId = userId;
-    __description = _description;
-    _numberWordsInList = numberWordsInList;
-    _type = type;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        __id = dict[@"id"];
-        
-        _permalink = dict[@"permalink"];
-        
-        _name = dict[@"name"];
-        
-        
-        
-        id createdAt_dict = dict[@"createdAt"];
-        
-        if(createdAt_dict != nil)
-            _createdAt = [[SWGDate  alloc]initWithValues:createdAt_dict];
-        
-        
-        
-        
-        id updatedAt_dict = dict[@"updatedAt"];
-        
-        if(updatedAt_dict != nil)
-            _updatedAt = [[SWGDate  alloc]initWithValues:updatedAt_dict];
-        
-        
-        
-        
-        id lastActivityAt_dict = dict[@"lastActivityAt"];
-        
-        if(lastActivityAt_dict != nil)
-            _lastActivityAt = [[SWGDate  alloc]initWithValues:lastActivityAt_dict];
-        
-        
-        _username = dict[@"username"];
-        
-        _userId = dict[@"userId"];
-        
-        __description = dict[@"description"];
-        
-        _numberWordsInList = dict[@"numberWordsInList"];
-        
-        _type = dict[@"type"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(__id != nil) dict[@"id"] = __id ;
-        
-    
-    
-            if(_permalink != nil) dict[@"permalink"] = _permalink ;
-        
-    
-    
-            if(_name != nil) dict[@"name"] = _name ;
-        
-    
-    
-    if(_createdAt != nil){
-        if([_createdAt isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGDate *createdAt in (NSArray*)_createdAt) {
-                [array addObject:[(SWGObject*)createdAt asDictionary]];
-            }
-            dict[@"createdAt"] = array;
-        }
-        else if(_createdAt && [_createdAt isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_createdAt toString];
-            if(dateString){
-                dict[@"createdAt"] = dateString;
-            }
-        }
-        else {
-        
-            if(_createdAt != nil) dict[@"createdAt"] = [(SWGObject*)_createdAt asDictionary];
-        
-        }
-    }
-    
-    
-    
-    if(_updatedAt != nil){
-        if([_updatedAt isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGDate *updatedAt in (NSArray*)_updatedAt) {
-                [array addObject:[(SWGObject*)updatedAt asDictionary]];
-            }
-            dict[@"updatedAt"] = array;
-        }
-        else if(_updatedAt && [_updatedAt isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_updatedAt toString];
-            if(dateString){
-                dict[@"updatedAt"] = dateString;
-            }
-        }
-        else {
-        
-            if(_updatedAt != nil) dict[@"updatedAt"] = [(SWGObject*)_updatedAt asDictionary];
-        
-        }
-    }
-    
-    
-    
-    if(_lastActivityAt != nil){
-        if([_lastActivityAt isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGDate *lastActivityAt in (NSArray*)_lastActivityAt) {
-                [array addObject:[(SWGObject*)lastActivityAt asDictionary]];
-            }
-            dict[@"lastActivityAt"] = array;
-        }
-        else if(_lastActivityAt && [_lastActivityAt isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_lastActivityAt toString];
-            if(dateString){
-                dict[@"lastActivityAt"] = dateString;
-            }
-        }
-        else {
-        
-            if(_lastActivityAt != nil) dict[@"lastActivityAt"] = [(SWGObject*)_lastActivityAt asDictionary];
-        
-        }
-    }
-    
-    
-    
-            if(_username != nil) dict[@"username"] = _username ;
-        
-    
-    
-            if(_userId != nil) dict[@"userId"] = _userId ;
-        
-    
-    
-            if(__description != nil) dict[@"description"] = __description ;
-        
-    
-    
-            if(_numberWordsInList != nil) dict[@"numberWordsInList"] = _numberWordsInList ;
-        
-    
-    
-            if(_type != nil) dict[@"type"] = _type ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGWordListApi.h b/samples/client/wordnik/objc/client/SWGWordListApi.h
deleted file mode 100644
index 84b659ce6a0..00000000000
--- a/samples/client/wordnik/objc/client/SWGWordListApi.h
+++ /dev/null
@@ -1,156 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGWordList.h"
-#import "SWGStringValue.h"
-#import "SWGObject.h"
-
-
-@interface SWGWordListApi: NSObject
-
--(void) addHeader:(NSString*)value forKey:(NSString*)key;
--(unsigned long) requestQueueSize;
-+(SWGWordListApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key;
-+(void) setBasePath:(NSString*)basePath;
-+(NSString*) getBasePath;
-/**
-
- Fetches a WordList by ID
- 
-
- 
- @param permalink permalink of WordList to fetch
- 
- @param auth_token The auth token of the logged-in user, obtained by calling /account.json/authenticate/{username} (described above)
- 
-
- return type: SWGWordList*
- */
--(NSNumber*) getWordListByPermalinkWithCompletionBlock :(NSString*) permalink 
-     auth_token:(NSString*) auth_token 
-    
-    completionHandler: (void (^)(SWGWordList* output, NSError* error))completionBlock;
-    
-
-
-/**
-
- Updates an existing WordList
- 
-
- 
- @param permalink permalink of WordList to update
- 
- @param body Updated WordList
- 
- @param auth_token The auth token of the logged-in user, obtained by calling /account.json/authenticate/{username} (described above)
- 
-
- return type: 
- */
--(NSNumber*) updateWordListWithCompletionBlock :(NSString*) permalink 
-     body:(SWGWordList*) body 
-     auth_token:(NSString*) auth_token 
-    
-    
-    completionHandler: (void (^)(NSError* error))completionBlock;
-
-
-/**
-
- Deletes an existing WordList
- 
-
- 
- @param permalink ID of WordList to delete
- 
- @param auth_token The auth token of the logged-in user, obtained by calling /account.json/authenticate/{username} (described above)
- 
-
- return type: 
- */
--(NSNumber*) deleteWordListWithCompletionBlock :(NSString*) permalink 
-     auth_token:(NSString*) auth_token 
-    
-    
-    completionHandler: (void (^)(NSError* error))completionBlock;
-
-
-/**
-
- Removes words from a WordList
- 
-
- 
- @param permalink permalink of WordList to use
- 
- @param body Words to remove from WordList
- 
- @param auth_token The auth token of the logged-in user, obtained by calling /account.json/authenticate/{username} (described above)
- 
-
- return type: 
- */
--(NSNumber*) deleteWordsFromWordListWithCompletionBlock :(NSString*) permalink 
-     body:(NSArray*) body 
-     auth_token:(NSString*) auth_token 
-    
-    
-    completionHandler: (void (^)(NSError* error))completionBlock;
-
-
-/**
-
- Fetches words in a WordList
- 
-
- 
- @param permalink ID of WordList to use
- 
- @param sortBy Field to sort by
- 
- @param sortOrder Direction to sort
- 
- @param skip Results to skip
- 
- @param limit Maximum number of results to return
- 
- @param auth_token The auth token of the logged-in user, obtained by calling /account.json/authenticate/{username} (described above)
- 
-
- return type: 
- */
--(NSNumber*) getWordListWordsWithCompletionBlock :(NSString*) permalink 
-     sortBy:(NSString*) sortBy 
-     sortOrder:(NSString*) sortOrder 
-     skip:(NSNumber*) skip 
-     limit:(NSNumber*) limit 
-     auth_token:(NSString*) auth_token 
-    
-    
-    completionHandler: (void (^)(NSError* error))completionBlock;
-
-
-/**
-
- Adds words to a WordList
- 
-
- 
- @param permalink permalink of WordList to user
- 
- @param body Array of words to add to WordList
- 
- @param auth_token The auth token of the logged-in user, obtained by calling /account.json/authenticate/{username} (described above)
- 
-
- return type: 
- */
--(NSNumber*) addWordsToWordListWithCompletionBlock :(NSString*) permalink 
-     body:(NSArray*) body 
-     auth_token:(NSString*) auth_token 
-    
-    
-    completionHandler: (void (^)(NSError* error))completionBlock;
-
-
-
-@end
\ No newline at end of file
diff --git a/samples/client/wordnik/objc/client/SWGWordListApi.m b/samples/client/wordnik/objc/client/SWGWordListApi.m
deleted file mode 100644
index 72d9072b1a9..00000000000
--- a/samples/client/wordnik/objc/client/SWGWordListApi.m
+++ /dev/null
@@ -1,528 +0,0 @@
-#import "SWGWordListApi.h"
-#import "SWGFile.h"
-#import "SWGApiClient.h"
-#import "SWGWordList.h"
-#import "SWGStringValue.h"
-
-
-
-@implementation SWGWordListApi
-static NSString * basePath = @"https://api.wordnik.com/v4";
-
-+(SWGWordListApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key {
-    static SWGWordListApi* singletonAPI = nil;
-
-    if (singletonAPI == nil) {
-        singletonAPI = [[SWGWordListApi alloc] init];
-        [singletonAPI addHeader:headerValue forKey:key];
-    }
-    return singletonAPI;
-}
-
-+(void) setBasePath:(NSString*)path {
-    basePath = path;
-}
-
-+(NSString*) getBasePath {
-    return basePath;
-}
-
--(SWGApiClient*) apiClient {
-    return [SWGApiClient sharedClientFromPool:basePath];
-}
-
--(void) addHeader:(NSString*)value forKey:(NSString*)key {
-    [[self apiClient] setHeaderValue:value forKey:key];
-}
-
--(id) init {
-    self = [super init];
-    [self apiClient];
-    return self;
-}
-
--(void) setHeaderValue:(NSString*) value
-           forKey:(NSString*)key {
-    [[self apiClient] setHeaderValue:value forKey:key];
-}
-
--(unsigned long) requestQueueSize {
-    return [SWGApiClient requestQueueSize];
-}
-
-
--(NSNumber*) getWordListByPermalinkWithCompletionBlock:(NSString*) permalink
-         auth_token:(NSString*) auth_token
-        
-        completionHandler: (void (^)(SWGWordList* output, NSError* error))completionBlock
-         {
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/wordList.json/{permalink}", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"permalink", @"}"]] withString: [SWGApiClient escape:permalink]];
-    
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    if(auth_token != nil)
-        headerParams[@"auth_token"] = auth_token;
-    
-
-    id bodyDictionary = nil;
-    
-    
-    
-
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    
-    
-    
-        
-    // comples response type
-    return [client dictionary:requestUrl 
-                       method:@"GET" 
-                  queryParams:queryParams 
-                         body:bodyDictionary 
-                 headerParams:headerParams
-           requestContentType:requestContentType
-          responseContentType:responseContentType
-              completionBlock:^(NSDictionary *data, NSError *error) {
-                if (error) {
-                    completionBlock(nil, error);
-                    
-                    return;
-                }
-                
-                SWGWordList *result = nil;
-                if (data) {
-                    result = [[SWGWordList    alloc]initWithValues: data];
-                }
-                completionBlock(result , nil);
-                
-              }];
-    
-    
-}
-
--(NSNumber*) updateWordListWithCompletionBlock:(NSString*) permalink
-         body:(SWGWordList*) body
-         auth_token:(NSString*) auth_token
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock {
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/wordList.json/{permalink}", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"permalink", @"}"]] withString: [SWGApiClient escape:permalink]];
-    
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    if(auth_token != nil)
-        headerParams[@"auth_token"] = auth_token;
-    
-
-    id bodyDictionary = nil;
-    
-    id __body = body;
-
-    if(__body != nil && [__body isKindOfClass:[NSArray class]]){
-        NSMutableArray * objs = [[NSMutableArray alloc] init];
-        for (id dict in (NSArray*)__body) {
-            if([dict respondsToSelector:@selector(asDictionary)]) {
-                [objs addObject:[(SWGObject*)dict asDictionary]];
-            }
-            else{
-                [objs addObject:dict];
-            }
-        }
-        bodyDictionary = objs;
-    }
-    else if([__body respondsToSelector:@selector(asDictionary)]) {
-        bodyDictionary = [(SWGObject*)__body asDictionary];
-    }
-    else if([__body isKindOfClass:[NSString class]]) {
-        // convert it to a dictionary
-        NSError * error;
-        NSString * str = (NSString*)__body;
-        NSDictionary *JSON =
-            [NSJSONSerialization JSONObjectWithData:[str dataUsingEncoding:NSUTF8StringEncoding]
-                                            options:NSJSONReadingMutableContainers
-                                              error:&error];
-        bodyDictionary = JSON;
-    }
-    else if([__body isKindOfClass: [SWGFile class]]) {
-        requestContentType = @"form-data";
-        bodyDictionary = __body;
-    }
-    else{
-        NSLog(@"don't know what to do with %@", __body);
-    }
-    
-    
-    
-
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    
-    
-            // primitive response type
-    
-    
-    // no return base type
-    return [client stringWithCompletionBlock:requestUrl 
-                                             method:@"PUT" 
-                                        queryParams:queryParams 
-                                               body:bodyDictionary 
-                                       headerParams:headerParams
-                                 requestContentType: requestContentType
-                                responseContentType: responseContentType
-                                    completionBlock:^(NSString *data, NSError *error) {
-                        if (error) {
-                            completionBlock(error);
-                            return;
-                        }
-                        completionBlock(nil);
-                    }];
-    
-    
-    
-    
-}
-
--(NSNumber*) deleteWordListWithCompletionBlock:(NSString*) permalink
-         auth_token:(NSString*) auth_token
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock {
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/wordList.json/{permalink}", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"permalink", @"}"]] withString: [SWGApiClient escape:permalink]];
-    
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    if(auth_token != nil)
-        headerParams[@"auth_token"] = auth_token;
-    
-
-    id bodyDictionary = nil;
-    
-    
-    
-
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    
-    
-            // primitive response type
-    
-    
-    // no return base type
-    return [client stringWithCompletionBlock:requestUrl 
-                                             method:@"DELETE" 
-                                        queryParams:queryParams 
-                                               body:bodyDictionary 
-                                       headerParams:headerParams
-                                 requestContentType: requestContentType
-                                responseContentType: responseContentType
-                                    completionBlock:^(NSString *data, NSError *error) {
-                        if (error) {
-                            completionBlock(error);
-                            return;
-                        }
-                        completionBlock(nil);
-                    }];
-    
-    
-    
-    
-}
-
--(NSNumber*) deleteWordsFromWordListWithCompletionBlock:(NSString*) permalink
-         body:(NSArray*) body
-         auth_token:(NSString*) auth_token
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock {
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/wordList.json/{permalink}/deleteWords", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"permalink", @"}"]] withString: [SWGApiClient escape:permalink]];
-    
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    if(auth_token != nil)
-        headerParams[@"auth_token"] = auth_token;
-    
-
-    id bodyDictionary = nil;
-    
-    id __body = body;
-
-    if(__body != nil && [__body isKindOfClass:[NSArray class]]){
-        NSMutableArray * objs = [[NSMutableArray alloc] init];
-        for (id dict in (NSArray*)__body) {
-            if([dict respondsToSelector:@selector(asDictionary)]) {
-                [objs addObject:[(SWGObject*)dict asDictionary]];
-            }
-            else{
-                [objs addObject:dict];
-            }
-        }
-        bodyDictionary = objs;
-    }
-    else if([__body respondsToSelector:@selector(asDictionary)]) {
-        bodyDictionary = [(SWGObject*)__body asDictionary];
-    }
-    else if([__body isKindOfClass:[NSString class]]) {
-        // convert it to a dictionary
-        NSError * error;
-        NSString * str = (NSString*)__body;
-        NSDictionary *JSON =
-            [NSJSONSerialization JSONObjectWithData:[str dataUsingEncoding:NSUTF8StringEncoding]
-                                            options:NSJSONReadingMutableContainers
-                                              error:&error];
-        bodyDictionary = JSON;
-    }
-    else if([__body isKindOfClass: [SWGFile class]]) {
-        requestContentType = @"form-data";
-        bodyDictionary = __body;
-    }
-    else{
-        NSLog(@"don't know what to do with %@", __body);
-    }
-    
-    
-    
-
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    
-    
-            // primitive response type
-    
-    
-    // no return base type
-    return [client stringWithCompletionBlock:requestUrl 
-                                             method:@"POST" 
-                                        queryParams:queryParams 
-                                               body:bodyDictionary 
-                                       headerParams:headerParams
-                                 requestContentType: requestContentType
-                                responseContentType: responseContentType
-                                    completionBlock:^(NSString *data, NSError *error) {
-                        if (error) {
-                            completionBlock(error);
-                            return;
-                        }
-                        completionBlock(nil);
-                    }];
-    
-    
-    
-    
-}
-
--(NSNumber*) getWordListWordsWithCompletionBlock:(NSString*) permalink
-         sortBy:(NSString*) sortBy
-         sortOrder:(NSString*) sortOrder
-         skip:(NSNumber*) skip
-         limit:(NSNumber*) limit
-         auth_token:(NSString*) auth_token
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock {
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/wordList.json/{permalink}/words", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"permalink", @"}"]] withString: [SWGApiClient escape:permalink]];
-    
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(sortBy != nil)
-        queryParams[@"sortBy"] = sortBy;
-    if(sortOrder != nil)
-        queryParams[@"sortOrder"] = sortOrder;
-    if(skip != nil)
-        queryParams[@"skip"] = skip;
-    if(limit != nil)
-        queryParams[@"limit"] = limit;
-    
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    if(auth_token != nil)
-        headerParams[@"auth_token"] = auth_token;
-    
-
-    id bodyDictionary = nil;
-    
-    
-    
-
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    
-    
-            // primitive response type
-    
-    
-    // no return base type
-    return [client stringWithCompletionBlock:requestUrl 
-                                             method:@"GET" 
-                                        queryParams:queryParams 
-                                               body:bodyDictionary 
-                                       headerParams:headerParams
-                                 requestContentType: requestContentType
-                                responseContentType: responseContentType
-                                    completionBlock:^(NSString *data, NSError *error) {
-                        if (error) {
-                            completionBlock(error);
-                            return;
-                        }
-                        completionBlock(nil);
-                    }];
-    
-    
-    
-    
-}
-
--(NSNumber*) addWordsToWordListWithCompletionBlock:(NSString*) permalink
-         body:(NSArray*) body
-         auth_token:(NSString*) auth_token
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock {
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/wordList.json/{permalink}/words", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"permalink", @"}"]] withString: [SWGApiClient escape:permalink]];
-    
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    if(auth_token != nil)
-        headerParams[@"auth_token"] = auth_token;
-    
-
-    id bodyDictionary = nil;
-    
-    id __body = body;
-
-    if(__body != nil && [__body isKindOfClass:[NSArray class]]){
-        NSMutableArray * objs = [[NSMutableArray alloc] init];
-        for (id dict in (NSArray*)__body) {
-            if([dict respondsToSelector:@selector(asDictionary)]) {
-                [objs addObject:[(SWGObject*)dict asDictionary]];
-            }
-            else{
-                [objs addObject:dict];
-            }
-        }
-        bodyDictionary = objs;
-    }
-    else if([__body respondsToSelector:@selector(asDictionary)]) {
-        bodyDictionary = [(SWGObject*)__body asDictionary];
-    }
-    else if([__body isKindOfClass:[NSString class]]) {
-        // convert it to a dictionary
-        NSError * error;
-        NSString * str = (NSString*)__body;
-        NSDictionary *JSON =
-            [NSJSONSerialization JSONObjectWithData:[str dataUsingEncoding:NSUTF8StringEncoding]
-                                            options:NSJSONReadingMutableContainers
-                                              error:&error];
-        bodyDictionary = JSON;
-    }
-    else if([__body isKindOfClass: [SWGFile class]]) {
-        requestContentType = @"form-data";
-        bodyDictionary = __body;
-    }
-    else{
-        NSLog(@"don't know what to do with %@", __body);
-    }
-    
-    
-    
-
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    
-    
-            // primitive response type
-    
-    
-    // no return base type
-    return [client stringWithCompletionBlock:requestUrl 
-                                             method:@"POST" 
-                                        queryParams:queryParams 
-                                               body:bodyDictionary 
-                                       headerParams:headerParams
-                                 requestContentType: requestContentType
-                                responseContentType: responseContentType
-                                    completionBlock:^(NSString *data, NSError *error) {
-                        if (error) {
-                            completionBlock(error);
-                            return;
-                        }
-                        completionBlock(nil);
-                    }];
-    
-    
-    
-    
-}
-
-
-
-@end
\ No newline at end of file
diff --git a/samples/client/wordnik/objc/client/SWGWordListWord.h b/samples/client/wordnik/objc/client/SWGWordListWord.h
deleted file mode 100644
index 733dda3dfbe..00000000000
--- a/samples/client/wordnik/objc/client/SWGWordListWord.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-#import "SWGDate.h"
-
-
-@interface SWGWordListWord : SWGObject
-
-@property(nonatomic) NSNumber* _id;  
-@property(nonatomic) NSString* word;  
-@property(nonatomic) NSString* username;  
-@property(nonatomic) NSNumber* userId;  
-@property(nonatomic) SWGDate* createdAt;  
-@property(nonatomic) NSNumber* numberCommentsOnWord;  
-@property(nonatomic) NSNumber* numberLists;  
-- (id) _id: (NSNumber*) _id     
-    word: (NSString*) word     
-    username: (NSString*) username     
-    userId: (NSNumber*) userId     
-    createdAt: (SWGDate*) createdAt     
-    numberCommentsOnWord: (NSNumber*) numberCommentsOnWord     
-    numberLists: (NSNumber*) numberLists;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGWordListWord.m b/samples/client/wordnik/objc/client/SWGWordListWord.m
deleted file mode 100644
index c199f5a002f..00000000000
--- a/samples/client/wordnik/objc/client/SWGWordListWord.m
+++ /dev/null
@@ -1,111 +0,0 @@
-#import "SWGDate.h"
-#import "SWGWordListWord.h"
-
-@implementation SWGWordListWord
-
--(id)_id: (NSNumber*) _id
-    word: (NSString*) word
-    username: (NSString*) username
-    userId: (NSNumber*) userId
-    createdAt: (SWGDate*) createdAt
-    numberCommentsOnWord: (NSNumber*) numberCommentsOnWord
-    numberLists: (NSNumber*) numberLists
-    
-{
-    __id = _id;
-    _word = word;
-    _username = username;
-    _userId = userId;
-    _createdAt = createdAt;
-    _numberCommentsOnWord = numberCommentsOnWord;
-    _numberLists = numberLists;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        __id = dict[@"id"];
-        
-        _word = dict[@"word"];
-        
-        _username = dict[@"username"];
-        
-        _userId = dict[@"userId"];
-        
-        
-        
-        id createdAt_dict = dict[@"createdAt"];
-        
-        if(createdAt_dict != nil)
-            _createdAt = [[SWGDate  alloc]initWithValues:createdAt_dict];
-        
-        
-        _numberCommentsOnWord = dict[@"numberCommentsOnWord"];
-        
-        _numberLists = dict[@"numberLists"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(__id != nil) dict[@"id"] = __id ;
-        
-    
-    
-            if(_word != nil) dict[@"word"] = _word ;
-        
-    
-    
-            if(_username != nil) dict[@"username"] = _username ;
-        
-    
-    
-            if(_userId != nil) dict[@"userId"] = _userId ;
-        
-    
-    
-    if(_createdAt != nil){
-        if([_createdAt isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGDate *createdAt in (NSArray*)_createdAt) {
-                [array addObject:[(SWGObject*)createdAt asDictionary]];
-            }
-            dict[@"createdAt"] = array;
-        }
-        else if(_createdAt && [_createdAt isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_createdAt toString];
-            if(dateString){
-                dict[@"createdAt"] = dateString;
-            }
-        }
-        else {
-        
-            if(_createdAt != nil) dict[@"createdAt"] = [(SWGObject*)_createdAt asDictionary];
-        
-        }
-    }
-    
-    
-    
-            if(_numberCommentsOnWord != nil) dict[@"numberCommentsOnWord"] = _numberCommentsOnWord ;
-        
-    
-    
-            if(_numberLists != nil) dict[@"numberLists"] = _numberLists ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGWordListsApi.h b/samples/client/wordnik/objc/client/SWGWordListsApi.h
deleted file mode 100644
index 0a07cdfde6b..00000000000
--- a/samples/client/wordnik/objc/client/SWGWordListsApi.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGWordList.h"
-#import "SWGObject.h"
-
-
-@interface SWGWordListsApi: NSObject
-
--(void) addHeader:(NSString*)value forKey:(NSString*)key;
--(unsigned long) requestQueueSize;
-+(SWGWordListsApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key;
-+(void) setBasePath:(NSString*)basePath;
-+(NSString*) getBasePath;
-/**
-
- Creates a WordList.
- 
-
- 
- @param body WordList to create
- 
- @param auth_token The auth token of the logged-in user, obtained by calling /account.json/authenticate/{username} (described above)
- 
-
- return type: SWGWordList*
- */
--(NSNumber*) createWordListWithCompletionBlock :(SWGWordList*) body 
-     auth_token:(NSString*) auth_token 
-    
-    completionHandler: (void (^)(SWGWordList* output, NSError* error))completionBlock;
-    
-
-
-
-@end
\ No newline at end of file
diff --git a/samples/client/wordnik/objc/client/SWGWordListsApi.m b/samples/client/wordnik/objc/client/SWGWordListsApi.m
deleted file mode 100644
index 3e9c1c88642..00000000000
--- a/samples/client/wordnik/objc/client/SWGWordListsApi.m
+++ /dev/null
@@ -1,151 +0,0 @@
-#import "SWGWordListsApi.h"
-#import "SWGFile.h"
-#import "SWGApiClient.h"
-#import "SWGWordList.h"
-
-
-
-@implementation SWGWordListsApi
-static NSString * basePath = @"https://api.wordnik.com/v4";
-
-+(SWGWordListsApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key {
-    static SWGWordListsApi* singletonAPI = nil;
-
-    if (singletonAPI == nil) {
-        singletonAPI = [[SWGWordListsApi alloc] init];
-        [singletonAPI addHeader:headerValue forKey:key];
-    }
-    return singletonAPI;
-}
-
-+(void) setBasePath:(NSString*)path {
-    basePath = path;
-}
-
-+(NSString*) getBasePath {
-    return basePath;
-}
-
--(SWGApiClient*) apiClient {
-    return [SWGApiClient sharedClientFromPool:basePath];
-}
-
--(void) addHeader:(NSString*)value forKey:(NSString*)key {
-    [[self apiClient] setHeaderValue:value forKey:key];
-}
-
--(id) init {
-    self = [super init];
-    [self apiClient];
-    return self;
-}
-
--(void) setHeaderValue:(NSString*) value
-           forKey:(NSString*)key {
-    [[self apiClient] setHeaderValue:value forKey:key];
-}
-
--(unsigned long) requestQueueSize {
-    return [SWGApiClient requestQueueSize];
-}
-
-
--(NSNumber*) createWordListWithCompletionBlock:(SWGWordList*) body
-         auth_token:(NSString*) auth_token
-        
-        completionHandler: (void (^)(SWGWordList* output, NSError* error))completionBlock
-         {
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/wordLists.json", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    if(auth_token != nil)
-        headerParams[@"auth_token"] = auth_token;
-    
-
-    id bodyDictionary = nil;
-    
-    id __body = body;
-
-    if(__body != nil && [__body isKindOfClass:[NSArray class]]){
-        NSMutableArray * objs = [[NSMutableArray alloc] init];
-        for (id dict in (NSArray*)__body) {
-            if([dict respondsToSelector:@selector(asDictionary)]) {
-                [objs addObject:[(SWGObject*)dict asDictionary]];
-            }
-            else{
-                [objs addObject:dict];
-            }
-        }
-        bodyDictionary = objs;
-    }
-    else if([__body respondsToSelector:@selector(asDictionary)]) {
-        bodyDictionary = [(SWGObject*)__body asDictionary];
-    }
-    else if([__body isKindOfClass:[NSString class]]) {
-        // convert it to a dictionary
-        NSError * error;
-        NSString * str = (NSString*)__body;
-        NSDictionary *JSON =
-            [NSJSONSerialization JSONObjectWithData:[str dataUsingEncoding:NSUTF8StringEncoding]
-                                            options:NSJSONReadingMutableContainers
-                                              error:&error];
-        bodyDictionary = JSON;
-    }
-    else if([__body isKindOfClass: [SWGFile class]]) {
-        requestContentType = @"form-data";
-        bodyDictionary = __body;
-    }
-    else{
-        NSLog(@"don't know what to do with %@", __body);
-    }
-    
-    
-    
-
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    
-    
-    
-        
-    // comples response type
-    return [client dictionary:requestUrl 
-                       method:@"POST" 
-                  queryParams:queryParams 
-                         body:bodyDictionary 
-                 headerParams:headerParams
-           requestContentType:requestContentType
-          responseContentType:responseContentType
-              completionBlock:^(NSDictionary *data, NSError *error) {
-                if (error) {
-                    completionBlock(nil, error);
-                    
-                    return;
-                }
-                
-                SWGWordList *result = nil;
-                if (data) {
-                    result = [[SWGWordList    alloc]initWithValues: data];
-                }
-                completionBlock(result , nil);
-                
-              }];
-    
-    
-}
-
-
-
-@end
\ No newline at end of file
diff --git a/samples/client/wordnik/objc/client/SWGWordObject.h b/samples/client/wordnik/objc/client/SWGWordObject.h
deleted file mode 100644
index ccadaf57201..00000000000
--- a/samples/client/wordnik/objc/client/SWGWordObject.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGWordObject : SWGObject
-
-@property(nonatomic) NSNumber* _id;  
-@property(nonatomic) NSString* word;  
-@property(nonatomic) NSString* originalWord;  
-@property(nonatomic) NSArray* suggestions;  
-@property(nonatomic) NSString* canonicalForm;  
-@property(nonatomic) NSString* vulgar;  
-- (id) _id: (NSNumber*) _id     
-    word: (NSString*) word     
-    originalWord: (NSString*) originalWord     
-    suggestions: (NSArray*) suggestions     
-    canonicalForm: (NSString*) canonicalForm     
-    vulgar: (NSString*) vulgar;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGWordObject.m b/samples/client/wordnik/objc/client/SWGWordObject.m
deleted file mode 100644
index 59342556046..00000000000
--- a/samples/client/wordnik/objc/client/SWGWordObject.m
+++ /dev/null
@@ -1,78 +0,0 @@
-#import "SWGDate.h"
-#import "SWGWordObject.h"
-
-@implementation SWGWordObject
-
--(id)_id: (NSNumber*) _id
-    word: (NSString*) word
-    originalWord: (NSString*) originalWord
-    suggestions: (NSArray*) suggestions
-    canonicalForm: (NSString*) canonicalForm
-    vulgar: (NSString*) vulgar
-    
-{
-    __id = _id;
-    _word = word;
-    _originalWord = originalWord;
-    _suggestions = suggestions;
-    _canonicalForm = canonicalForm;
-    _vulgar = vulgar;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        __id = dict[@"id"];
-        
-        _word = dict[@"word"];
-        
-        _originalWord = dict[@"originalWord"];
-        
-        _suggestions = dict[@"suggestions"];
-        
-        _canonicalForm = dict[@"canonicalForm"];
-        
-        _vulgar = dict[@"vulgar"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(__id != nil) dict[@"id"] = __id ;
-        
-    
-    
-            if(_word != nil) dict[@"word"] = _word ;
-        
-    
-    
-            if(_originalWord != nil) dict[@"originalWord"] = _originalWord ;
-        
-    
-    
-            if(_suggestions != nil) dict[@"suggestions"] = _suggestions ;
-        
-    
-    
-            if(_canonicalForm != nil) dict[@"canonicalForm"] = _canonicalForm ;
-        
-    
-    
-            if(_vulgar != nil) dict[@"vulgar"] = _vulgar ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGWordOfTheDay.h b/samples/client/wordnik/objc/client/SWGWordOfTheDay.h
deleted file mode 100644
index 8a046f92f74..00000000000
--- a/samples/client/wordnik/objc/client/SWGWordOfTheDay.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-#import "SWGDate.h"
-#import "SWGSimpleDefinition.h"
-#import "SWGSimpleExample.h"
-#import "SWGContentProvider.h"
-
-
-@interface SWGWordOfTheDay : SWGObject
-
-@property(nonatomic) NSNumber* _id;  
-@property(nonatomic) NSString* parentId;  
-@property(nonatomic) NSString* category;  
-@property(nonatomic) NSString* createdBy;  
-@property(nonatomic) SWGDate* createdAt;  
-@property(nonatomic) SWGContentProvider* contentProvider;  
-@property(nonatomic) NSString* htmlExtra;  
-@property(nonatomic) NSString* word;  
-@property(nonatomic) NSArray* definitions;  
-@property(nonatomic) NSArray* examples;  
-@property(nonatomic) NSString* note;  
-@property(nonatomic) SWGDate* publishDate;  
-- (id) _id: (NSNumber*) _id     
-    parentId: (NSString*) parentId     
-    category: (NSString*) category     
-    createdBy: (NSString*) createdBy     
-    createdAt: (SWGDate*) createdAt     
-    contentProvider: (SWGContentProvider*) contentProvider     
-    htmlExtra: (NSString*) htmlExtra     
-    word: (NSString*) word     
-    definitions: (NSArray*) definitions     
-    examples: (NSArray*) examples     
-    note: (NSString*) note     
-    publishDate: (SWGDate*) publishDate;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGWordOfTheDay.m b/samples/client/wordnik/objc/client/SWGWordOfTheDay.m
deleted file mode 100644
index 245e4a969fb..00000000000
--- a/samples/client/wordnik/objc/client/SWGWordOfTheDay.m
+++ /dev/null
@@ -1,277 +0,0 @@
-#import "SWGDate.h"
-#import "SWGWordOfTheDay.h"
-
-@implementation SWGWordOfTheDay
-
--(id)_id: (NSNumber*) _id
-    parentId: (NSString*) parentId
-    category: (NSString*) category
-    createdBy: (NSString*) createdBy
-    createdAt: (SWGDate*) createdAt
-    contentProvider: (SWGContentProvider*) contentProvider
-    htmlExtra: (NSString*) htmlExtra
-    word: (NSString*) word
-    definitions: (NSArray*) definitions
-    examples: (NSArray*) examples
-    note: (NSString*) note
-    publishDate: (SWGDate*) publishDate
-    
-{
-    __id = _id;
-    _parentId = parentId;
-    _category = category;
-    _createdBy = createdBy;
-    _createdAt = createdAt;
-    _contentProvider = contentProvider;
-    _htmlExtra = htmlExtra;
-    _word = word;
-    _definitions = definitions;
-    _examples = examples;
-    _note = note;
-    _publishDate = publishDate;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        __id = dict[@"id"];
-        
-        _parentId = dict[@"parentId"];
-        
-        _category = dict[@"category"];
-        
-        _createdBy = dict[@"createdBy"];
-        
-        
-        
-        id createdAt_dict = dict[@"createdAt"];
-        
-        if(createdAt_dict != nil)
-            _createdAt = [[SWGDate  alloc]initWithValues:createdAt_dict];
-        
-        
-        
-        
-        id contentProvider_dict = dict[@"contentProvider"];
-        
-        if(contentProvider_dict != nil)
-            _contentProvider = [[SWGContentProvider  alloc]initWithValues:contentProvider_dict];
-        
-        
-        _htmlExtra = dict[@"htmlExtra"];
-        
-        _word = dict[@"word"];
-        
-        
-        
-        id definitions_dict = dict[@"definitions"];
-        
-        if([definitions_dict isKindOfClass:[NSArray class]]) {
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)definitions_dict count]];
-            if([(NSArray*)definitions_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)definitions_dict) {
-                    SWGSimpleDefinition* d = [[SWGSimpleDefinition alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                _definitions = [[NSArray alloc] initWithArray:objs];
-            }
-            else
-                _definitions = [[NSArray alloc] init];
-        }
-        else {
-            _definitions = [[NSArray alloc] init];
-        }
-        
-        
-        
-        
-        id examples_dict = dict[@"examples"];
-        
-        if([examples_dict isKindOfClass:[NSArray class]]) {
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)examples_dict count]];
-            if([(NSArray*)examples_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)examples_dict) {
-                    SWGSimpleExample* d = [[SWGSimpleExample alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                _examples = [[NSArray alloc] initWithArray:objs];
-            }
-            else
-                _examples = [[NSArray alloc] init];
-        }
-        else {
-            _examples = [[NSArray alloc] init];
-        }
-        
-        
-        _note = dict[@"note"];
-        
-        
-        
-        id publishDate_dict = dict[@"publishDate"];
-        
-        if(publishDate_dict != nil)
-            _publishDate = [[SWGDate  alloc]initWithValues:publishDate_dict];
-        
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(__id != nil) dict[@"id"] = __id ;
-        
-    
-    
-            if(_parentId != nil) dict[@"parentId"] = _parentId ;
-        
-    
-    
-            if(_category != nil) dict[@"category"] = _category ;
-        
-    
-    
-            if(_createdBy != nil) dict[@"createdBy"] = _createdBy ;
-        
-    
-    
-    if(_createdAt != nil){
-        if([_createdAt isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGDate *createdAt in (NSArray*)_createdAt) {
-                [array addObject:[(SWGObject*)createdAt asDictionary]];
-            }
-            dict[@"createdAt"] = array;
-        }
-        else if(_createdAt && [_createdAt isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_createdAt toString];
-            if(dateString){
-                dict[@"createdAt"] = dateString;
-            }
-        }
-        else {
-        
-            if(_createdAt != nil) dict[@"createdAt"] = [(SWGObject*)_createdAt asDictionary];
-        
-        }
-    }
-    
-    
-    
-    if(_contentProvider != nil){
-        if([_contentProvider isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGContentProvider *contentProvider in (NSArray*)_contentProvider) {
-                [array addObject:[(SWGObject*)contentProvider asDictionary]];
-            }
-            dict[@"contentProvider"] = array;
-        }
-        else if(_contentProvider && [_contentProvider isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_contentProvider toString];
-            if(dateString){
-                dict[@"contentProvider"] = dateString;
-            }
-        }
-        else {
-        
-            if(_contentProvider != nil) dict[@"contentProvider"] = [(SWGObject*)_contentProvider asDictionary];
-        
-        }
-    }
-    
-    
-    
-            if(_htmlExtra != nil) dict[@"htmlExtra"] = _htmlExtra ;
-        
-    
-    
-            if(_word != nil) dict[@"word"] = _word ;
-        
-    
-    
-    if(_definitions != nil){
-        if([_definitions isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGSimpleDefinition *definitions in (NSArray*)_definitions) {
-                [array addObject:[(SWGObject*)definitions asDictionary]];
-            }
-            dict[@"definitions"] = array;
-        }
-        else if(_definitions && [_definitions isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_definitions toString];
-            if(dateString){
-                dict[@"definitions"] = dateString;
-            }
-        }
-        else {
-        
-            if(_definitions != nil) dict[@"definitions"] = [(SWGObject*)_definitions asDictionary];
-        
-        }
-    }
-    
-    
-    
-    if(_examples != nil){
-        if([_examples isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGSimpleExample *examples in (NSArray*)_examples) {
-                [array addObject:[(SWGObject*)examples asDictionary]];
-            }
-            dict[@"examples"] = array;
-        }
-        else if(_examples && [_examples isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_examples toString];
-            if(dateString){
-                dict[@"examples"] = dateString;
-            }
-        }
-        else {
-        
-            if(_examples != nil) dict[@"examples"] = [(SWGObject*)_examples asDictionary];
-        
-        }
-    }
-    
-    
-    
-            if(_note != nil) dict[@"note"] = _note ;
-        
-    
-    
-    if(_publishDate != nil){
-        if([_publishDate isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGDate *publishDate in (NSArray*)_publishDate) {
-                [array addObject:[(SWGObject*)publishDate asDictionary]];
-            }
-            dict[@"publishDate"] = array;
-        }
-        else if(_publishDate && [_publishDate isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_publishDate toString];
-            if(dateString){
-                dict[@"publishDate"] = dateString;
-            }
-        }
-        else {
-        
-            if(_publishDate != nil) dict[@"publishDate"] = [(SWGObject*)_publishDate asDictionary];
-        
-        }
-    }
-    
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGWordSearchResult.h b/samples/client/wordnik/objc/client/SWGWordSearchResult.h
deleted file mode 100644
index a1f7dea02fd..00000000000
--- a/samples/client/wordnik/objc/client/SWGWordSearchResult.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-
-
-@interface SWGWordSearchResult : SWGObject
-
-@property(nonatomic) NSNumber* count;  
-@property(nonatomic) NSNumber* lexicality;  
-@property(nonatomic) NSString* word;  
-- (id) count: (NSNumber*) count     
-    lexicality: (NSNumber*) lexicality     
-    word: (NSString*) word;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGWordSearchResult.m b/samples/client/wordnik/objc/client/SWGWordSearchResult.m
deleted file mode 100644
index 8ab66bb42a3..00000000000
--- a/samples/client/wordnik/objc/client/SWGWordSearchResult.m
+++ /dev/null
@@ -1,54 +0,0 @@
-#import "SWGDate.h"
-#import "SWGWordSearchResult.h"
-
-@implementation SWGWordSearchResult
-
--(id)count: (NSNumber*) count
-    lexicality: (NSNumber*) lexicality
-    word: (NSString*) word
-    
-{
-    _count = count;
-    _lexicality = lexicality;
-    _word = word;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        _count = dict[@"count"];
-        
-        _lexicality = dict[@"lexicality"];
-        
-        _word = dict[@"word"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(_count != nil) dict[@"count"] = _count ;
-        
-    
-    
-            if(_lexicality != nil) dict[@"lexicality"] = _lexicality ;
-        
-    
-    
-            if(_word != nil) dict[@"word"] = _word ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGWordSearchResults.h b/samples/client/wordnik/objc/client/SWGWordSearchResults.h
deleted file mode 100644
index 017ab789d09..00000000000
--- a/samples/client/wordnik/objc/client/SWGWordSearchResults.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGObject.h"
-#import "SWGWordSearchResult.h"
-
-
-@interface SWGWordSearchResults : SWGObject
-
-@property(nonatomic) NSArray* searchResults;  
-@property(nonatomic) NSNumber* totalResults;  
-- (id) searchResults: (NSArray*) searchResults     
-    totalResults: (NSNumber*) totalResults;
-    
-
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGWordSearchResults.m b/samples/client/wordnik/objc/client/SWGWordSearchResults.m
deleted file mode 100644
index f9c7d84e4aa..00000000000
--- a/samples/client/wordnik/objc/client/SWGWordSearchResults.m
+++ /dev/null
@@ -1,84 +0,0 @@
-#import "SWGDate.h"
-#import "SWGWordSearchResults.h"
-
-@implementation SWGWordSearchResults
-
--(id)searchResults: (NSArray*) searchResults
-    totalResults: (NSNumber*) totalResults
-    
-{
-    _searchResults = searchResults;
-    _totalResults = totalResults;
-    
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
-{
-    self = [super init];
-    if(self) {
-        
-        
-        id searchResults_dict = dict[@"searchResults"];
-        
-        if([searchResults_dict isKindOfClass:[NSArray class]]) {
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)searchResults_dict count]];
-            if([(NSArray*)searchResults_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)searchResults_dict) {
-                    SWGWordSearchResult* d = [[SWGWordSearchResult alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                _searchResults = [[NSArray alloc] initWithArray:objs];
-            }
-            else
-                _searchResults = [[NSArray alloc] init];
-        }
-        else {
-            _searchResults = [[NSArray alloc] init];
-        }
-        
-        
-        _totalResults = dict[@"totalResults"];
-        
-        
-    }
-    return self;
-}
-
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-    if(_searchResults != nil){
-        if([_searchResults isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGWordSearchResult *searchResults in (NSArray*)_searchResults) {
-                [array addObject:[(SWGObject*)searchResults asDictionary]];
-            }
-            dict[@"searchResults"] = array;
-        }
-        else if(_searchResults && [_searchResults isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_searchResults toString];
-            if(dateString){
-                dict[@"searchResults"] = dateString;
-            }
-        }
-        else {
-        
-            if(_searchResults != nil) dict[@"searchResults"] = [(SWGObject*)_searchResults asDictionary];
-        
-        }
-    }
-    
-    
-    
-            if(_totalResults != nil) dict[@"totalResults"] = _totalResults ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
-}
-
-@end
diff --git a/samples/client/wordnik/objc/client/SWGWordsApi.h b/samples/client/wordnik/objc/client/SWGWordsApi.h
deleted file mode 100644
index 685d90ef27b..00000000000
--- a/samples/client/wordnik/objc/client/SWGWordsApi.h
+++ /dev/null
@@ -1,237 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGWordObject.h"
-#import "SWGDefinitionSearchResults.h"
-#import "SWGWordSearchResults.h"
-#import "SWGWordOfTheDay.h"
-#import "SWGObject.h"
-
-
-@interface SWGWordsApi: NSObject
-
--(void) addHeader:(NSString*)value forKey:(NSString*)key;
--(unsigned long) requestQueueSize;
-+(SWGWordsApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key;
-+(void) setBasePath:(NSString*)basePath;
-+(NSString*) getBasePath;
-/**
-
- Returns a single random WordObject
- 
-
- 
- @param hasDictionaryDef Only return words with dictionary definitions
- 
- @param includePartOfSpeech CSV part-of-speech values to include
- 
- @param excludePartOfSpeech CSV part-of-speech values to exclude
- 
- @param minCorpusCount Minimum corpus frequency for terms
- 
- @param maxCorpusCount Maximum corpus frequency for terms
- 
- @param minDictionaryCount Minimum dictionary count
- 
- @param maxDictionaryCount Maximum dictionary count
- 
- @param minLength Minimum word length
- 
- @param maxLength Maximum word length
- 
-
- return type: SWGWordObject*
- */
--(NSNumber*) getRandomWordWithCompletionBlock :(NSString*) hasDictionaryDef 
-     includePartOfSpeech:(NSString*) includePartOfSpeech 
-     excludePartOfSpeech:(NSString*) excludePartOfSpeech 
-     minCorpusCount:(NSNumber*) minCorpusCount 
-     maxCorpusCount:(NSNumber*) maxCorpusCount 
-     minDictionaryCount:(NSNumber*) minDictionaryCount 
-     maxDictionaryCount:(NSNumber*) maxDictionaryCount 
-     minLength:(NSNumber*) minLength 
-     maxLength:(NSNumber*) maxLength 
-    
-    completionHandler: (void (^)(SWGWordObject* output, NSError* error))completionBlock;
-    
-
-
-/**
-
- Returns an array of random WordObjects
- 
-
- 
- @param hasDictionaryDef Only return words with dictionary definitions
- 
- @param includePartOfSpeech CSV part-of-speech values to include
- 
- @param excludePartOfSpeech CSV part-of-speech values to exclude
- 
- @param minCorpusCount Minimum corpus frequency for terms
- 
- @param maxCorpusCount Maximum corpus frequency for terms
- 
- @param minDictionaryCount Minimum dictionary count
- 
- @param maxDictionaryCount Maximum dictionary count
- 
- @param minLength Minimum word length
- 
- @param maxLength Maximum word length
- 
- @param sortBy Attribute to sort by
- 
- @param sortOrder Sort direction
- 
- @param limit Maximum number of results to return
- 
-
- return type: 
- */
--(NSNumber*) getRandomWordsWithCompletionBlock :(NSString*) hasDictionaryDef 
-     includePartOfSpeech:(NSString*) includePartOfSpeech 
-     excludePartOfSpeech:(NSString*) excludePartOfSpeech 
-     minCorpusCount:(NSNumber*) minCorpusCount 
-     maxCorpusCount:(NSNumber*) maxCorpusCount 
-     minDictionaryCount:(NSNumber*) minDictionaryCount 
-     maxDictionaryCount:(NSNumber*) maxDictionaryCount 
-     minLength:(NSNumber*) minLength 
-     maxLength:(NSNumber*) maxLength 
-     sortBy:(NSString*) sortBy 
-     sortOrder:(NSString*) sortOrder 
-     limit:(NSNumber*) limit 
-    
-    
-    completionHandler: (void (^)(NSError* error))completionBlock;
-
-
-/**
-
- Reverse dictionary search
- 
-
- 
- @param query Search term
- 
- @param findSenseForWord Restricts words and finds closest sense
- 
- @param includeSourceDictionaries Only include these comma-delimited source dictionaries
- 
- @param excludeSourceDictionaries Exclude these comma-delimited source dictionaries
- 
- @param includePartOfSpeech Only include these comma-delimited parts of speech
- 
- @param excludePartOfSpeech Exclude these comma-delimited parts of speech
- 
- @param minCorpusCount Minimum corpus frequency for terms
- 
- @param maxCorpusCount Maximum corpus frequency for terms
- 
- @param minLength Minimum word length
- 
- @param maxLength Maximum word length
- 
- @param expandTerms Expand terms
- 
- @param includeTags Return a closed set of XML tags in response
- 
- @param sortBy Attribute to sort by
- 
- @param sortOrder Sort direction
- 
- @param skip Results to skip
- 
- @param limit Maximum number of results to return
- 
-
- return type: SWGDefinitionSearchResults*
- */
--(NSNumber*) reverseDictionaryWithCompletionBlock :(NSString*) query 
-     findSenseForWord:(NSString*) findSenseForWord 
-     includeSourceDictionaries:(NSString*) includeSourceDictionaries 
-     excludeSourceDictionaries:(NSString*) excludeSourceDictionaries 
-     includePartOfSpeech:(NSString*) includePartOfSpeech 
-     excludePartOfSpeech:(NSString*) excludePartOfSpeech 
-     minCorpusCount:(NSNumber*) minCorpusCount 
-     maxCorpusCount:(NSNumber*) maxCorpusCount 
-     minLength:(NSNumber*) minLength 
-     maxLength:(NSNumber*) maxLength 
-     expandTerms:(NSString*) expandTerms 
-     includeTags:(NSString*) includeTags 
-     sortBy:(NSString*) sortBy 
-     sortOrder:(NSString*) sortOrder 
-     skip:(NSString*) skip 
-     limit:(NSNumber*) limit 
-    
-    completionHandler: (void (^)(SWGDefinitionSearchResults* output, NSError* error))completionBlock;
-    
-
-
-/**
-
- Searches words
- 
-
- 
- @param query Search query
- 
- @param caseSensitive Search case sensitive
- 
- @param includePartOfSpeech Only include these comma-delimited parts of speech
- 
- @param excludePartOfSpeech Exclude these comma-delimited parts of speech
- 
- @param minCorpusCount Minimum corpus frequency for terms
- 
- @param maxCorpusCount Maximum corpus frequency for terms
- 
- @param minDictionaryCount Minimum number of dictionary entries for words returned
- 
- @param maxDictionaryCount Maximum dictionary definition count
- 
- @param minLength Minimum word length
- 
- @param maxLength Maximum word length
- 
- @param skip Results to skip
- 
- @param limit Maximum number of results to return
- 
-
- return type: SWGWordSearchResults*
- */
--(NSNumber*) searchWordsWithCompletionBlock :(NSString*) query 
-     caseSensitive:(NSString*) caseSensitive 
-     includePartOfSpeech:(NSString*) includePartOfSpeech 
-     excludePartOfSpeech:(NSString*) excludePartOfSpeech 
-     minCorpusCount:(NSNumber*) minCorpusCount 
-     maxCorpusCount:(NSNumber*) maxCorpusCount 
-     minDictionaryCount:(NSNumber*) minDictionaryCount 
-     maxDictionaryCount:(NSNumber*) maxDictionaryCount 
-     minLength:(NSNumber*) minLength 
-     maxLength:(NSNumber*) maxLength 
-     skip:(NSNumber*) skip 
-     limit:(NSNumber*) limit 
-    
-    completionHandler: (void (^)(SWGWordSearchResults* output, NSError* error))completionBlock;
-    
-
-
-/**
-
- Returns a specific WordOfTheDay
- 
-
- 
- @param date Fetches by date in yyyy-MM-dd
- 
-
- return type: SWGWordOfTheDay*
- */
--(NSNumber*) getWordOfTheDayWithCompletionBlock :(NSString*) date 
-    
-    completionHandler: (void (^)(SWGWordOfTheDay* output, NSError* error))completionBlock;
-    
-
-
-
-@end
\ No newline at end of file
diff --git a/samples/client/wordnik/objc/client/SWGWordsApi.m b/samples/client/wordnik/objc/client/SWGWordsApi.m
deleted file mode 100644
index 86fb95da317..00000000000
--- a/samples/client/wordnik/objc/client/SWGWordsApi.m
+++ /dev/null
@@ -1,488 +0,0 @@
-#import "SWGWordsApi.h"
-#import "SWGFile.h"
-#import "SWGApiClient.h"
-#import "SWGWordObject.h"
-#import "SWGDefinitionSearchResults.h"
-#import "SWGWordSearchResults.h"
-#import "SWGWordOfTheDay.h"
-
-
-
-@implementation SWGWordsApi
-static NSString * basePath = @"https://api.wordnik.com/v4";
-
-+(SWGWordsApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key {
-    static SWGWordsApi* singletonAPI = nil;
-
-    if (singletonAPI == nil) {
-        singletonAPI = [[SWGWordsApi alloc] init];
-        [singletonAPI addHeader:headerValue forKey:key];
-    }
-    return singletonAPI;
-}
-
-+(void) setBasePath:(NSString*)path {
-    basePath = path;
-}
-
-+(NSString*) getBasePath {
-    return basePath;
-}
-
--(SWGApiClient*) apiClient {
-    return [SWGApiClient sharedClientFromPool:basePath];
-}
-
--(void) addHeader:(NSString*)value forKey:(NSString*)key {
-    [[self apiClient] setHeaderValue:value forKey:key];
-}
-
--(id) init {
-    self = [super init];
-    [self apiClient];
-    return self;
-}
-
--(void) setHeaderValue:(NSString*) value
-           forKey:(NSString*)key {
-    [[self apiClient] setHeaderValue:value forKey:key];
-}
-
--(unsigned long) requestQueueSize {
-    return [SWGApiClient requestQueueSize];
-}
-
-
--(NSNumber*) getRandomWordWithCompletionBlock:(NSString*) hasDictionaryDef
-         includePartOfSpeech:(NSString*) includePartOfSpeech
-         excludePartOfSpeech:(NSString*) excludePartOfSpeech
-         minCorpusCount:(NSNumber*) minCorpusCount
-         maxCorpusCount:(NSNumber*) maxCorpusCount
-         minDictionaryCount:(NSNumber*) minDictionaryCount
-         maxDictionaryCount:(NSNumber*) maxDictionaryCount
-         minLength:(NSNumber*) minLength
-         maxLength:(NSNumber*) maxLength
-        
-        completionHandler: (void (^)(SWGWordObject* output, NSError* error))completionBlock
-         {
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/words.json/randomWord", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(hasDictionaryDef != nil)
-        queryParams[@"hasDictionaryDef"] = hasDictionaryDef;
-    if(includePartOfSpeech != nil)
-        queryParams[@"includePartOfSpeech"] = includePartOfSpeech;
-    if(excludePartOfSpeech != nil)
-        queryParams[@"excludePartOfSpeech"] = excludePartOfSpeech;
-    if(minCorpusCount != nil)
-        queryParams[@"minCorpusCount"] = minCorpusCount;
-    if(maxCorpusCount != nil)
-        queryParams[@"maxCorpusCount"] = maxCorpusCount;
-    if(minDictionaryCount != nil)
-        queryParams[@"minDictionaryCount"] = minDictionaryCount;
-    if(maxDictionaryCount != nil)
-        queryParams[@"maxDictionaryCount"] = maxDictionaryCount;
-    if(minLength != nil)
-        queryParams[@"minLength"] = minLength;
-    if(maxLength != nil)
-        queryParams[@"maxLength"] = maxLength;
-    
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    
-
-    id bodyDictionary = nil;
-    
-    
-    
-
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    
-    
-    
-        
-    // comples response type
-    return [client dictionary:requestUrl 
-                       method:@"GET" 
-                  queryParams:queryParams 
-                         body:bodyDictionary 
-                 headerParams:headerParams
-           requestContentType:requestContentType
-          responseContentType:responseContentType
-              completionBlock:^(NSDictionary *data, NSError *error) {
-                if (error) {
-                    completionBlock(nil, error);
-                    
-                    return;
-                }
-                
-                SWGWordObject *result = nil;
-                if (data) {
-                    result = [[SWGWordObject    alloc]initWithValues: data];
-                }
-                completionBlock(result , nil);
-                
-              }];
-    
-    
-}
-
--(NSNumber*) getRandomWordsWithCompletionBlock:(NSString*) hasDictionaryDef
-         includePartOfSpeech:(NSString*) includePartOfSpeech
-         excludePartOfSpeech:(NSString*) excludePartOfSpeech
-         minCorpusCount:(NSNumber*) minCorpusCount
-         maxCorpusCount:(NSNumber*) maxCorpusCount
-         minDictionaryCount:(NSNumber*) minDictionaryCount
-         maxDictionaryCount:(NSNumber*) maxDictionaryCount
-         minLength:(NSNumber*) minLength
-         maxLength:(NSNumber*) maxLength
-         sortBy:(NSString*) sortBy
-         sortOrder:(NSString*) sortOrder
-         limit:(NSNumber*) limit
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock {
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/words.json/randomWords", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(hasDictionaryDef != nil)
-        queryParams[@"hasDictionaryDef"] = hasDictionaryDef;
-    if(includePartOfSpeech != nil)
-        queryParams[@"includePartOfSpeech"] = includePartOfSpeech;
-    if(excludePartOfSpeech != nil)
-        queryParams[@"excludePartOfSpeech"] = excludePartOfSpeech;
-    if(minCorpusCount != nil)
-        queryParams[@"minCorpusCount"] = minCorpusCount;
-    if(maxCorpusCount != nil)
-        queryParams[@"maxCorpusCount"] = maxCorpusCount;
-    if(minDictionaryCount != nil)
-        queryParams[@"minDictionaryCount"] = minDictionaryCount;
-    if(maxDictionaryCount != nil)
-        queryParams[@"maxDictionaryCount"] = maxDictionaryCount;
-    if(minLength != nil)
-        queryParams[@"minLength"] = minLength;
-    if(maxLength != nil)
-        queryParams[@"maxLength"] = maxLength;
-    if(sortBy != nil)
-        queryParams[@"sortBy"] = sortBy;
-    if(sortOrder != nil)
-        queryParams[@"sortOrder"] = sortOrder;
-    if(limit != nil)
-        queryParams[@"limit"] = limit;
-    
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    
-
-    id bodyDictionary = nil;
-    
-    
-    
-
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    
-    
-            // primitive response type
-    
-    
-    // no return base type
-    return [client stringWithCompletionBlock:requestUrl 
-                                             method:@"GET" 
-                                        queryParams:queryParams 
-                                               body:bodyDictionary 
-                                       headerParams:headerParams
-                                 requestContentType: requestContentType
-                                responseContentType: responseContentType
-                                    completionBlock:^(NSString *data, NSError *error) {
-                        if (error) {
-                            completionBlock(error);
-                            return;
-                        }
-                        completionBlock(nil);
-                    }];
-    
-    
-    
-    
-}
-
--(NSNumber*) reverseDictionaryWithCompletionBlock:(NSString*) query
-         findSenseForWord:(NSString*) findSenseForWord
-         includeSourceDictionaries:(NSString*) includeSourceDictionaries
-         excludeSourceDictionaries:(NSString*) excludeSourceDictionaries
-         includePartOfSpeech:(NSString*) includePartOfSpeech
-         excludePartOfSpeech:(NSString*) excludePartOfSpeech
-         minCorpusCount:(NSNumber*) minCorpusCount
-         maxCorpusCount:(NSNumber*) maxCorpusCount
-         minLength:(NSNumber*) minLength
-         maxLength:(NSNumber*) maxLength
-         expandTerms:(NSString*) expandTerms
-         includeTags:(NSString*) includeTags
-         sortBy:(NSString*) sortBy
-         sortOrder:(NSString*) sortOrder
-         skip:(NSString*) skip
-         limit:(NSNumber*) limit
-        
-        completionHandler: (void (^)(SWGDefinitionSearchResults* output, NSError* error))completionBlock
-         {
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/words.json/reverseDictionary", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(query != nil)
-        queryParams[@"query"] = query;
-    if(findSenseForWord != nil)
-        queryParams[@"findSenseForWord"] = findSenseForWord;
-    if(includeSourceDictionaries != nil)
-        queryParams[@"includeSourceDictionaries"] = includeSourceDictionaries;
-    if(excludeSourceDictionaries != nil)
-        queryParams[@"excludeSourceDictionaries"] = excludeSourceDictionaries;
-    if(includePartOfSpeech != nil)
-        queryParams[@"includePartOfSpeech"] = includePartOfSpeech;
-    if(excludePartOfSpeech != nil)
-        queryParams[@"excludePartOfSpeech"] = excludePartOfSpeech;
-    if(minCorpusCount != nil)
-        queryParams[@"minCorpusCount"] = minCorpusCount;
-    if(maxCorpusCount != nil)
-        queryParams[@"maxCorpusCount"] = maxCorpusCount;
-    if(minLength != nil)
-        queryParams[@"minLength"] = minLength;
-    if(maxLength != nil)
-        queryParams[@"maxLength"] = maxLength;
-    if(expandTerms != nil)
-        queryParams[@"expandTerms"] = expandTerms;
-    if(includeTags != nil)
-        queryParams[@"includeTags"] = includeTags;
-    if(sortBy != nil)
-        queryParams[@"sortBy"] = sortBy;
-    if(sortOrder != nil)
-        queryParams[@"sortOrder"] = sortOrder;
-    if(skip != nil)
-        queryParams[@"skip"] = skip;
-    if(limit != nil)
-        queryParams[@"limit"] = limit;
-    
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    
-
-    id bodyDictionary = nil;
-    
-    
-    
-
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    
-    
-    
-        
-    // comples response type
-    return [client dictionary:requestUrl 
-                       method:@"GET" 
-                  queryParams:queryParams 
-                         body:bodyDictionary 
-                 headerParams:headerParams
-           requestContentType:requestContentType
-          responseContentType:responseContentType
-              completionBlock:^(NSDictionary *data, NSError *error) {
-                if (error) {
-                    completionBlock(nil, error);
-                    
-                    return;
-                }
-                
-                SWGDefinitionSearchResults *result = nil;
-                if (data) {
-                    result = [[SWGDefinitionSearchResults    alloc]initWithValues: data];
-                }
-                completionBlock(result , nil);
-                
-              }];
-    
-    
-}
-
--(NSNumber*) searchWordsWithCompletionBlock:(NSString*) query
-         caseSensitive:(NSString*) caseSensitive
-         includePartOfSpeech:(NSString*) includePartOfSpeech
-         excludePartOfSpeech:(NSString*) excludePartOfSpeech
-         minCorpusCount:(NSNumber*) minCorpusCount
-         maxCorpusCount:(NSNumber*) maxCorpusCount
-         minDictionaryCount:(NSNumber*) minDictionaryCount
-         maxDictionaryCount:(NSNumber*) maxDictionaryCount
-         minLength:(NSNumber*) minLength
-         maxLength:(NSNumber*) maxLength
-         skip:(NSNumber*) skip
-         limit:(NSNumber*) limit
-        
-        completionHandler: (void (^)(SWGWordSearchResults* output, NSError* error))completionBlock
-         {
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/words.json/search/{query}", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"query", @"}"]] withString: [SWGApiClient escape:query]];
-    
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(caseSensitive != nil)
-        queryParams[@"caseSensitive"] = caseSensitive;
-    if(includePartOfSpeech != nil)
-        queryParams[@"includePartOfSpeech"] = includePartOfSpeech;
-    if(excludePartOfSpeech != nil)
-        queryParams[@"excludePartOfSpeech"] = excludePartOfSpeech;
-    if(minCorpusCount != nil)
-        queryParams[@"minCorpusCount"] = minCorpusCount;
-    if(maxCorpusCount != nil)
-        queryParams[@"maxCorpusCount"] = maxCorpusCount;
-    if(minDictionaryCount != nil)
-        queryParams[@"minDictionaryCount"] = minDictionaryCount;
-    if(maxDictionaryCount != nil)
-        queryParams[@"maxDictionaryCount"] = maxDictionaryCount;
-    if(minLength != nil)
-        queryParams[@"minLength"] = minLength;
-    if(maxLength != nil)
-        queryParams[@"maxLength"] = maxLength;
-    if(skip != nil)
-        queryParams[@"skip"] = skip;
-    if(limit != nil)
-        queryParams[@"limit"] = limit;
-    
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    
-
-    id bodyDictionary = nil;
-    
-    
-    
-
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    
-    
-    
-        
-    // comples response type
-    return [client dictionary:requestUrl 
-                       method:@"GET" 
-                  queryParams:queryParams 
-                         body:bodyDictionary 
-                 headerParams:headerParams
-           requestContentType:requestContentType
-          responseContentType:responseContentType
-              completionBlock:^(NSDictionary *data, NSError *error) {
-                if (error) {
-                    completionBlock(nil, error);
-                    
-                    return;
-                }
-                
-                SWGWordSearchResults *result = nil;
-                if (data) {
-                    result = [[SWGWordSearchResults    alloc]initWithValues: data];
-                }
-                completionBlock(result , nil);
-                
-              }];
-    
-    
-}
-
--(NSNumber*) getWordOfTheDayWithCompletionBlock:(NSString*) date
-        
-        completionHandler: (void (^)(SWGWordOfTheDay* output, NSError* error))completionBlock
-         {
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/words.json/wordOfTheDay", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    
-
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(date != nil)
-        queryParams[@"date"] = date;
-    
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
-    
-
-    id bodyDictionary = nil;
-    
-    
-    
-
-    SWGApiClient* client = [SWGApiClient sharedClientFromPool:basePath];
-
-    
-    
-    
-        
-    // comples response type
-    return [client dictionary:requestUrl 
-                       method:@"GET" 
-                  queryParams:queryParams 
-                         body:bodyDictionary 
-                 headerParams:headerParams
-           requestContentType:requestContentType
-          responseContentType:responseContentType
-              completionBlock:^(NSDictionary *data, NSError *error) {
-                if (error) {
-                    completionBlock(nil, error);
-                    
-                    return;
-                }
-                
-                SWGWordOfTheDay *result = nil;
-                if (data) {
-                    result = [[SWGWordOfTheDay    alloc]initWithValues: data];
-                }
-                completionBlock(result , nil);
-                
-              }];
-    
-    
-}
-
-
-
-@end
\ No newline at end of file
diff --git a/samples/client/wordnik/scala/pom.xml b/samples/client/wordnik/scala/pom.xml
deleted file mode 100644
index 9802920a0a1..00000000000
--- a/samples/client/wordnik/scala/pom.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.wordnik</groupId>
-    <artifactId>swagger-client</artifactId>
-    <packaging>jar</packaging>
-    <name>swagger-client</name>
-    <version>1.0.0</version>
-    <prerequisites>
-        <maven>2.2.0</maven>
-    </prerequisites>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>maven-mongodb-plugin-repo</id>
-            <name>maven mongodb plugin repository</name>
-            <url>http://maven-mongodb-plugin.googlecode.com/svn/maven/repo</url>
-            <layout>default</layout>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.12</version>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>loggerPath</name>
-                            <value>conf/log4j.properties</value>
-                        </property>
-                    </systemProperties>
-                    <argLine>-Xms512m -Xmx1500m</argLine>
-                    <parallel>methods</parallel>
-                    <forkMode>pertest</forkMode>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- attach test jar -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.2</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>jar</goal>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add_sources</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>src/main/java</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>add_test_sources</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>src/test/java</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>net.alchim31.maven</groupId>
-                <artifactId>scala-maven-plugin</artifactId>
-                <version>${scala-maven-plugin-version}</version>
-                <executions>
-                    <execution>
-                        <id>scala-compile-first</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                            <goal>compile</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>scala-test-compile</id>
-                        <phase>process-test-resources</phase>
-                        <goals>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <jvmArgs>
-                        <jvmArg>-Xms128m</jvmArg>
-                        <jvmArg>-Xmx1500m</jvmArg>
-                    </jvmArgs>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.scala-tools</groupId>
-                <artifactId>maven-scala-plugin</artifactId>
-                <configuration>
-                    <scalaVersion>${scala-version}</scalaVersion>
-                </configuration>
-            </plugin>
-        </plugins>
-    </reporting>
-    <dependencies>
-        <dependency>
-            <groupId>com.fasterxml.jackson.module</groupId>
-            <artifactId>jackson-module-scala_2.10</artifactId>
-            <version>${jackson-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-client</artifactId>
-            <version>${jersey-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey.contribs</groupId>
-            <artifactId>jersey-multipart</artifactId>
-            <version>${jersey-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jfarcand</groupId>
-            <artifactId>jersey-ahc-client</artifactId>
-            <version>${jersey-async-version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.scala-lang</groupId>
-            <artifactId>scala-library</artifactId>
-            <version>${scala-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.wordnik</groupId>
-            <artifactId>swagger-core</artifactId>
-            <version>${swagger-core-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.scalatest</groupId>
-            <artifactId>scalatest_2.10</artifactId>
-            <version>${scala-test-version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit-version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>${joda-time-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.joda</groupId>
-            <artifactId>joda-convert</artifactId>
-            <version>${joda-version}</version>
-        </dependency>
-    </dependencies>
-    <properties>
-        <scala-version>2.10.4</scala-version>
-        <joda-version>1.2</joda-version>
-        <joda-time-version>2.2</joda-time-version>
-        <jersey-version>1.7</jersey-version>
-        <swagger-core-version>1.5.0-M1</swagger-core-version>
-        <jersey-async-version>1.0.5</jersey-async-version>
-        <maven-plugin.version>1.0.0</maven-plugin.version>
-        <jackson-version>2.4.2</jackson-version>
-
-        <junit-version>4.8.1</junit-version>
-        <scala-maven-plugin-version>3.1.5</scala-maven-plugin-version>
-        <scala-test-version>2.1.3</scala-test-version>
-    </properties>
-</project>
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/ApiInvoker.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/ApiInvoker.scala
deleted file mode 100644
index 94e7d6a6e22..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/ApiInvoker.scala
+++ /dev/null
@@ -1,176 +0,0 @@
-package io.swagger.client
-
-import java.io.File
-import java.net.URLEncoder
-
-import scala.collection.JavaConverters._
-import scala.collection.mutable.HashMap
-
-object ScalaJsonUtil {
-  def getJsonMapper = {
-    val mapper = new ObjectMapper()
-    mapper.registerModule(new DefaultScalaModule())
-    mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-    mapper.setSerializationInclusion(JsonInclude.Include.NON_DEFAULT)
-    mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false)
-    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-    mapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY)
-    mapper
-  }
-}
-
-class ApiInvoker(val mapper: ObjectMapper = ScalaJsonUtil.getJsonMapper,
-                 httpHeaders: HashMap[String, String] = HashMap(),
-                 hostMap: HashMap[String, Client] = HashMap(),
-                 asyncHttpClient: Boolean = false,
-                 authScheme: String = "",
-                 authPreemptive: Boolean = false) {
-
-  var defaultHeaders: HashMap[String, String] = httpHeaders
-
-  def escape(value: Long): String = value.toString
-
-  def escape(value: Double): String = value.toString
-
-  def escape(value: Float): String = value.toString
-
-  def deserialize(json: String, containerType: String, cls: Class[_]) = {
-    if (cls == classOf[String]) {
-      json match {
-        case s: String => {
-          if (s.startsWith("\"") && s.endsWith("\"") && s.length > 1) s.substring(1, s.length - 2)
-          else s
-        }
-        case _ => null
-      }
-    } else {
-      containerType.toLowerCase match {
-        case "array" => {
-          val typeInfo = mapper.getTypeFactory().constructCollectionType(classOf[java.util.List[_]], cls)
-          val response = mapper.readValue(json, typeInfo).asInstanceOf[java.util.List[_]]
-          response.asScala.toList
-        }
-        case "list" => {
-          val typeInfo = mapper.getTypeFactory().constructCollectionType(classOf[java.util.List[_]], cls)
-          val response = mapper.readValue(json, typeInfo).asInstanceOf[java.util.List[_]]
-          response.asScala.toList
-        }
-        case _ => {
-          json match {
-            case e: String if ("\"\"" == e) => null
-            case _ => mapper.readValue(json, cls)
-          }
-        }
-      }
-    }
-  }
-
-  def invokeApi(host: String, path: String, method: String, queryParams: Map[String, String], body: AnyRef, headerParams: Map[String, String], contentType: String): String = {
-    val client = getClient(host)
-
-    val querystring = queryParams.filter(k => k._2 != null).map(k => (escape(k._1) + "=" + escape(k._2))).mkString("?", "&", "")
-    val builder = client.resource(host + path + querystring).accept(contentType)
-    headerParams.map(p => builder.header(p._1, p._2))
-    defaultHeaders.map(p => {
-      headerParams.contains(p._1) match {
-        case true => // override default with supplied header
-        case false => if (p._2 != null) builder.header(p._1, p._2)
-      }
-    })
-
-    val response: ClientResponse = method match {
-      case "GET" => {
-        builder.get(classOf[ClientResponse]).asInstanceOf[ClientResponse]
-      }
-      case "POST" => {
-        if (body != null && body.isInstanceOf[File]) {
-          val file = body.asInstanceOf[File]
-          val form = new FormDataMultiPart()
-          form.field("filename", file.getName())
-          form.bodyPart(new FileDataBodyPart("file", file, MediaType.MULTIPART_FORM_DATA_TYPE))
-          builder.post(classOf[ClientResponse], form)
-        }
-        else {
-          if (body == null) builder.post(classOf[ClientResponse], serialize(body))
-          else builder.`type`(contentType).post(classOf[ClientResponse], serialize(body))
-        }
-      }
-      case "PUT" => {
-        if (body == null) builder.put(classOf[ClientResponse], null)
-        else builder.`type`(contentType).put(classOf[ClientResponse], serialize(body))
-      }
-      case "DELETE" => {
-        builder.delete(classOf[ClientResponse])
-      }
-      case _ => null
-    }
-    response.getClientResponseStatus().getStatusCode() match {
-      case 204 => ""
-      case code: Int if (Range(200, 299).contains(code)) => {
-        response.hasEntity() match {
-          case true => response.getEntity(classOf[String])
-          case false => ""
-        }
-      }
-      case _ => {
-        val entity = response.hasEntity() match {
-          case true => response.getEntity(classOf[String])
-          case false => "no data"
-        }
-        throw new ApiException(
-          response.getClientResponseStatus().getStatusCode(),
-          entity)
-      }
-    }
-  }
-
-  def escape(value: String): String = {
-    URLEncoder.encode(value, "utf-8").replaceAll("\\+", "%20")
-  }
-
-  def serialize(obj: AnyRef): String = {
-    if (obj != null) {
-      obj match {
-        case e: List[_] => mapper.writeValueAsString(obj.asInstanceOf[List[_]].asJava)
-        case _ => mapper.writeValueAsString(obj)
-      }
-    } else null
-  }
-
-  def getClient(host: String): Client = {
-    hostMap.contains(host) match {
-      case true => hostMap(host)
-      case false => {
-        val client = newClient(host)
-        // client.addFilter(new LoggingFilter())
-        hostMap += host -> client
-        client
-      }
-    }
-  }
-
-  def newClient(host: String): Client = asyncHttpClient match {
-    case true => {
-
-      val config: DefaultAhcConfig = new DefaultAhcConfig()
-      if (!authScheme.isEmpty) {
-        val authSchemeEnum = Realm.AuthScheme.valueOf(authScheme)
-        config.getAsyncHttpClientConfigBuilder
-          .setRealm(new Realm.RealmBuilder().setScheme(authSchemeEnum)
-          .setUsePreemptiveAuth(authPreemptive).build)
-      }
-      AhcHttpClient.create(config)
-    }
-    case _ => Client.create()
-  }
-}
-
-object ApiInvoker extends ApiInvoker(mapper = ScalaJsonUtil.getJsonMapper,
-  httpHeaders = HashMap(),
-  hostMap = HashMap(),
-  asyncHttpClient = false,
-  authScheme = "",
-  authPreemptive = false)
-
-class ApiException(val code: Int, msg: String) extends RuntimeException(msg)
-
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/api/AccountApi.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/api/AccountApi.scala
deleted file mode 100644
index bdec6692cd7..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/api/AccountApi.scala
+++ /dev/null
@@ -1,193 +0,0 @@
-package io.swagger.client.api
-
-import java.io.File
-
-import scala.collection.mutable.HashMap
-
-class AccountApi(val defBasePath: String = "https://api.wordnik.com/v4",
-                 defApiInvoker: ApiInvoker = ApiInvoker) {
-  var basePath = defBasePath
-  var apiInvoker = defApiInvoker
-
-  def addHeader(key: String, value: String) = apiInvoker.defaultHeaders += key -> value
-
-
-  def getApiTokenStatus(api_key: String): Option[ApiTokenStatus] = {
-    // create path and map variables
-    val path = "/account.json/apiTokenStatus".replaceAll("\\{format\\}", "json")
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-
-
-    headerParams += "api_key" -> api_key
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "", classOf[ApiTokenStatus]).asInstanceOf[ApiTokenStatus])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def authenticate(username: String, password: String): Option[AuthenticationToken] = {
-    // create path and map variables
-    val path = "/account.json/authenticate/{username}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escape(username))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(password) != "null") queryParams += "password" -> password.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "", classOf[AuthenticationToken]).asInstanceOf[AuthenticationToken])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def authenticatePost(username: String, body: String): Option[AuthenticationToken] = {
-    // create path and map variables
-    val path = "/account.json/authenticate/{username}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escape(username))
-
-
-
-
-    val contentType = {
-      if (body != null && body.isInstanceOf[File])
-        "multipart/form-data"
-      else "application/json"
-
-
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, body, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "", classOf[AuthenticationToken]).asInstanceOf[AuthenticationToken])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getLoggedInUser(auth_token: String): Option[User] = {
-    // create path and map variables
-    val path = "/account.json/user".replaceAll("\\{format\\}", "json")
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-
-
-    headerParams += "auth_token" -> auth_token
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "", classOf[User]).asInstanceOf[User])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getWordListsForLoggedInUser(auth_token: String, skip: Integer, limit: Integer): Option[List[WordList]] = {
-    // create path and map variables
-    val path = "/account.json/wordLists".replaceAll("\\{format\\}", "json")
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(skip) != "null") queryParams += "skip" -> skip.toString
-    if (String.valueOf(limit) != "null") queryParams += "limit" -> limit.toString
-
-
-    headerParams += "auth_token" -> auth_token
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "array", classOf[WordList]).asInstanceOf[List[WordList]])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-}
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/api/WordApi.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/api/WordApi.scala
deleted file mode 100644
index bb449cdbfa0..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/api/WordApi.scala
+++ /dev/null
@@ -1,426 +0,0 @@
-package io.swagger.client.api
-
-import scala.collection.mutable.HashMap
-
-class WordApi(val defBasePath: String = "https://api.wordnik.com/v4",
-              defApiInvoker: ApiInvoker = ApiInvoker) {
-  var basePath = defBasePath
-  var apiInvoker = defApiInvoker
-
-  def addHeader(key: String, value: String) = apiInvoker.defaultHeaders += key -> value
-
-
-  def getWord(word: String, useCanonical: String, includeSuggestions: String): Option[WordObject] = {
-    // create path and map variables
-    val path = "/word.json/{word}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escape(word))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(useCanonical) != "null") queryParams += "useCanonical" -> useCanonical.toString
-    if (String.valueOf(includeSuggestions) != "null") queryParams += "includeSuggestions" -> includeSuggestions.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "", classOf[WordObject]).asInstanceOf[WordObject])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getAudio(word: String, useCanonical: String, limit: Integer): Option[List[AudioFile]] = {
-    // create path and map variables
-    val path = "/word.json/{word}/audio".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escape(word))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(useCanonical) != "null") queryParams += "useCanonical" -> useCanonical.toString
-    if (String.valueOf(limit) != "null") queryParams += "limit" -> limit.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "array", classOf[AudioFile]).asInstanceOf[List[AudioFile]])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getDefinitions(word: String, limit: Integer, partOfSpeech: String, includeRelated: String, sourceDictionaries: List[String], useCanonical: String, includeTags: String): Option[List[Definition]] = {
-    // create path and map variables
-    val path = "/word.json/{word}/definitions".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escape(word))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(limit) != "null") queryParams += "limit" -> limit.toString
-    if (String.valueOf(partOfSpeech) != "null") queryParams += "partOfSpeech" -> partOfSpeech.toString
-    if (String.valueOf(includeRelated) != "null") queryParams += "includeRelated" -> includeRelated.toString
-    if (String.valueOf(sourceDictionaries) != "null") queryParams += "sourceDictionaries" -> sourceDictionaries.toString
-    if (String.valueOf(useCanonical) != "null") queryParams += "useCanonical" -> useCanonical.toString
-    if (String.valueOf(includeTags) != "null") queryParams += "includeTags" -> includeTags.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "array", classOf[Definition]).asInstanceOf[List[Definition]])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getEtymologies(word: String, useCanonical: String): Option[List[String]] = {
-    // create path and map variables
-    val path = "/word.json/{word}/etymologies".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escape(word))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(useCanonical) != "null") queryParams += "useCanonical" -> useCanonical.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "array", classOf[String]).asInstanceOf[List[String]])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getExamples(word: String, includeDuplicates: String, useCanonical: String, skip: Integer, limit: Integer) = {
-    // create path and map variables
-    val path = "/word.json/{word}/examples".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escape(word))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(includeDuplicates) != "null") queryParams += "includeDuplicates" -> includeDuplicates.toString
-    if (String.valueOf(useCanonical) != "null") queryParams += "useCanonical" -> useCanonical.toString
-    if (String.valueOf(skip) != "null") queryParams += "skip" -> skip.toString
-    if (String.valueOf(limit) != "null") queryParams += "limit" -> limit.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getWordFrequency(word: String, useCanonical: String, startYear: Integer, endYear: Integer): Option[FrequencySummary] = {
-    // create path and map variables
-    val path = "/word.json/{word}/frequency".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escape(word))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(useCanonical) != "null") queryParams += "useCanonical" -> useCanonical.toString
-    if (String.valueOf(startYear) != "null") queryParams += "startYear" -> startYear.toString
-    if (String.valueOf(endYear) != "null") queryParams += "endYear" -> endYear.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "", classOf[FrequencySummary]).asInstanceOf[FrequencySummary])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getHyphenation(word: String, useCanonical: String, sourceDictionary: String, limit: Integer) = {
-    // create path and map variables
-    val path = "/word.json/{word}/hyphenation".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escape(word))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(useCanonical) != "null") queryParams += "useCanonical" -> useCanonical.toString
-    if (String.valueOf(sourceDictionary) != "null") queryParams += "sourceDictionary" -> sourceDictionary.toString
-    if (String.valueOf(limit) != "null") queryParams += "limit" -> limit.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getPhrases(word: String, limit: Integer, wlmi: Integer, useCanonical: String): Option[List[Bigram]] = {
-    // create path and map variables
-    val path = "/word.json/{word}/phrases".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escape(word))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(limit) != "null") queryParams += "limit" -> limit.toString
-    if (String.valueOf(wlmi) != "null") queryParams += "wlmi" -> wlmi.toString
-    if (String.valueOf(useCanonical) != "null") queryParams += "useCanonical" -> useCanonical.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "array", classOf[Bigram]).asInstanceOf[List[Bigram]])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getTextPronunciations(word: String, useCanonical: String, sourceDictionary: String, typeFormat: String, limit: Integer) = {
-    // create path and map variables
-    val path = "/word.json/{word}/pronunciations".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escape(word))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(useCanonical) != "null") queryParams += "useCanonical" -> useCanonical.toString
-    if (String.valueOf(sourceDictionary) != "null") queryParams += "sourceDictionary" -> sourceDictionary.toString
-    if (String.valueOf(typeFormat) != "null") queryParams += "typeFormat" -> typeFormat.toString
-    if (String.valueOf(limit) != "null") queryParams += "limit" -> limit.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getRelatedWords(word: String, useCanonical: String, relationshipTypes: String, limitPerRelationshipType: Integer) = {
-    // create path and map variables
-    val path = "/word.json/{word}/relatedWords".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escape(word))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(useCanonical) != "null") queryParams += "useCanonical" -> useCanonical.toString
-    if (String.valueOf(relationshipTypes) != "null") queryParams += "relationshipTypes" -> relationshipTypes.toString
-    if (String.valueOf(limitPerRelationshipType) != "null") queryParams += "limitPerRelationshipType" -> limitPerRelationshipType.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getTopExample(word: String, useCanonical: String): Option[Example] = {
-    // create path and map variables
-    val path = "/word.json/{word}/topExample".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escape(word))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(useCanonical) != "null") queryParams += "useCanonical" -> useCanonical.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "", classOf[Example]).asInstanceOf[Example])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-}
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/api/WordListApi.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/api/WordListApi.scala
deleted file mode 100644
index 35a4e4fed4e..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/api/WordListApi.scala
+++ /dev/null
@@ -1,239 +0,0 @@
-package io.swagger.client.api
-
-import java.io.File
-
-import scala.collection.mutable.HashMap
-
-class WordListApi(val defBasePath: String = "https://api.wordnik.com/v4",
-                  defApiInvoker: ApiInvoker = ApiInvoker) {
-  var basePath = defBasePath
-  var apiInvoker = defApiInvoker
-
-  def addHeader(key: String, value: String) = apiInvoker.defaultHeaders += key -> value
-
-
-  def getWordListByPermalink(permalink: String, auth_token: String): Option[WordList] = {
-    // create path and map variables
-    val path = "/wordList.json/{permalink}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escape(permalink))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-
-
-    headerParams += "auth_token" -> auth_token
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "", classOf[WordList]).asInstanceOf[WordList])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def updateWordList(permalink: String, body: WordList, auth_token: String) = {
-    // create path and map variables
-    val path = "/wordList.json/{permalink}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escape(permalink))
-
-
-
-
-    val contentType = {
-      if (body != null && body.isInstanceOf[File])
-        "multipart/form-data"
-      else "application/json"
-
-
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-
-
-    headerParams += "auth_token" -> auth_token
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "PUT", queryParams.toMap, body, headerParams.toMap, contentType) match {
-        case s: String =>
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def deleteWordList(permalink: String, auth_token: String) = {
-    // create path and map variables
-    val path = "/wordList.json/{permalink}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escape(permalink))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-
-
-    headerParams += "auth_token" -> auth_token
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "DELETE", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def deleteWordsFromWordList(permalink: String, body: List[StringValue], auth_token: String) = {
-    // create path and map variables
-    val path = "/wordList.json/{permalink}/deleteWords".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escape(permalink))
-
-
-
-
-    val contentType = {
-      if (body != null && body.isInstanceOf[File])
-        "multipart/form-data"
-      else "application/json"
-
-
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-
-
-    headerParams += "auth_token" -> auth_token
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, body, headerParams.toMap, contentType) match {
-        case s: String =>
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getWordListWords(permalink: String, sortBy: String, sortOrder: String, skip: Integer, limit: Integer, auth_token: String) = {
-    // create path and map variables
-    val path = "/wordList.json/{permalink}/words".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escape(permalink))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(sortBy) != "null") queryParams += "sortBy" -> sortBy.toString
-    if (String.valueOf(sortOrder) != "null") queryParams += "sortOrder" -> sortOrder.toString
-    if (String.valueOf(skip) != "null") queryParams += "skip" -> skip.toString
-    if (String.valueOf(limit) != "null") queryParams += "limit" -> limit.toString
-
-
-    headerParams += "auth_token" -> auth_token
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def addWordsToWordList(permalink: String, body: List[StringValue], auth_token: String) = {
-    // create path and map variables
-    val path = "/wordList.json/{permalink}/words".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escape(permalink))
-
-
-
-
-    val contentType = {
-      if (body != null && body.isInstanceOf[File])
-        "multipart/form-data"
-      else "application/json"
-
-
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-
-
-    headerParams += "auth_token" -> auth_token
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, body, headerParams.toMap, contentType) match {
-        case s: String =>
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-}
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/api/WordListsApi.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/api/WordListsApi.scala
deleted file mode 100644
index 86ae49f1f59..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/api/WordListsApi.scala
+++ /dev/null
@@ -1,52 +0,0 @@
-package io.swagger.client.api
-
-import java.io.File
-
-import scala.collection.mutable.HashMap
-
-class WordListsApi(val defBasePath: String = "https://api.wordnik.com/v4",
-                   defApiInvoker: ApiInvoker = ApiInvoker) {
-  var basePath = defBasePath
-  var apiInvoker = defApiInvoker
-
-  def addHeader(key: String, value: String) = apiInvoker.defaultHeaders += key -> value
-
-
-  def createWordList(body: WordList, auth_token: String): Option[WordList] = {
-    // create path and map variables
-    val path = "/wordLists.json".replaceAll("\\{format\\}", "json")
-
-
-    val contentType = {
-      if (body != null && body.isInstanceOf[File])
-        "multipart/form-data"
-      else "application/json"
-
-
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-
-
-    headerParams += "auth_token" -> auth_token
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, body, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "", classOf[WordList]).asInstanceOf[WordList])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-}
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/api/WordsApi.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/api/WordsApi.scala
deleted file mode 100644
index 0ce6da2f1de..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/api/WordsApi.scala
+++ /dev/null
@@ -1,228 +0,0 @@
-package io.swagger.client.api
-
-import scala.collection.mutable.HashMap
-
-class WordsApi(val defBasePath: String = "https://api.wordnik.com/v4",
-               defApiInvoker: ApiInvoker = ApiInvoker) {
-  var basePath = defBasePath
-  var apiInvoker = defApiInvoker
-
-  def addHeader(key: String, value: String) = apiInvoker.defaultHeaders += key -> value
-
-
-  def getRandomWord(hasDictionaryDef: String, includePartOfSpeech: String, excludePartOfSpeech: String, minCorpusCount: Integer, maxCorpusCount: Integer, minDictionaryCount: Integer, maxDictionaryCount: Integer, minLength: Integer, maxLength: Integer): Option[WordObject] = {
-    // create path and map variables
-    val path = "/words.json/randomWord".replaceAll("\\{format\\}", "json")
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(hasDictionaryDef) != "null") queryParams += "hasDictionaryDef" -> hasDictionaryDef.toString
-    if (String.valueOf(includePartOfSpeech) != "null") queryParams += "includePartOfSpeech" -> includePartOfSpeech.toString
-    if (String.valueOf(excludePartOfSpeech) != "null") queryParams += "excludePartOfSpeech" -> excludePartOfSpeech.toString
-    if (String.valueOf(minCorpusCount) != "null") queryParams += "minCorpusCount" -> minCorpusCount.toString
-    if (String.valueOf(maxCorpusCount) != "null") queryParams += "maxCorpusCount" -> maxCorpusCount.toString
-    if (String.valueOf(minDictionaryCount) != "null") queryParams += "minDictionaryCount" -> minDictionaryCount.toString
-    if (String.valueOf(maxDictionaryCount) != "null") queryParams += "maxDictionaryCount" -> maxDictionaryCount.toString
-    if (String.valueOf(minLength) != "null") queryParams += "minLength" -> minLength.toString
-    if (String.valueOf(maxLength) != "null") queryParams += "maxLength" -> maxLength.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "", classOf[WordObject]).asInstanceOf[WordObject])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getRandomWords(hasDictionaryDef: String, includePartOfSpeech: String, excludePartOfSpeech: String, minCorpusCount: Integer, maxCorpusCount: Integer, minDictionaryCount: Integer, maxDictionaryCount: Integer, minLength: Integer, maxLength: Integer, sortBy: String, sortOrder: String, limit: Integer) = {
-    // create path and map variables
-    val path = "/words.json/randomWords".replaceAll("\\{format\\}", "json")
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(hasDictionaryDef) != "null") queryParams += "hasDictionaryDef" -> hasDictionaryDef.toString
-    if (String.valueOf(includePartOfSpeech) != "null") queryParams += "includePartOfSpeech" -> includePartOfSpeech.toString
-    if (String.valueOf(excludePartOfSpeech) != "null") queryParams += "excludePartOfSpeech" -> excludePartOfSpeech.toString
-    if (String.valueOf(minCorpusCount) != "null") queryParams += "minCorpusCount" -> minCorpusCount.toString
-    if (String.valueOf(maxCorpusCount) != "null") queryParams += "maxCorpusCount" -> maxCorpusCount.toString
-    if (String.valueOf(minDictionaryCount) != "null") queryParams += "minDictionaryCount" -> minDictionaryCount.toString
-    if (String.valueOf(maxDictionaryCount) != "null") queryParams += "maxDictionaryCount" -> maxDictionaryCount.toString
-    if (String.valueOf(minLength) != "null") queryParams += "minLength" -> minLength.toString
-    if (String.valueOf(maxLength) != "null") queryParams += "maxLength" -> maxLength.toString
-    if (String.valueOf(sortBy) != "null") queryParams += "sortBy" -> sortBy.toString
-    if (String.valueOf(sortOrder) != "null") queryParams += "sortOrder" -> sortOrder.toString
-    if (String.valueOf(limit) != "null") queryParams += "limit" -> limit.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def reverseDictionary(query: String, findSenseForWord: String, includeSourceDictionaries: String, excludeSourceDictionaries: String, includePartOfSpeech: String, excludePartOfSpeech: String, minCorpusCount: Integer, maxCorpusCount: Integer, minLength: Integer, maxLength: Integer, expandTerms: String, includeTags: String, sortBy: String, sortOrder: String, skip: String, limit: Integer): Option[DefinitionSearchResults] = {
-    // create path and map variables
-    val path = "/words.json/reverseDictionary".replaceAll("\\{format\\}", "json")
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(query) != "null") queryParams += "query" -> query.toString
-    if (String.valueOf(findSenseForWord) != "null") queryParams += "findSenseForWord" -> findSenseForWord.toString
-    if (String.valueOf(includeSourceDictionaries) != "null") queryParams += "includeSourceDictionaries" -> includeSourceDictionaries.toString
-    if (String.valueOf(excludeSourceDictionaries) != "null") queryParams += "excludeSourceDictionaries" -> excludeSourceDictionaries.toString
-    if (String.valueOf(includePartOfSpeech) != "null") queryParams += "includePartOfSpeech" -> includePartOfSpeech.toString
-    if (String.valueOf(excludePartOfSpeech) != "null") queryParams += "excludePartOfSpeech" -> excludePartOfSpeech.toString
-    if (String.valueOf(minCorpusCount) != "null") queryParams += "minCorpusCount" -> minCorpusCount.toString
-    if (String.valueOf(maxCorpusCount) != "null") queryParams += "maxCorpusCount" -> maxCorpusCount.toString
-    if (String.valueOf(minLength) != "null") queryParams += "minLength" -> minLength.toString
-    if (String.valueOf(maxLength) != "null") queryParams += "maxLength" -> maxLength.toString
-    if (String.valueOf(expandTerms) != "null") queryParams += "expandTerms" -> expandTerms.toString
-    if (String.valueOf(includeTags) != "null") queryParams += "includeTags" -> includeTags.toString
-    if (String.valueOf(sortBy) != "null") queryParams += "sortBy" -> sortBy.toString
-    if (String.valueOf(sortOrder) != "null") queryParams += "sortOrder" -> sortOrder.toString
-    if (String.valueOf(skip) != "null") queryParams += "skip" -> skip.toString
-    if (String.valueOf(limit) != "null") queryParams += "limit" -> limit.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "", classOf[DefinitionSearchResults]).asInstanceOf[DefinitionSearchResults])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def searchWords(query: String, caseSensitive: String, includePartOfSpeech: String, excludePartOfSpeech: String, minCorpusCount: Integer, maxCorpusCount: Integer, minDictionaryCount: Integer, maxDictionaryCount: Integer, minLength: Integer, maxLength: Integer, skip: Integer, limit: Integer): Option[WordSearchResults] = {
-    // create path and map variables
-    val path = "/words.json/search/{query}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "query" + "\\}", apiInvoker.escape(query))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(caseSensitive) != "null") queryParams += "caseSensitive" -> caseSensitive.toString
-    if (String.valueOf(includePartOfSpeech) != "null") queryParams += "includePartOfSpeech" -> includePartOfSpeech.toString
-    if (String.valueOf(excludePartOfSpeech) != "null") queryParams += "excludePartOfSpeech" -> excludePartOfSpeech.toString
-    if (String.valueOf(minCorpusCount) != "null") queryParams += "minCorpusCount" -> minCorpusCount.toString
-    if (String.valueOf(maxCorpusCount) != "null") queryParams += "maxCorpusCount" -> maxCorpusCount.toString
-    if (String.valueOf(minDictionaryCount) != "null") queryParams += "minDictionaryCount" -> minDictionaryCount.toString
-    if (String.valueOf(maxDictionaryCount) != "null") queryParams += "maxDictionaryCount" -> maxDictionaryCount.toString
-    if (String.valueOf(minLength) != "null") queryParams += "minLength" -> minLength.toString
-    if (String.valueOf(maxLength) != "null") queryParams += "maxLength" -> maxLength.toString
-    if (String.valueOf(skip) != "null") queryParams += "skip" -> skip.toString
-    if (String.valueOf(limit) != "null") queryParams += "limit" -> limit.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "", classOf[WordSearchResults]).asInstanceOf[WordSearchResults])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getWordOfTheDay(date: String): Option[WordOfTheDay] = {
-    // create path and map variables
-    val path = "/words.json/wordOfTheDay".replaceAll("\\{format\\}", "json")
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(date) != "null") queryParams += "date" -> date.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "", classOf[WordOfTheDay]).asInstanceOf[WordOfTheDay])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-}
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/ApiTokenStatus.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/ApiTokenStatus.scala
deleted file mode 100644
index 2d84f206c11..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/ApiTokenStatus.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.swagger.client.model
-
-
-case class ApiTokenStatus(
-                           valid: Boolean,
-                           token: String,
-                           resetsInMillis: Long,
-                           remainingCalls: Long,
-                           expiresInMillis: Long,
-                           totalRequests: Long)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/AudioFile.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/AudioFile.scala
deleted file mode 100644
index 85987918396..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/AudioFile.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.swagger.client.model
-
-
-case class AudioFile(
-                      attributionUrl: String,
-                      commentCount: Integer,
-                      voteCount: Integer,
-                      fileUrl: String,
-                      audioType: String,
-                      id: Long,
-                      duration: Double,
-                      attributionText: String,
-                      createdBy: String,
-                      description: String,
-                      createdAt: DateTime,
-                      voteWeightedAverage: Float,
-                      voteAverage: Float,
-                      word: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/AudioType.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/AudioType.scala
deleted file mode 100644
index dde065afc2c..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/AudioType.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.swagger.client.model
-
-
-case class AudioType(
-                      id: Integer,
-                      name: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/AuthenticationToken.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/AuthenticationToken.scala
deleted file mode 100644
index 932eadd7a5a..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/AuthenticationToken.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.swagger.client.model
-
-
-case class AuthenticationToken(
-                                token: String,
-                                userId: Long,
-                                userSignature: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Bigram.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Bigram.scala
deleted file mode 100644
index 1c20e0ef830..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Bigram.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-package io.swagger.client.model
-
-
-case class Bigram(
-                   count: Long,
-                   gram2: String,
-                   gram1: String,
-                   wlmi: Double,
-                   mi: Double)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Category.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Category.scala
deleted file mode 100644
index dcc19f58d75..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Category.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.swagger.client.model
-
-
-case class Category(
-                     id: Long,
-                     name: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Citation.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Citation.scala
deleted file mode 100644
index 8744747c910..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Citation.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.swagger.client.model
-
-
-case class Citation(
-                     cite: String,
-                     source: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/ContentProvider.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/ContentProvider.scala
deleted file mode 100644
index 2c85443804c..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/ContentProvider.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.swagger.client.model
-
-
-case class ContentProvider(
-                            id: Integer,
-                            name: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Definition.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Definition.scala
deleted file mode 100644
index 6d86caea535..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Definition.scala
+++ /dev/null
@@ -1,21 +0,0 @@
-package io.swagger.client.model
-
-
-case class Definition(
-                       extendedText: String,
-                       text: String,
-                       sourceDictionary: String,
-                       citations: List[Citation],
-                       labels: List[Label],
-                       score: Float,
-                       exampleUses: List[ExampleUsage],
-                       attributionUrl: String,
-                       seqString: String,
-                       attributionText: String,
-                       relatedWords: List[Related],
-                       sequence: String,
-                       word: String,
-                       notes: List[Note],
-                       textProns: List[TextPron],
-                       partOfSpeech: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/DefinitionSearchResults.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/DefinitionSearchResults.scala
deleted file mode 100644
index c3be55de820..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/DefinitionSearchResults.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.swagger.client.model
-
-
-case class DefinitionSearchResults(
-                                    results: List[Definition],
-                                    totalResults: Integer)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Example.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Example.scala
deleted file mode 100644
index 90e88f590eb..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Example.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-package io.swagger.client.model
-
-
-case class Example(
-                    id: Long,
-                    exampleId: Long,
-                    title: String,
-                    text: String,
-                    score: ScoredWord,
-                    sentence: Sentence,
-                    word: String,
-                    provider: ContentProvider,
-                    year: Integer,
-                    rating: Float,
-                    documentId: Long,
-                    url: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/ExampleSearchResults.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/ExampleSearchResults.scala
deleted file mode 100644
index 623d5d461c6..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/ExampleSearchResults.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.swagger.client.model
-
-
-case class ExampleSearchResults(
-                                 facets: List[Facet],
-                                 examples: List[Example])
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/ExampleUsage.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/ExampleUsage.scala
deleted file mode 100644
index 084c0579564..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/ExampleUsage.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-package io.swagger.client.model
-
-
-case class ExampleUsage(
-                         text: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Facet.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Facet.scala
deleted file mode 100644
index 72290c88a66..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Facet.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.swagger.client.model
-
-
-case class Facet(
-                  facetValues: List[FacetValue],
-                  name: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/FacetValue.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/FacetValue.scala
deleted file mode 100644
index bed5f35418b..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/FacetValue.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.swagger.client.model
-
-
-case class FacetValue(
-                       count: Long,
-                       value: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Frequency.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Frequency.scala
deleted file mode 100644
index 840ae9db0e8..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Frequency.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.swagger.client.model
-
-
-case class Frequency(
-                      count: Long,
-                      year: Integer)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/FrequencySummary.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/FrequencySummary.scala
deleted file mode 100644
index d30d4c8f421..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/FrequencySummary.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-package io.swagger.client.model
-
-
-case class FrequencySummary(
-                             unknownYearCount: Integer,
-                             totalCount: Long,
-                             frequencyString: String,
-                             word: String,
-                             frequency: List[Frequency])
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Label.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Label.scala
deleted file mode 100644
index d1d03cac5ea..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Label.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.swagger.client.model
-
-
-case class Label(
-                  text: String,
-                  _type: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Note.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Note.scala
deleted file mode 100644
index be6e87f6d4d..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Note.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.swagger.client.model
-
-
-case class Note(
-                 noteType: String,
-                 appliesTo: List[String],
-                 value: String,
-                 pos: Integer)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/PartOfSpeech.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/PartOfSpeech.scala
deleted file mode 100644
index fc12361cf56..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/PartOfSpeech.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.swagger.client.model
-
-
-case class PartOfSpeech(
-                         roots: List[Root],
-                         storageAbbr: List[String],
-                         allCategories: List[Category])
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Related.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Related.scala
deleted file mode 100644
index ab43c6181c9..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Related.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.swagger.client.model
-
-
-case class Related(
-                    label1: String,
-                    relationshipType: String,
-                    label2: String,
-                    label3: String,
-                    words: List[String],
-                    gram: String,
-                    label4: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Root.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Root.scala
deleted file mode 100644
index 913efb0c884..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Root.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.swagger.client.model
-
-
-case class Root(
-                 id: Long,
-                 name: String,
-                 categories: List[Category])
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/ScoredWord.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/ScoredWord.scala
deleted file mode 100644
index 47e0d17e437..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/ScoredWord.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.swagger.client.model
-
-
-case class ScoredWord(
-                       position: Integer,
-                       id: Long,
-                       docTermCount: Integer,
-                       lemma: String,
-                       wordType: String,
-                       score: Float,
-                       sentenceId: Long,
-                       word: String,
-                       stopword: Boolean,
-                       baseWordScore: Double,
-                       partOfSpeech: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Sentence.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Sentence.scala
deleted file mode 100644
index 2fefa9103db..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Sentence.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.swagger.client.model
-
-
-case class Sentence(
-                     hasScoredWords: Boolean,
-                     id: Long,
-                     scoredWords: List[ScoredWord],
-                     display: String,
-                     rating: Integer,
-                     documentMetadataId: Long)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/SimpleDefinition.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/SimpleDefinition.scala
deleted file mode 100644
index c2c45286a10..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/SimpleDefinition.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.swagger.client.model
-
-
-case class SimpleDefinition(
-                             text: String,
-                             source: String,
-                             note: String,
-                             partOfSpeech: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/SimpleExample.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/SimpleExample.scala
deleted file mode 100644
index 040e68f1d6a..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/SimpleExample.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.swagger.client.model
-
-
-case class SimpleExample(
-                          id: Long,
-                          title: String,
-                          text: String,
-                          url: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/StringValue.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/StringValue.scala
deleted file mode 100644
index 87e22226277..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/StringValue.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-package io.swagger.client.model
-
-
-case class StringValue(
-                        word: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Syllable.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Syllable.scala
deleted file mode 100644
index f0f81c21108..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/Syllable.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.swagger.client.model
-
-
-case class Syllable(
-                     text: String,
-                     seq: Integer,
-                     _type: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/TextPron.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/TextPron.scala
deleted file mode 100644
index 1a12817f2d2..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/TextPron.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.swagger.client.model
-
-
-case class TextPron(
-                     raw: String,
-                     seq: Integer,
-                     rawType: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/User.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/User.scala
deleted file mode 100644
index 8680a848935..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/User.scala
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.swagger.client.model
-
-
-case class User(
-                 id: Long,
-                 username: String,
-                 email: String,
-                 status: Integer,
-                 faceBookId: String,
-                 userName: String,
-                 displayName: String,
-                 password: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/WordList.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/WordList.scala
deleted file mode 100644
index 0f354b54c0b..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/WordList.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.swagger.client.model
-
-
-case class WordList(
-                     id: Long,
-                     permalink: String,
-                     name: String,
-                     createdAt: DateTime,
-                     updatedAt: DateTime,
-                     lastActivityAt: DateTime,
-                     username: String,
-                     userId: Long,
-                     description: String,
-                     numberWordsInList: Long,
-                     _type: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/WordListWord.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/WordListWord.scala
deleted file mode 100644
index b556ce119b5..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/WordListWord.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.swagger.client.model
-
-
-case class WordListWord(
-                         id: Long,
-                         word: String,
-                         username: String,
-                         userId: Long,
-                         createdAt: DateTime,
-                         numberCommentsOnWord: Long,
-                         numberLists: Long)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/WordObject.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/WordObject.scala
deleted file mode 100644
index e1cd5380895..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/WordObject.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.swagger.client.model
-
-
-case class WordObject(
-                       id: Long,
-                       word: String,
-                       originalWord: String,
-                       suggestions: List[String],
-                       canonicalForm: String,
-                       vulgar: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/WordOfTheDay.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/WordOfTheDay.scala
deleted file mode 100644
index 710564364c8..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/WordOfTheDay.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-package io.swagger.client.model
-
-
-case class WordOfTheDay(
-                         id: Long,
-                         parentId: String,
-                         category: String,
-                         createdBy: String,
-                         createdAt: DateTime,
-                         contentProvider: ContentProvider,
-                         htmlExtra: String,
-                         word: String,
-                         definitions: List[SimpleDefinition],
-                         examples: List[SimpleExample],
-                         note: String,
-                         publishDate: DateTime)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/WordSearchResult.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/WordSearchResult.scala
deleted file mode 100644
index bd2dfd67624..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/WordSearchResult.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.swagger.client.model
-
-
-case class WordSearchResult(
-                             count: Long,
-                             lexicality: Double,
-                             word: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/WordSearchResults.scala b/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/WordSearchResults.scala
deleted file mode 100644
index b5394cb2664..00000000000
--- a/samples/client/wordnik/scala/src/main/java/io/swagger/client/model/WordSearchResults.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.swagger.client.model
-
-
-case class WordSearchResults(
-                              searchResults: List[WordSearchResult],
-                              totalResults: Integer)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/ApiInvoker.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/ApiInvoker.scala
deleted file mode 100644
index c84081c4f10..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/ApiInvoker.scala
+++ /dev/null
@@ -1,177 +0,0 @@
-package io.swagger.client
-
-import java.io.File
-import java.net.URLEncoder
-
-import scala.collection.JavaConverters._
-import scala.collection.mutable.HashMap
-
-object ScalaJsonUtil {
-  def getJsonMapper = {
-    val mapper = new ObjectMapper()
-    mapper.registerModule(new DefaultScalaModule())
-    mapper.registerModule(new JodaModule());
-    mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-    mapper.setSerializationInclusion(JsonInclude.Include.NON_DEFAULT)
-    mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false)
-    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-    mapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY)
-    mapper
-  }
-}
-
-class ApiInvoker(val mapper: ObjectMapper = ScalaJsonUtil.getJsonMapper,
-                 httpHeaders: HashMap[String, String] = HashMap(),
-                 hostMap: HashMap[String, Client] = HashMap(),
-                 asyncHttpClient: Boolean = false,
-                 authScheme: String = "",
-                 authPreemptive: Boolean = false) {
-
-  var defaultHeaders: HashMap[String, String] = httpHeaders
-
-  def escape(value: Long): String = value.toString
-
-  def escape(value: Double): String = value.toString
-
-  def escape(value: Float): String = value.toString
-
-  def deserialize(json: String, containerType: String, cls: Class[_]) = {
-    if (cls == classOf[String]) {
-      json match {
-        case s: String => {
-          if (s.startsWith("\"") && s.endsWith("\"") && s.length > 1) s.substring(1, s.length - 2)
-          else s
-        }
-        case _ => null
-      }
-    } else {
-      containerType.toLowerCase match {
-        case "array" => {
-          val typeInfo = mapper.getTypeFactory().constructCollectionType(classOf[java.util.List[_]], cls)
-          val response = mapper.readValue(json, typeInfo).asInstanceOf[java.util.List[_]]
-          response.asScala.toList
-        }
-        case "list" => {
-          val typeInfo = mapper.getTypeFactory().constructCollectionType(classOf[java.util.List[_]], cls)
-          val response = mapper.readValue(json, typeInfo).asInstanceOf[java.util.List[_]]
-          response.asScala.toList
-        }
-        case _ => {
-          json match {
-            case e: String if ("\"\"" == e) => null
-            case _ => mapper.readValue(json, cls)
-          }
-        }
-      }
-    }
-  }
-
-  def invokeApi(host: String, path: String, method: String, queryParams: Map[String, String], body: AnyRef, headerParams: Map[String, String], contentType: String): String = {
-    val client = getClient(host)
-
-    val querystring = queryParams.filter(k => k._2 != null).map(k => (escape(k._1) + "=" + escape(k._2))).mkString("?", "&", "")
-    val builder = client.resource(host + path + querystring).accept(contentType)
-    headerParams.map(p => builder.header(p._1, p._2))
-    defaultHeaders.map(p => {
-      headerParams.contains(p._1) match {
-        case true => // override default with supplied header
-        case false => if (p._2 != null) builder.header(p._1, p._2)
-      }
-    })
-
-    val response: ClientResponse = method match {
-      case "GET" => {
-        builder.get(classOf[ClientResponse]).asInstanceOf[ClientResponse]
-      }
-      case "POST" => {
-        if (body != null && body.isInstanceOf[File]) {
-          val file = body.asInstanceOf[File]
-          val form = new FormDataMultiPart()
-          form.field("filename", file.getName())
-          form.bodyPart(new FileDataBodyPart("file", file, MediaType.MULTIPART_FORM_DATA_TYPE))
-          builder.post(classOf[ClientResponse], form)
-        }
-        else {
-          if (body == null) builder.post(classOf[ClientResponse], serialize(body))
-          else builder.`type`(contentType).post(classOf[ClientResponse], serialize(body))
-        }
-      }
-      case "PUT" => {
-        if (body == null) builder.put(classOf[ClientResponse], null)
-        else builder.`type`(contentType).put(classOf[ClientResponse], serialize(body))
-      }
-      case "DELETE" => {
-        builder.delete(classOf[ClientResponse])
-      }
-      case _ => null
-    }
-    response.getClientResponseStatus().getStatusCode() match {
-      case 204 => ""
-      case code: Int if (Range(200, 299).contains(code)) => {
-        response.hasEntity() match {
-          case true => response.getEntity(classOf[String])
-          case false => ""
-        }
-      }
-      case _ => {
-        val entity = response.hasEntity() match {
-          case true => response.getEntity(classOf[String])
-          case false => "no data"
-        }
-        throw new ApiException(
-          response.getClientResponseStatus().getStatusCode(),
-          entity)
-      }
-    }
-  }
-
-  def escape(value: String): String = {
-    URLEncoder.encode(value, "utf-8").replaceAll("\\+", "%20")
-  }
-
-  def serialize(obj: AnyRef): String = {
-    if (obj != null) {
-      obj match {
-        case e: List[_] => mapper.writeValueAsString(obj.asInstanceOf[List[_]].asJava)
-        case _ => mapper.writeValueAsString(obj)
-      }
-    } else null
-  }
-
-  def getClient(host: String): Client = {
-    hostMap.contains(host) match {
-      case true => hostMap(host)
-      case false => {
-        val client = newClient(host)
-        // client.addFilter(new LoggingFilter())
-        hostMap += host -> client
-        client
-      }
-    }
-  }
-
-  def newClient(host: String): Client = asyncHttpClient match {
-    case true => {
-
-      val config: DefaultAhcConfig = new DefaultAhcConfig()
-      if (!authScheme.isEmpty) {
-        val authSchemeEnum = Realm.AuthScheme.valueOf(authScheme)
-        config.getAsyncHttpClientConfigBuilder
-          .setRealm(new Realm.RealmBuilder().setScheme(authSchemeEnum)
-          .setUsePreemptiveAuth(authPreemptive).build)
-      }
-      AhcHttpClient.create(config)
-    }
-    case _ => Client.create()
-  }
-}
-
-object ApiInvoker extends ApiInvoker(mapper = ScalaJsonUtil.getJsonMapper,
-  httpHeaders = HashMap(),
-  hostMap = HashMap(),
-  asyncHttpClient = false,
-  authScheme = "",
-  authPreemptive = false)
-
-class ApiException(val code: Int, msg: String) extends RuntimeException(msg)
-
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/api/AccountApi.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/api/AccountApi.scala
deleted file mode 100644
index bdec6692cd7..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/api/AccountApi.scala
+++ /dev/null
@@ -1,193 +0,0 @@
-package io.swagger.client.api
-
-import java.io.File
-
-import scala.collection.mutable.HashMap
-
-class AccountApi(val defBasePath: String = "https://api.wordnik.com/v4",
-                 defApiInvoker: ApiInvoker = ApiInvoker) {
-  var basePath = defBasePath
-  var apiInvoker = defApiInvoker
-
-  def addHeader(key: String, value: String) = apiInvoker.defaultHeaders += key -> value
-
-
-  def getApiTokenStatus(api_key: String): Option[ApiTokenStatus] = {
-    // create path and map variables
-    val path = "/account.json/apiTokenStatus".replaceAll("\\{format\\}", "json")
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-
-
-    headerParams += "api_key" -> api_key
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "", classOf[ApiTokenStatus]).asInstanceOf[ApiTokenStatus])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def authenticate(username: String, password: String): Option[AuthenticationToken] = {
-    // create path and map variables
-    val path = "/account.json/authenticate/{username}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escape(username))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(password) != "null") queryParams += "password" -> password.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "", classOf[AuthenticationToken]).asInstanceOf[AuthenticationToken])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def authenticatePost(username: String, body: String): Option[AuthenticationToken] = {
-    // create path and map variables
-    val path = "/account.json/authenticate/{username}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escape(username))
-
-
-
-
-    val contentType = {
-      if (body != null && body.isInstanceOf[File])
-        "multipart/form-data"
-      else "application/json"
-
-
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, body, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "", classOf[AuthenticationToken]).asInstanceOf[AuthenticationToken])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getLoggedInUser(auth_token: String): Option[User] = {
-    // create path and map variables
-    val path = "/account.json/user".replaceAll("\\{format\\}", "json")
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-
-
-    headerParams += "auth_token" -> auth_token
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "", classOf[User]).asInstanceOf[User])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getWordListsForLoggedInUser(auth_token: String, skip: Integer, limit: Integer): Option[List[WordList]] = {
-    // create path and map variables
-    val path = "/account.json/wordLists".replaceAll("\\{format\\}", "json")
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(skip) != "null") queryParams += "skip" -> skip.toString
-    if (String.valueOf(limit) != "null") queryParams += "limit" -> limit.toString
-
-
-    headerParams += "auth_token" -> auth_token
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "array", classOf[WordList]).asInstanceOf[List[WordList]])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-}
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/api/WordApi.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/api/WordApi.scala
deleted file mode 100644
index bb449cdbfa0..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/api/WordApi.scala
+++ /dev/null
@@ -1,426 +0,0 @@
-package io.swagger.client.api
-
-import scala.collection.mutable.HashMap
-
-class WordApi(val defBasePath: String = "https://api.wordnik.com/v4",
-              defApiInvoker: ApiInvoker = ApiInvoker) {
-  var basePath = defBasePath
-  var apiInvoker = defApiInvoker
-
-  def addHeader(key: String, value: String) = apiInvoker.defaultHeaders += key -> value
-
-
-  def getWord(word: String, useCanonical: String, includeSuggestions: String): Option[WordObject] = {
-    // create path and map variables
-    val path = "/word.json/{word}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escape(word))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(useCanonical) != "null") queryParams += "useCanonical" -> useCanonical.toString
-    if (String.valueOf(includeSuggestions) != "null") queryParams += "includeSuggestions" -> includeSuggestions.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "", classOf[WordObject]).asInstanceOf[WordObject])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getAudio(word: String, useCanonical: String, limit: Integer): Option[List[AudioFile]] = {
-    // create path and map variables
-    val path = "/word.json/{word}/audio".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escape(word))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(useCanonical) != "null") queryParams += "useCanonical" -> useCanonical.toString
-    if (String.valueOf(limit) != "null") queryParams += "limit" -> limit.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "array", classOf[AudioFile]).asInstanceOf[List[AudioFile]])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getDefinitions(word: String, limit: Integer, partOfSpeech: String, includeRelated: String, sourceDictionaries: List[String], useCanonical: String, includeTags: String): Option[List[Definition]] = {
-    // create path and map variables
-    val path = "/word.json/{word}/definitions".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escape(word))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(limit) != "null") queryParams += "limit" -> limit.toString
-    if (String.valueOf(partOfSpeech) != "null") queryParams += "partOfSpeech" -> partOfSpeech.toString
-    if (String.valueOf(includeRelated) != "null") queryParams += "includeRelated" -> includeRelated.toString
-    if (String.valueOf(sourceDictionaries) != "null") queryParams += "sourceDictionaries" -> sourceDictionaries.toString
-    if (String.valueOf(useCanonical) != "null") queryParams += "useCanonical" -> useCanonical.toString
-    if (String.valueOf(includeTags) != "null") queryParams += "includeTags" -> includeTags.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "array", classOf[Definition]).asInstanceOf[List[Definition]])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getEtymologies(word: String, useCanonical: String): Option[List[String]] = {
-    // create path and map variables
-    val path = "/word.json/{word}/etymologies".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escape(word))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(useCanonical) != "null") queryParams += "useCanonical" -> useCanonical.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "array", classOf[String]).asInstanceOf[List[String]])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getExamples(word: String, includeDuplicates: String, useCanonical: String, skip: Integer, limit: Integer) = {
-    // create path and map variables
-    val path = "/word.json/{word}/examples".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escape(word))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(includeDuplicates) != "null") queryParams += "includeDuplicates" -> includeDuplicates.toString
-    if (String.valueOf(useCanonical) != "null") queryParams += "useCanonical" -> useCanonical.toString
-    if (String.valueOf(skip) != "null") queryParams += "skip" -> skip.toString
-    if (String.valueOf(limit) != "null") queryParams += "limit" -> limit.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getWordFrequency(word: String, useCanonical: String, startYear: Integer, endYear: Integer): Option[FrequencySummary] = {
-    // create path and map variables
-    val path = "/word.json/{word}/frequency".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escape(word))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(useCanonical) != "null") queryParams += "useCanonical" -> useCanonical.toString
-    if (String.valueOf(startYear) != "null") queryParams += "startYear" -> startYear.toString
-    if (String.valueOf(endYear) != "null") queryParams += "endYear" -> endYear.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "", classOf[FrequencySummary]).asInstanceOf[FrequencySummary])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getHyphenation(word: String, useCanonical: String, sourceDictionary: String, limit: Integer) = {
-    // create path and map variables
-    val path = "/word.json/{word}/hyphenation".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escape(word))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(useCanonical) != "null") queryParams += "useCanonical" -> useCanonical.toString
-    if (String.valueOf(sourceDictionary) != "null") queryParams += "sourceDictionary" -> sourceDictionary.toString
-    if (String.valueOf(limit) != "null") queryParams += "limit" -> limit.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getPhrases(word: String, limit: Integer, wlmi: Integer, useCanonical: String): Option[List[Bigram]] = {
-    // create path and map variables
-    val path = "/word.json/{word}/phrases".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escape(word))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(limit) != "null") queryParams += "limit" -> limit.toString
-    if (String.valueOf(wlmi) != "null") queryParams += "wlmi" -> wlmi.toString
-    if (String.valueOf(useCanonical) != "null") queryParams += "useCanonical" -> useCanonical.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "array", classOf[Bigram]).asInstanceOf[List[Bigram]])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getTextPronunciations(word: String, useCanonical: String, sourceDictionary: String, typeFormat: String, limit: Integer) = {
-    // create path and map variables
-    val path = "/word.json/{word}/pronunciations".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escape(word))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(useCanonical) != "null") queryParams += "useCanonical" -> useCanonical.toString
-    if (String.valueOf(sourceDictionary) != "null") queryParams += "sourceDictionary" -> sourceDictionary.toString
-    if (String.valueOf(typeFormat) != "null") queryParams += "typeFormat" -> typeFormat.toString
-    if (String.valueOf(limit) != "null") queryParams += "limit" -> limit.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getRelatedWords(word: String, useCanonical: String, relationshipTypes: String, limitPerRelationshipType: Integer) = {
-    // create path and map variables
-    val path = "/word.json/{word}/relatedWords".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escape(word))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(useCanonical) != "null") queryParams += "useCanonical" -> useCanonical.toString
-    if (String.valueOf(relationshipTypes) != "null") queryParams += "relationshipTypes" -> relationshipTypes.toString
-    if (String.valueOf(limitPerRelationshipType) != "null") queryParams += "limitPerRelationshipType" -> limitPerRelationshipType.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getTopExample(word: String, useCanonical: String): Option[Example] = {
-    // create path and map variables
-    val path = "/word.json/{word}/topExample".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "word" + "\\}", apiInvoker.escape(word))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(useCanonical) != "null") queryParams += "useCanonical" -> useCanonical.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "", classOf[Example]).asInstanceOf[Example])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-}
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/api/WordListApi.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/api/WordListApi.scala
deleted file mode 100644
index 35a4e4fed4e..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/api/WordListApi.scala
+++ /dev/null
@@ -1,239 +0,0 @@
-package io.swagger.client.api
-
-import java.io.File
-
-import scala.collection.mutable.HashMap
-
-class WordListApi(val defBasePath: String = "https://api.wordnik.com/v4",
-                  defApiInvoker: ApiInvoker = ApiInvoker) {
-  var basePath = defBasePath
-  var apiInvoker = defApiInvoker
-
-  def addHeader(key: String, value: String) = apiInvoker.defaultHeaders += key -> value
-
-
-  def getWordListByPermalink(permalink: String, auth_token: String): Option[WordList] = {
-    // create path and map variables
-    val path = "/wordList.json/{permalink}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escape(permalink))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-
-
-    headerParams += "auth_token" -> auth_token
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "", classOf[WordList]).asInstanceOf[WordList])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def updateWordList(permalink: String, body: WordList, auth_token: String) = {
-    // create path and map variables
-    val path = "/wordList.json/{permalink}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escape(permalink))
-
-
-
-
-    val contentType = {
-      if (body != null && body.isInstanceOf[File])
-        "multipart/form-data"
-      else "application/json"
-
-
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-
-
-    headerParams += "auth_token" -> auth_token
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "PUT", queryParams.toMap, body, headerParams.toMap, contentType) match {
-        case s: String =>
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def deleteWordList(permalink: String, auth_token: String) = {
-    // create path and map variables
-    val path = "/wordList.json/{permalink}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escape(permalink))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-
-
-    headerParams += "auth_token" -> auth_token
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "DELETE", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def deleteWordsFromWordList(permalink: String, body: List[StringValue], auth_token: String) = {
-    // create path and map variables
-    val path = "/wordList.json/{permalink}/deleteWords".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escape(permalink))
-
-
-
-
-    val contentType = {
-      if (body != null && body.isInstanceOf[File])
-        "multipart/form-data"
-      else "application/json"
-
-
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-
-
-    headerParams += "auth_token" -> auth_token
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, body, headerParams.toMap, contentType) match {
-        case s: String =>
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getWordListWords(permalink: String, sortBy: String, sortOrder: String, skip: Integer, limit: Integer, auth_token: String) = {
-    // create path and map variables
-    val path = "/wordList.json/{permalink}/words".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escape(permalink))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(sortBy) != "null") queryParams += "sortBy" -> sortBy.toString
-    if (String.valueOf(sortOrder) != "null") queryParams += "sortOrder" -> sortOrder.toString
-    if (String.valueOf(skip) != "null") queryParams += "skip" -> skip.toString
-    if (String.valueOf(limit) != "null") queryParams += "limit" -> limit.toString
-
-
-    headerParams += "auth_token" -> auth_token
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def addWordsToWordList(permalink: String, body: List[StringValue], auth_token: String) = {
-    // create path and map variables
-    val path = "/wordList.json/{permalink}/words".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "permalink" + "\\}", apiInvoker.escape(permalink))
-
-
-
-
-    val contentType = {
-      if (body != null && body.isInstanceOf[File])
-        "multipart/form-data"
-      else "application/json"
-
-
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-
-
-    headerParams += "auth_token" -> auth_token
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, body, headerParams.toMap, contentType) match {
-        case s: String =>
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-}
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/api/WordListsApi.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/api/WordListsApi.scala
deleted file mode 100644
index 86ae49f1f59..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/api/WordListsApi.scala
+++ /dev/null
@@ -1,52 +0,0 @@
-package io.swagger.client.api
-
-import java.io.File
-
-import scala.collection.mutable.HashMap
-
-class WordListsApi(val defBasePath: String = "https://api.wordnik.com/v4",
-                   defApiInvoker: ApiInvoker = ApiInvoker) {
-  var basePath = defBasePath
-  var apiInvoker = defApiInvoker
-
-  def addHeader(key: String, value: String) = apiInvoker.defaultHeaders += key -> value
-
-
-  def createWordList(body: WordList, auth_token: String): Option[WordList] = {
-    // create path and map variables
-    val path = "/wordLists.json".replaceAll("\\{format\\}", "json")
-
-
-    val contentType = {
-      if (body != null && body.isInstanceOf[File])
-        "multipart/form-data"
-      else "application/json"
-
-
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-
-
-    headerParams += "auth_token" -> auth_token
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, body, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "", classOf[WordList]).asInstanceOf[WordList])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-}
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/api/WordsApi.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/api/WordsApi.scala
deleted file mode 100644
index 0ce6da2f1de..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/api/WordsApi.scala
+++ /dev/null
@@ -1,228 +0,0 @@
-package io.swagger.client.api
-
-import scala.collection.mutable.HashMap
-
-class WordsApi(val defBasePath: String = "https://api.wordnik.com/v4",
-               defApiInvoker: ApiInvoker = ApiInvoker) {
-  var basePath = defBasePath
-  var apiInvoker = defApiInvoker
-
-  def addHeader(key: String, value: String) = apiInvoker.defaultHeaders += key -> value
-
-
-  def getRandomWord(hasDictionaryDef: String, includePartOfSpeech: String, excludePartOfSpeech: String, minCorpusCount: Integer, maxCorpusCount: Integer, minDictionaryCount: Integer, maxDictionaryCount: Integer, minLength: Integer, maxLength: Integer): Option[WordObject] = {
-    // create path and map variables
-    val path = "/words.json/randomWord".replaceAll("\\{format\\}", "json")
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(hasDictionaryDef) != "null") queryParams += "hasDictionaryDef" -> hasDictionaryDef.toString
-    if (String.valueOf(includePartOfSpeech) != "null") queryParams += "includePartOfSpeech" -> includePartOfSpeech.toString
-    if (String.valueOf(excludePartOfSpeech) != "null") queryParams += "excludePartOfSpeech" -> excludePartOfSpeech.toString
-    if (String.valueOf(minCorpusCount) != "null") queryParams += "minCorpusCount" -> minCorpusCount.toString
-    if (String.valueOf(maxCorpusCount) != "null") queryParams += "maxCorpusCount" -> maxCorpusCount.toString
-    if (String.valueOf(minDictionaryCount) != "null") queryParams += "minDictionaryCount" -> minDictionaryCount.toString
-    if (String.valueOf(maxDictionaryCount) != "null") queryParams += "maxDictionaryCount" -> maxDictionaryCount.toString
-    if (String.valueOf(minLength) != "null") queryParams += "minLength" -> minLength.toString
-    if (String.valueOf(maxLength) != "null") queryParams += "maxLength" -> maxLength.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "", classOf[WordObject]).asInstanceOf[WordObject])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getRandomWords(hasDictionaryDef: String, includePartOfSpeech: String, excludePartOfSpeech: String, minCorpusCount: Integer, maxCorpusCount: Integer, minDictionaryCount: Integer, maxDictionaryCount: Integer, minLength: Integer, maxLength: Integer, sortBy: String, sortOrder: String, limit: Integer) = {
-    // create path and map variables
-    val path = "/words.json/randomWords".replaceAll("\\{format\\}", "json")
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(hasDictionaryDef) != "null") queryParams += "hasDictionaryDef" -> hasDictionaryDef.toString
-    if (String.valueOf(includePartOfSpeech) != "null") queryParams += "includePartOfSpeech" -> includePartOfSpeech.toString
-    if (String.valueOf(excludePartOfSpeech) != "null") queryParams += "excludePartOfSpeech" -> excludePartOfSpeech.toString
-    if (String.valueOf(minCorpusCount) != "null") queryParams += "minCorpusCount" -> minCorpusCount.toString
-    if (String.valueOf(maxCorpusCount) != "null") queryParams += "maxCorpusCount" -> maxCorpusCount.toString
-    if (String.valueOf(minDictionaryCount) != "null") queryParams += "minDictionaryCount" -> minDictionaryCount.toString
-    if (String.valueOf(maxDictionaryCount) != "null") queryParams += "maxDictionaryCount" -> maxDictionaryCount.toString
-    if (String.valueOf(minLength) != "null") queryParams += "minLength" -> minLength.toString
-    if (String.valueOf(maxLength) != "null") queryParams += "maxLength" -> maxLength.toString
-    if (String.valueOf(sortBy) != "null") queryParams += "sortBy" -> sortBy.toString
-    if (String.valueOf(sortOrder) != "null") queryParams += "sortOrder" -> sortOrder.toString
-    if (String.valueOf(limit) != "null") queryParams += "limit" -> limit.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def reverseDictionary(query: String, findSenseForWord: String, includeSourceDictionaries: String, excludeSourceDictionaries: String, includePartOfSpeech: String, excludePartOfSpeech: String, minCorpusCount: Integer, maxCorpusCount: Integer, minLength: Integer, maxLength: Integer, expandTerms: String, includeTags: String, sortBy: String, sortOrder: String, skip: String, limit: Integer): Option[DefinitionSearchResults] = {
-    // create path and map variables
-    val path = "/words.json/reverseDictionary".replaceAll("\\{format\\}", "json")
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(query) != "null") queryParams += "query" -> query.toString
-    if (String.valueOf(findSenseForWord) != "null") queryParams += "findSenseForWord" -> findSenseForWord.toString
-    if (String.valueOf(includeSourceDictionaries) != "null") queryParams += "includeSourceDictionaries" -> includeSourceDictionaries.toString
-    if (String.valueOf(excludeSourceDictionaries) != "null") queryParams += "excludeSourceDictionaries" -> excludeSourceDictionaries.toString
-    if (String.valueOf(includePartOfSpeech) != "null") queryParams += "includePartOfSpeech" -> includePartOfSpeech.toString
-    if (String.valueOf(excludePartOfSpeech) != "null") queryParams += "excludePartOfSpeech" -> excludePartOfSpeech.toString
-    if (String.valueOf(minCorpusCount) != "null") queryParams += "minCorpusCount" -> minCorpusCount.toString
-    if (String.valueOf(maxCorpusCount) != "null") queryParams += "maxCorpusCount" -> maxCorpusCount.toString
-    if (String.valueOf(minLength) != "null") queryParams += "minLength" -> minLength.toString
-    if (String.valueOf(maxLength) != "null") queryParams += "maxLength" -> maxLength.toString
-    if (String.valueOf(expandTerms) != "null") queryParams += "expandTerms" -> expandTerms.toString
-    if (String.valueOf(includeTags) != "null") queryParams += "includeTags" -> includeTags.toString
-    if (String.valueOf(sortBy) != "null") queryParams += "sortBy" -> sortBy.toString
-    if (String.valueOf(sortOrder) != "null") queryParams += "sortOrder" -> sortOrder.toString
-    if (String.valueOf(skip) != "null") queryParams += "skip" -> skip.toString
-    if (String.valueOf(limit) != "null") queryParams += "limit" -> limit.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "", classOf[DefinitionSearchResults]).asInstanceOf[DefinitionSearchResults])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def searchWords(query: String, caseSensitive: String, includePartOfSpeech: String, excludePartOfSpeech: String, minCorpusCount: Integer, maxCorpusCount: Integer, minDictionaryCount: Integer, maxDictionaryCount: Integer, minLength: Integer, maxLength: Integer, skip: Integer, limit: Integer): Option[WordSearchResults] = {
-    // create path and map variables
-    val path = "/words.json/search/{query}".replaceAll("\\{format\\}", "json").replaceAll("\\{" + "query" + "\\}", apiInvoker.escape(query))
-
-
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(caseSensitive) != "null") queryParams += "caseSensitive" -> caseSensitive.toString
-    if (String.valueOf(includePartOfSpeech) != "null") queryParams += "includePartOfSpeech" -> includePartOfSpeech.toString
-    if (String.valueOf(excludePartOfSpeech) != "null") queryParams += "excludePartOfSpeech" -> excludePartOfSpeech.toString
-    if (String.valueOf(minCorpusCount) != "null") queryParams += "minCorpusCount" -> minCorpusCount.toString
-    if (String.valueOf(maxCorpusCount) != "null") queryParams += "maxCorpusCount" -> maxCorpusCount.toString
-    if (String.valueOf(minDictionaryCount) != "null") queryParams += "minDictionaryCount" -> minDictionaryCount.toString
-    if (String.valueOf(maxDictionaryCount) != "null") queryParams += "maxDictionaryCount" -> maxDictionaryCount.toString
-    if (String.valueOf(minLength) != "null") queryParams += "minLength" -> minLength.toString
-    if (String.valueOf(maxLength) != "null") queryParams += "maxLength" -> maxLength.toString
-    if (String.valueOf(skip) != "null") queryParams += "skip" -> skip.toString
-    if (String.valueOf(limit) != "null") queryParams += "limit" -> limit.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "", classOf[WordSearchResults]).asInstanceOf[WordSearchResults])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-  def getWordOfTheDay(date: String): Option[WordOfTheDay] = {
-    // create path and map variables
-    val path = "/words.json/wordOfTheDay".replaceAll("\\{format\\}", "json")
-
-
-    val contentType = {
-
-      "application/json"
-    }
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-
-
-
-    if (String.valueOf(date) != "null") queryParams += "date" -> date.toString
-
-
-
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, None, headerParams.toMap, contentType) match {
-        case s: String =>
-          Some(ApiInvoker.deserialize(s, "", classOf[WordOfTheDay]).asInstanceOf[WordOfTheDay])
-
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-
-}
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/ApiTokenStatus.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/ApiTokenStatus.scala
deleted file mode 100644
index 2d84f206c11..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/ApiTokenStatus.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.swagger.client.model
-
-
-case class ApiTokenStatus(
-                           valid: Boolean,
-                           token: String,
-                           resetsInMillis: Long,
-                           remainingCalls: Long,
-                           expiresInMillis: Long,
-                           totalRequests: Long)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/AudioFile.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/AudioFile.scala
deleted file mode 100644
index 85987918396..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/AudioFile.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.swagger.client.model
-
-
-case class AudioFile(
-                      attributionUrl: String,
-                      commentCount: Integer,
-                      voteCount: Integer,
-                      fileUrl: String,
-                      audioType: String,
-                      id: Long,
-                      duration: Double,
-                      attributionText: String,
-                      createdBy: String,
-                      description: String,
-                      createdAt: DateTime,
-                      voteWeightedAverage: Float,
-                      voteAverage: Float,
-                      word: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/AudioType.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/AudioType.scala
deleted file mode 100644
index dde065afc2c..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/AudioType.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.swagger.client.model
-
-
-case class AudioType(
-                      id: Integer,
-                      name: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/AuthenticationToken.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/AuthenticationToken.scala
deleted file mode 100644
index 932eadd7a5a..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/AuthenticationToken.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.swagger.client.model
-
-
-case class AuthenticationToken(
-                                token: String,
-                                userId: Long,
-                                userSignature: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Bigram.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Bigram.scala
deleted file mode 100644
index 1c20e0ef830..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Bigram.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-package io.swagger.client.model
-
-
-case class Bigram(
-                   count: Long,
-                   gram2: String,
-                   gram1: String,
-                   wlmi: Double,
-                   mi: Double)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Category.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Category.scala
deleted file mode 100644
index dcc19f58d75..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Category.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.swagger.client.model
-
-
-case class Category(
-                     id: Long,
-                     name: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Citation.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Citation.scala
deleted file mode 100644
index 8744747c910..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Citation.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.swagger.client.model
-
-
-case class Citation(
-                     cite: String,
-                     source: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/ContentProvider.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/ContentProvider.scala
deleted file mode 100644
index 2c85443804c..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/ContentProvider.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.swagger.client.model
-
-
-case class ContentProvider(
-                            id: Integer,
-                            name: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Definition.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Definition.scala
deleted file mode 100644
index 6d86caea535..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Definition.scala
+++ /dev/null
@@ -1,21 +0,0 @@
-package io.swagger.client.model
-
-
-case class Definition(
-                       extendedText: String,
-                       text: String,
-                       sourceDictionary: String,
-                       citations: List[Citation],
-                       labels: List[Label],
-                       score: Float,
-                       exampleUses: List[ExampleUsage],
-                       attributionUrl: String,
-                       seqString: String,
-                       attributionText: String,
-                       relatedWords: List[Related],
-                       sequence: String,
-                       word: String,
-                       notes: List[Note],
-                       textProns: List[TextPron],
-                       partOfSpeech: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/DefinitionSearchResults.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/DefinitionSearchResults.scala
deleted file mode 100644
index c3be55de820..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/DefinitionSearchResults.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.swagger.client.model
-
-
-case class DefinitionSearchResults(
-                                    results: List[Definition],
-                                    totalResults: Integer)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Example.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Example.scala
deleted file mode 100644
index 90e88f590eb..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Example.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-package io.swagger.client.model
-
-
-case class Example(
-                    id: Long,
-                    exampleId: Long,
-                    title: String,
-                    text: String,
-                    score: ScoredWord,
-                    sentence: Sentence,
-                    word: String,
-                    provider: ContentProvider,
-                    year: Integer,
-                    rating: Float,
-                    documentId: Long,
-                    url: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/ExampleSearchResults.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/ExampleSearchResults.scala
deleted file mode 100644
index 623d5d461c6..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/ExampleSearchResults.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.swagger.client.model
-
-
-case class ExampleSearchResults(
-                                 facets: List[Facet],
-                                 examples: List[Example])
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/ExampleUsage.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/ExampleUsage.scala
deleted file mode 100644
index 084c0579564..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/ExampleUsage.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-package io.swagger.client.model
-
-
-case class ExampleUsage(
-                         text: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Facet.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Facet.scala
deleted file mode 100644
index 72290c88a66..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Facet.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.swagger.client.model
-
-
-case class Facet(
-                  facetValues: List[FacetValue],
-                  name: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/FacetValue.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/FacetValue.scala
deleted file mode 100644
index bed5f35418b..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/FacetValue.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.swagger.client.model
-
-
-case class FacetValue(
-                       count: Long,
-                       value: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Frequency.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Frequency.scala
deleted file mode 100644
index 840ae9db0e8..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Frequency.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.swagger.client.model
-
-
-case class Frequency(
-                      count: Long,
-                      year: Integer)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/FrequencySummary.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/FrequencySummary.scala
deleted file mode 100644
index d30d4c8f421..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/FrequencySummary.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-package io.swagger.client.model
-
-
-case class FrequencySummary(
-                             unknownYearCount: Integer,
-                             totalCount: Long,
-                             frequencyString: String,
-                             word: String,
-                             frequency: List[Frequency])
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Label.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Label.scala
deleted file mode 100644
index d1d03cac5ea..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Label.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.swagger.client.model
-
-
-case class Label(
-                  text: String,
-                  _type: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Note.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Note.scala
deleted file mode 100644
index be6e87f6d4d..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Note.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.swagger.client.model
-
-
-case class Note(
-                 noteType: String,
-                 appliesTo: List[String],
-                 value: String,
-                 pos: Integer)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/PartOfSpeech.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/PartOfSpeech.scala
deleted file mode 100644
index fc12361cf56..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/PartOfSpeech.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.swagger.client.model
-
-
-case class PartOfSpeech(
-                         roots: List[Root],
-                         storageAbbr: List[String],
-                         allCategories: List[Category])
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Related.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Related.scala
deleted file mode 100644
index ab43c6181c9..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Related.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.swagger.client.model
-
-
-case class Related(
-                    label1: String,
-                    relationshipType: String,
-                    label2: String,
-                    label3: String,
-                    words: List[String],
-                    gram: String,
-                    label4: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Root.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Root.scala
deleted file mode 100644
index 913efb0c884..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Root.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.swagger.client.model
-
-
-case class Root(
-                 id: Long,
-                 name: String,
-                 categories: List[Category])
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/ScoredWord.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/ScoredWord.scala
deleted file mode 100644
index 47e0d17e437..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/ScoredWord.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.swagger.client.model
-
-
-case class ScoredWord(
-                       position: Integer,
-                       id: Long,
-                       docTermCount: Integer,
-                       lemma: String,
-                       wordType: String,
-                       score: Float,
-                       sentenceId: Long,
-                       word: String,
-                       stopword: Boolean,
-                       baseWordScore: Double,
-                       partOfSpeech: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Sentence.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Sentence.scala
deleted file mode 100644
index 2fefa9103db..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Sentence.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.swagger.client.model
-
-
-case class Sentence(
-                     hasScoredWords: Boolean,
-                     id: Long,
-                     scoredWords: List[ScoredWord],
-                     display: String,
-                     rating: Integer,
-                     documentMetadataId: Long)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/SimpleDefinition.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/SimpleDefinition.scala
deleted file mode 100644
index c2c45286a10..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/SimpleDefinition.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.swagger.client.model
-
-
-case class SimpleDefinition(
-                             text: String,
-                             source: String,
-                             note: String,
-                             partOfSpeech: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/SimpleExample.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/SimpleExample.scala
deleted file mode 100644
index 040e68f1d6a..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/SimpleExample.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.swagger.client.model
-
-
-case class SimpleExample(
-                          id: Long,
-                          title: String,
-                          text: String,
-                          url: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/StringValue.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/StringValue.scala
deleted file mode 100644
index 87e22226277..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/StringValue.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-package io.swagger.client.model
-
-
-case class StringValue(
-                        word: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Syllable.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Syllable.scala
deleted file mode 100644
index f0f81c21108..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/Syllable.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.swagger.client.model
-
-
-case class Syllable(
-                     text: String,
-                     seq: Integer,
-                     _type: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/TextPron.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/TextPron.scala
deleted file mode 100644
index 1a12817f2d2..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/TextPron.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.swagger.client.model
-
-
-case class TextPron(
-                     raw: String,
-                     seq: Integer,
-                     rawType: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/User.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/User.scala
deleted file mode 100644
index 8680a848935..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/User.scala
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.swagger.client.model
-
-
-case class User(
-                 id: Long,
-                 username: String,
-                 email: String,
-                 status: Integer,
-                 faceBookId: String,
-                 userName: String,
-                 displayName: String,
-                 password: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/WordList.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/WordList.scala
deleted file mode 100644
index 0f354b54c0b..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/WordList.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.swagger.client.model
-
-
-case class WordList(
-                     id: Long,
-                     permalink: String,
-                     name: String,
-                     createdAt: DateTime,
-                     updatedAt: DateTime,
-                     lastActivityAt: DateTime,
-                     username: String,
-                     userId: Long,
-                     description: String,
-                     numberWordsInList: Long,
-                     _type: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/WordListWord.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/WordListWord.scala
deleted file mode 100644
index b556ce119b5..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/WordListWord.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.swagger.client.model
-
-
-case class WordListWord(
-                         id: Long,
-                         word: String,
-                         username: String,
-                         userId: Long,
-                         createdAt: DateTime,
-                         numberCommentsOnWord: Long,
-                         numberLists: Long)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/WordObject.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/WordObject.scala
deleted file mode 100644
index e1cd5380895..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/WordObject.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.swagger.client.model
-
-
-case class WordObject(
-                       id: Long,
-                       word: String,
-                       originalWord: String,
-                       suggestions: List[String],
-                       canonicalForm: String,
-                       vulgar: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/WordOfTheDay.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/WordOfTheDay.scala
deleted file mode 100644
index 710564364c8..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/WordOfTheDay.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-package io.swagger.client.model
-
-
-case class WordOfTheDay(
-                         id: Long,
-                         parentId: String,
-                         category: String,
-                         createdBy: String,
-                         createdAt: DateTime,
-                         contentProvider: ContentProvider,
-                         htmlExtra: String,
-                         word: String,
-                         definitions: List[SimpleDefinition],
-                         examples: List[SimpleExample],
-                         note: String,
-                         publishDate: DateTime)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/WordSearchResult.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/WordSearchResult.scala
deleted file mode 100644
index bd2dfd67624..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/WordSearchResult.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.swagger.client.model
-
-
-case class WordSearchResult(
-                             count: Long,
-                             lexicality: Double,
-                             word: String)
-  
diff --git a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/WordSearchResults.scala b/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/WordSearchResults.scala
deleted file mode 100644
index b5394cb2664..00000000000
--- a/samples/client/wordnik/scala/src/main/scala/io/swagger/client/model/WordSearchResults.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.swagger.client.model
-
-
-case class WordSearchResults(
-                              searchResults: List[WordSearchResult],
-                              totalResults: Integer)
-  
diff --git a/samples/server/petstore/aspnet5/.gitignore b/samples/server/petstore/aspnet5/.gitignore
new file mode 100644
index 00000000000..e4349f244a1
--- /dev/null
+++ b/samples/server/petstore/aspnet5/.gitignore
@@ -0,0 +1 @@
+artifacts/
\ No newline at end of file
diff --git a/samples/server/petstore/aspnet5/build.sh b/samples/server/petstore/aspnet5/build.sh
new file mode 100755
index 00000000000..5d6402baee7
--- /dev/null
+++ b/samples/server/petstore/aspnet5/build.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+if ! type dnvm > /dev/null 2>&1; then
+    source /usr/local/lib/dnx/bin/dnvm.sh
+fi
+
+if ! type dnu > /dev/null 2>&1 || [ -z "$SKIP_DNX_INSTALL" ]; then
+    dnvm install latest -runtime coreclr -alias default
+    dnvm install default -runtime mono -alias default
+else
+    dnvm use default -runtime mono
+fi
+
+dnu restore src/IO.Swagger/ && \
+    dnu build src/IO.Swagger/ && \
+    dnu pack src/IO.Swagger/ --out artifacts && \
+    echo "Now, run the following to start the project: dnx --project src/IO.Swagger/project.json web"
\ No newline at end of file
diff --git a/samples/server/petstore/aspnet5/global.json b/samples/server/petstore/aspnet5/global.json
new file mode 100644
index 00000000000..4a6d1feac95
--- /dev/null
+++ b/samples/server/petstore/aspnet5/global.json
@@ -0,0 +1,8 @@
+{
+  "projects": [ "src", "." ],
+  "sdk": {
+    "version": "1.0.0-rc1-final",
+    "runtime": "coreclr",
+    "architecture": "x64"
+  }
+}
\ No newline at end of file
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/.gitignore b/samples/server/petstore/aspnet5/src/IO.Swagger/.gitignore
new file mode 100644
index 00000000000..cd9b840e549
--- /dev/null
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/.gitignore
@@ -0,0 +1,208 @@
+PID
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+build/
+bld/
+[Bb]in/
+[Oo]bj/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# DNX
+project.lock.json
+artifacts/
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+
+# Windows Azure Build Output
+csx/
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.pfx
+*.publishsettings
+node_modules/
+bower_components/
+orleans.codegen.cs
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/PetApi.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/PetApi.cs
new file mode 100644
index 00000000000..8eb740a1e4e
--- /dev/null
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/PetApi.cs
@@ -0,0 +1,212 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc;
+using Newtonsoft.Json;
+using Swashbuckle.SwaggerGen.Annotations;
+using IO.Swagger.Models;
+
+namespace IO.Swagger.Controllers
+{ 
+    /// <summary>
+    /// 
+    /// </summary>
+    public class PetApiController : Controller
+    { 
+
+        /// <summary>
+        /// Update an existing pet
+        /// </summary>
+        /// <remarks></remarks>
+        /// <param name="body">Pet object that needs to be added to the store</param>
+        /// <response code="400">Invalid ID supplied</response>
+        /// <response code="404">Pet not found</response>
+        /// <response code="405">Validation exception</response>
+        [HttpPut]
+        [Route("/pet")]
+        [SwaggerOperation("UpdatePet")]
+        public void UpdatePet([FromBody]Pet body)
+        { 
+            throw new NotImplementedException();
+        }
+
+
+        /// <summary>
+        /// Add a new pet to the store
+        /// </summary>
+        /// <remarks></remarks>
+        /// <param name="body">Pet object that needs to be added to the store</param>
+        /// <response code="405">Invalid input</response>
+        [HttpPost]
+        [Route("/pet")]
+        [SwaggerOperation("AddPet")]
+        public void AddPet([FromBody]Pet body)
+        { 
+            throw new NotImplementedException();
+        }
+
+
+        /// <summary>
+        /// Finds Pets by status
+        /// </summary>
+        /// <remarks>Multiple status values can be provided with comma seperated strings</remarks>
+        /// <param name="status">Status values that need to be considered for filter</param>
+        /// <response code="200">successful operation</response>
+        /// <response code="400">Invalid status value</response>
+        [HttpGet]
+        [Route("/pet/findByStatus")]
+        [SwaggerOperation("FindPetsByStatus")]
+        [SwaggerResponse(200, type: typeof(List<Pet>))]
+        public IActionResult FindPetsByStatus([FromQuery]List<string> status)
+        { 
+            string exampleJson = null;
+            
+            var example = exampleJson != null
+            ? JsonConvert.DeserializeObject<List<Pet>>(exampleJson)
+            : default(List<Pet>);
+            
+            return new ObjectResult(example);
+        }
+
+
+        /// <summary>
+        /// Finds Pets by tags
+        /// </summary>
+        /// <remarks>Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.</remarks>
+        /// <param name="tags">Tags to filter by</param>
+        /// <response code="200">successful operation</response>
+        /// <response code="400">Invalid tag value</response>
+        [HttpGet]
+        [Route("/pet/findByTags")]
+        [SwaggerOperation("FindPetsByTags")]
+        [SwaggerResponse(200, type: typeof(List<Pet>))]
+        public IActionResult FindPetsByTags([FromQuery]List<string> tags)
+        { 
+            string exampleJson = null;
+            
+            var example = exampleJson != null
+            ? JsonConvert.DeserializeObject<List<Pet>>(exampleJson)
+            : default(List<Pet>);
+            
+            return new ObjectResult(example);
+        }
+
+
+        /// <summary>
+        /// Find pet by ID
+        /// </summary>
+        /// <remarks>Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions</remarks>
+        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <response code="200">successful operation</response>
+        /// <response code="400">Invalid ID supplied</response>
+        /// <response code="404">Pet not found</response>
+        [HttpGet]
+        [Route("/pet/{petId}")]
+        [SwaggerOperation("GetPetById")]
+        [SwaggerResponse(200, type: typeof(Pet))]
+        public IActionResult GetPetById([FromRoute]long? petId)
+        { 
+            string exampleJson = null;
+            
+            var example = exampleJson != null
+            ? JsonConvert.DeserializeObject<Pet>(exampleJson)
+            : default(Pet);
+            
+            return new ObjectResult(example);
+        }
+
+
+        /// <summary>
+        /// Updates a pet in the store with form data
+        /// </summary>
+        /// <remarks></remarks>
+        /// <param name="petId">ID of pet that needs to be updated</param>
+        /// <param name="name">Updated name of the pet</param>
+        /// <param name="status">Updated status of the pet</param>
+        /// <response code="405">Invalid input</response>
+        [HttpPost]
+        [Route("/pet/{petId}")]
+        [SwaggerOperation("UpdatePetWithForm")]
+        public void UpdatePetWithForm([FromRoute]string petId, [FromForm]string name, [FromForm]string status)
+        { 
+            throw new NotImplementedException();
+        }
+
+
+        /// <summary>
+        /// Deletes a pet
+        /// </summary>
+        /// <remarks></remarks>
+        /// <param name="petId">Pet id to delete</param>
+        /// <param name="apiKey"></param>
+        /// <response code="400">Invalid pet value</response>
+        [HttpDelete]
+        [Route("/pet/{petId}")]
+        [SwaggerOperation("DeletePet")]
+        public void DeletePet([FromRoute]long? petId, [FromHeader]string apiKey)
+        { 
+            throw new NotImplementedException();
+        }
+
+
+        /// <summary>
+        /// uploads an image
+        /// </summary>
+        /// <remarks></remarks>
+        /// <param name="petId">ID of pet to update</param>
+        /// <param name="additionalMetadata">Additional data to pass to server</param>
+        /// <param name="file">file to upload</param>
+        /// <response code="0">successful operation</response>
+        [HttpPost]
+        [Route("/pet/{petId}/uploadImage")]
+        [SwaggerOperation("UploadFile")]
+        public void UploadFile([FromRoute]long? petId, [FromForm]string additionalMetadata, [FromForm]Stream file)
+        { 
+            throw new NotImplementedException();
+        }
+
+
+        /// <summary>
+        /// Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+        /// </summary>
+        /// <remarks>Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions</remarks>
+        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <response code="200">successful operation</response>
+        /// <response code="400">Invalid ID supplied</response>
+        /// <response code="404">Pet not found</response>
+        [HttpGet]
+        [Route("/pet/{petId}/testing_byte_array=true")]
+        [SwaggerOperation("GetPetByIdWithByteArray")]
+        [SwaggerResponse(200, type: typeof(byte[]))]
+        public IActionResult GetPetByIdWithByteArray([FromRoute]long? petId)
+        { 
+            string exampleJson = null;
+            
+            var example = exampleJson != null
+            ? JsonConvert.DeserializeObject<byte[]>(exampleJson)
+            : default(byte[]);
+            
+            return new ObjectResult(example);
+        }
+
+
+        /// <summary>
+        /// Fake endpoint to test byte array in body parameter for adding a new pet to the store
+        /// </summary>
+        /// <remarks></remarks>
+        /// <param name="body">Pet object in the form of byte array</param>
+        /// <response code="405">Invalid input</response>
+        [HttpPost]
+        [Route("/pet/testing_byte_array=true")]
+        [SwaggerOperation("AddPetUsingByteArray")]
+        public void AddPetUsingByteArray([FromBody]byte[] body)
+        { 
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/StoreApi.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/StoreApi.cs
new file mode 100644
index 00000000000..347c46abd69
--- /dev/null
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/StoreApi.cs
@@ -0,0 +1,105 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc;
+using Newtonsoft.Json;
+using Swashbuckle.SwaggerGen.Annotations;
+using IO.Swagger.Models;
+
+namespace IO.Swagger.Controllers
+{ 
+    /// <summary>
+    /// 
+    /// </summary>
+    public class StoreApiController : Controller
+    { 
+
+        /// <summary>
+        /// Returns pet inventories by status
+        /// </summary>
+        /// <remarks>Returns a map of status codes to quantities</remarks>
+        /// <response code="200">successful operation</response>
+        [HttpGet]
+        [Route("/store/inventory")]
+        [SwaggerOperation("GetInventory")]
+        [SwaggerResponse(200, type: typeof(Dictionary<string, int?>))]
+        public IActionResult GetInventory()
+        { 
+            string exampleJson = null;
+            
+            var example = exampleJson != null
+            ? JsonConvert.DeserializeObject<Dictionary<string, int?>>(exampleJson)
+            : default(Dictionary<string, int?>);
+            
+            return new ObjectResult(example);
+        }
+
+
+        /// <summary>
+        /// Place an order for a pet
+        /// </summary>
+        /// <remarks></remarks>
+        /// <param name="body">order placed for purchasing the pet</param>
+        /// <response code="200">successful operation</response>
+        /// <response code="400">Invalid Order</response>
+        [HttpPost]
+        [Route("/store/order")]
+        [SwaggerOperation("PlaceOrder")]
+        [SwaggerResponse(200, type: typeof(Order))]
+        public IActionResult PlaceOrder([FromBody]Order body)
+        { 
+            string exampleJson = null;
+            
+            var example = exampleJson != null
+            ? JsonConvert.DeserializeObject<Order>(exampleJson)
+            : default(Order);
+            
+            return new ObjectResult(example);
+        }
+
+
+        /// <summary>
+        /// Find purchase order by ID
+        /// </summary>
+        /// <remarks>For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions</remarks>
+        /// <param name="orderId">ID of pet that needs to be fetched</param>
+        /// <response code="200">successful operation</response>
+        /// <response code="400">Invalid ID supplied</response>
+        /// <response code="404">Order not found</response>
+        [HttpGet]
+        [Route("/store/order/{orderId}")]
+        [SwaggerOperation("GetOrderById")]
+        [SwaggerResponse(200, type: typeof(Order))]
+        public IActionResult GetOrderById([FromRoute]string orderId)
+        { 
+            string exampleJson = null;
+            
+            var example = exampleJson != null
+            ? JsonConvert.DeserializeObject<Order>(exampleJson)
+            : default(Order);
+            
+            return new ObjectResult(example);
+        }
+
+
+        /// <summary>
+        /// Delete purchase order by ID
+        /// </summary>
+        /// <remarks>For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors</remarks>
+        /// <param name="orderId">ID of the order that needs to be deleted</param>
+        /// <response code="400">Invalid ID supplied</response>
+        /// <response code="404">Order not found</response>
+        [HttpDelete]
+        [Route("/store/order/{orderId}")]
+        [SwaggerOperation("DeleteOrder")]
+        public void DeleteOrder([FromRoute]string orderId)
+        { 
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/UserApi.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/UserApi.cs
new file mode 100644
index 00000000000..180dc4aa00a
--- /dev/null
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/UserApi.cs
@@ -0,0 +1,161 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc;
+using Newtonsoft.Json;
+using Swashbuckle.SwaggerGen.Annotations;
+using IO.Swagger.Models;
+
+namespace IO.Swagger.Controllers
+{ 
+    /// <summary>
+    /// 
+    /// </summary>
+    public class UserApiController : Controller
+    { 
+
+        /// <summary>
+        /// Create user
+        /// </summary>
+        /// <remarks>This can only be done by the logged in user.</remarks>
+        /// <param name="body">Created user object</param>
+        /// <response code="0">successful operation</response>
+        [HttpPost]
+        [Route("/user")]
+        [SwaggerOperation("CreateUser")]
+        public void CreateUser([FromBody]User body)
+        { 
+            throw new NotImplementedException();
+        }
+
+
+        /// <summary>
+        /// Creates list of users with given input array
+        /// </summary>
+        /// <remarks></remarks>
+        /// <param name="body">List of user object</param>
+        /// <response code="0">successful operation</response>
+        [HttpPost]
+        [Route("/user/createWithArray")]
+        [SwaggerOperation("CreateUsersWithArrayInput")]
+        public void CreateUsersWithArrayInput([FromBody]List<User> body)
+        { 
+            throw new NotImplementedException();
+        }
+
+
+        /// <summary>
+        /// Creates list of users with given input array
+        /// </summary>
+        /// <remarks></remarks>
+        /// <param name="body">List of user object</param>
+        /// <response code="0">successful operation</response>
+        [HttpPost]
+        [Route("/user/createWithList")]
+        [SwaggerOperation("CreateUsersWithListInput")]
+        public void CreateUsersWithListInput([FromBody]List<User> body)
+        { 
+            throw new NotImplementedException();
+        }
+
+
+        /// <summary>
+        /// Logs user into the system
+        /// </summary>
+        /// <remarks></remarks>
+        /// <param name="username">The user name for login</param>
+        /// <param name="password">The password for login in clear text</param>
+        /// <response code="200">successful operation</response>
+        /// <response code="400">Invalid username/password supplied</response>
+        [HttpGet]
+        [Route("/user/login")]
+        [SwaggerOperation("LoginUser")]
+        [SwaggerResponse(200, type: typeof(string))]
+        public IActionResult LoginUser([FromQuery]string username, [FromQuery]string password)
+        { 
+            string exampleJson = null;
+            
+            var example = exampleJson != null
+            ? JsonConvert.DeserializeObject<string>(exampleJson)
+            : default(string);
+            
+            return new ObjectResult(example);
+        }
+
+
+        /// <summary>
+        /// Logs out current logged in user session
+        /// </summary>
+        /// <remarks></remarks>
+        /// <response code="0">successful operation</response>
+        [HttpGet]
+        [Route("/user/logout")]
+        [SwaggerOperation("LogoutUser")]
+        public void LogoutUser()
+        { 
+            throw new NotImplementedException();
+        }
+
+
+        /// <summary>
+        /// Get user by user name
+        /// </summary>
+        /// <remarks></remarks>
+        /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
+        /// <response code="200">successful operation</response>
+        /// <response code="400">Invalid username supplied</response>
+        /// <response code="404">User not found</response>
+        [HttpGet]
+        [Route("/user/{username}")]
+        [SwaggerOperation("GetUserByName")]
+        [SwaggerResponse(200, type: typeof(User))]
+        public IActionResult GetUserByName([FromRoute]string username)
+        { 
+            string exampleJson = null;
+            
+            var example = exampleJson != null
+            ? JsonConvert.DeserializeObject<User>(exampleJson)
+            : default(User);
+            
+            return new ObjectResult(example);
+        }
+
+
+        /// <summary>
+        /// Updated user
+        /// </summary>
+        /// <remarks>This can only be done by the logged in user.</remarks>
+        /// <param name="username">name that need to be deleted</param>
+        /// <param name="body">Updated user object</param>
+        /// <response code="400">Invalid user supplied</response>
+        /// <response code="404">User not found</response>
+        [HttpPut]
+        [Route("/user/{username}")]
+        [SwaggerOperation("UpdateUser")]
+        public void UpdateUser([FromRoute]string username, [FromBody]User body)
+        { 
+            throw new NotImplementedException();
+        }
+
+
+        /// <summary>
+        /// Delete user
+        /// </summary>
+        /// <remarks>This can only be done by the logged in user.</remarks>
+        /// <param name="username">The name that needs to be deleted</param>
+        /// <response code="400">Invalid username supplied</response>
+        /// <response code="404">User not found</response>
+        [HttpDelete]
+        [Route("/user/{username}")]
+        [SwaggerOperation("DeleteUser")]
+        public void DeleteUser([FromRoute]string username)
+        { 
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Dockerfile b/samples/server/petstore/aspnet5/src/IO.Swagger/Dockerfile
new file mode 100644
index 00000000000..af879b80ab0
--- /dev/null
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Dockerfile
@@ -0,0 +1,10 @@
+FROM microsoft/aspnet:1.0.0-rc1-final
+
+RUN mkdir -p /app/IO.Swagger
+COPY . /app/IO.Swagger
+WORKDIR /app/IO.Swagger
+RUN ["dnu", "restore"]
+RUN ["dnu", "pack", "--out", "artifacts"]
+
+EXPOSE 5000/tcp
+ENTRYPOINT ["dnx", "-p", "project.json", "web"]
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Category.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Category.cs
new file mode 100644
index 00000000000..1bdccbdc4e1
--- /dev/null
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Category.cs
@@ -0,0 +1,142 @@
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+
+namespace IO.Swagger.Models
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public partial class Category :  IEquatable<Category>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Category" /> class.
+        /// </summary>
+        /// <param name="Id">Id.</param>
+        /// <param name="Name">Name.</param>
+        public Category(long? Id = null, string Name = null)
+        {
+            this.Id = Id;
+            this.Name = Name;
+            
+        }
+
+        
+        /// <summary>
+        /// Gets or Sets Id
+        /// </summary>
+        public long? Id { get; set; }
+
+        
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        public string Name { get; set; }
+
+        
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class Category {\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="obj">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != GetType()) return false;
+            return Equals((Category)obj);
+        }
+
+        /// <summary>
+        /// Returns true if Category instances are equal
+        /// </summary>
+        /// <param name="other">Instance of Category to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(Category other)
+        {
+
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return 
+                (
+                    this.Id == other.Id ||
+                    this.Id != null &&
+                    this.Id.Equals(other.Id)
+                ) && 
+                (
+                    this.Name == other.Name ||
+                    this.Name != null &&
+                    this.Name.Equals(other.Name)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            // credit: http://stackoverflow.com/a/263416/677735
+            unchecked // Overflow is fine, just wrap
+            {
+                int hash = 41;
+                // Suitable nullity checks etc, of course :)
+                
+                    if (this.Id != null)
+                    hash = hash * 59 + this.Id.GetHashCode();
+                
+                    if (this.Name != null)
+                    hash = hash * 59 + this.Name.GetHashCode();
+                
+                return hash;
+            }
+        }
+
+        #region Operators
+
+        public static bool operator ==(Category left, Category right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(Category left, Category right)
+        {
+            return !Equals(left, right);
+        }
+
+        #endregion Operators
+
+    }
+}
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Order.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Order.cs
new file mode 100644
index 00000000000..27252258328
--- /dev/null
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Order.cs
@@ -0,0 +1,211 @@
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+
+namespace IO.Swagger.Models
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public partial class Order :  IEquatable<Order>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Order" /> class.
+        /// </summary>
+        /// <param name="Id">Id.</param>
+        /// <param name="PetId">PetId.</param>
+        /// <param name="Quantity">Quantity.</param>
+        /// <param name="ShipDate">ShipDate.</param>
+        /// <param name="Status">Order Status.</param>
+        /// <param name="Complete">Complete.</param>
+        public Order(long? Id = null, long? PetId = null, int? Quantity = null, DateTime? ShipDate = null, string Status = null, bool? Complete = null)
+        {
+            this.Id = Id;
+            this.PetId = PetId;
+            this.Quantity = Quantity;
+            this.ShipDate = ShipDate;
+            this.Status = Status;
+            this.Complete = Complete;
+            
+        }
+
+        
+        /// <summary>
+        /// Gets or Sets Id
+        /// </summary>
+        public long? Id { get; set; }
+
+        
+        /// <summary>
+        /// Gets or Sets PetId
+        /// </summary>
+        public long? PetId { get; set; }
+
+        
+        /// <summary>
+        /// Gets or Sets Quantity
+        /// </summary>
+        public int? Quantity { get; set; }
+
+        
+        /// <summary>
+        /// Gets or Sets ShipDate
+        /// </summary>
+        public DateTime? ShipDate { get; set; }
+
+        
+        /// <summary>
+        /// Order Status
+        /// </summary>
+        /// <value>Order Status</value>
+        public string Status { get; set; }
+
+        
+        /// <summary>
+        /// Gets or Sets Complete
+        /// </summary>
+        public bool? Complete { get; set; }
+
+        
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class Order {\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  PetId: ").Append(PetId).Append("\n");
+            sb.Append("  Quantity: ").Append(Quantity).Append("\n");
+            sb.Append("  ShipDate: ").Append(ShipDate).Append("\n");
+            sb.Append("  Status: ").Append(Status).Append("\n");
+            sb.Append("  Complete: ").Append(Complete).Append("\n");
+            
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="obj">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != GetType()) return false;
+            return Equals((Order)obj);
+        }
+
+        /// <summary>
+        /// Returns true if Order instances are equal
+        /// </summary>
+        /// <param name="other">Instance of Order to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(Order other)
+        {
+
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return 
+                (
+                    this.Id == other.Id ||
+                    this.Id != null &&
+                    this.Id.Equals(other.Id)
+                ) && 
+                (
+                    this.PetId == other.PetId ||
+                    this.PetId != null &&
+                    this.PetId.Equals(other.PetId)
+                ) && 
+                (
+                    this.Quantity == other.Quantity ||
+                    this.Quantity != null &&
+                    this.Quantity.Equals(other.Quantity)
+                ) && 
+                (
+                    this.ShipDate == other.ShipDate ||
+                    this.ShipDate != null &&
+                    this.ShipDate.Equals(other.ShipDate)
+                ) && 
+                (
+                    this.Status == other.Status ||
+                    this.Status != null &&
+                    this.Status.Equals(other.Status)
+                ) && 
+                (
+                    this.Complete == other.Complete ||
+                    this.Complete != null &&
+                    this.Complete.Equals(other.Complete)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            // credit: http://stackoverflow.com/a/263416/677735
+            unchecked // Overflow is fine, just wrap
+            {
+                int hash = 41;
+                // Suitable nullity checks etc, of course :)
+                
+                    if (this.Id != null)
+                    hash = hash * 59 + this.Id.GetHashCode();
+                
+                    if (this.PetId != null)
+                    hash = hash * 59 + this.PetId.GetHashCode();
+                
+                    if (this.Quantity != null)
+                    hash = hash * 59 + this.Quantity.GetHashCode();
+                
+                    if (this.ShipDate != null)
+                    hash = hash * 59 + this.ShipDate.GetHashCode();
+                
+                    if (this.Status != null)
+                    hash = hash * 59 + this.Status.GetHashCode();
+                
+                    if (this.Complete != null)
+                    hash = hash * 59 + this.Complete.GetHashCode();
+                
+                return hash;
+            }
+        }
+
+        #region Operators
+
+        public static bool operator ==(Order left, Order right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(Order left, Order right)
+        {
+            return !Equals(left, right);
+        }
+
+        #endregion Operators
+
+    }
+}
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Pet.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Pet.cs
new file mode 100644
index 00000000000..e2756f6a80d
--- /dev/null
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Pet.cs
@@ -0,0 +1,227 @@
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+
+namespace IO.Swagger.Models
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public partial class Pet :  IEquatable<Pet>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Pet" /> class.
+        /// </summary>
+        /// <param name="Id">Id.</param>
+        /// <param name="Category">Category.</param>
+        /// <param name="Name">Name (required).</param>
+        /// <param name="PhotoUrls">PhotoUrls (required).</param>
+        /// <param name="Tags">Tags.</param>
+        /// <param name="Status">pet status in the store.</param>
+        public Pet(long? Id = null, Category Category = null, string Name = null, List<string> PhotoUrls = null, List<Tag> Tags = null, string Status = null)
+        {
+            // to ensure "Name" is required (not null)
+            if (Name == null)
+            {
+                throw new InvalidDataException("Name is a required property for Pet and cannot be null");
+            }
+            else
+            {
+                this.Name = Name;
+            }
+            // to ensure "PhotoUrls" is required (not null)
+            if (PhotoUrls == null)
+            {
+                throw new InvalidDataException("PhotoUrls is a required property for Pet and cannot be null");
+            }
+            else
+            {
+                this.PhotoUrls = PhotoUrls;
+            }
+            this.Id = Id;
+            this.Category = Category;
+            this.Tags = Tags;
+            this.Status = Status;
+            
+        }
+
+        
+        /// <summary>
+        /// Gets or Sets Id
+        /// </summary>
+        public long? Id { get; set; }
+
+        
+        /// <summary>
+        /// Gets or Sets Category
+        /// </summary>
+        public Category Category { get; set; }
+
+        
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        public string Name { get; set; }
+
+        
+        /// <summary>
+        /// Gets or Sets PhotoUrls
+        /// </summary>
+        public List<string> PhotoUrls { get; set; }
+
+        
+        /// <summary>
+        /// Gets or Sets Tags
+        /// </summary>
+        public List<Tag> Tags { get; set; }
+
+        
+        /// <summary>
+        /// pet status in the store
+        /// </summary>
+        /// <value>pet status in the store</value>
+        public string Status { get; set; }
+
+        
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class Pet {\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  Category: ").Append(Category).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  PhotoUrls: ").Append(PhotoUrls).Append("\n");
+            sb.Append("  Tags: ").Append(Tags).Append("\n");
+            sb.Append("  Status: ").Append(Status).Append("\n");
+            
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="obj">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != GetType()) return false;
+            return Equals((Pet)obj);
+        }
+
+        /// <summary>
+        /// Returns true if Pet instances are equal
+        /// </summary>
+        /// <param name="other">Instance of Pet to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(Pet other)
+        {
+
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return 
+                (
+                    this.Id == other.Id ||
+                    this.Id != null &&
+                    this.Id.Equals(other.Id)
+                ) && 
+                (
+                    this.Category == other.Category ||
+                    this.Category != null &&
+                    this.Category.Equals(other.Category)
+                ) && 
+                (
+                    this.Name == other.Name ||
+                    this.Name != null &&
+                    this.Name.Equals(other.Name)
+                ) && 
+                (
+                    this.PhotoUrls == other.PhotoUrls ||
+                    this.PhotoUrls != null &&
+                    this.PhotoUrls.SequenceEqual(other.PhotoUrls)
+                ) && 
+                (
+                    this.Tags == other.Tags ||
+                    this.Tags != null &&
+                    this.Tags.SequenceEqual(other.Tags)
+                ) && 
+                (
+                    this.Status == other.Status ||
+                    this.Status != null &&
+                    this.Status.Equals(other.Status)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            // credit: http://stackoverflow.com/a/263416/677735
+            unchecked // Overflow is fine, just wrap
+            {
+                int hash = 41;
+                // Suitable nullity checks etc, of course :)
+                
+                    if (this.Id != null)
+                    hash = hash * 59 + this.Id.GetHashCode();
+                
+                    if (this.Category != null)
+                    hash = hash * 59 + this.Category.GetHashCode();
+                
+                    if (this.Name != null)
+                    hash = hash * 59 + this.Name.GetHashCode();
+                
+                    if (this.PhotoUrls != null)
+                    hash = hash * 59 + this.PhotoUrls.GetHashCode();
+                
+                    if (this.Tags != null)
+                    hash = hash * 59 + this.Tags.GetHashCode();
+                
+                    if (this.Status != null)
+                    hash = hash * 59 + this.Status.GetHashCode();
+                
+                return hash;
+            }
+        }
+
+        #region Operators
+
+        public static bool operator ==(Pet left, Pet right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(Pet left, Pet right)
+        {
+            return !Equals(left, right);
+        }
+
+        #endregion Operators
+
+    }
+}
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Tag.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Tag.cs
new file mode 100644
index 00000000000..ce8a4e8eafe
--- /dev/null
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Tag.cs
@@ -0,0 +1,142 @@
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+
+namespace IO.Swagger.Models
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public partial class Tag :  IEquatable<Tag>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Tag" /> class.
+        /// </summary>
+        /// <param name="Id">Id.</param>
+        /// <param name="Name">Name.</param>
+        public Tag(long? Id = null, string Name = null)
+        {
+            this.Id = Id;
+            this.Name = Name;
+            
+        }
+
+        
+        /// <summary>
+        /// Gets or Sets Id
+        /// </summary>
+        public long? Id { get; set; }
+
+        
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        public string Name { get; set; }
+
+        
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class Tag {\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="obj">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != GetType()) return false;
+            return Equals((Tag)obj);
+        }
+
+        /// <summary>
+        /// Returns true if Tag instances are equal
+        /// </summary>
+        /// <param name="other">Instance of Tag to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(Tag other)
+        {
+
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return 
+                (
+                    this.Id == other.Id ||
+                    this.Id != null &&
+                    this.Id.Equals(other.Id)
+                ) && 
+                (
+                    this.Name == other.Name ||
+                    this.Name != null &&
+                    this.Name.Equals(other.Name)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            // credit: http://stackoverflow.com/a/263416/677735
+            unchecked // Overflow is fine, just wrap
+            {
+                int hash = 41;
+                // Suitable nullity checks etc, of course :)
+                
+                    if (this.Id != null)
+                    hash = hash * 59 + this.Id.GetHashCode();
+                
+                    if (this.Name != null)
+                    hash = hash * 59 + this.Name.GetHashCode();
+                
+                return hash;
+            }
+        }
+
+        #region Operators
+
+        public static bool operator ==(Tag left, Tag right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(Tag left, Tag right)
+        {
+            return !Equals(left, right);
+        }
+
+        #endregion Operators
+
+    }
+}
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/User.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/User.cs
new file mode 100644
index 00000000000..9c3737b8b32
--- /dev/null
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/User.cs
@@ -0,0 +1,245 @@
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+
+namespace IO.Swagger.Models
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public partial class User :  IEquatable<User>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="User" /> class.
+        /// </summary>
+        /// <param name="Id">Id.</param>
+        /// <param name="Username">Username.</param>
+        /// <param name="FirstName">FirstName.</param>
+        /// <param name="LastName">LastName.</param>
+        /// <param name="Email">Email.</param>
+        /// <param name="Password">Password.</param>
+        /// <param name="Phone">Phone.</param>
+        /// <param name="UserStatus">User Status.</param>
+        public User(long? Id = null, string Username = null, string FirstName = null, string LastName = null, string Email = null, string Password = null, string Phone = null, int? UserStatus = null)
+        {
+            this.Id = Id;
+            this.Username = Username;
+            this.FirstName = FirstName;
+            this.LastName = LastName;
+            this.Email = Email;
+            this.Password = Password;
+            this.Phone = Phone;
+            this.UserStatus = UserStatus;
+            
+        }
+
+        
+        /// <summary>
+        /// Gets or Sets Id
+        /// </summary>
+        public long? Id { get; set; }
+
+        
+        /// <summary>
+        /// Gets or Sets Username
+        /// </summary>
+        public string Username { get; set; }
+
+        
+        /// <summary>
+        /// Gets or Sets FirstName
+        /// </summary>
+        public string FirstName { get; set; }
+
+        
+        /// <summary>
+        /// Gets or Sets LastName
+        /// </summary>
+        public string LastName { get; set; }
+
+        
+        /// <summary>
+        /// Gets or Sets Email
+        /// </summary>
+        public string Email { get; set; }
+
+        
+        /// <summary>
+        /// Gets or Sets Password
+        /// </summary>
+        public string Password { get; set; }
+
+        
+        /// <summary>
+        /// Gets or Sets Phone
+        /// </summary>
+        public string Phone { get; set; }
+
+        
+        /// <summary>
+        /// User Status
+        /// </summary>
+        /// <value>User Status</value>
+        public int? UserStatus { get; set; }
+
+        
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class User {\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  Username: ").Append(Username).Append("\n");
+            sb.Append("  FirstName: ").Append(FirstName).Append("\n");
+            sb.Append("  LastName: ").Append(LastName).Append("\n");
+            sb.Append("  Email: ").Append(Email).Append("\n");
+            sb.Append("  Password: ").Append(Password).Append("\n");
+            sb.Append("  Phone: ").Append(Phone).Append("\n");
+            sb.Append("  UserStatus: ").Append(UserStatus).Append("\n");
+            
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="obj">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != GetType()) return false;
+            return Equals((User)obj);
+        }
+
+        /// <summary>
+        /// Returns true if User instances are equal
+        /// </summary>
+        /// <param name="other">Instance of User to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(User other)
+        {
+
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return 
+                (
+                    this.Id == other.Id ||
+                    this.Id != null &&
+                    this.Id.Equals(other.Id)
+                ) && 
+                (
+                    this.Username == other.Username ||
+                    this.Username != null &&
+                    this.Username.Equals(other.Username)
+                ) && 
+                (
+                    this.FirstName == other.FirstName ||
+                    this.FirstName != null &&
+                    this.FirstName.Equals(other.FirstName)
+                ) && 
+                (
+                    this.LastName == other.LastName ||
+                    this.LastName != null &&
+                    this.LastName.Equals(other.LastName)
+                ) && 
+                (
+                    this.Email == other.Email ||
+                    this.Email != null &&
+                    this.Email.Equals(other.Email)
+                ) && 
+                (
+                    this.Password == other.Password ||
+                    this.Password != null &&
+                    this.Password.Equals(other.Password)
+                ) && 
+                (
+                    this.Phone == other.Phone ||
+                    this.Phone != null &&
+                    this.Phone.Equals(other.Phone)
+                ) && 
+                (
+                    this.UserStatus == other.UserStatus ||
+                    this.UserStatus != null &&
+                    this.UserStatus.Equals(other.UserStatus)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            // credit: http://stackoverflow.com/a/263416/677735
+            unchecked // Overflow is fine, just wrap
+            {
+                int hash = 41;
+                // Suitable nullity checks etc, of course :)
+                
+                    if (this.Id != null)
+                    hash = hash * 59 + this.Id.GetHashCode();
+                
+                    if (this.Username != null)
+                    hash = hash * 59 + this.Username.GetHashCode();
+                
+                    if (this.FirstName != null)
+                    hash = hash * 59 + this.FirstName.GetHashCode();
+                
+                    if (this.LastName != null)
+                    hash = hash * 59 + this.LastName.GetHashCode();
+                
+                    if (this.Email != null)
+                    hash = hash * 59 + this.Email.GetHashCode();
+                
+                    if (this.Password != null)
+                    hash = hash * 59 + this.Password.GetHashCode();
+                
+                    if (this.Phone != null)
+                    hash = hash * 59 + this.Phone.GetHashCode();
+                
+                    if (this.UserStatus != null)
+                    hash = hash * 59 + this.UserStatus.GetHashCode();
+                
+                return hash;
+            }
+        }
+
+        #region Operators
+
+        public static bool operator ==(User left, User right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(User left, User right)
+        {
+            return !Equals(left, right);
+        }
+
+        #endregion Operators
+
+    }
+}
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Properties/launchSettings.json b/samples/server/petstore/aspnet5/src/IO.Swagger/Properties/launchSettings.json
new file mode 100644
index 00000000000..7d41a0f84b9
--- /dev/null
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Properties/launchSettings.json
@@ -0,0 +1,12 @@
+{
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "swagger/ui",
+      "environmentVariables": {
+        "ASPNET_ENV": "Development"
+      }
+    }
+  }
+}
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Startup.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Startup.cs
new file mode 100644
index 00000000000..21cb3aa6042
--- /dev/null
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Startup.cs
@@ -0,0 +1,136 @@
+using System;
+using System.IO;
+using System.Linq;
+using Microsoft.AspNet.Builder;
+using Microsoft.AspNet.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.PlatformAbstractions;
+using Newtonsoft.Json.Serialization;
+using Swashbuckle.SwaggerGen;
+using Swashbuckle.SwaggerGen.XmlComments;
+
+namespace IO.Swagger
+{
+    public class Startup
+    {
+        private readonly IHostingEnvironment _hostingEnv;
+        private readonly IApplicationEnvironment _appEnv;
+
+        public Startup(IHostingEnvironment env, IApplicationEnvironment appEnv)
+        {
+            _hostingEnv = env;
+            _appEnv = appEnv;
+
+            // Set up configuration sources.
+            var builder = new ConfigurationBuilder()
+                .AddJsonFile("appsettings.json")
+                .AddEnvironmentVariables();
+            Configuration = builder.Build();
+        }
+
+        public IConfigurationRoot Configuration { get; set; }
+
+        // This method gets called by the runtime. Use this method to add services to the container.
+        public void ConfigureServices(IServiceCollection services)
+        {
+            string xmlComments = string.Format(@"{0}{4}artifacts{4}{1}{4}{2}{3}{4}IO.Swagger.xml",
+                   GetSolutionBasePath(),
+                   _appEnv.Configuration,
+                   _appEnv.RuntimeFramework.Identifier.ToLower(),
+                   _appEnv.RuntimeFramework.Version.ToString().Replace(".", string.Empty),
+                   Path.DirectorySeparatorChar);
+                   
+            // Add framework services.
+            services.AddMvc()
+                .AddJsonOptions(
+                    opts => { opts.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver(); });
+
+            // Uncomment the following line to add Web API services which makes it easier to port Web API 2 controllers.
+            // You will also need to add the Microsoft.AspNet.Mvc.WebApiCompatShim package to the 'dependencies' section of project.json.
+            // services.AddWebApiConventions();
+
+            services.AddSwaggerGen();
+            services.ConfigureSwaggerDocument(options =>
+            {
+                options.SingleApiVersion(new Info
+                {
+                    Version = "v1",
+                    Title = "IO.Swagger",
+                    Description = "IO.Swagger (ASP.NET 5 Web API 2.x)"
+                });
+                
+                options.OperationFilter(new ApplyXmlActionCommentsFixed(xmlComments));
+            });
+
+            services.ConfigureSwaggerSchema(options => { 
+                options.DescribeAllEnumsAsStrings = true; 
+                options.ModelFilter(new ApplyXmlTypeCommentsFixed(xmlComments));
+            });
+        }
+
+        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
+        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
+        {
+            loggerFactory.MinimumLevel = LogLevel.Information;
+            loggerFactory.AddConsole(Configuration.GetSection("Logging"));
+            loggerFactory.AddDebug();
+
+            app.UseIISPlatformHandler();
+
+            app.UseDefaultFiles();
+            app.UseStaticFiles();
+
+            app.UseMvc();
+
+            app.UseSwaggerGen();
+            app.UseSwaggerUi();
+        }
+
+        // Taken from https://github.com/domaindrivendev/Ahoy/blob/master/test/WebSites/Basic/Startup.cs
+        private string GetSolutionBasePath()
+        {
+            var dir = Directory.CreateDirectory(_appEnv.ApplicationBasePath);
+            while (dir.Parent != null)
+            {
+                if (dir.GetDirectories("artifacts").Any())
+                    return dir.FullName;
+
+                dir = dir.Parent;
+            }
+            throw new InvalidOperationException("Failed to detect solution base path - artifacts not found. Did you run dnu pack --out artifacts?");
+        }
+
+        // Entry point for the application.
+        public static void Main(string[] args) => WebApplication.Run<Startup>(args);
+    }
+    
+        
+    //  using Swashbuckle.SwaggerGen.XmlComments;
+    public class ApplyXmlTypeCommentsFixed : ApplyXmlTypeComments
+    {
+        public ApplyXmlTypeCommentsFixed() : base("")
+        {
+            throw new NotImplementedException();
+        }
+
+        public ApplyXmlTypeCommentsFixed(string filePath): base(filePath)
+        {
+
+        }
+    }
+
+    public class ApplyXmlActionCommentsFixed : ApplyXmlActionComments
+    {
+        public ApplyXmlActionCommentsFixed() : base("")
+        {
+            throw new NotImplementedException();
+        }
+
+        public ApplyXmlActionCommentsFixed(string filePath): base(filePath)
+        {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/appsettings.json b/samples/server/petstore/aspnet5/src/IO.Swagger/appsettings.json
new file mode 100644
index 00000000000..e5472e562b7
--- /dev/null
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/appsettings.json
@@ -0,0 +1,10 @@
+{
+  "Logging": {
+    "IncludeScopes": false,
+    "LogLevel": {
+      "Default": "Verbose",
+      "System": "Information",
+      "Microsoft": "Information"
+    }
+  }
+}
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/project.json b/samples/server/petstore/aspnet5/src/IO.Swagger/project.json
new file mode 100644
index 00000000000..7317a7c0d0c
--- /dev/null
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/project.json
@@ -0,0 +1,41 @@
+{
+  "version": "1.0.0-*",
+  "compilationOptions": {
+    "emitEntryPoint": true
+  },
+  "tooling": {
+    "defaultNamespace": "IO.Swagger"
+  },
+
+  "dependencies": {
+    "Microsoft.AspNet.IISPlatformHandler": "1.0.0-rc1-final",
+    "Microsoft.AspNet.Mvc": "6.0.0-rc1-final",
+    "Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final",
+    "Microsoft.AspNet.StaticFiles": "1.0.0-rc1-final",
+    "Microsoft.Extensions.Configuration.FileProviderExtensions" : "1.0.0-rc1-final",
+    "Microsoft.Extensions.Logging": "1.0.0-rc1-final",
+    "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
+    "Microsoft.Extensions.Logging.Debug" : "1.0.0-rc1-final",
+    "Swashbuckle.SwaggerGen": "6.0.0-rc1-final",
+    "Swashbuckle.SwaggerUi": "6.0.0-rc1-final"
+  },
+
+  "commands": {
+    "web": "Microsoft.AspNet.Server.Kestrel --server.urls http://0.0.0.0:5000"
+  },
+
+  "frameworks": {
+    "dnx451": { },
+    "dnxcore50": { }
+  },
+
+  "exclude": [
+    "wwwroot",
+    "node_modules",
+    "bower_components"
+  ],
+  "publishExclude": [
+    "**.user",
+    "**.vspscc"
+  ]
+}
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/wwwroot/README.md b/samples/server/petstore/aspnet5/src/IO.Swagger/wwwroot/README.md
new file mode 100644
index 00000000000..6a0b78471a3
--- /dev/null
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/wwwroot/README.md
@@ -0,0 +1,42 @@
+# Welcome to ASP.NET 5 Preview
+
+We've made some big updates in this release, so it’s **important** that you spend a few minutes to learn what’s new.
+
+ASP.NET 5 has been rearchitected to make it **lean** and **composable**. It's fully **open source** and available on [GitHub](http://go.microsoft.com/fwlink/?LinkID=517854).
+Your new project automatically takes advantage of modern client-side utilities like [Bower](http://go.microsoft.com/fwlink/?LinkId=518004) and [npm](http://go.microsoft.com/fwlink/?LinkId=518005) (to add client-side libraries) and [Gulp](http://go.microsoft.com/fwlink/?LinkId=518007) (for client-side build and automation tasks).
+
+We hope you enjoy the new capabilities in ASP.NET 5 and Visual Studio 2015.
+The ASP.NET Team
+
+### You've created a new ASP.NET 5 project. [Learn what's new](http://go.microsoft.com/fwlink/?LinkId=518016)
+
+### This application consists of:
+* Sample pages using ASP.NET MVC 6
+* [Gulp](http://go.microsoft.com/fwlink/?LinkId=518007) and [Bower](http://go.microsoft.com/fwlink/?LinkId=518004) for managing client-side resources
+* Theming using [Bootstrap](http://go.microsoft.com/fwlink/?LinkID=398939)
+
+#### NEW CONCEPTS
+* [The 'wwwroot' explained](http://go.microsoft.com/fwlink/?LinkId=518008)
+* [Configuration in ASP.NET 5](http://go.microsoft.com/fwlink/?LinkId=518012)
+* [Dependency Injection](http://go.microsoft.com/fwlink/?LinkId=518013)
+* [Razor TagHelpers](http://go.microsoft.com/fwlink/?LinkId=518014)
+* [Manage client packages using Gulp](http://go.microsoft.com/fwlink/?LinkID=517849)
+* [Develop on different platforms](http://go.microsoft.com/fwlink/?LinkID=517850)
+
+#### CUSTOMIZE APP
+* [Add Controllers and Views](http://go.microsoft.com/fwlink/?LinkID=398600)
+* [Add Data using EntityFramework](http://go.microsoft.com/fwlink/?LinkID=398602)
+* [Add Authentication using Identity](http://go.microsoft.com/fwlink/?LinkID=398603)
+* [Add real time support using SignalR](http://go.microsoft.com/fwlink/?LinkID=398606)
+* [Add Class library](http://go.microsoft.com/fwlink/?LinkID=398604)
+* [Add Web APIs with MVC 6](http://go.microsoft.com/fwlink/?LinkId=518009)
+* [Add client packages using Bower](http://go.microsoft.com/fwlink/?LinkID=517848)
+
+#### DEPLOY
+* [Run your app locally](http://go.microsoft.com/fwlink/?LinkID=517851)
+* [Run your app on ASP.NET Core 5](http://go.microsoft.com/fwlink/?LinkID=517852)
+* [Run commands in your 'project.json'](http://go.microsoft.com/fwlink/?LinkID=517853)
+* [Publish to Microsoft Azure Web Sites](http://go.microsoft.com/fwlink/?LinkID=398609)
+* [Publish to the file system](http://go.microsoft.com/fwlink/?LinkId=518019)
+
+We would love to hear your [feedback](http://go.microsoft.com/fwlink/?LinkId=518015)
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/wwwroot/index.html b/samples/server/petstore/aspnet5/src/IO.Swagger/wwwroot/index.html
new file mode 100644
index 00000000000..c8c055b34f7
--- /dev/null
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/wwwroot/index.html
@@ -0,0 +1 @@
+<meta http-equiv="refresh" content="0;URL='./swagger/ui/index.html'" />
\ No newline at end of file
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/wwwroot/web.config b/samples/server/petstore/aspnet5/src/IO.Swagger/wwwroot/web.config
new file mode 100644
index 00000000000..e70a7778d60
--- /dev/null
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/wwwroot/web.config
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <system.webServer>
+    <handlers>
+      <add name="httpPlatformHandler" path="*" verb="*" modules="httpPlatformHandler" resourceType="Unspecified"/>
+    </handlers>
+    <httpPlatform processPath="%DNX_PATH%" arguments="%DNX_ARGS%" stdoutLogEnabled="false"/>
+  </system.webServer>
+</configuration>
diff --git a/samples/server/petstore/flaskConnexion/README.md b/samples/server/petstore/flaskConnexion/README.md
index 2b8c96e6170..933d4ec2723 100644
--- a/samples/server/petstore/flaskConnexion/README.md
+++ b/samples/server/petstore/flaskConnexion/README.md
@@ -2,26 +2,27 @@
 
 ## Overview
 This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project. By using the
-[swagger-spec](https://github.com/swagger-api/swagger-core/wiki) from a remote server, you can easily generate a server stub.  This
-is an example of building a swagger-enabled flask server.
+[OpenAPI-Spec](https://github.com/swagger-api/swagger-core/wiki) from a remote server, you can easily generate a server stub.  This
+is an example of building a swagger-enabled Flask server.
 
-This example uses the [connexion](https://github.com/zalando/connexion) library on top of Flask.
+This example uses the [Connexion](https://github.com/zalando/connexion) library on top of Flask.
 
 To run the server, please execute the following:
 
 ```
+sudo pip3 install -U connexion # install Connexion from PyPI
 python3 app.py
 ```
 
 and open your browser to here:
 
 ```
-http://localhost:8080/ui
+http://localhost:8080/v2/ui/
 ```
 
-Your swagger definition lives here:
+Your Swagger definition lives here:
 
 ```
-http://localhost:8080/swagger.json
+http://localhost:8080/v2/swagger.json
 ```
 
diff --git a/samples/server/petstore/flaskConnexion/app.py b/samples/server/petstore/flaskConnexion/app.py
index ae021b58df9..1e2fed4d9ea 100644
--- a/samples/server/petstore/flaskConnexion/app.py
+++ b/samples/server/petstore/flaskConnexion/app.py
@@ -3,7 +3,6 @@
 import connexion
 
 if __name__ == '__main__':
-    app = connexion.App(__name__, 8080,
-    specification_dir='./swagger/')
-    app.add_api('swagger.yaml', arguments={'title': 'This is a sample server Petstore server.  You can find out more about Swagger at &lt;a href=\&quot;http://swagger.io\&quot;&gt;http://swagger.io&lt;/a&gt; or on irc.freenode.net, #swagger.  For this sample, you can use the api key \&quot;special-key\&quot; to test the authorization filters'})
-    app.run()
+    app = connexion.App(__name__, specification_dir='./swagger/')
+    app.add_api('swagger.yaml', arguments={'title': 'This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.'})
+    app.run(port=8080)
diff --git a/samples/server/petstore/flaskConnexion/swagger/swagger.yaml b/samples/server/petstore/flaskConnexion/swagger/swagger.yaml
index 1a4ff85e60a..d086d6ff49d 100644
--- a/samples/server/petstore/flaskConnexion/swagger/swagger.yaml
+++ b/samples/server/petstore/flaskConnexion/swagger/swagger.yaml
@@ -2,9 +2,9 @@
 swagger: "2.0"
 info:
   description: "This is a sample server Petstore server.  You can find out more about\
-    \ Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net,\
-    \ #swagger.  For this sample, you can use the api key \"special-key\" to test\
-    \ the authorization filters"
+    \ Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).\
+    \  For this sample, you can use the api key `special-key` to test the authorization\
+    \ filters."
   version: "1.0.0"
   title: "Swagger Petstore"
   termsOfService: "http://swagger.io/terms/"
@@ -15,6 +15,19 @@ info:
     url: "http://www.apache.org/licenses/LICENSE-2.0.html"
 host: "petstore.swagger.io"
 basePath: "/v2"
+tags:
+- name: "pet"
+  description: "Everything about your Pets"
+  externalDocs:
+    description: "Find out more"
+    url: "http://swagger.io"
+- name: "store"
+  description: "Access to Petstore orders"
+- name: "user"
+  description: "Operations about user"
+  externalDocs:
+    description: "Find out more about our store"
+    url: "http://swagger.io"
 schemes:
 - "http"
 paths:
@@ -29,22 +42,18 @@ paths:
       - "application/json"
       - "application/xml"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "Pet object that needs to be added to the store"
-        required: false
+        required: true
         schema:
           $ref: "#/definitions/Pet"
       responses:
         405:
           description: "Invalid input"
-      security:
-      - petstore_auth:
-        - "write:pets"
-        - "read:pets"
       x-tags:
       - tag: "pet"
     put:
@@ -57,13 +66,13 @@ paths:
       - "application/json"
       - "application/xml"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "Pet object that needs to be added to the store"
-        required: false
+        required: true
         schema:
           $ref: "#/definitions/Pet"
       responses:
@@ -73,10 +82,6 @@ paths:
           description: "Pet not found"
         405:
           description: "Validation exception"
-      security:
-      - petstore_auth:
-        - "write:pets"
-        - "read:pets"
       x-tags:
       - tag: "pet"
   /pet/findByStatus:
@@ -84,21 +89,25 @@ paths:
       tags:
       - "pet"
       summary: "Finds Pets by status"
-      description: "Multiple status values can be provided with comma seperated strings"
+      description: "Multiple status values can be provided with comma separated strings"
       operationId: "controllers.default_controller.find_pets_by_status"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "status"
         in: "query"
         description: "Status values that need to be considered for filter"
-        required: false
+        required: true
         type: "array"
         items:
           type: "string"
+          enum:
+          - "available"
+          - "pending"
+          - "sold"
+          default: "available"
         collectionFormat: "multi"
-        default: "available"
       responses:
         200:
           description: "successful operation"
@@ -108,10 +117,6 @@ paths:
               $ref: "#/definitions/Pet"
         400:
           description: "Invalid status value"
-      security:
-      - petstore_auth:
-        - "write:pets"
-        - "read:pets"
       x-tags:
       - tag: "pet"
   /pet/findByTags:
@@ -119,17 +124,17 @@ paths:
       tags:
       - "pet"
       summary: "Finds Pets by tags"
-      description: "Muliple tags can be provided with comma seperated strings. Use\
+      description: "Muliple tags can be provided with comma separated strings. Use\
         \ tag1, tag2, tag3 for testing."
       operationId: "controllers.default_controller.find_pets_by_tags"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "tags"
         in: "query"
         description: "Tags to filter by"
-        required: false
+        required: true
         type: "array"
         items:
           type: "string"
@@ -143,10 +148,7 @@ paths:
               $ref: "#/definitions/Pet"
         400:
           description: "Invalid tag value"
-      security:
-      - petstore_auth:
-        - "write:pets"
-        - "read:pets"
+      deprecated: true
       x-tags:
       - tag: "pet"
   /pet/{petId}:
@@ -154,16 +156,15 @@ paths:
       tags:
       - "pet"
       summary: "Find pet by ID"
-      description: "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate\
-        \ API error conditions"
+      description: "Returns a single pet"
       operationId: "controllers.default_controller.get_pet_by_id"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "petId"
         in: "path"
-        description: "ID of pet that needs to be fetched"
+        description: "ID of pet to return"
         required: true
         type: "integer"
         format: "int64"
@@ -178,9 +179,6 @@ paths:
           description: "Pet not found"
       security:
       - api_key: []
-      - petstore_auth:
-        - "write:pets"
-        - "read:pets"
       x-tags:
       - tag: "pet"
     post:
@@ -192,14 +190,15 @@ paths:
       consumes:
       - "application/x-www-form-urlencoded"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "petId"
         in: "path"
         description: "ID of pet that needs to be updated"
         required: true
-        type: "string"
+        type: "integer"
+        format: "int64"
       - name: "name"
         in: "formData"
         description: "Updated name of the pet"
@@ -213,10 +212,6 @@ paths:
       responses:
         405:
           description: "Invalid input"
-      security:
-      - petstore_auth:
-        - "write:pets"
-        - "read:pets"
       x-tags:
       - tag: "pet"
     delete:
@@ -226,12 +221,11 @@ paths:
       description: ""
       operationId: "controllers.default_controller.delete_pet"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "api_key"
         in: "header"
-        description: ""
         required: false
         type: "string"
       - name: "petId"
@@ -242,11 +236,9 @@ paths:
         format: "int64"
       responses:
         400:
-          description: "Invalid pet value"
-      security:
-      - petstore_auth:
-        - "write:pets"
-        - "read:pets"
+          description: "Invalid ID supplied"
+        404:
+          description: "Pet not found"
       x-tags:
       - tag: "pet"
   /pet/{petId}/uploadImage:
@@ -260,7 +252,6 @@ paths:
       - "multipart/form-data"
       produces:
       - "application/json"
-      - "application/xml"
       parameters:
       - name: "petId"
         in: "path"
@@ -279,12 +270,10 @@ paths:
         required: false
         type: "file"
       responses:
-        default:
+        200:
           description: "successful operation"
-      security:
-      - petstore_auth:
-        - "write:pets"
-        - "read:pets"
+          schema:
+            $ref: "#/definitions/ApiResponse"
       x-tags:
       - tag: "pet"
   /store/inventory:
@@ -296,7 +285,6 @@ paths:
       operationId: "controllers.default_controller.get_inventory"
       produces:
       - "application/json"
-      - "application/xml"
       parameters: []
       responses:
         200:
@@ -318,13 +306,13 @@ paths:
       description: ""
       operationId: "controllers.default_controller.place_order"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "order placed for purchasing the pet"
-        required: false
+        required: true
         schema:
           $ref: "#/definitions/Order"
       responses:
@@ -341,18 +329,21 @@ paths:
       tags:
       - "store"
       summary: "Find purchase order by ID"
-      description: "For valid response try integer IDs with value <= 5 or > 10. Other\
-        \ values will generated exceptions"
+      description: "For valid response try integer IDs with value >= 1 and <= 10.\
+        \ Other values will generated exceptions"
       operationId: "controllers.default_controller.get_order_by_id"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "orderId"
         in: "path"
         description: "ID of pet that needs to be fetched"
         required: true
-        type: "string"
+        type: "integer"
+        maximum: 10.0
+        minimum: 1.0
+        format: "int64"
       responses:
         200:
           description: "successful operation"
@@ -368,18 +359,20 @@ paths:
       tags:
       - "store"
       summary: "Delete purchase order by ID"
-      description: "For valid response try integer IDs with value < 1000. Anything\
-        \ above 1000 or nonintegers will generate API errors"
+      description: "For valid response try integer IDs with positive integer value.\
+        \ Negative or non-integer values will generate API errors"
       operationId: "controllers.default_controller.delete_order"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "orderId"
         in: "path"
         description: "ID of the order that needs to be deleted"
         required: true
-        type: "string"
+        type: "integer"
+        minimum: 1.0
+        format: "int64"
       responses:
         400:
           description: "Invalid ID supplied"
@@ -395,13 +388,13 @@ paths:
       description: "This can only be done by the logged in user."
       operationId: "controllers.default_controller.create_user"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "Created user object"
-        required: false
+        required: true
         schema:
           $ref: "#/definitions/User"
       responses:
@@ -417,13 +410,13 @@ paths:
       description: ""
       operationId: "controllers.default_controller.create_users_with_array_input"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "List of user object"
-        required: false
+        required: true
         schema:
           type: "array"
           items:
@@ -441,13 +434,13 @@ paths:
       description: ""
       operationId: "controllers.default_controller.create_users_with_list_input"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "List of user object"
-        required: false
+        required: true
         schema:
           type: "array"
           items:
@@ -465,24 +458,33 @@ paths:
       description: ""
       operationId: "controllers.default_controller.login_user"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "username"
         in: "query"
         description: "The user name for login"
-        required: false
+        required: true
         type: "string"
       - name: "password"
         in: "query"
         description: "The password for login in clear text"
-        required: false
+        required: true
         type: "string"
       responses:
         200:
           description: "successful operation"
           schema:
             type: "string"
+          headers:
+            X-Rate-Limit:
+              type: "integer"
+              format: "int32"
+              description: "calls per hour allowed by the user"
+            X-Expires-After:
+              type: "string"
+              format: "date-time"
+              description: "date in UTC when token expires"
         400:
           description: "Invalid username/password supplied"
       x-tags:
@@ -495,8 +497,8 @@ paths:
       description: ""
       operationId: "controllers.default_controller.logout_user"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters: []
       responses:
         default:
@@ -511,8 +513,8 @@ paths:
       description: ""
       operationId: "controllers.default_controller.get_user_by_name"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "username"
         in: "path"
@@ -524,16 +526,6 @@ paths:
           description: "successful operation"
           schema:
             $ref: "#/definitions/User"
-          examples:
-            application/json:
-              id: 1
-              username: "johnp"
-              firstName: "John"
-              lastName: "Public"
-              email: "johnp@swagger.io"
-              password: "-secret-"
-              phone: "0123456789"
-              userStatus: 0
         400:
           description: "Invalid username supplied"
         404:
@@ -547,18 +539,18 @@ paths:
       description: "This can only be done by the logged in user."
       operationId: "controllers.default_controller.update_user"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "username"
         in: "path"
-        description: "name that need to be deleted"
+        description: "name that need to be updated"
         required: true
         type: "string"
       - in: "body"
         name: "body"
         description: "Updated user object"
-        required: false
+        required: true
         schema:
           $ref: "#/definitions/User"
       responses:
@@ -575,8 +567,8 @@ paths:
       description: "This can only be done by the logged in user."
       operationId: "controllers.default_controller.delete_user"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "username"
         in: "path"
@@ -591,19 +583,40 @@ paths:
       x-tags:
       - tag: "user"
 securityDefinitions:
-  petstore_auth:
-    type: "oauth2"
-    authorizationUrl: "http://petstore.swagger.io/api/oauth/dialog"
-    flow: "implicit"
-    scopes:
-      write:pets: "modify pets in your account"
-      read:pets: "read your pets"
   api_key:
     type: "apiKey"
     name: "api_key"
     in: "header"
 definitions:
+  Order:
+    type: "object"
+    properties:
+      id:
+        type: "integer"
+        format: "int64"
+      petId:
+        type: "integer"
+        format: "int64"
+      quantity:
+        type: "integer"
+        format: "int32"
+      shipDate:
+        type: "string"
+        format: "date-time"
+      status:
+        type: "string"
+        description: "Order Status"
+        enum:
+        - "placed"
+        - "approved"
+        - "delivered"
+      complete:
+        type: "boolean"
+        default: false
+    xml:
+      name: "Order"
   User:
+    type: "object"
     properties:
       id:
         type: "integer"
@@ -627,6 +640,7 @@ definitions:
     xml:
       name: "User"
   Category:
+    type: "object"
     properties:
       id:
         type: "integer"
@@ -635,7 +649,28 @@ definitions:
         type: "string"
     xml:
       name: "Category"
+  Tag:
+    type: "object"
+    properties:
+      id:
+        type: "integer"
+        format: "int64"
+      name:
+        type: "string"
+    xml:
+      name: "Tag"
+  ApiResponse:
+    type: "object"
+    properties:
+      code:
+        type: "integer"
+        format: "int32"
+      type:
+        type: "string"
+      message:
+        type: "string"
   Pet:
+    type: "object"
     required:
     - "name"
     - "photoUrls"
@@ -671,37 +706,6 @@ definitions:
         - "sold"
     xml:
       name: "Pet"
-  Tag:
-    properties:
-      id:
-        type: "integer"
-        format: "int64"
-      name:
-        type: "string"
-    xml:
-      name: "Tag"
-  Order:
-    properties:
-      id:
-        type: "integer"
-        format: "int64"
-      petId:
-        type: "integer"
-        format: "int64"
-      quantity:
-        type: "integer"
-        format: "int32"
-      shipDate:
-        type: "string"
-        format: "date-time"
-      status:
-        type: "string"
-        description: "Order Status"
-        enum:
-        - "placed"
-        - "approved"
-        - "delivered"
-      complete:
-        type: "boolean"
-    xml:
-      name: "Order"
+externalDocs:
+  description: "Find out more about Swagger"
+  url: "http://swagger.io"
diff --git a/samples/server/petstore/haskell-servant/LICENSE b/samples/server/petstore/haskell-servant/LICENSE
new file mode 100644
index 00000000000..b0033f5f837
--- /dev/null
+++ b/samples/server/petstore/haskell-servant/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2015 Masahiro Yamauchi
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/samples/server/petstore/haskell-servant/README.md b/samples/server/petstore/haskell-servant/README.md
new file mode 100644
index 00000000000..c8f4b4bbb9d
--- /dev/null
+++ b/samples/server/petstore/haskell-servant/README.md
@@ -0,0 +1,7 @@
+# Generated Servant Codes
+
+## How to use
+
+0. Install haskell-stack
+1. stack build
+2. stack exec client
diff --git a/samples/server/petstore/haskell-servant/Setup.hs b/samples/server/petstore/haskell-servant/Setup.hs
new file mode 100644
index 00000000000..9a994af677b
--- /dev/null
+++ b/samples/server/petstore/haskell-servant/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/samples/server/petstore/haskell-servant/client/Main.hs b/samples/server/petstore/haskell-servant/client/Main.hs
new file mode 100644
index 00000000000..718a8587989
--- /dev/null
+++ b/samples/server/petstore/haskell-servant/client/Main.hs
@@ -0,0 +1,35 @@
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE TypeOperators #-}
+
+module Main where
+
+import Control.Monad (void)
+import Control.Monad.Trans.Either
+import Control.Monad.IO.Class
+import Servant.API
+import Servant.Client
+
+import Data.List.Split (splitOn)
+import Network.URI (URI (..), URIAuth (..), parseURI)
+import Data.Maybe (fromMaybe)
+import Test.QuickCheck
+import Control.Monad
+import Model.User
+import Model.Category
+import Model.Pet
+import Model.Tag
+import Model.Order
+import Api.UserApi
+import Api.PetApi
+import Api.StoreApi
+
+-- userClient :: IO ()
+-- userClient = do 
+--     users <- sample' (arbitrary :: Gen String)
+--     let user = last users
+--     void . runEitherT $ do
+--         getUserByName user >>= (liftIO . putStrLn . show)
+
+main :: IO ()
+main = putStrLn "Hello Server!"
diff --git a/samples/server/petstore/haskell-servant/haskell-servant-codegen.cabal b/samples/server/petstore/haskell-servant/haskell-servant-codegen.cabal
new file mode 100644
index 00000000000..9347cee563c
--- /dev/null
+++ b/samples/server/petstore/haskell-servant/haskell-servant-codegen.cabal
@@ -0,0 +1,64 @@
+name:                haskell-servant-codegen
+version:             0.1.0.0
+synopsis:            Swagger-codegen example for Haskell servant
+description:         Please see README.md
+homepage:            https://github.com/swagger-api/swagger-codegen#readme
+license:             Apache-2.0
+license-file:        LICENSE
+author:              Masahiro Yamauchi
+maintainer:          sgt.yamauchi@gmail.com
+copyright:           2015- Masahiro Yamauchi
+category:            Web
+build-type:          Simple
+-- extra-source-files:
+cabal-version:       >=1.10
+
+library
+  hs-source-dirs:      lib
+  exposed-modules:     Utils
+                     , Model.User
+                     , Model.Category
+                     , Model.Pet
+                     , Model.Tag
+                     , Model.Order
+                     , Api.UserApi
+                     , Api.PetApi
+                     , Api.StoreApi
+                     , Apis
+  ghc-options:         -Wall
+  build-depends:       base
+                     , aeson
+                     , text
+                     , split
+                     , containers
+                     , network-uri
+                     , QuickCheck
+                     , servant
+                     , servant-client
+  default-language:    Haskell2010
+
+executable client
+  hs-source-dirs:      client
+  main-is:             Main.hs
+  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
+  build-depends:       base
+                     , either
+                     , transformers
+                     , split
+                     , network-uri
+                     , QuickCheck
+                     , servant
+                     , servant-client
+                     , haskell-servant-codegen
+  default-language:    Haskell2010
+
+executable server
+  hs-source-dirs:      server
+  main-is:             Main.hs
+  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
+  build-depends:       base
+                     , warp
+                     , servant-server
+                     , servant-mock
+                     , haskell-servant-codegen
+  default-language:    Haskell2010
diff --git a/samples/server/petstore/haskell-servant/lib/Api/PetApi.hs b/samples/server/petstore/haskell-servant/lib/Api/PetApi.hs
new file mode 100644
index 00000000000..62c71f26ec9
--- /dev/null
+++ b/samples/server/petstore/haskell-servant/lib/Api/PetApi.hs
@@ -0,0 +1,113 @@
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+module Api.PetApi (
+      updatePet
+    , addPet
+    , findPetsByStatus
+    , findPetsByTags
+    , getPetById
+    , updatePetWithForm
+    , deletePet
+    , uploadFile
+    , getPetByIdWithByteArray
+    , addPetUsingByteArray
+    , proxyPetApi
+    , PetApi
+    ) where
+
+import GHC.Generics
+import Data.Proxy
+import Servant.API
+import Servant.Client
+import Network.URI (URI (..), URIAuth (..), parseURI)
+import Data.Maybe (fromMaybe)
+import Servant.Common.Text
+import Data.List (intercalate)
+import qualified Data.Text as T
+import Utils
+import Test.QuickCheck
+import Model.Pet
+import Model.Binary
+
+
+
+
+
+
+data Formnamestatus = Formnamestatus
+    { name :: String
+    , status :: String
+    } deriving (Show, Eq, Generic)
+
+instance FromFormUrlEncoded Formnamestatus where
+    fromFormUrlEncoded inputs = Formnamestatus <$>  lkp inputs "name" <*>  lkp inputs "status"
+instance ToFormUrlEncoded Formnamestatus where
+    toFormUrlEncoded x = [((T.pack $ show $ Api.PetApi.name x), (T.pack $ show $ Api.PetApi.status x))]
+instance Arbitrary Formnamestatus where
+    arbitrary = Formnamestatus <$> arbitrary <*> arbitrary
+
+
+data FormadditionalMetadatafile = FormadditionalMetadatafile
+    { additionalMetadata :: String
+    , file :: FilePath
+    } deriving (Show, Eq, Generic)
+
+instance FromFormUrlEncoded FormadditionalMetadatafile where
+    fromFormUrlEncoded inputs = FormadditionalMetadatafile <$>  lkp inputs "additionalMetadata" <*>  lkp inputs "file"
+instance ToFormUrlEncoded FormadditionalMetadatafile where
+    toFormUrlEncoded x = [((T.pack $ show $ Api.PetApi.additionalMetadata x), (T.pack $ show $ Api.PetApi.file x))]
+instance Arbitrary FormadditionalMetadatafile where
+    arbitrary = FormadditionalMetadatafile <$> arbitrary <*> arbitrary
+
+
+
+
+type PetApi = "pet" :> ReqBody '[JSON] Pet :> Put '[JSON] () -- updatePet
+    :<|> "pet" :> ReqBody '[JSON] Pet :> Post '[JSON] () -- addPet
+    :<|> "pet" :> "findByStatus" :> QueryParam "status" [String] :> Get '[JSON] [Pet] -- findPetsByStatus
+    :<|> "pet" :> "findByTags" :> QueryParam "tags" [String] :> Get '[JSON] [Pet] -- findPetsByTags
+    :<|> "pet" :> Capture "petId" Integer :> Get '[JSON] Pet -- getPetById
+    :<|> "pet" :> Capture "petId" String :> ReqBody '[FormUrlEncoded] Formnamestatus :> Post '[JSON] () -- updatePetWithForm
+    :<|> "pet" :> Capture "petId" Integer :> Header "api_key" String :> Delete '[JSON] () -- deletePet
+    :<|> "pet" :> Capture "petId" Integer :> "uploadImage" :> ReqBody '[FormUrlEncoded] FormadditionalMetadatafile :> Post '[JSON] () -- uploadFile
+    :<|> "pet" :> Capture "petId" Integer?testing_byte_array=true :> Get '[JSON] Binary -- getPetByIdWithByteArray
+    :<|> "pet?testing_byte_array=true" :> ReqBody '[JSON] Binary :> Post '[JSON] () -- addPetUsingByteArray
+
+proxyPetApi :: Proxy PetApi
+proxyPetApi = Proxy
+
+
+serverPath :: String
+serverPath = "http://petstore.swagger.io/v2"
+
+parseHostPort :: String -> (String, Int)
+parseHostPort path = (host,port)
+    where
+        authority = case parseURI path of
+            Just x -> uriAuthority x
+            _      -> Nothing
+        (host, port) = case authority of
+            Just y -> (uriRegName y, (getPort . uriPort) y)
+            _      -> ("localhost", 8080)
+        getPort p = case (length p) of
+            0 -> 80
+            _ -> (read . drop 1) p
+
+(host, port) = parseHostPort serverPath
+
+updatePet
+    :<|> addPet
+    :<|> findPetsByStatus
+    :<|> findPetsByTags
+    :<|> getPetById
+    :<|> updatePetWithForm
+    :<|> deletePet
+    :<|> uploadFile
+    :<|> getPetByIdWithByteArray
+    :<|> addPetUsingByteArray
+    = client proxyPetApi $ BaseUrl Http host port
diff --git a/samples/server/petstore/haskell-servant/lib/Api/StoreApi.hs b/samples/server/petstore/haskell-servant/lib/Api/StoreApi.hs
new file mode 100644
index 00000000000..819da1e5a05
--- /dev/null
+++ b/samples/server/petstore/haskell-servant/lib/Api/StoreApi.hs
@@ -0,0 +1,67 @@
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+module Api.StoreApi (
+      getInventory
+    , placeOrder
+    , getOrderById
+    , deleteOrder
+    , proxyStoreApi
+    , StoreApi
+    ) where
+
+import GHC.Generics
+import Data.Proxy
+import Servant.API
+import Servant.Client
+import Network.URI (URI (..), URIAuth (..), parseURI)
+import Data.Maybe (fromMaybe)
+import Servant.Common.Text
+import Data.List (intercalate)
+import qualified Data.Text as T
+import Utils
+import Test.QuickCheck
+import qualified Data.Map as Map
+import Model.Order
+
+
+
+
+
+
+type StoreApi = "store" :> "inventory" :> Get '[JSON] (Map.Map String Integer) -- getInventory
+    :<|> "store" :> "order" :> ReqBody '[JSON] Order :> Post '[JSON] Order -- placeOrder
+    :<|> "store" :> "order" :> Capture "orderId" String :> Get '[JSON] Order -- getOrderById
+    :<|> "store" :> "order" :> Capture "orderId" String :> Delete '[JSON] () -- deleteOrder
+
+proxyStoreApi :: Proxy StoreApi
+proxyStoreApi = Proxy
+
+
+serverPath :: String
+serverPath = "http://petstore.swagger.io/v2"
+
+parseHostPort :: String -> (String, Int)
+parseHostPort path = (host,port)
+    where
+        authority = case parseURI path of
+            Just x -> uriAuthority x
+            _      -> Nothing
+        (host, port) = case authority of
+            Just y -> (uriRegName y, (getPort . uriPort) y)
+            _      -> ("localhost", 8080)
+        getPort p = case (length p) of
+            0 -> 80
+            _ -> (read . drop 1) p
+
+(host, port) = parseHostPort serverPath
+
+getInventory
+    :<|> placeOrder
+    :<|> getOrderById
+    :<|> deleteOrder
+    = client proxyStoreApi $ BaseUrl Http host port
diff --git a/samples/server/petstore/haskell-servant/lib/Api/UserApi.hs b/samples/server/petstore/haskell-servant/lib/Api/UserApi.hs
new file mode 100644
index 00000000000..b7c0ad638c5
--- /dev/null
+++ b/samples/server/petstore/haskell-servant/lib/Api/UserApi.hs
@@ -0,0 +1,82 @@
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+module Api.UserApi (
+      createUser
+    , createUsersWithArrayInput
+    , createUsersWithListInput
+    , loginUser
+    , logoutUser
+    , getUserByName
+    , updateUser
+    , deleteUser
+    , proxyUserApi
+    , UserApi
+    ) where
+
+import GHC.Generics
+import Data.Proxy
+import Servant.API
+import Servant.Client
+import Network.URI (URI (..), URIAuth (..), parseURI)
+import Data.Maybe (fromMaybe)
+import Servant.Common.Text
+import Data.List (intercalate)
+import qualified Data.Text as T
+import Utils
+import Test.QuickCheck
+import Model.User
+
+
+
+
+
+
+
+
+
+
+type UserApi = "user" :> ReqBody '[JSON] User :> Post '[JSON] () -- createUser
+    :<|> "user" :> "createWithArray" :> ReqBody '[JSON] [User] :> Post '[JSON] () -- createUsersWithArrayInput
+    :<|> "user" :> "createWithList" :> ReqBody '[JSON] [User] :> Post '[JSON] () -- createUsersWithListInput
+    :<|> "user" :> "login" :> QueryParam "username" String :> QueryParam "password" String :> Get '[JSON] String -- loginUser
+    :<|> "user" :> "logout" :> Get '[JSON] () -- logoutUser
+    :<|> "user" :> Capture "username" String :> Get '[JSON] User -- getUserByName
+    :<|> "user" :> Capture "username" String :> ReqBody '[JSON] User :> Put '[JSON] () -- updateUser
+    :<|> "user" :> Capture "username" String :> Delete '[JSON] () -- deleteUser
+
+proxyUserApi :: Proxy UserApi
+proxyUserApi = Proxy
+
+
+serverPath :: String
+serverPath = "http://petstore.swagger.io/v2"
+
+parseHostPort :: String -> (String, Int)
+parseHostPort path = (host,port)
+    where
+        authority = case parseURI path of
+            Just x -> uriAuthority x
+            _      -> Nothing
+        (host, port) = case authority of
+            Just y -> (uriRegName y, (getPort . uriPort) y)
+            _      -> ("localhost", 8080)
+        getPort p = case (length p) of
+            0 -> 80
+            _ -> (read . drop 1) p
+
+(host, port) = parseHostPort serverPath
+
+createUser
+    :<|> createUsersWithArrayInput
+    :<|> createUsersWithListInput
+    :<|> loginUser
+    :<|> logoutUser
+    :<|> getUserByName
+    :<|> updateUser
+    :<|> deleteUser
+    = client proxyUserApi $ BaseUrl Http host port
diff --git a/samples/server/petstore/haskell-servant/lib/Apis.hs b/samples/server/petstore/haskell-servant/lib/Apis.hs
new file mode 100644
index 00000000000..1add14160d4
--- /dev/null
+++ b/samples/server/petstore/haskell-servant/lib/Apis.hs
@@ -0,0 +1,24 @@
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE FlexibleInstances #-}
+module Apis (
+      api
+    , API
+    ) where
+
+import Api.UserApi (UserApi)
+import Api.PetApi (PetApi)
+import Api.StoreApi (StoreApi)
+
+import Data.Proxy
+import Servant.API
+import Test.QuickCheck
+import qualified Data.Map as Map
+import Utils
+
+type API = UserApi :<|> PetApi :<|> StoreApi
+
+api :: Proxy API
+api = Proxy
diff --git a/samples/server/petstore/haskell-servant/lib/Model/Category.hs b/samples/server/petstore/haskell-servant/lib/Model/Category.hs
new file mode 100644
index 00000000000..2d7d90776b2
--- /dev/null
+++ b/samples/server/petstore/haskell-servant/lib/Model/Category.hs
@@ -0,0 +1,24 @@
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+
+module Model.Category
+    ( Category (..)
+    ) where
+
+import Data.Aeson
+import GHC.Generics
+import Test.QuickCheck
+
+
+data Category = Category
+    { id_ :: Integer
+    , name :: String
+    } deriving (Show, Eq, Generic)
+
+instance FromJSON Category
+instance ToJSON Category
+instance Arbitrary Category where
+    arbitrary = Category <$> arbitrary <*> arbitrary
diff --git a/samples/server/petstore/haskell-servant/lib/Model/Order.hs b/samples/server/petstore/haskell-servant/lib/Model/Order.hs
new file mode 100644
index 00000000000..5c50f4ad85c
--- /dev/null
+++ b/samples/server/petstore/haskell-servant/lib/Model/Order.hs
@@ -0,0 +1,28 @@
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+
+module Model.Order
+    ( Order (..)
+    ) where
+
+import Data.Aeson
+import GHC.Generics
+import Test.QuickCheck
+
+
+data Order = Order
+    { id_ :: Integer
+    , petId :: Integer
+    , quantity :: Integer
+    , shipDate :: Integer
+    , status :: String
+    , complete :: Bool
+    } deriving (Show, Eq, Generic)
+
+instance FromJSON Order
+instance ToJSON Order
+instance Arbitrary Order where
+    arbitrary = Order <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary
diff --git a/samples/server/petstore/haskell-servant/lib/Model/Pet.hs b/samples/server/petstore/haskell-servant/lib/Model/Pet.hs
new file mode 100644
index 00000000000..dfe4bb8893a
--- /dev/null
+++ b/samples/server/petstore/haskell-servant/lib/Model/Pet.hs
@@ -0,0 +1,30 @@
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+
+module Model.Pet
+    ( Pet (..)
+    ) where
+
+import Data.Aeson
+import GHC.Generics
+import Test.QuickCheck
+import Model.Category
+import Model.Tag
+
+
+data Pet = Pet
+    { id_ :: Integer
+    , category :: Category
+    , name :: String
+    , photoUrls :: [String]
+    , tags :: [Tag]
+    , status :: String
+    } deriving (Show, Eq, Generic)
+
+instance FromJSON Pet
+instance ToJSON Pet
+instance Arbitrary Pet where
+    arbitrary = Pet <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary
diff --git a/samples/server/petstore/haskell-servant/lib/Model/Tag.hs b/samples/server/petstore/haskell-servant/lib/Model/Tag.hs
new file mode 100644
index 00000000000..7bbf8feb9b4
--- /dev/null
+++ b/samples/server/petstore/haskell-servant/lib/Model/Tag.hs
@@ -0,0 +1,24 @@
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+
+module Model.Tag
+    ( Tag (..)
+    ) where
+
+import Data.Aeson
+import GHC.Generics
+import Test.QuickCheck
+
+
+data Tag = Tag
+    { id_ :: Integer
+    , name :: String
+    } deriving (Show, Eq, Generic)
+
+instance FromJSON Tag
+instance ToJSON Tag
+instance Arbitrary Tag where
+    arbitrary = Tag <$> arbitrary <*> arbitrary
diff --git a/samples/server/petstore/haskell-servant/lib/Model/User.hs b/samples/server/petstore/haskell-servant/lib/Model/User.hs
new file mode 100644
index 00000000000..8ccf875dc7d
--- /dev/null
+++ b/samples/server/petstore/haskell-servant/lib/Model/User.hs
@@ -0,0 +1,30 @@
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+
+module Model.User
+    ( User (..)
+    ) where
+
+import Data.Aeson
+import GHC.Generics
+import Test.QuickCheck
+
+
+data User = User
+    { id_ :: Integer
+    , username :: String
+    , firstName :: String
+    , lastName :: String
+    , email :: String
+    , password :: String
+    , phone :: String
+    , userStatus :: Integer
+    } deriving (Show, Eq, Generic)
+
+instance FromJSON User
+instance ToJSON User
+instance Arbitrary User where
+    arbitrary = User <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary
diff --git a/samples/server/petstore/haskell-servant/lib/Utils.hs b/samples/server/petstore/haskell-servant/lib/Utils.hs
new file mode 100644
index 00000000000..f6db2602ce8
--- /dev/null
+++ b/samples/server/petstore/haskell-servant/lib/Utils.hs
@@ -0,0 +1,27 @@
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE FlexibleInstances #-}
+module Utils where
+
+import GHC.Generics
+import Servant.API
+import Data.List (intercalate)
+import Data.List.Split (splitOn)
+import qualified Data.Map as Map
+import qualified Data.Text as T
+import Test.QuickCheck
+
+instance FromText [String] where
+    fromText = Just . splitOn "," . T.unpack
+
+instance ToText [String] where
+    toText = T.pack . intercalate ","
+
+lkp inputs l = case lookup l inputs of
+        Nothing -> Left $ "label " ++ T.unpack l ++ " not found"
+        Just v  -> Right $ read (T.unpack v)
+
+instance (Ord k, Arbitrary k, Arbitrary v) => Arbitrary (Map.Map k v) where
+    arbitrary = Map.fromList <$> arbitrary
diff --git a/samples/server/petstore/haskell-servant/server/Main.hs b/samples/server/petstore/haskell-servant/server/Main.hs
new file mode 100644
index 00000000000..68b4ff6ce33
--- /dev/null
+++ b/samples/server/petstore/haskell-servant/server/Main.hs
@@ -0,0 +1,13 @@
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE TypeOperators #-}
+
+module Main where
+
+import Apis
+import Servant
+import Servant.Mock
+import qualified Network.Wai.Handler.Warp as Warp
+
+main :: IO ()
+main = Warp.run 8080 $ serve api (mock api)
diff --git a/samples/server/petstore/haskell-servant/stack.yaml b/samples/server/petstore/haskell-servant/stack.yaml
new file mode 100644
index 00000000000..00448df3e95
--- /dev/null
+++ b/samples/server/petstore/haskell-servant/stack.yaml
@@ -0,0 +1,33 @@
+# For more information, see: https://github.com/commercialhaskell/stack/blob/release/doc/yaml_configuration.md
+
+# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
+resolver: lts-3.17
+
+# Local packages, usually specified by relative directory name
+packages:
+- '.'
+
+# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
+extra-deps:
+- servant-mock-0.4.4.6
+
+# Override default flag values for local packages and extra-deps
+flags: {}
+
+# Extra package databases containing global packages
+extra-package-dbs: []
+
+# Control whether we use the GHC we find on the path
+# system-ghc: true
+
+# Require a specific version of stack, using version ranges
+# require-stack-version: -any # Default
+# require-stack-version: >= 0.1.10.0
+
+# Override the architecture used by stack, especially useful on Windows
+# arch: i386
+# arch: x86_64
+
+# Extra directories used by stack for building
+# extra-include-dirs: [/path/to/dir]
+# extra-lib-dirs: [/path/to/dir]
diff --git a/samples/server/petstore/java-inflector/pom.xml b/samples/server/petstore/java-inflector/pom.xml
index 681c0c874c0..ace023a70db 100644
--- a/samples/server/petstore/java-inflector/pom.xml
+++ b/samples/server/petstore/java-inflector/pom.xml
@@ -83,7 +83,7 @@
     </dependencies>
     <properties>
         <maven-plugin-version>1.0.0</maven-plugin-version>
-        <swagger-core-version>1.5.4</swagger-core-version>
+        <swagger-core-version>1.5.7</swagger-core-version>
         <jetty-version>9.2.9.v20150224</jetty-version>
         <logback-version>1.0.1</logback-version>
         <junit-version>4.8.2</junit-version>
diff --git a/samples/server/petstore/java-inflector/src/main/java/io/swagger/handler/PetController.java b/samples/server/petstore/java-inflector/src/main/java/io/swagger/handler/PetController.java
index 3690a40f94c..9a9c25f919f 100644
--- a/samples/server/petstore/java-inflector/src/main/java/io/swagger/handler/PetController.java
+++ b/samples/server/petstore/java-inflector/src/main/java/io/swagger/handler/PetController.java
@@ -13,7 +13,7 @@ import io.swagger.model.*;
 import io.swagger.model.Pet;
 import java.io.File;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2016-01-05T14:57:33.884+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2016-01-19T23:33:17.124+08:00")
 public class PetController  {
   /** 
    * Uncomment and implement as you see fit.  These operations will map
@@ -69,5 +69,11 @@ public class PetController  {
     }
   */
 
+  /*
+    public ResponseContext getPetByIdWithByteArray(RequestContext request , Long petId) {
+        return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
+    }
+  */
+
 }
 
diff --git a/samples/server/petstore/java-inflector/src/main/java/io/swagger/handler/StoreController.java b/samples/server/petstore/java-inflector/src/main/java/io/swagger/handler/StoreController.java
index 464fe9d67cf..e00b1a67048 100644
--- a/samples/server/petstore/java-inflector/src/main/java/io/swagger/handler/StoreController.java
+++ b/samples/server/petstore/java-inflector/src/main/java/io/swagger/handler/StoreController.java
@@ -13,7 +13,7 @@ import io.swagger.model.*;
 import java.util.Map;
 import io.swagger.model.Order;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2016-01-05T14:57:33.884+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2016-01-19T23:33:17.124+08:00")
 public class StoreController  {
   /** 
    * Uncomment and implement as you see fit.  These operations will map
diff --git a/samples/server/petstore/java-inflector/src/main/java/io/swagger/handler/UserController.java b/samples/server/petstore/java-inflector/src/main/java/io/swagger/handler/UserController.java
index ccbcc4ea413..41331602f07 100644
--- a/samples/server/petstore/java-inflector/src/main/java/io/swagger/handler/UserController.java
+++ b/samples/server/petstore/java-inflector/src/main/java/io/swagger/handler/UserController.java
@@ -13,7 +13,7 @@ import io.swagger.model.*;
 import io.swagger.model.User;
 import java.util.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2016-01-05T14:57:33.884+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2016-01-19T23:33:17.124+08:00")
 public class UserController  {
   /** 
    * Uncomment and implement as you see fit.  These operations will map
diff --git a/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Category.java b/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Category.java
index bc9d61291ea..ce925e6cfb8 100644
--- a/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Category.java
+++ b/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Category.java
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2016-01-05T14:57:33.884+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2016-01-19T23:33:17.124+08:00")
 public class Category   {
   
   private Long id = null;
diff --git a/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Order.java b/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Order.java
index cd08d7623da..4a1505f7442 100644
--- a/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Order.java
+++ b/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Order.java
@@ -11,7 +11,7 @@ import java.util.Date;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2016-01-05T14:57:33.884+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2016-01-19T23:33:17.124+08:00")
 public class Order   {
   
   private Long id = null;
diff --git a/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Pet.java b/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Pet.java
index ed11d7ada61..1e62a0a60dd 100644
--- a/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Pet.java
+++ b/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Pet.java
@@ -13,7 +13,7 @@ import java.util.*;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2016-01-05T14:57:33.884+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2016-01-19T23:33:17.124+08:00")
 public class Pet   {
   
   private Long id = null;
diff --git a/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Tag.java b/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Tag.java
index 42b385d3e81..c0d2e1e4c0e 100644
--- a/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Tag.java
+++ b/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Tag.java
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2016-01-05T14:57:33.884+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2016-01-19T23:33:17.124+08:00")
 public class Tag   {
   
   private Long id = null;
diff --git a/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/User.java b/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/User.java
index 2d33376bd8a..e2982024306 100644
--- a/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/User.java
+++ b/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/User.java
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2016-01-05T14:57:33.884+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2016-01-19T23:33:17.124+08:00")
 public class User   {
   
   private Long id = null;
diff --git a/samples/server/petstore/java-inflector/src/main/swagger/swagger.yaml b/samples/server/petstore/java-inflector/src/main/swagger/swagger.yaml
index 00fefa7f678..6e00a887848 100644
--- a/samples/server/petstore/java-inflector/src/main/swagger/swagger.yaml
+++ b/samples/server/petstore/java-inflector/src/main/swagger/swagger.yaml
@@ -287,6 +287,72 @@ paths:
         - "read:pets"
       x-contentType: "multipart/form-data"
       x-accepts: "application/json"
+  /pet/{petId}?testing_byte_array=true:
+    get:
+      tags:
+      - "pet"
+      summary: "Fake endpoint to test byte array return by 'Find pet by ID'"
+      description: "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate\
+        \ API error conditions"
+      operationId: "getPetByIdWithByteArray"
+      produces:
+      - "application/json"
+      - "application/xml"
+      parameters:
+      - name: "petId"
+        in: "path"
+        description: "ID of pet that needs to be fetched"
+        required: true
+        type: "integer"
+        format: "int64"
+      responses:
+        200:
+          description: "successful operation"
+          schema:
+            type: "string"
+            format: "binary"
+        400:
+          description: "Invalid ID supplied"
+        404:
+          description: "Pet not found"
+      security:
+      - api_key: []
+      - petstore_auth:
+        - "write:pets"
+        - "read:pets"
+      x-contentType: "application/json"
+      x-accepts: "application/json"
+  /pet?testing_byte_array=true:
+    post:
+      tags:
+      - "pet"
+      summary: "Fake endpoint to test byte array in body parameter for adding a new\
+        \ pet to the store"
+      description: ""
+      operationId: "addPetUsingByteArray"
+      consumes:
+      - "application/json"
+      - "application/xml"
+      produces:
+      - "application/json"
+      - "application/xml"
+      parameters:
+      - in: "body"
+        name: "body"
+        description: "Pet object in the form of byte array"
+        required: false
+        schema:
+          type: "string"
+          format: "binary"
+      responses:
+        405:
+          description: "Invalid input"
+      security:
+      - petstore_auth:
+        - "write:pets"
+        - "read:pets"
+      x-contentType: "application/json"
+      x-accepts: "application/json"
   /store/inventory:
     get:
       tags:
diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/api/PetApi.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/api/PetApi.java
new file mode 100644
index 00000000000..2e8ef241f49
--- /dev/null
+++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/api/PetApi.java
@@ -0,0 +1,56 @@
+package io.swagger.api;
+
+import io.swagger.model.Pet;
+import io.swagger.model.ApiResponse;
+import java.io.File;
+
+import javax.ws.rs.*;
+import javax.ws.rs.core.Response;
+
+import org.apache.cxf.jaxrs.ext.multipart.*;
+
+@Path("/")
+public interface PetApi  {
+    @POST
+    @Path("/pet")
+    @Consumes({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
+    public Response addPet(Pet body);
+    @DELETE
+    @Path("/pet/{petId}")
+    
+    @Produces({ "application/xml", "application/json" })
+    public Response deletePet(@PathParam("petId") Long petId,@HeaderParam("api_key") String apiKey);
+    @GET
+    @Path("/pet/findByStatus")
+    
+    @Produces({ "application/xml", "application/json" })
+    public Response findPetsByStatus(@QueryParam("status") List<String> status);
+    @GET
+    @Path("/pet/findByTags")
+    
+    @Produces({ "application/xml", "application/json" })
+    public Response findPetsByTags(@QueryParam("tags") List<String> tags);
+    @GET
+    @Path("/pet/{petId}")
+    
+    @Produces({ "application/xml", "application/json" })
+    public Response getPetById(@PathParam("petId") Long petId);
+    @PUT
+    @Path("/pet")
+    @Consumes({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
+    public Response updatePet(Pet body);
+    @POST
+    @Path("/pet/{petId}")
+    @Consumes({ "application/x-www-form-urlencoded" })
+    @Produces({ "application/xml", "application/json" })
+    public Response updatePetWithForm(@PathParam("petId") Long petId,@Multipart(value = "name", required = false)  String name,@Multipart(value = "status", required = false)  String status);
+    @POST
+    @Path("/pet/{petId}/uploadImage")
+    @Consumes({ "multipart/form-data" })
+    @Produces({ "application/json" })
+    public Response uploadFile(@PathParam("petId") Long petId,@Multipart(value = "additionalMetadata", required = false)  String additionalMetadata, @Multipart(value = "file", required = false) InputStream fileInputStream,
+   @Multipart(value = "file" , required = false) Attachment fileDetail);
+}
+
diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/api/StoreApi.java
new file mode 100644
index 00000000000..7b26e047746
--- /dev/null
+++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/api/StoreApi.java
@@ -0,0 +1,34 @@
+package io.swagger.api;
+
+import java.util.Map;
+import io.swagger.model.Order;
+
+import javax.ws.rs.*;
+import javax.ws.rs.core.Response;
+
+import org.apache.cxf.jaxrs.ext.multipart.*;
+
+@Path("/")
+public interface StoreApi  {
+    @DELETE
+    @Path("/store/order/{orderId}")
+    
+    @Produces({ "application/xml", "application/json" })
+    public Response deleteOrder(@PathParam("orderId") Long orderId);
+    @GET
+    @Path("/store/inventory")
+    
+    @Produces({ "application/json" })
+    public Response getInventory();
+    @GET
+    @Path("/store/order/{orderId}")
+    
+    @Produces({ "application/xml", "application/json" })
+    public Response getOrderById(@PathParam("orderId") Long orderId);
+    @POST
+    @Path("/store/order")
+    
+    @Produces({ "application/xml", "application/json" })
+    public Response placeOrder(Order body);
+}
+
diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/api/UserApi.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/api/UserApi.java
new file mode 100644
index 00000000000..19e5ab04f3a
--- /dev/null
+++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/api/UserApi.java
@@ -0,0 +1,54 @@
+package io.swagger.api;
+
+import io.swagger.model.User;
+import java.util.List;
+
+import javax.ws.rs.*;
+import javax.ws.rs.core.Response;
+
+import org.apache.cxf.jaxrs.ext.multipart.*;
+
+@Path("/")
+public interface UserApi  {
+    @POST
+    @Path("/user")
+    
+    @Produces({ "application/xml", "application/json" })
+    public Response createUser(User body);
+    @POST
+    @Path("/user/createWithArray")
+    
+    @Produces({ "application/xml", "application/json" })
+    public Response createUsersWithArrayInput(List<User> body);
+    @POST
+    @Path("/user/createWithList")
+    
+    @Produces({ "application/xml", "application/json" })
+    public Response createUsersWithListInput(List<User> body);
+    @DELETE
+    @Path("/user/{username}")
+    
+    @Produces({ "application/xml", "application/json" })
+    public Response deleteUser(@PathParam("username") String username);
+    @GET
+    @Path("/user/{username}")
+    
+    @Produces({ "application/xml", "application/json" })
+    public Response getUserByName(@PathParam("username") String username);
+    @GET
+    @Path("/user/login")
+    
+    @Produces({ "application/xml", "application/json" })
+    public Response loginUser(@QueryParam("username") String username,@QueryParam("password") String password);
+    @GET
+    @Path("/user/logout")
+    
+    @Produces({ "application/xml", "application/json" })
+    public Response logoutUser();
+    @PUT
+    @Path("/user/{username}")
+    
+    @Produces({ "application/xml", "application/json" })
+    public Response updateUser(@PathParam("username") String username,User body);
+}
+
diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/ApiResponse.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/ApiResponse.java
new file mode 100644
index 00000000000..68908204335
--- /dev/null
+++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/ApiResponse.java
@@ -0,0 +1,82 @@
+package io.swagger.model;
+
+
+
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+ @XmlType(name = "", propOrder =
+	{ "code", "type", "message"
+})
+
+@XmlRootElement(name="ApiResponse")
+public class ApiResponse  {
+  
+
+  private Integer code = null;
+
+  private String type = null;
+
+  private String message = null;
+
+  
+  /**
+   **/
+  
+  public Integer getCode() {
+    return code;
+  }
+  public void setCode(Integer code) {
+    this.code = code;
+  }
+  
+  /**
+   **/
+  
+  public String getType() {
+    return type;
+  }
+  public void setType(String type) {
+    this.type = type;
+  }
+  
+  /**
+   **/
+  
+  public String getMessage() {
+    return message;
+  }
+  public void setMessage(String message) {
+    this.message = message;
+  }
+  
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ApiResponse {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    type: ").append(toIndentedString(type)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private static String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Category.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Category.java
new file mode 100644
index 00000000000..d34537dc435
--- /dev/null
+++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Category.java
@@ -0,0 +1,69 @@
+package io.swagger.model;
+
+
+
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+ @XmlType(name = "", propOrder =
+	{ "id", "name"
+})
+
+@XmlRootElement(name="Category")
+public class Category  {
+  
+
+  private Long id = null;
+
+  private String name = null;
+
+  
+  /**
+   **/
+  
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+  
+  /**
+   **/
+  
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+  
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Category {\n");
+    
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private static String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Order.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Order.java
new file mode 100644
index 00000000000..93c120e6c5a
--- /dev/null
+++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Order.java
@@ -0,0 +1,139 @@
+package io.swagger.model;
+
+
+
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+ @XmlType(name = "", propOrder =
+	{ "id", "petId", "quantity", "shipDate", "status", "complete"
+})
+
+@XmlRootElement(name="Order")
+public class Order  {
+  
+
+  private Long id = null;
+
+  private Long petId = null;
+
+  private Integer quantity = null;
+
+  private javax.xml.datatype.XMLGregorianCalendar shipDate = null;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlType(name="Order")
+@XmlEnum
+public enum Order {
+    {values=[placed, approved, delivered], enumVars=[{name=PLACED, value=placed}, {name=APPROVED, value=approved}, {name=DELIVERED, value=delivered}]}, 
+    
+    public String value() {
+        return name();
+    }
+
+    public static Order fromValue(String v) {
+        return valueOf(v);
+    }
+}
+
+  private StatusEnum status = null;
+
+  private Boolean complete = false;
+
+  
+  /**
+   **/
+  
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+  
+  /**
+   **/
+  
+  public Long getPetId() {
+    return petId;
+  }
+  public void setPetId(Long petId) {
+    this.petId = petId;
+  }
+  
+  /**
+   **/
+  
+  public Integer getQuantity() {
+    return quantity;
+  }
+  public void setQuantity(Integer quantity) {
+    this.quantity = quantity;
+  }
+  
+  /**
+   **/
+  
+  public javax.xml.datatype.XMLGregorianCalendar getShipDate() {
+    return shipDate;
+  }
+  public void setShipDate(javax.xml.datatype.XMLGregorianCalendar shipDate) {
+    this.shipDate = shipDate;
+  }
+  
+  /**
+   * Order Status
+   **/
+  
+  public StatusEnum getStatus() {
+    return status;
+  }
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+  
+  /**
+   **/
+  
+  public Boolean getComplete() {
+    return complete;
+  }
+  public void setComplete(Boolean complete) {
+    this.complete = complete;
+  }
+  
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Order {\n");
+    
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    petId: ").append(toIndentedString(petId)).append("\n");
+    sb.append("    quantity: ").append(toIndentedString(quantity)).append("\n");
+    sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private static String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Pet.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Pet.java
new file mode 100644
index 00000000000..979781f19e0
--- /dev/null
+++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Pet.java
@@ -0,0 +1,143 @@
+package io.swagger.model;
+
+import io.swagger.model.Category;
+import io.swagger.model.Tag;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+ @XmlType(name = "", propOrder =
+	{ "id", "category", "name", "photoUrls", "tags", "status"
+})
+
+@XmlRootElement(name="Pet")
+public class Pet  {
+  
+
+  private Long id = null;
+
+  private Category category = null;
+
+  private String name = null;
+
+  private List<String> photoUrls = new ArrayList<String>();
+
+  private List<Tag> tags = new ArrayList<Tag>();
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlType(name="Pet")
+@XmlEnum
+public enum Pet {
+    {values=[available, pending, sold], enumVars=[{name=AVAILABLE, value=available}, {name=PENDING, value=pending}, {name=SOLD, value=sold}]}, 
+    
+    public String value() {
+        return name();
+    }
+
+    public static Pet fromValue(String v) {
+        return valueOf(v);
+    }
+}
+
+  private StatusEnum status = null;
+
+  
+  /**
+   **/
+  
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+  
+  /**
+   **/
+  
+  public Category getCategory() {
+    return category;
+  }
+  public void setCategory(Category category) {
+    this.category = category;
+  }
+  
+  /**
+   **/
+  
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+  
+  /**
+   **/
+  
+  public List<String> getPhotoUrls() {
+    return photoUrls;
+  }
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+  
+  /**
+   **/
+  
+  public List<Tag> getTags() {
+    return tags;
+  }
+  public void setTags(List<Tag> tags) {
+    this.tags = tags;
+  }
+  
+  /**
+   * pet status in the store
+   **/
+  
+  public StatusEnum getStatus() {
+    return status;
+  }
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+  
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Pet {\n");
+    
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    category: ").append(toIndentedString(category)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private static String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Tag.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Tag.java
new file mode 100644
index 00000000000..b2a2bcaaff9
--- /dev/null
+++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Tag.java
@@ -0,0 +1,69 @@
+package io.swagger.model;
+
+
+
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+ @XmlType(name = "", propOrder =
+	{ "id", "name"
+})
+
+@XmlRootElement(name="Tag")
+public class Tag  {
+  
+
+  private Long id = null;
+
+  private String name = null;
+
+  
+  /**
+   **/
+  
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+  
+  /**
+   **/
+  
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+  
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Tag {\n");
+    
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private static String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/User.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/User.java
new file mode 100644
index 00000000000..8683a630e5c
--- /dev/null
+++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/User.java
@@ -0,0 +1,148 @@
+package io.swagger.model;
+
+
+
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+ @XmlType(name = "", propOrder =
+	{ "id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus"
+})
+
+@XmlRootElement(name="User")
+public class User  {
+  
+
+  private Long id = null;
+
+  private String username = null;
+
+  private String firstName = null;
+
+  private String lastName = null;
+
+  private String email = null;
+
+  private String password = null;
+
+  private String phone = null;
+
+  private Integer userStatus = null;
+
+  
+  /**
+   **/
+  
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+  
+  /**
+   **/
+  
+  public String getUsername() {
+    return username;
+  }
+  public void setUsername(String username) {
+    this.username = username;
+  }
+  
+  /**
+   **/
+  
+  public String getFirstName() {
+    return firstName;
+  }
+  public void setFirstName(String firstName) {
+    this.firstName = firstName;
+  }
+  
+  /**
+   **/
+  
+  public String getLastName() {
+    return lastName;
+  }
+  public void setLastName(String lastName) {
+    this.lastName = lastName;
+  }
+  
+  /**
+   **/
+  
+  public String getEmail() {
+    return email;
+  }
+  public void setEmail(String email) {
+    this.email = email;
+  }
+  
+  /**
+   **/
+  
+  public String getPassword() {
+    return password;
+  }
+  public void setPassword(String password) {
+    this.password = password;
+  }
+  
+  /**
+   **/
+  
+  public String getPhone() {
+    return phone;
+  }
+  public void setPhone(String phone) {
+    this.phone = phone;
+  }
+  
+  /**
+   * User Status
+   **/
+  
+  public Integer getUserStatus() {
+    return userStatus;
+  }
+  public void setUserStatus(Integer userStatus) {
+    this.userStatus = userStatus;
+  }
+  
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class User {\n");
+    
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    username: ").append(toIndentedString(username)).append("\n");
+    sb.append("    firstName: ").append(toIndentedString(firstName)).append("\n");
+    sb.append("    lastName: ").append(toIndentedString(lastName)).append("\n");
+    sb.append("    email: ").append(toIndentedString(email)).append("\n");
+    sb.append("    password: ").append(toIndentedString(password)).append("\n");
+    sb.append("    phone: ").append(toIndentedString(phone)).append("\n");
+    sb.append("    userStatus: ").append(toIndentedString(userStatus)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private static String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jaxrs-resteasy/README.md b/samples/server/petstore/jaxrs-resteasy/README.md
new file mode 100644
index 00000000000..cc011c37ee5
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/README.md
@@ -0,0 +1,23 @@
+# Swagger generated server
+
+## Overview
+This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project. By using the 
+[OpenAPI-Spec](https://github.com/swagger-api/swagger-core/wiki) from a remote server, you can easily generate a server stub.  This
+is an example of building a swagger-enabled JAX-RS server.
+
+This example uses the [JAX-RS](https://jax-rs-spec.java.net/) framework.
+
+To run the server, please execute the following:
+
+```
+mvn clean package jetty:run
+```
+
+You can then view the swagger listing here:
+
+```
+http://localhost:8080/v2/swagger.json
+```
+
+Note that if you have configured the `host` to be something other than localhost, the calls through
+swagger-ui will be directed to that host and not localhost!
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/build.gradle b/samples/server/petstore/jaxrs-resteasy/build.gradle
new file mode 100644
index 00000000000..d7afa6c5222
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/build.gradle
@@ -0,0 +1,32 @@
+apply plugin: 'war'
+
+project.version = "1.0.0"
+project.group = "io.swagger"
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    providedCompile 'org.jboss.resteasy:resteasy-jaxrs:3.0.11.Final'
+    providedCompile 'org.jboss.resteasy:jaxrs-api:3.0.11.Final'
+    providedCompile 'org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final'
+    providedCompile 'org.jboss.resteasy:resteasy-multipart-provider:3.0.11.Final'
+    providedCompile 'javax.annotation:javax.annotation-api:1.2'
+    providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final'
+    compile         'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final'
+
+//    compile         'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.4.1'
+//    compile         'joda-time:joda-time:2.7'
+
+    testCompile     'junit:junit:4.12',
+                    'org.hamcrest:hamcrest-core:1.3'
+}
+
+sourceSets {
+    main {
+        java {
+            srcDir 'src/gen/java'
+        }
+    }
+}
diff --git a/samples/server/petstore/jaxrs-resteasy/pom.xml b/samples/server/petstore/jaxrs-resteasy/pom.xml
new file mode 100644
index 00000000000..c87fa4ab30d
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/pom.xml
@@ -0,0 +1,155 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>io.swagger</groupId>
+    <artifactId>swagger-jaxrs-resteasy-server</artifactId>
+    <packaging>war</packaging>
+    <name>swagger-jaxrs-resteasy-server</name>
+    <version>1.0.0</version>
+    <build>
+        <sourceDirectory>src/main/java</sourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.1.1</version>
+            </plugin>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.9.1</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>
+                                src/gen/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>${slf4j-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>${servlet-api-version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jaxrs</artifactId>
+            <version>${resteasy-version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>jaxrs-api</artifactId>
+            <version>${resteasy-version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-validator-provider-11</artifactId>
+            <version>${resteasy-version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-multipart-provider</artifactId>
+            <version>${resteasy-version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jackson2-provider</artifactId>
+            <version>${resteasy-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.2</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-joda</artifactId>
+            <version>2.4.1</version>
+        </dependency>
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>2.7</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>6.8.8</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>junit</artifactId>
+                    <groupId>junit</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>snakeyaml</artifactId>
+                    <groupId>org.yaml</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>bsh</artifactId>
+                    <groupId>org.beanshell</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+    <repositories>
+        <repository>
+            <id>sonatype-snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+    <properties>
+        <swagger-core-version>1.5.7</swagger-core-version>
+        <jetty-version>9.2.9.v20150224</jetty-version>
+        <resteasy-version>3.0.11.Final</resteasy-version>
+        <slf4j-version>1.6.3</slf4j-version>
+        <junit-version>4.8.1</junit-version>
+        <servlet-api-version>2.5</servlet-api-version>
+    </properties>
+</project>
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/settings.gradle b/samples/server/petstore/jaxrs-resteasy/settings.gradle
new file mode 100644
index 00000000000..6392b5011e0
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = "swagger-jaxrs-resteasy-server"
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/ApiException.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/ApiException.java
new file mode 100644
index 00000000000..bfeaf6571ad
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/ApiException.java
@@ -0,0 +1,10 @@
+package io.swagger.api;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+public class ApiException extends Exception{
+	private int code;
+	public ApiException (int code, String msg) {
+		super(msg);
+		this.code = code;
+	}
+}
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/ApiOriginFilter.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/ApiOriginFilter.java
new file mode 100644
index 00000000000..419f9ebab09
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/ApiOriginFilter.java
@@ -0,0 +1,22 @@
+package io.swagger.api;
+
+import java.io.IOException;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletResponse;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+public class ApiOriginFilter implements javax.servlet.Filter {
+	public void doFilter(ServletRequest request, ServletResponse response,
+			FilterChain chain) throws IOException, ServletException {
+		HttpServletResponse res = (HttpServletResponse) response;
+		res.addHeader("Access-Control-Allow-Origin", "*");
+		res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT");
+		res.addHeader("Access-Control-Allow-Headers", "Content-Type");
+		chain.doFilter(request, response);
+	}
+
+	public void destroy() {}
+
+	public void init(FilterConfig filterConfig) throws ServletException {}
+}
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/ApiResponseMessage.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/ApiResponseMessage.java
new file mode 100644
index 00000000000..2e00645c336
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/ApiResponseMessage.java
@@ -0,0 +1,69 @@
+package io.swagger.api;
+
+import javax.xml.bind.annotation.XmlTransient;
+
+@javax.xml.bind.annotation.XmlRootElement
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+public class ApiResponseMessage {
+	public static final int ERROR = 1;
+	public static final int WARNING = 2;
+	public static final int INFO = 3;
+	public static final int OK = 4;
+	public static final int TOO_BUSY = 5;
+
+	int code;
+	String type;
+	String message;
+	
+	public ApiResponseMessage(){}
+	
+	public ApiResponseMessage(int code, String message){
+		this.code = code;
+		switch(code){
+		case ERROR:
+			setType("error");
+			break;
+		case WARNING:
+			setType("warning");
+			break;
+		case INFO:
+			setType("info");
+			break;
+		case OK:
+			setType("ok");
+			break;
+		case TOO_BUSY:
+			setType("too busy");
+			break;
+		default:
+			setType("unknown");
+			break;
+		}
+		this.message = message;
+	}
+
+	@XmlTransient
+	public int getCode() {
+		return code;
+	}
+
+	public void setCode(int code) {
+		this.code = code;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+}
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/NotFoundException.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/NotFoundException.java
new file mode 100644
index 00000000000..52d5224b7eb
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/NotFoundException.java
@@ -0,0 +1,10 @@
+package io.swagger.api;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+public class NotFoundException extends ApiException {
+	private int code;
+	public NotFoundException (int code, String msg) {
+		super(code, msg);
+		this.code = code;
+	}
+}
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/PetApi.java
new file mode 100644
index 00000000000..10d335c19bd
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/PetApi.java
@@ -0,0 +1,109 @@
+package io.swagger.api;
+
+import io.swagger.model.*;
+import io.swagger.api.PetApiService;
+import io.swagger.api.factories.PetApiServiceFactory;
+
+import io.swagger.model.Pet;
+import io.swagger.model.InlineResponse200;
+import java.io.File;
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.*;
+import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput;
+
+@Path("/pet")
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+public class PetApi  {
+   private final PetApiService delegate = PetApiServiceFactory.getPetApi();
+
+    @POST
+    
+    @Consumes({ "application/json", "application/xml" })
+    @Produces({ "application/json", "application/xml" })
+    public Response addPet( Pet body,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.addPet(body,securityContext);
+    }
+    @DELETE
+    @Path("/{petId}")
+    
+    @Produces({ "application/json", "application/xml" })
+    public Response deletePet( @PathParam("petId") Long petId,@HeaderParam("api_key") String apiKey,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.deletePet(petId,apiKey,securityContext);
+    }
+    @GET
+    @Path("/findByStatus")
+    
+    @Produces({ "application/json", "application/xml" })
+    public Response findPetsByStatus( @QueryParam("status") List<String> status,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.findPetsByStatus(status,securityContext);
+    }
+    @GET
+    @Path("/findByTags")
+    
+    @Produces({ "application/json", "application/xml" })
+    public Response findPetsByTags( @QueryParam("tags") List<String> tags,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.findPetsByTags(tags,securityContext);
+    }
+    @GET
+    @Path("/{petId}")
+    
+    @Produces({ "application/json", "application/xml" })
+    public Response getPetById( @PathParam("petId") Long petId,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.getPetById(petId,securityContext);
+    }
+    @GET
+    @Path("/{petId}?response=inline_arbitrary_object")
+    
+    @Produces({ "application/json", "application/xml" })
+    public Response getPetByIdInObject( @PathParam("petId") Long petId,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.getPetByIdInObject(petId,securityContext);
+    }
+    @GET
+    @Path("/{petId}?testing_byte_array=true")
+    
+    @Produces({ "application/json", "application/xml" })
+    public Response petPetIdtestingByteArraytrueGet( @PathParam("petId") Long petId,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.petPetIdtestingByteArraytrueGet(petId,securityContext);
+    }
+    @PUT
+    
+    @Consumes({ "application/json", "application/xml" })
+    @Produces({ "application/json", "application/xml" })
+    public Response updatePet( Pet body,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.updatePet(body,securityContext);
+    }
+    @POST
+    @Path("/{petId}")
+    @Consumes({ "application/x-www-form-urlencoded" })
+    @Produces({ "application/json", "application/xml" })
+    public Response updatePetWithForm( @PathParam("petId") String petId,@FormParam("name")  String name,@FormParam("status")  String status,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.updatePetWithForm(petId,name,status,securityContext);
+    }
+    @POST
+    @Path("/{petId}/uploadImage")
+    @Consumes({ "multipart/form-data" })
+    @Produces({ "application/json", "application/xml" })
+    public Response uploadFile(MultipartFormDataInput input, @PathParam("petId") Long petId,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.uploadFile(input,petId,securityContext);
+    }
+}
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/PetApiService.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/PetApiService.java
new file mode 100644
index 00000000000..47ed65af8ab
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/PetApiService.java
@@ -0,0 +1,53 @@
+package io.swagger.api;
+
+import io.swagger.api.*;
+import io.swagger.model.*;
+import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput;
+
+
+import io.swagger.model.Pet;
+import io.swagger.model.InlineResponse200;
+import java.io.File;
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+public abstract class PetApiService {
+  
+      public abstract Response addPet(Pet body,SecurityContext securityContext)
+      throws NotFoundException;
+  
+      public abstract Response deletePet(Long petId,String apiKey,SecurityContext securityContext)
+      throws NotFoundException;
+  
+      public abstract Response findPetsByStatus(List<String> status,SecurityContext securityContext)
+      throws NotFoundException;
+  
+      public abstract Response findPetsByTags(List<String> tags,SecurityContext securityContext)
+      throws NotFoundException;
+  
+      public abstract Response getPetById(Long petId,SecurityContext securityContext)
+      throws NotFoundException;
+  
+      public abstract Response getPetByIdInObject(Long petId,SecurityContext securityContext)
+      throws NotFoundException;
+  
+      public abstract Response petPetIdtestingByteArraytrueGet(Long petId,SecurityContext securityContext)
+      throws NotFoundException;
+  
+      public abstract Response updatePet(Pet body,SecurityContext securityContext)
+      throws NotFoundException;
+  
+      public abstract Response updatePetWithForm(String petId,String name,String status,SecurityContext securityContext)
+      throws NotFoundException;
+  
+      public abstract Response uploadFile(MultipartFormDataInput input,Long petId,SecurityContext securityContext)
+      throws NotFoundException;
+  
+}
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/PettestingByteArraytrueApi.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/PettestingByteArraytrueApi.java
new file mode 100644
index 00000000000..8c742e89268
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/PettestingByteArraytrueApi.java
@@ -0,0 +1,33 @@
+package io.swagger.api;
+
+import io.swagger.model.*;
+import io.swagger.api.PettestingByteArraytrueApiService;
+import io.swagger.api.factories.PettestingByteArraytrueApiServiceFactory;
+
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.*;
+
+@Path("/pet?testing_byte_array=true")
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+public class PettestingByteArraytrueApi  {
+   private final PettestingByteArraytrueApiService delegate = PettestingByteArraytrueApiServiceFactory.getPettestingByteArraytrueApi();
+
+    @POST
+    
+    @Consumes({ "application/json", "application/xml" })
+    @Produces({ "application/json", "application/xml" })
+    public Response addPetUsingByteArray( byte[] body,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.addPetUsingByteArray(body,securityContext);
+    }
+}
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/PettestingByteArraytrueApiService.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/PettestingByteArraytrueApiService.java
new file mode 100644
index 00000000000..08186045b71
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/PettestingByteArraytrueApiService.java
@@ -0,0 +1,22 @@
+package io.swagger.api;
+
+import io.swagger.api.*;
+import io.swagger.model.*;
+
+
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+public abstract class PettestingByteArraytrueApiService {
+  
+      public abstract Response addPetUsingByteArray(byte[] body,SecurityContext securityContext)
+      throws NotFoundException;
+  
+}
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/RestApplication.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/RestApplication.java
new file mode 100644
index 00000000000..24aa63ce824
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/RestApplication.java
@@ -0,0 +1,9 @@
+package io.swagger.api;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+@ApplicationPath("/")
+public class RestApplication extends Application {
+
+}
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/StoreApi.java
new file mode 100644
index 00000000000..945b73e32f3
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/StoreApi.java
@@ -0,0 +1,75 @@
+package io.swagger.api;
+
+import io.swagger.model.*;
+import io.swagger.api.StoreApiService;
+import io.swagger.api.factories.StoreApiServiceFactory;
+
+import io.swagger.model.Order;
+import java.util.Map;
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.*;
+
+@Path("/store")
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+public class StoreApi  {
+   private final StoreApiService delegate = StoreApiServiceFactory.getStoreApi();
+
+    @DELETE
+    @Path("/order/{orderId}")
+    
+    @Produces({ "application/json", "application/xml" })
+    public Response deleteOrder( @PathParam("orderId") String orderId,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.deleteOrder(orderId,securityContext);
+    }
+    @GET
+    @Path("/findByStatus")
+    
+    @Produces({ "application/json", "application/xml" })
+    public Response findOrdersByStatus( @QueryParam("status") String status,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.findOrdersByStatus(status,securityContext);
+    }
+    @GET
+    @Path("/inventory")
+    
+    @Produces({ "application/json", "application/xml" })
+    public Response getInventory(@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.getInventory(securityContext);
+    }
+    @GET
+    @Path("/inventory?response=arbitrary_object")
+    
+    @Produces({ "application/json", "application/xml" })
+    public Response getInventoryInObject(@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.getInventoryInObject(securityContext);
+    }
+    @GET
+    @Path("/order/{orderId}")
+    
+    @Produces({ "application/json", "application/xml" })
+    public Response getOrderById( @PathParam("orderId") String orderId,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.getOrderById(orderId,securityContext);
+    }
+    @POST
+    @Path("/order")
+    
+    @Produces({ "application/json", "application/xml" })
+    public Response placeOrder( Order body,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.placeOrder(body,securityContext);
+    }
+}
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/StoreApiService.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/StoreApiService.java
new file mode 100644
index 00000000000..61ad4fd923b
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/StoreApiService.java
@@ -0,0 +1,39 @@
+package io.swagger.api;
+
+import io.swagger.api.*;
+import io.swagger.model.*;
+
+
+import io.swagger.model.Order;
+import java.util.Map;
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+public abstract class StoreApiService {
+  
+      public abstract Response deleteOrder(String orderId,SecurityContext securityContext)
+      throws NotFoundException;
+  
+      public abstract Response findOrdersByStatus(String status,SecurityContext securityContext)
+      throws NotFoundException;
+  
+      public abstract Response getInventory(SecurityContext securityContext)
+      throws NotFoundException;
+  
+      public abstract Response getInventoryInObject(SecurityContext securityContext)
+      throws NotFoundException;
+  
+      public abstract Response getOrderById(String orderId,SecurityContext securityContext)
+      throws NotFoundException;
+  
+      public abstract Response placeOrder(Order body,SecurityContext securityContext)
+      throws NotFoundException;
+  
+}
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/StringUtil.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/StringUtil.java
new file mode 100644
index 00000000000..87d9317396e
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/StringUtil.java
@@ -0,0 +1,42 @@
+package io.swagger.api;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+public class StringUtil {
+  /**
+   * Check if the given array contains the given value (with case-insensitive comparison).
+   *
+   * @param array The array
+   * @param value The value to search
+   * @return true if the array contains the value
+   */
+  public static boolean containsIgnoreCase(String[] array, String value) {
+    for (String str : array) {
+      if (value == null && str == null) return true;
+      if (value != null && value.equalsIgnoreCase(str)) return true;
+    }
+    return false;
+  }
+
+  /**
+   * Join an array of strings with the given separator.
+   * <p>
+   * Note: This might be replaced by utility method from commons-lang or guava someday
+   * if one of those libraries is added as dependency.
+   * </p>
+   *
+   * @param array     The array of strings
+   * @param separator The separator
+   * @return the resulting string
+   */
+  public static String join(String[] array, String separator) {
+    int len = array.length;
+    if (len == 0) return "";
+
+    StringBuilder out = new StringBuilder();
+    out.append(array[0]);
+    for (int i = 1; i < len; i++) {
+      out.append(separator).append(array[i]);
+    }
+    return out.toString();
+  }
+}
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/UserApi.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/UserApi.java
new file mode 100644
index 00000000000..be7af49cefa
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/UserApi.java
@@ -0,0 +1,91 @@
+package io.swagger.api;
+
+import io.swagger.model.*;
+import io.swagger.api.UserApiService;
+import io.swagger.api.factories.UserApiServiceFactory;
+
+import io.swagger.model.User;
+import java.util.List;
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.*;
+
+@Path("/user")
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+public class UserApi  {
+   private final UserApiService delegate = UserApiServiceFactory.getUserApi();
+
+    @POST
+    
+    
+    @Produces({ "application/json", "application/xml" })
+    public Response createUser( User body,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.createUser(body,securityContext);
+    }
+    @POST
+    @Path("/createWithArray")
+    
+    @Produces({ "application/json", "application/xml" })
+    public Response createUsersWithArrayInput( List<User> body,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.createUsersWithArrayInput(body,securityContext);
+    }
+    @POST
+    @Path("/createWithList")
+    
+    @Produces({ "application/json", "application/xml" })
+    public Response createUsersWithListInput( List<User> body,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.createUsersWithListInput(body,securityContext);
+    }
+    @DELETE
+    @Path("/{username}")
+    
+    @Produces({ "application/json", "application/xml" })
+    public Response deleteUser( @PathParam("username") String username,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.deleteUser(username,securityContext);
+    }
+    @GET
+    @Path("/{username}")
+    
+    @Produces({ "application/json", "application/xml" })
+    public Response getUserByName( @PathParam("username") String username,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.getUserByName(username,securityContext);
+    }
+    @GET
+    @Path("/login")
+    
+    @Produces({ "application/json", "application/xml" })
+    public Response loginUser( @QueryParam("username") String username, @QueryParam("password") String password,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.loginUser(username,password,securityContext);
+    }
+    @GET
+    @Path("/logout")
+    
+    @Produces({ "application/json", "application/xml" })
+    public Response logoutUser(@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.logoutUser(securityContext);
+    }
+    @PUT
+    @Path("/{username}")
+    
+    @Produces({ "application/json", "application/xml" })
+    public Response updateUser( @PathParam("username") String username, User body,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.updateUser(username,body,securityContext);
+    }
+}
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/UserApiService.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/UserApiService.java
new file mode 100644
index 00000000000..d28f14c07c0
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/UserApiService.java
@@ -0,0 +1,45 @@
+package io.swagger.api;
+
+import io.swagger.api.*;
+import io.swagger.model.*;
+
+
+import io.swagger.model.User;
+import java.util.List;
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+public abstract class UserApiService {
+  
+      public abstract Response createUser(User body,SecurityContext securityContext)
+      throws NotFoundException;
+  
+      public abstract Response createUsersWithArrayInput(List<User> body,SecurityContext securityContext)
+      throws NotFoundException;
+  
+      public abstract Response createUsersWithListInput(List<User> body,SecurityContext securityContext)
+      throws NotFoundException;
+  
+      public abstract Response deleteUser(String username,SecurityContext securityContext)
+      throws NotFoundException;
+  
+      public abstract Response getUserByName(String username,SecurityContext securityContext)
+      throws NotFoundException;
+  
+      public abstract Response loginUser(String username,String password,SecurityContext securityContext)
+      throws NotFoundException;
+  
+      public abstract Response logoutUser(SecurityContext securityContext)
+      throws NotFoundException;
+  
+      public abstract Response updateUser(String username,User body,SecurityContext securityContext)
+      throws NotFoundException;
+  
+}
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Category.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Category.java
new file mode 100644
index 00000000000..3786c816887
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Category.java
@@ -0,0 +1,83 @@
+package io.swagger.model;
+
+import java.util.Objects;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+public class Category   {
+  
+  private Long id = null;
+  private String name = null;
+
+  
+  /**
+   **/
+  
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Category category = (Category) o;
+    return Objects.equals(id, category.id) &&
+        Objects.equals(name, category.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, name);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Category {\n");
+    
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/InlineResponse200.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/InlineResponse200.java
new file mode 100644
index 00000000000..408a4ccdb0e
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/InlineResponse200.java
@@ -0,0 +1,166 @@
+package io.swagger.model;
+
+import java.util.Objects;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.model.Tag;
+import java.util.List;
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+public class InlineResponse200   {
+  
+  private List<Tag> tags = new ArrayList<Tag>();
+  private Long id = null;
+  private Object category = null;
+
+
+  public enum StatusEnum {
+    AVAILABLE("available"),
+    PENDING("pending"),
+    SOLD("sold");
+
+    private String value;
+
+    StatusEnum(String value) {
+      this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+      return value;
+    }
+  }
+
+  private StatusEnum status = null;
+  private String name = null;
+  private List<String> photoUrls = new ArrayList<String>();
+
+  
+  /**
+   **/
+  
+  @JsonProperty("tags")
+  public List<Tag> getTags() {
+    return tags;
+  }
+  public void setTags(List<Tag> tags) {
+    this.tags = tags;
+  }
+
+  
+  /**
+   **/
+  
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  
+  @JsonProperty("category")
+  public Object getCategory() {
+    return category;
+  }
+  public void setCategory(Object category) {
+    this.category = category;
+  }
+
+  
+  /**
+   * pet status in the store
+   **/
+  
+  @JsonProperty("status")
+  public StatusEnum getStatus() {
+    return status;
+  }
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+  
+  /**
+   **/
+  
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  
+  /**
+   **/
+  
+  @JsonProperty("photoUrls")
+  public List<String> getPhotoUrls() {
+    return photoUrls;
+  }
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    InlineResponse200 inlineResponse200 = (InlineResponse200) o;
+    return Objects.equals(tags, inlineResponse200.tags) &&
+        Objects.equals(id, inlineResponse200.id) &&
+        Objects.equals(category, inlineResponse200.category) &&
+        Objects.equals(status, inlineResponse200.status) &&
+        Objects.equals(name, inlineResponse200.name) &&
+        Objects.equals(photoUrls, inlineResponse200.photoUrls);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(tags, id, category, status, name, photoUrls);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class InlineResponse200 {\n");
+    
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    category: ").append(toIndentedString(category)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/ModelReturn.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/ModelReturn.java
new file mode 100644
index 00000000000..a7ab3bb3df6
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/ModelReturn.java
@@ -0,0 +1,68 @@
+package io.swagger.model;
+
+import java.util.Objects;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+public class ModelReturn   {
+  
+  private Integer _return = null;
+
+  
+  /**
+   **/
+  
+  @JsonProperty("return")
+  public Integer getReturn() {
+    return _return;
+  }
+  public void setReturn(Integer _return) {
+    this._return = _return;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ModelReturn _return = (ModelReturn) o;
+    return Objects.equals(_return, _return._return);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(_return);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ModelReturn {\n");
+    
+    sb.append("    _return: ").append(toIndentedString(_return)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Name.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Name.java
new file mode 100644
index 00000000000..ff879eeb209
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Name.java
@@ -0,0 +1,68 @@
+package io.swagger.model;
+
+import java.util.Objects;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+public class Name   {
+  
+  private Integer name = null;
+
+  
+  /**
+   **/
+  
+  @JsonProperty("name")
+  public Integer getName() {
+    return name;
+  }
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Name name = (Name) o;
+    return Objects.equals(name, name.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Name {\n");
+    
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Order.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Order.java
new file mode 100644
index 00000000000..1d40f9c3359
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Order.java
@@ -0,0 +1,165 @@
+package io.swagger.model;
+
+import java.util.Objects;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+import java.util.Date;
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+public class Order   {
+  
+  private Long id = null;
+  private Long petId = null;
+  private Integer quantity = null;
+  private Date shipDate = null;
+
+
+  public enum StatusEnum {
+    PLACED("placed"),
+    APPROVED("approved"),
+    DELIVERED("delivered");
+
+    private String value;
+
+    StatusEnum(String value) {
+      this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+      return value;
+    }
+  }
+
+  private StatusEnum status = null;
+  private Boolean complete = null;
+
+  
+  /**
+   **/
+  
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  
+  @JsonProperty("petId")
+  public Long getPetId() {
+    return petId;
+  }
+  public void setPetId(Long petId) {
+    this.petId = petId;
+  }
+
+  
+  /**
+   **/
+  
+  @JsonProperty("quantity")
+  public Integer getQuantity() {
+    return quantity;
+  }
+  public void setQuantity(Integer quantity) {
+    this.quantity = quantity;
+  }
+
+  
+  /**
+   **/
+  
+  @JsonProperty("shipDate")
+  public Date getShipDate() {
+    return shipDate;
+  }
+  public void setShipDate(Date shipDate) {
+    this.shipDate = shipDate;
+  }
+
+  
+  /**
+   * Order Status
+   **/
+  
+  @JsonProperty("status")
+  public StatusEnum getStatus() {
+    return status;
+  }
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+  
+  /**
+   **/
+  
+  @JsonProperty("complete")
+  public Boolean getComplete() {
+    return complete;
+  }
+  public void setComplete(Boolean complete) {
+    this.complete = complete;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Order order = (Order) o;
+    return Objects.equals(id, order.id) &&
+        Objects.equals(petId, order.petId) &&
+        Objects.equals(quantity, order.quantity) &&
+        Objects.equals(shipDate, order.shipDate) &&
+        Objects.equals(status, order.status) &&
+        Objects.equals(complete, order.complete);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Order {\n");
+    
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    petId: ").append(toIndentedString(petId)).append("\n");
+    sb.append("    quantity: ").append(toIndentedString(quantity)).append("\n");
+    sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Pet.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Pet.java
new file mode 100644
index 00000000000..51f31e982ef
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Pet.java
@@ -0,0 +1,167 @@
+package io.swagger.model;
+
+import java.util.Objects;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.model.Category;
+import io.swagger.model.Tag;
+import java.util.List;
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+public class Pet   {
+  
+  private Long id = null;
+  private Category category = null;
+  private String name = null;
+  private List<String> photoUrls = new ArrayList<String>();
+  private List<Tag> tags = new ArrayList<Tag>();
+
+
+  public enum StatusEnum {
+    AVAILABLE("available"),
+    PENDING("pending"),
+    SOLD("sold");
+
+    private String value;
+
+    StatusEnum(String value) {
+      this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+      return value;
+    }
+  }
+
+  private StatusEnum status = null;
+
+  
+  /**
+   **/
+  
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  
+  @JsonProperty("category")
+  public Category getCategory() {
+    return category;
+  }
+  public void setCategory(Category category) {
+    this.category = category;
+  }
+
+  
+  /**
+   **/
+  
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  
+  /**
+   **/
+  
+  @JsonProperty("photoUrls")
+  public List<String> getPhotoUrls() {
+    return photoUrls;
+  }
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
+  
+  /**
+   **/
+  
+  @JsonProperty("tags")
+  public List<Tag> getTags() {
+    return tags;
+  }
+  public void setTags(List<Tag> tags) {
+    this.tags = tags;
+  }
+
+  
+  /**
+   * pet status in the store
+   **/
+  
+  @JsonProperty("status")
+  public StatusEnum getStatus() {
+    return status;
+  }
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Pet pet = (Pet) o;
+    return Objects.equals(id, pet.id) &&
+        Objects.equals(category, pet.category) &&
+        Objects.equals(name, pet.name) &&
+        Objects.equals(photoUrls, pet.photoUrls) &&
+        Objects.equals(tags, pet.tags) &&
+        Objects.equals(status, pet.status);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, category, name, photoUrls, tags, status);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Pet {\n");
+    
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    category: ").append(toIndentedString(category)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/SpecialModelName.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/SpecialModelName.java
new file mode 100644
index 00000000000..f5c2edcb253
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/SpecialModelName.java
@@ -0,0 +1,68 @@
+package io.swagger.model;
+
+import java.util.Objects;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+public class SpecialModelName   {
+  
+  private Long specialPropertyName = null;
+
+  
+  /**
+   **/
+  
+  @JsonProperty("$special[property.name]")
+  public Long getSpecialPropertyName() {
+    return specialPropertyName;
+  }
+  public void setSpecialPropertyName(Long specialPropertyName) {
+    this.specialPropertyName = specialPropertyName;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    SpecialModelName specialModelName = (SpecialModelName) o;
+    return Objects.equals(specialPropertyName, specialModelName.specialPropertyName);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(specialPropertyName);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class SpecialModelName {\n");
+    
+    sb.append("    specialPropertyName: ").append(toIndentedString(specialPropertyName)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Tag.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Tag.java
new file mode 100644
index 00000000000..9f231bfabcd
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Tag.java
@@ -0,0 +1,83 @@
+package io.swagger.model;
+
+import java.util.Objects;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+public class Tag   {
+  
+  private Long id = null;
+  private String name = null;
+
+  
+  /**
+   **/
+  
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Tag tag = (Tag) o;
+    return Objects.equals(id, tag.id) &&
+        Objects.equals(name, tag.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, name);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Tag {\n");
+    
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/User.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/User.java
new file mode 100644
index 00000000000..16b2b78a9f3
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/User.java
@@ -0,0 +1,174 @@
+package io.swagger.model;
+
+import java.util.Objects;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+public class User   {
+  
+  private Long id = null;
+  private String username = null;
+  private String firstName = null;
+  private String lastName = null;
+  private String email = null;
+  private String password = null;
+  private String phone = null;
+  private Integer userStatus = null;
+
+  
+  /**
+   **/
+  
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  
+  @JsonProperty("username")
+  public String getUsername() {
+    return username;
+  }
+  public void setUsername(String username) {
+    this.username = username;
+  }
+
+  
+  /**
+   **/
+  
+  @JsonProperty("firstName")
+  public String getFirstName() {
+    return firstName;
+  }
+  public void setFirstName(String firstName) {
+    this.firstName = firstName;
+  }
+
+  
+  /**
+   **/
+  
+  @JsonProperty("lastName")
+  public String getLastName() {
+    return lastName;
+  }
+  public void setLastName(String lastName) {
+    this.lastName = lastName;
+  }
+
+  
+  /**
+   **/
+  
+  @JsonProperty("email")
+  public String getEmail() {
+    return email;
+  }
+  public void setEmail(String email) {
+    this.email = email;
+  }
+
+  
+  /**
+   **/
+  
+  @JsonProperty("password")
+  public String getPassword() {
+    return password;
+  }
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+  
+  /**
+   **/
+  
+  @JsonProperty("phone")
+  public String getPhone() {
+    return phone;
+  }
+  public void setPhone(String phone) {
+    this.phone = phone;
+  }
+
+  
+  /**
+   * User Status
+   **/
+  
+  @JsonProperty("userStatus")
+  public Integer getUserStatus() {
+    return userStatus;
+  }
+  public void setUserStatus(Integer userStatus) {
+    this.userStatus = userStatus;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    User user = (User) o;
+    return Objects.equals(id, user.id) &&
+        Objects.equals(username, user.username) &&
+        Objects.equals(firstName, user.firstName) &&
+        Objects.equals(lastName, user.lastName) &&
+        Objects.equals(email, user.email) &&
+        Objects.equals(password, user.password) &&
+        Objects.equals(phone, user.phone) &&
+        Objects.equals(userStatus, user.userStatus);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class User {\n");
+    
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    username: ").append(toIndentedString(username)).append("\n");
+    sb.append("    firstName: ").append(toIndentedString(firstName)).append("\n");
+    sb.append("    lastName: ").append(toIndentedString(lastName)).append("\n");
+    sb.append("    email: ").append(toIndentedString(email)).append("\n");
+    sb.append("    password: ").append(toIndentedString(password)).append("\n");
+    sb.append("    phone: ").append(toIndentedString(phone)).append("\n");
+    sb.append("    userStatus: ").append(toIndentedString(userStatus)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java b/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java
new file mode 100644
index 00000000000..5b59c799d83
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java
@@ -0,0 +1,15 @@
+package io.swagger.api.factories;
+
+import io.swagger.api.PetApiService;
+import io.swagger.api.impl.PetApiServiceImpl;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-02-04T01:58:20.368+07:00")
+public class PetApiServiceFactory {
+
+   private final static PetApiService service = new PetApiServiceImpl();
+
+   public static PetApiService getPetApi()
+   {
+      return service;
+   }
+}
diff --git a/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/factories/PettestingByteArraytrueApiServiceFactory.java b/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/factories/PettestingByteArraytrueApiServiceFactory.java
new file mode 100644
index 00000000000..42f4715fad4
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/factories/PettestingByteArraytrueApiServiceFactory.java
@@ -0,0 +1,15 @@
+package io.swagger.api.factories;
+
+import io.swagger.api.PettestingByteArraytrueApiService;
+import io.swagger.api.impl.PettestingByteArraytrueApiServiceImpl;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-02-04T01:58:20.368+07:00")
+public class PettestingByteArraytrueApiServiceFactory {
+
+   private final static PettestingByteArraytrueApiService service = new PettestingByteArraytrueApiServiceImpl();
+
+   public static PettestingByteArraytrueApiService getPettestingByteArraytrueApi()
+   {
+      return service;
+   }
+}
diff --git a/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java b/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java
new file mode 100644
index 00000000000..d24f09ed8fc
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java
@@ -0,0 +1,15 @@
+package io.swagger.api.factories;
+
+import io.swagger.api.StoreApiService;
+import io.swagger.api.impl.StoreApiServiceImpl;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-02-04T01:58:20.368+07:00")
+public class StoreApiServiceFactory {
+
+   private final static StoreApiService service = new StoreApiServiceImpl();
+
+   public static StoreApiService getStoreApi()
+   {
+      return service;
+   }
+}
diff --git a/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java b/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java
new file mode 100644
index 00000000000..8a976ccd354
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java
@@ -0,0 +1,15 @@
+package io.swagger.api.factories;
+
+import io.swagger.api.UserApiService;
+import io.swagger.api.impl.UserApiServiceImpl;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-02-04T01:58:20.368+07:00")
+public class UserApiServiceFactory {
+
+   private final static UserApiService service = new UserApiServiceImpl();
+
+   public static UserApiService getUserApi()
+   {
+      return service;
+   }
+}
diff --git a/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java
new file mode 100644
index 00000000000..1e4b479b32f
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java
@@ -0,0 +1,85 @@
+package io.swagger.api.impl;
+
+import io.swagger.api.*;
+import io.swagger.model.*;
+import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput;
+
+
+import io.swagger.model.Pet;
+import java.io.File;
+
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-02-04T01:58:20.368+07:00")
+
+public class PetApiServiceImpl extends PetApiService {
+
+    @Override
+    public Response updatePet(Pet body,SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+
+    @Override
+    public Response addPet(Pet body,SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+
+    @Override
+    public Response findPetsByStatus(List<String> status,SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+
+    @Override
+    public Response findPetsByTags(List<String> tags,SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+
+    @Override
+    public Response getPetById(Long petId,SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+
+    @Override
+    public Response getPetByIdInObject(Long petId,SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+
+    @Override
+    public Response updatePetWithForm(String petId,String name,String status,SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+
+    @Override
+    public Response deletePet(Long petId,String apiKey,SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+
+    @Override
+    public Response uploadFile(MultipartFormDataInput input,Long petId,SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+
+    @Override
+    public Response petPetIdtestingByteArraytrueGet(Long petId,SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+
+}
+
diff --git a/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/impl/PettestingByteArraytrueApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/impl/PettestingByteArraytrueApiServiceImpl.java
new file mode 100644
index 00000000000..5a3c2519b03
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/impl/PettestingByteArraytrueApiServiceImpl.java
@@ -0,0 +1,29 @@
+package io.swagger.api.impl;
+
+import io.swagger.api.*;
+import io.swagger.model.*;
+
+
+
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-02-04T01:58:20.368+07:00")
+
+public class PettestingByteArraytrueApiServiceImpl extends PettestingByteArraytrueApiService {
+  
+      @Override
+      public Response addPetUsingByteArray(byte[] body,SecurityContext securityContext)
+      throws NotFoundException {
+      // do some magic!
+      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+  }
+  
+}
+
diff --git a/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java
new file mode 100644
index 00000000000..0bb503589cb
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java
@@ -0,0 +1,60 @@
+package io.swagger.api.impl;
+
+import io.swagger.api.*;
+import io.swagger.model.*;
+
+
+import java.util.Map;
+import io.swagger.model.Order;
+
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-02-04T01:58:20.368+07:00")
+
+public class StoreApiServiceImpl extends StoreApiService {
+
+    @Override
+    public Response getInventory(SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+
+    @Override
+    public Response getInventoryInObject(SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+
+    @Override
+    public Response placeOrder(Order body,SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+
+    @Override
+    public Response getOrderById(String orderId,SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+
+    @Override
+    public Response deleteOrder(String orderId,SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+
+    @Override
+    public Response findOrdersByStatus(String status, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+
+}
+
diff --git a/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java
new file mode 100644
index 00000000000..e2d9acb67ba
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java
@@ -0,0 +1,72 @@
+package io.swagger.api.impl;
+
+import io.swagger.api.*;
+import io.swagger.model.*;
+
+
+import io.swagger.model.User;
+import java.util.*;
+
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-02-04T01:58:20.368+07:00")
+
+public class UserApiServiceImpl extends UserApiService {
+
+    @Override
+    public Response createUser(User body,SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+
+    @Override
+    public Response createUsersWithArrayInput(List<User> body,SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+
+    @Override
+    public Response createUsersWithListInput(List<User> body,SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+
+    @Override
+    public Response loginUser(String username,String password,SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+
+    @Override
+    public Response logoutUser(SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+
+    @Override
+    public Response getUserByName(String username,SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+
+    @Override
+    public Response updateUser(String username,User body,SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+
+    @Override
+    public Response deleteUser(String username,SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+
+}
+
diff --git a/samples/server/petstore/jaxrs-resteasy/src/main/webapp/WEB-INF/jboss-web.xml b/samples/server/petstore/jaxrs-resteasy/src/main/webapp/WEB-INF/jboss-web.xml
new file mode 100644
index 00000000000..9c05ed07b78
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/main/webapp/WEB-INF/jboss-web.xml
@@ -0,0 +1,3 @@
+<jboss-web>
+    <context-root>/v2</context-root>
+</jboss-web>
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/src/main/webapp/WEB-INF/web.xml b/samples/server/petstore/jaxrs-resteasy/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 00000000000..52a89e92132
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+  xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee    http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+  <filter>
+    <filter-name>ApiOriginFilter</filter-name>
+    <filter-class>io.swagger.api.ApiOriginFilter</filter-class>
+  </filter>
+  <filter-mapping>
+    <filter-name>ApiOriginFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+</web-app>
diff --git a/samples/server/petstore/jaxrs/pom.xml b/samples/server/petstore/jaxrs/pom.xml
index dda5043b7d1..9064489b34d 100644
--- a/samples/server/petstore/jaxrs/pom.xml
+++ b/samples/server/petstore/jaxrs/pom.xml
@@ -168,7 +168,7 @@
     </repository>
   </repositories>
   <properties>
-    <swagger-core-version>1.5.4</swagger-core-version>
+    <swagger-core-version>1.5.8</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey-version>1.18.1</jersey-version>
     <slf4j-version>1.6.3</slf4j-version>
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiException.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiException.java
index 53cfa9257fc..7fa61c50d24 100644
--- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiException.java
+++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiException.java
@@ -1,6 +1,6 @@
 package io.swagger.api;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2016-01-05T15:00:28.637+08:00")
+
 public class ApiException extends Exception{
 	private int code;
 	public ApiException (int code, String msg) {
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiOriginFilter.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiOriginFilter.java
index ecd55f5964f..2dc07362c92 100644
--- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiOriginFilter.java
+++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiOriginFilter.java
@@ -5,7 +5,7 @@ import java.io.IOException;
 import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2016-01-05T15:00:28.637+08:00")
+
 public class ApiOriginFilter implements javax.servlet.Filter {
 	public void doFilter(ServletRequest request, ServletResponse response,
 			FilterChain chain) throws IOException, ServletException {
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiResponseMessage.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiResponseMessage.java
index 8683412c079..33f95878e54 100644
--- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiResponseMessage.java
+++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiResponseMessage.java
@@ -3,7 +3,7 @@ package io.swagger.api;
 import javax.xml.bind.annotation.XmlTransient;
 
 @javax.xml.bind.annotation.XmlRootElement
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2016-01-05T15:00:28.637+08:00")
+
 public class ApiResponseMessage {
 	public static final int ERROR = 1;
 	public static final int WARNING = 2;
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/JacksonJsonProvider.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/JacksonJsonProvider.java
new file mode 100644
index 00000000000..49792814c5e
--- /dev/null
+++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/JacksonJsonProvider.java
@@ -0,0 +1,19 @@
+package io.swagger.api;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
+import io.swagger.util.Json;
+
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@Produces({MediaType.APPLICATION_JSON})
+public class JacksonJsonProvider extends JacksonJaxbJsonProvider {
+    private static ObjectMapper commonMapper = Json.mapper();
+
+    public JacksonJsonProvider() {
+        super.setMapper(commonMapper);
+    }
+}
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/NotFoundException.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/NotFoundException.java
index a7bfa44cf6a..295109d7fc4 100644
--- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/NotFoundException.java
+++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/NotFoundException.java
@@ -1,6 +1,6 @@
 package io.swagger.api;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2016-01-05T15:00:28.637+08:00")
+
 public class NotFoundException extends ApiException {
 	private int code;
 	public NotFoundException (int code, String msg) {
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApi.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApi.java
index 267a9dc4e47..500451add3a 100644
--- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApi.java
+++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApi.java
@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiParam;
 import com.sun.jersey.multipart.FormDataParam;
 
 import io.swagger.model.Pet;
+import io.swagger.model.ApiResponse;
 import java.io.File;
 
 import java.util.List;
@@ -28,53 +29,53 @@ import javax.ws.rs.*;
 
 
 @io.swagger.annotations.Api(description = "the pet API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2016-01-05T15:00:28.637+08:00")
+
 public class PetApi  {
    private final PetApiService delegate = PetApiServiceFactory.getPetApi();
 
-    @PUT
-    
-    @Consumes({ "application/json", "application/xml" })
-    @Produces({ "application/json", "application/xml" })
-    @io.swagger.annotations.ApiOperation(value = "Update an existing pet", notes = "", response = Void.class, authorizations = {
-        @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
-            @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-            @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets")
-        })
-    }, tags={ "pet",  })
-    @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
-        
-        @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Void.class),
-        
-        @io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception", response = Void.class) })
-
-    public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ) Pet body,@Context SecurityContext securityContext)
-    throws NotFoundException {
-        return delegate.updatePet(body,securityContext);
-    }
     @POST
     
     @Consumes({ "application/json", "application/xml" })
-    @Produces({ "application/json", "application/xml" })
-    @io.swagger.annotations.ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class, authorizations = {
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Add a new pet to the store", notes = "", response = void.class, authorizations = {
         @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
             @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
             @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets")
         })
     }, tags={ "pet",  })
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
-
-    public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ) Pet body,@Context SecurityContext securityContext)
+        @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = void.class) })
+    public Response addPet(
+        @ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet body,
+        @Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.addPet(body,securityContext);
     }
+    @DELETE
+    @Path("/{petId}")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Deletes a pet", notes = "", response = void.class, authorizations = {
+        @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
+            @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+            @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets")
+        })
+    }, tags={ "pet",  })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = void.class),
+        @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = void.class) })
+    public Response deletePet(
+        @ApiParam(value = "Pet id to delete",required=true) @PathParam("petId") Long petId,
+        @ApiParam(value = "" )@HeaderParam("api_key") String apiKey,
+        @Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.deletePet(petId,apiKey,securityContext);
+    }
     @GET
     @Path("/findByStatus")
     
-    @Produces({ "application/json", "application/xml" })
-    @io.swagger.annotations.ApiOperation(value = "Finds Pets by status", notes = "Multiple status values can be provided with comma seperated strings", response = Pet.class, responseContainer = "List", authorizations = {
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Finds Pets by status", notes = "Multiple status values can be provided with comma separated strings", response = Pet.class, responseContainer = "List", authorizations = {
         @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
             @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
             @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets")
@@ -82,18 +83,18 @@ public class PetApi  {
     }, tags={ "pet",  })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
-        
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid status value", response = Pet.class, responseContainer = "List") })
-
-    public Response findPetsByStatus(@ApiParam(value = "Status values that need to be considered for filter", defaultValue="available") @QueryParam("status") List<String> status,@Context SecurityContext securityContext)
+    public Response findPetsByStatus(
+        @ApiParam(value = "Status values that need to be considered for filter",required=true) @QueryParam("status") List<String> status,
+        @Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.findPetsByStatus(status,securityContext);
     }
     @GET
     @Path("/findByTags")
     
-    @Produces({ "application/json", "application/xml" })
-    @io.swagger.annotations.ApiOperation(value = "Finds Pets by tags", notes = "Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = {
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Finds Pets by tags", notes = "Muliple tags can be provided with comma separated strings. Use\ntag1, tag2, tag3 for testing.\n", response = Pet.class, responseContainer = "List", authorizations = {
         @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
             @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
             @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets")
@@ -101,81 +102,89 @@ public class PetApi  {
     }, tags={ "pet",  })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
-        
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid tag value", response = Pet.class, responseContainer = "List") })
-
-    public Response findPetsByTags(@ApiParam(value = "Tags to filter by") @QueryParam("tags") List<String> tags,@Context SecurityContext securityContext)
+    public Response findPetsByTags(
+        @ApiParam(value = "Tags to filter by",required=true) @QueryParam("tags") List<String> tags,
+        @Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.findPetsByTags(tags,securityContext);
     }
     @GET
     @Path("/{petId}")
     
-    @Produces({ "application/json", "application/xml" })
-    @io.swagger.annotations.ApiOperation(value = "Find pet by ID", notes = "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions", response = Pet.class, authorizations = {
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Find pet by ID", notes = "Returns a single pet", response = Pet.class, authorizations = {
         @io.swagger.annotations.Authorization(value = "api_key")
     }, tags={ "pet",  })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class),
-        
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Pet.class),
-        
         @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Pet.class) })
-
-    public Response getPetById(@ApiParam(value = "ID of pet that needs to be fetched",required=true) @PathParam("petId") Long petId,@Context SecurityContext securityContext)
+    public Response getPetById(
+        @ApiParam(value = "ID of pet to return",required=true) @PathParam("petId") Long petId,
+        @Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.getPetById(petId,securityContext);
     }
+    @PUT
+    
+    @Consumes({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Update an existing pet", notes = "", response = void.class, authorizations = {
+        @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
+            @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+            @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets")
+        })
+    }, tags={ "pet",  })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = void.class),
+        @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = void.class),
+        @io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception", response = void.class) })
+    public Response updatePet(
+        @ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet body,
+        @Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.updatePet(body,securityContext);
+    }
     @POST
     @Path("/{petId}")
     @Consumes({ "application/x-www-form-urlencoded" })
-    @Produces({ "application/json", "application/xml" })
-    @io.swagger.annotations.ApiOperation(value = "Updates a pet in the store with form data", notes = "", response = Void.class, authorizations = {
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Updates a pet in the store with form data", notes = "null", response = void.class, authorizations = {
         @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
             @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
             @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets")
         })
     }, tags={ "pet",  })
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
-
-    public Response updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated",required=true) @PathParam("petId") String petId,@ApiParam(value = "Updated name of the pet")@FormParam("name")  String name,@ApiParam(value = "Updated status of the pet")@FormParam("status")  String status,@Context SecurityContext securityContext)
+        @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = void.class) })
+    public Response updatePetWithForm(
+        @ApiParam(value = "ID of pet that needs to be updated",required=true) @PathParam("petId") Long petId,
+        @ApiParam(value = "Updated name of the pet")@FormParam("name")  String name,
+        @ApiParam(value = "Updated status of the pet")@FormParam("status")  String status,
+        @Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.updatePetWithForm(petId,name,status,securityContext);
     }
-    @DELETE
-    @Path("/{petId}")
-    
-    @Produces({ "application/json", "application/xml" })
-    @io.swagger.annotations.ApiOperation(value = "Deletes a pet", notes = "", response = Void.class, authorizations = {
-        @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
-            @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-            @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets")
-        })
-    }, tags={ "pet",  })
-    @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid pet value", response = Void.class) })
-
-    public Response deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathParam("petId") Long petId,@ApiParam(value = "" )@HeaderParam("api_key") String apiKey,@Context SecurityContext securityContext)
-    throws NotFoundException {
-        return delegate.deletePet(petId,apiKey,securityContext);
-    }
     @POST
     @Path("/{petId}/uploadImage")
     @Consumes({ "multipart/form-data" })
-    @Produces({ "application/json", "application/xml" })
-    @io.swagger.annotations.ApiOperation(value = "uploads an image", notes = "", response = Void.class, authorizations = {
+    @Produces({ "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "uploads an image", notes = "", response = ApiResponse.class, authorizations = {
         @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
             @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
             @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets")
         })
     }, tags={ "pet" })
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-
-    public Response uploadFile(@ApiParam(value = "ID of pet to update",required=true) @PathParam("petId") Long petId,@ApiParam(value = "Additional data to pass to server")@FormParam("additionalMetadata")  String additionalMetadata,  @FormDataParam("file") InputStream inputStream,
-      @FormDataParam("file") FormDataContentDisposition fileDetail,@Context SecurityContext securityContext)
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = ApiResponse.class) })
+    public Response uploadFile(
+        @ApiParam(value = "ID of pet to update",required=true) @PathParam("petId") Long petId,
+        @FormDataParam("additionalMetadata")  String additionalMetadata,
+        @FormDataParam("file") InputStream inputStream,
+        @FormDataParam("file") FormDataContentDisposition fileDetail,
+        @Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.uploadFile(petId,additionalMetadata,fileDetail,securityContext);
+        return delegate.uploadFile(petId,additionalMetadata,inputStream, fileDetail,securityContext);
     }
 }
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApiService.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApiService.java
index e24543592be..2aa3ab0cd34 100644
--- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApiService.java
+++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApiService.java
@@ -6,6 +6,7 @@ import io.swagger.model.*;
 import com.sun.jersey.multipart.FormDataParam;
 
 import io.swagger.model.Pet;
+import io.swagger.model.ApiResponse;
 import java.io.File;
 
 import java.util.List;
@@ -19,13 +20,13 @@ import com.sun.jersey.multipart.FormDataParam;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2016-01-05T15:00:28.637+08:00")
+
 public abstract class PetApiService {
   
-      public abstract Response updatePet(Pet body,SecurityContext securityContext)
+      public abstract Response addPet(Pet body,SecurityContext securityContext)
       throws NotFoundException;
   
-      public abstract Response addPet(Pet body,SecurityContext securityContext)
+      public abstract Response deletePet(Long petId,String apiKey,SecurityContext securityContext)
       throws NotFoundException;
   
       public abstract Response findPetsByStatus(List<String> status,SecurityContext securityContext)
@@ -37,13 +38,13 @@ public abstract class PetApiService {
       public abstract Response getPetById(Long petId,SecurityContext securityContext)
       throws NotFoundException;
   
-      public abstract Response updatePetWithForm(String petId,String name,String status,SecurityContext securityContext)
+      public abstract Response updatePet(Pet body,SecurityContext securityContext)
       throws NotFoundException;
   
-      public abstract Response deletePet(Long petId,String apiKey,SecurityContext securityContext)
+      public abstract Response updatePetWithForm(Long petId,String name,String status,SecurityContext securityContext)
       throws NotFoundException;
   
-      public abstract Response uploadFile(Long petId,String additionalMetadata,FormDataContentDisposition fileDetail,SecurityContext securityContext)
+      public abstract Response uploadFile(Long petId,String additionalMetadata,InputStream inputStream, FormDataContentDisposition fileDetail,SecurityContext securityContext)
       throws NotFoundException;
   
 }
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApi.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApi.java
index 3a3c2a3c08a..c9d9a17aec7 100644
--- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApi.java
@@ -28,66 +28,65 @@ import javax.ws.rs.*;
 
 
 @io.swagger.annotations.Api(description = "the store API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2016-01-05T15:00:28.637+08:00")
+
 public class StoreApi  {
    private final StoreApiService delegate = StoreApiServiceFactory.getStoreApi();
 
+    @DELETE
+    @Path("/order/{orderId}")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with positive integer value.\\ \\ Negative or non-integer values will generate API errors", response = void.class, tags={ "store",  })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = void.class),
+        @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = void.class) })
+    public Response deleteOrder(
+        @ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathParam("orderId") Long orderId,
+        @Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.deleteOrder(orderId,securityContext);
+    }
     @GET
     @Path("/inventory")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/json" })
     @io.swagger.annotations.ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", response = Integer.class, responseContainer = "Map", authorizations = {
         @io.swagger.annotations.Authorization(value = "api_key")
     }, tags={ "store",  })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Integer.class, responseContainer = "Map") })
-
-    public Response getInventory(@Context SecurityContext securityContext)
+    public Response getInventory(
+        @Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.getInventory(securityContext);
     }
-    @POST
-    @Path("/order")
-    
-    @Produces({ "application/json", "application/xml" })
-    @io.swagger.annotations.ApiOperation(value = "Place an order for a pet", notes = "", response = Order.class, tags={ "store",  })
-    @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
-        
-        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order", response = Order.class) })
-
-    public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ) Order body,@Context SecurityContext securityContext)
-    throws NotFoundException {
-        return delegate.placeOrder(body,securityContext);
-    }
     @GET
     @Path("/order/{orderId}")
     
-    @Produces({ "application/json", "application/xml" })
-    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, tags={ "store",  })
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value >= 1 and <= 10.\nOther values will generated exceptions\n", response = Order.class, tags={ "store",  })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
-        
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Order.class),
-        
         @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Order.class) })
-
-    public Response getOrderById(@ApiParam(value = "ID of pet that needs to be fetched",required=true) @PathParam("orderId") String orderId,@Context SecurityContext securityContext)
+    public Response getOrderById(
+        @ApiParam(value = "ID of pet that needs to be fetched",required=true) @PathParam("orderId") Long orderId,
+        @Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.getOrderById(orderId,securityContext);
     }
-    @DELETE
-    @Path("/order/{orderId}")
+    @POST
+    @Path("/order")
     
-    @Produces({ "application/json", "application/xml" })
-    @io.swagger.annotations.ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class, tags={ "store" })
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Place an order for a pet", notes = "", response = Order.class, tags={ "store" })
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
-        
-        @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Void.class) })
-
-    public Response deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathParam("orderId") String orderId,@Context SecurityContext securityContext)
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order", response = Order.class) })
+    public Response placeOrder(
+        @ApiParam(value = "order placed for purchasing the pet" ,required=true) Order body,
+        @Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.deleteOrder(orderId,securityContext);
+        return delegate.placeOrder(body,securityContext);
     }
 }
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApiService.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApiService.java
index e71c9b33ecf..643a46d6596 100644
--- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApiService.java
+++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApiService.java
@@ -19,19 +19,19 @@ import com.sun.jersey.multipart.FormDataParam;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2016-01-05T15:00:28.637+08:00")
+
 public abstract class StoreApiService {
   
+      public abstract Response deleteOrder(Long orderId,SecurityContext securityContext)
+      throws NotFoundException;
+  
       public abstract Response getInventory(SecurityContext securityContext)
       throws NotFoundException;
   
+      public abstract Response getOrderById(Long orderId,SecurityContext securityContext)
+      throws NotFoundException;
+  
       public abstract Response placeOrder(Order body,SecurityContext securityContext)
       throws NotFoundException;
   
-      public abstract Response getOrderById(String orderId,SecurityContext securityContext)
-      throws NotFoundException;
-  
-      public abstract Response deleteOrder(String orderId,SecurityContext securityContext)
-      throws NotFoundException;
-  
 }
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StringUtil.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StringUtil.java
new file mode 100644
index 00000000000..6f4a3dadbbf
--- /dev/null
+++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StringUtil.java
@@ -0,0 +1,42 @@
+package io.swagger.api;
+
+
+public class StringUtil {
+  /**
+   * Check if the given array contains the given value (with case-insensitive comparison).
+   *
+   * @param array The array
+   * @param value The value to search
+   * @return true if the array contains the value
+   */
+  public static boolean containsIgnoreCase(String[] array, String value) {
+    for (String str : array) {
+      if (value == null && str == null) return true;
+      if (value != null && value.equalsIgnoreCase(str)) return true;
+    }
+    return false;
+  }
+
+  /**
+   * Join an array of strings with the given separator.
+   * <p>
+   * Note: This might be replaced by utility method from commons-lang or guava someday
+   * if one of those libraries is added as dependency.
+   * </p>
+   *
+   * @param array     The array of strings
+   * @param separator The separator
+   * @return the resulting string
+   */
+  public static String join(String[] array, String separator) {
+    int len = array.length;
+    if (len == 0) return "";
+
+    StringBuilder out = new StringBuilder();
+    out.append(array[0]);
+    for (int i = 1; i < len; i++) {
+      out.append(separator).append(array[i]);
+    }
+    return out.toString();
+  }
+}
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApi.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApi.java
index 281ca64889c..43728481866 100644
--- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApi.java
+++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApi.java
@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiParam;
 import com.sun.jersey.multipart.FormDataParam;
 
 import io.swagger.model.User;
-import java.util.*;
+import java.util.List;
 
 import java.util.List;
 import io.swagger.api.NotFoundException;
@@ -28,114 +28,118 @@ import javax.ws.rs.*;
 
 
 @io.swagger.annotations.Api(description = "the user API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2016-01-05T15:00:28.637+08:00")
+
 public class UserApi  {
    private final UserApiService delegate = UserApiServiceFactory.getUserApi();
 
     @POST
     
     
-    @Produces({ "application/json", "application/xml" })
-    @io.swagger.annotations.ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user",  })
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = void.class, tags={ "user",  })
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-
-    public Response createUser(@ApiParam(value = "Created user object" ) User body,@Context SecurityContext securityContext)
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = void.class) })
+    public Response createUser(
+        @ApiParam(value = "Created user object" ,required=true) User body,
+        @Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.createUser(body,securityContext);
     }
     @POST
     @Path("/createWithArray")
     
-    @Produces({ "application/json", "application/xml" })
-    @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user",  })
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = void.class, tags={ "user",  })
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-
-    public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ) List<User> body,@Context SecurityContext securityContext)
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = void.class) })
+    public Response createUsersWithArrayInput(
+        @ApiParam(value = "List of user object" ,required=true) List<User> body,
+        @Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.createUsersWithArrayInput(body,securityContext);
     }
     @POST
     @Path("/createWithList")
     
-    @Produces({ "application/json", "application/xml" })
-    @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user",  })
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = void.class, tags={ "user",  })
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-
-    public Response createUsersWithListInput(@ApiParam(value = "List of user object" ) List<User> body,@Context SecurityContext securityContext)
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = void.class) })
+    public Response createUsersWithListInput(
+        @ApiParam(value = "List of user object" ,required=true) List<User> body,
+        @Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.createUsersWithListInput(body,securityContext);
     }
+    @DELETE
+    @Path("/{username}")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = void.class, tags={ "user",  })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = void.class),
+        @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = void.class) })
+    public Response deleteUser(
+        @ApiParam(value = "The name that needs to be deleted",required=true) @PathParam("username") String username,
+        @Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.deleteUser(username,securityContext);
+    }
+    @GET
+    @Path("/{username}")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Get user by user name", notes = "", response = User.class, tags={ "user",  })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = User.class),
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = User.class),
+        @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = User.class) })
+    public Response getUserByName(
+        @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.",required=true) @PathParam("username") String username,
+        @Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.getUserByName(username,securityContext);
+    }
     @GET
     @Path("/login")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     @io.swagger.annotations.ApiOperation(value = "Logs user into the system", notes = "", response = String.class, tags={ "user",  })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = String.class),
-        
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username/password supplied", response = String.class) })
-
-    public Response loginUser(@ApiParam(value = "The user name for login") @QueryParam("username") String username,@ApiParam(value = "The password for login in clear text") @QueryParam("password") String password,@Context SecurityContext securityContext)
+    public Response loginUser(
+        @ApiParam(value = "The user name for login",required=true) @QueryParam("username") String username,
+        @ApiParam(value = "The password for login in clear text",required=true) @QueryParam("password") String password,
+        @Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.loginUser(username,password,securityContext);
     }
     @GET
     @Path("/logout")
     
-    @Produces({ "application/json", "application/xml" })
-    @io.swagger.annotations.ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class, tags={ "user",  })
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Logs out current logged in user session", notes = "null", response = void.class, tags={ "user",  })
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-
-    public Response logoutUser(@Context SecurityContext securityContext)
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = void.class) })
+    public Response logoutUser(
+        @Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.logoutUser(securityContext);
     }
-    @GET
-    @Path("/{username}")
-    
-    @Produces({ "application/json", "application/xml" })
-    @io.swagger.annotations.ApiOperation(value = "Get user by user name", notes = "", response = User.class, tags={ "user",  })
-    @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = User.class),
-        
-        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = User.class),
-        
-        @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = User.class) })
-
-    public Response getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.",required=true) @PathParam("username") String username,@Context SecurityContext securityContext)
-    throws NotFoundException {
-        return delegate.getUserByName(username,securityContext);
-    }
     @PUT
     @Path("/{username}")
     
-    @Produces({ "application/json", "application/xml" })
-    @io.swagger.annotations.ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user",  })
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = void.class, tags={ "user" })
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid user supplied", response = Void.class),
-        
-        @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) })
-
-    public Response updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathParam("username") String username,@ApiParam(value = "Updated user object" ) User body,@Context SecurityContext securityContext)
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid user supplied", response = void.class),
+        @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = void.class) })
+    public Response updateUser(
+        @ApiParam(value = "name that need to be updated",required=true) @PathParam("username") String username,
+        @ApiParam(value = "Updated user object" ,required=true) User body,
+        @Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.updateUser(username,body,securityContext);
     }
-    @DELETE
-    @Path("/{username}")
-    
-    @Produces({ "application/json", "application/xml" })
-    @io.swagger.annotations.ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user" })
-    @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
-        
-        @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) })
-
-    public Response deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathParam("username") String username,@Context SecurityContext securityContext)
-    throws NotFoundException {
-        return delegate.deleteUser(username,securityContext);
-    }
 }
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApiService.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApiService.java
index dc7804341d1..334bfa1164b 100644
--- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApiService.java
+++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApiService.java
@@ -6,7 +6,7 @@ import io.swagger.model.*;
 import com.sun.jersey.multipart.FormDataParam;
 
 import io.swagger.model.User;
-import java.util.*;
+import java.util.List;
 
 import java.util.List;
 import io.swagger.api.NotFoundException;
@@ -19,7 +19,7 @@ import com.sun.jersey.multipart.FormDataParam;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2016-01-05T15:00:28.637+08:00")
+
 public abstract class UserApiService {
   
       public abstract Response createUser(User body,SecurityContext securityContext)
@@ -31,19 +31,19 @@ public abstract class UserApiService {
       public abstract Response createUsersWithListInput(List<User> body,SecurityContext securityContext)
       throws NotFoundException;
   
+      public abstract Response deleteUser(String username,SecurityContext securityContext)
+      throws NotFoundException;
+  
+      public abstract Response getUserByName(String username,SecurityContext securityContext)
+      throws NotFoundException;
+  
       public abstract Response loginUser(String username,String password,SecurityContext securityContext)
       throws NotFoundException;
   
       public abstract Response logoutUser(SecurityContext securityContext)
       throws NotFoundException;
   
-      public abstract Response getUserByName(String username,SecurityContext securityContext)
-      throws NotFoundException;
-  
       public abstract Response updateUser(String username,User body,SecurityContext securityContext)
       throws NotFoundException;
   
-      public abstract Response deleteUser(String username,SecurityContext securityContext)
-      throws NotFoundException;
-  
 }
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/ApiResponse.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/ApiResponse.java
new file mode 100644
index 00000000000..dd6bcbf2cb1
--- /dev/null
+++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/ApiResponse.java
@@ -0,0 +1,117 @@
+package io.swagger.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+
+
+
+
+public class ApiResponse   {
+  
+  private Integer code = null;
+  private String type = null;
+  private String message = null;
+
+  
+  /**
+   **/
+  public ApiResponse code(Integer code) {
+    this.code = code;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("code")
+  public Integer getCode() {
+    return code;
+  }
+  public void setCode(Integer code) {
+    this.code = code;
+  }
+
+  
+  /**
+   **/
+  public ApiResponse type(String type) {
+    this.type = type;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("type")
+  public String getType() {
+    return type;
+  }
+  public void setType(String type) {
+    this.type = type;
+  }
+
+  
+  /**
+   **/
+  public ApiResponse message(String message) {
+    this.message = message;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("message")
+  public String getMessage() {
+    return message;
+  }
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ApiResponse apiResponse = (ApiResponse) o;
+    return Objects.equals(code, apiResponse.code) &&
+        Objects.equals(type, apiResponse.type) &&
+        Objects.equals(message, apiResponse.message);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(code, type, message);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ApiResponse {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    type: ").append(toIndentedString(type)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Category.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Category.java
index f4c69f09d72..fd27ccac1c4 100644
--- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Category.java
+++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Category.java
@@ -2,7 +2,6 @@ package io.swagger.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -10,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2016-01-05T15:00:28.637+08:00")
+
 public class Category   {
   
   private Long id = null;
@@ -19,6 +18,11 @@ public class Category   {
   
   /**
    **/
+  public Category id(Long id) {
+    this.id = id;
+    return this;
+  }
+
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -32,6 +36,11 @@ public class Category   {
   
   /**
    **/
+  public Category name(String name) {
+    this.name = name;
+    return this;
+  }
+
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Order.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Order.java
index 6924871e072..0dd4222776c 100644
--- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Order.java
+++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Order.java
@@ -11,7 +11,7 @@ import java.util.Date;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2016-01-05T15:00:28.637+08:00")
+
 public class Order   {
   
   private Long id = null;
@@ -39,11 +39,16 @@ public class Order   {
   }
 
   private StatusEnum status = null;
-  private Boolean complete = null;
+  private Boolean complete = false;
 
   
   /**
    **/
+  public Order id(Long id) {
+    this.id = id;
+    return this;
+  }
+
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -57,6 +62,11 @@ public class Order   {
   
   /**
    **/
+  public Order petId(Long petId) {
+    this.petId = petId;
+    return this;
+  }
+
   
   @ApiModelProperty(value = "")
   @JsonProperty("petId")
@@ -70,6 +80,11 @@ public class Order   {
   
   /**
    **/
+  public Order quantity(Integer quantity) {
+    this.quantity = quantity;
+    return this;
+  }
+
   
   @ApiModelProperty(value = "")
   @JsonProperty("quantity")
@@ -83,6 +98,11 @@ public class Order   {
   
   /**
    **/
+  public Order shipDate(Date shipDate) {
+    this.shipDate = shipDate;
+    return this;
+  }
+
   
   @ApiModelProperty(value = "")
   @JsonProperty("shipDate")
@@ -97,6 +117,11 @@ public class Order   {
   /**
    * Order Status
    **/
+  public Order status(StatusEnum status) {
+    this.status = status;
+    return this;
+  }
+
   
   @ApiModelProperty(value = "Order Status")
   @JsonProperty("status")
@@ -110,6 +135,11 @@ public class Order   {
   
   /**
    **/
+  public Order complete(Boolean complete) {
+    this.complete = complete;
+    return this;
+  }
+
   
   @ApiModelProperty(value = "")
   @JsonProperty("complete")
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Pet.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Pet.java
index 228f3cdfc3d..514bb24508d 100644
--- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Pet.java
+++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Pet.java
@@ -7,13 +7,14 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.model.Category;
 import io.swagger.model.Tag;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+
 
 
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2016-01-05T15:00:28.637+08:00")
 public class Pet   {
   
   private Long id = null;
@@ -46,6 +47,11 @@ public class Pet   {
   
   /**
    **/
+  public Pet id(Long id) {
+    this.id = id;
+    return this;
+  }
+
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -59,6 +65,11 @@ public class Pet   {
   
   /**
    **/
+  public Pet category(Category category) {
+    this.category = category;
+    return this;
+  }
+
   
   @ApiModelProperty(value = "")
   @JsonProperty("category")
@@ -72,8 +83,13 @@ public class Pet   {
   
   /**
    **/
+  public Pet name(String name) {
+    this.name = name;
+    return this;
+  }
+
   
-  @ApiModelProperty(required = true, value = "")
+  @ApiModelProperty(example = "doggie", required = true, value = "")
   @JsonProperty("name")
   public String getName() {
     return name;
@@ -85,6 +101,11 @@ public class Pet   {
   
   /**
    **/
+  public Pet photoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+    return this;
+  }
+
   
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("photoUrls")
@@ -98,6 +119,11 @@ public class Pet   {
   
   /**
    **/
+  public Pet tags(List<Tag> tags) {
+    this.tags = tags;
+    return this;
+  }
+
   
   @ApiModelProperty(value = "")
   @JsonProperty("tags")
@@ -112,6 +138,11 @@ public class Pet   {
   /**
    * pet status in the store
    **/
+  public Pet status(StatusEnum status) {
+    this.status = status;
+    return this;
+  }
+
   
   @ApiModelProperty(value = "pet status in the store")
   @JsonProperty("status")
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Tag.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Tag.java
index 71b8486c54c..b46638ccb69 100644
--- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Tag.java
+++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Tag.java
@@ -2,7 +2,6 @@ package io.swagger.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -10,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2016-01-05T15:00:28.637+08:00")
+
 public class Tag   {
   
   private Long id = null;
@@ -19,6 +18,11 @@ public class Tag   {
   
   /**
    **/
+  public Tag id(Long id) {
+    this.id = id;
+    return this;
+  }
+
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -32,6 +36,11 @@ public class Tag   {
   
   /**
    **/
+  public Tag name(String name) {
+    this.name = name;
+    return this;
+  }
+
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/User.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/User.java
index 9bb0e077179..7f18c02f599 100644
--- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/User.java
+++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/User.java
@@ -2,7 +2,6 @@ package io.swagger.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -10,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2016-01-05T15:00:28.637+08:00")
+
 public class User   {
   
   private Long id = null;
@@ -25,6 +24,11 @@ public class User   {
   
   /**
    **/
+  public User id(Long id) {
+    this.id = id;
+    return this;
+  }
+
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -38,6 +42,11 @@ public class User   {
   
   /**
    **/
+  public User username(String username) {
+    this.username = username;
+    return this;
+  }
+
   
   @ApiModelProperty(value = "")
   @JsonProperty("username")
@@ -51,6 +60,11 @@ public class User   {
   
   /**
    **/
+  public User firstName(String firstName) {
+    this.firstName = firstName;
+    return this;
+  }
+
   
   @ApiModelProperty(value = "")
   @JsonProperty("firstName")
@@ -64,6 +78,11 @@ public class User   {
   
   /**
    **/
+  public User lastName(String lastName) {
+    this.lastName = lastName;
+    return this;
+  }
+
   
   @ApiModelProperty(value = "")
   @JsonProperty("lastName")
@@ -77,6 +96,11 @@ public class User   {
   
   /**
    **/
+  public User email(String email) {
+    this.email = email;
+    return this;
+  }
+
   
   @ApiModelProperty(value = "")
   @JsonProperty("email")
@@ -90,6 +114,11 @@ public class User   {
   
   /**
    **/
+  public User password(String password) {
+    this.password = password;
+    return this;
+  }
+
   
   @ApiModelProperty(value = "")
   @JsonProperty("password")
@@ -103,6 +132,11 @@ public class User   {
   
   /**
    **/
+  public User phone(String phone) {
+    this.phone = phone;
+    return this;
+  }
+
   
   @ApiModelProperty(value = "")
   @JsonProperty("phone")
@@ -117,6 +151,11 @@ public class User   {
   /**
    * User Status
    **/
+  public User userStatus(Integer userStatus) {
+    this.userStatus = userStatus;
+    return this;
+  }
+
   
   @ApiModelProperty(value = "User Status")
   @JsonProperty("userStatus")
diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/Bootstrap.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/Bootstrap.java
new file mode 100644
index 00000000000..0651af80f18
--- /dev/null
+++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/Bootstrap.java
@@ -0,0 +1,31 @@
+package io.swagger.api;
+
+import io.swagger.jaxrs.config.SwaggerContextService;
+import io.swagger.models.*;
+
+import io.swagger.models.auth.*;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+
+public class Bootstrap extends HttpServlet {
+  @Override
+  public void init(ServletConfig config) throws ServletException {
+    Info info = new Info()
+      .title("Swagger Server")
+      .description("This is a sample server Petstore server.  You can find out more about\nSwagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).\nFor this sample, you can use the api key `special-key` to test the authorization filters.\n")
+      .termsOfService("http://swagger.io/terms/")
+      .contact(new Contact()
+        .email("apiteam@swagger.io"))
+      .license(new License()
+        .name("Apache 2.0")
+        .url("http://www.apache.org/licenses/LICENSE-2.0.html"));
+
+    ServletContext context = config.getServletContext();
+    Swagger swagger = new Swagger().info(info);
+
+    new SwaggerContextService().withServletConfig(config).updateSwagger(swagger);
+  }
+}
diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java
index 1096ef30806..8a15fd9a8ad 100644
--- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java
@@ -3,7 +3,7 @@ package io.swagger.api.factories;
 import io.swagger.api.PetApiService;
 import io.swagger.api.impl.PetApiServiceImpl;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T22:31:25.130-08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-03T13:30:41.715-06:00")
 public class PetApiServiceFactory {
 
    private final static PetApiService service = new PetApiServiceImpl();
diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java
index 2fb1234323a..4f83a413c6f 100644
--- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java
@@ -3,7 +3,7 @@ package io.swagger.api.factories;
 import io.swagger.api.StoreApiService;
 import io.swagger.api.impl.StoreApiServiceImpl;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T22:31:25.130-08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-03T13:30:41.715-06:00")
 public class StoreApiServiceFactory {
 
    private final static StoreApiService service = new StoreApiServiceImpl();
diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java
index 4c654779ed9..0ce96e28a30 100644
--- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java
@@ -3,7 +3,7 @@ package io.swagger.api.factories;
 import io.swagger.api.UserApiService;
 import io.swagger.api.impl.UserApiServiceImpl;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-05T22:31:25.130-08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-03T13:30:41.715-06:00")
 public class UserApiServiceFactory {
 
    private final static UserApiService service = new UserApiServiceImpl();
diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java
index 1907ffd40a5..a6183190212 100644
--- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java
@@ -6,6 +6,7 @@ import io.swagger.model.*;
 import com.sun.jersey.multipart.FormDataParam;
 
 import io.swagger.model.Pet;
+import io.swagger.model.ApiResponse;
 import java.io.File;
 
 import java.util.List;
@@ -19,63 +20,63 @@ import com.sun.jersey.multipart.FormDataParam;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-23T10:25:42.314Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-03T13:30:41.715-06:00")
 public class PetApiServiceImpl extends PetApiService {
-  
-      @Override
-      public Response updatePet(Pet body,SecurityContext securityContext)
-      throws NotFoundException {
-      // do some magic!
-      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-  }
-  
-      @Override
-      public Response addPet(Pet body,SecurityContext securityContext)
-      throws NotFoundException {
-      // do some magic!
-      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-  }
-  
-      @Override
-      public Response findPetsByStatus(List<String> status,SecurityContext securityContext)
-      throws NotFoundException {
-      // do some magic!
-      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-  }
-  
-      @Override
-      public Response findPetsByTags(List<String> tags,SecurityContext securityContext)
-      throws NotFoundException {
-      // do some magic!
-      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-  }
-  
-      @Override
-      public Response getPetById(Long petId,SecurityContext securityContext)
-      throws NotFoundException {
-      // do some magic!
-      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-  }
-  
-      @Override
-      public Response updatePetWithForm(String petId,String name,String status,SecurityContext securityContext)
-      throws NotFoundException {
-      // do some magic!
-      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-  }
-  
-      @Override
-      public Response deletePet(Long petId,String apiKey,SecurityContext securityContext)
-      throws NotFoundException {
-      // do some magic!
-      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-  }
-  
-      @Override
-      public Response uploadFile(Long petId,String additionalMetadata,FormDataContentDisposition fileDetail,SecurityContext securityContext)
-      throws NotFoundException {
-      // do some magic!
-      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-  }
-  
+    
+    @Override
+    public Response addPet(Pet body, SecurityContext securityContext)
+    throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response deletePet(Long petId, String apiKey, SecurityContext securityContext)
+    throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response findPetsByStatus(List<String> status, SecurityContext securityContext)
+    throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response findPetsByTags(List<String> tags, SecurityContext securityContext)
+    throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response getPetById(Long petId, SecurityContext securityContext)
+    throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response updatePet(Pet body, SecurityContext securityContext)
+    throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response updatePetWithForm(Long petId, String name, String status, SecurityContext securityContext)
+    throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response uploadFile(Long petId, String additionalMetadata, InputStream inputStream, FormDataContentDisposition fileDetail, SecurityContext securityContext)
+    throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
 }
diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java
index c60547a73a0..e54a128b242 100644
--- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java
@@ -19,35 +19,35 @@ import com.sun.jersey.multipart.FormDataParam;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-23T10:25:42.314Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-03T13:30:41.715-06:00")
 public class StoreApiServiceImpl extends StoreApiService {
-  
-      @Override
-      public Response getInventory(SecurityContext securityContext)
-      throws NotFoundException {
-      // do some magic!
-      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-  }
-  
-      @Override
-      public Response placeOrder(Order body,SecurityContext securityContext)
-      throws NotFoundException {
-      // do some magic!
-      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-  }
-  
-      @Override
-      public Response getOrderById(String orderId,SecurityContext securityContext)
-      throws NotFoundException {
-      // do some magic!
-      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-  }
-  
-      @Override
-      public Response deleteOrder(String orderId,SecurityContext securityContext)
-      throws NotFoundException {
-      // do some magic!
-      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-  }
-  
+    
+    @Override
+    public Response deleteOrder(Long orderId, SecurityContext securityContext)
+    throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response getInventory(SecurityContext securityContext)
+    throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response getOrderById(Long orderId, SecurityContext securityContext)
+    throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response placeOrder(Order body, SecurityContext securityContext)
+    throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
 }
diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java
index 2c3f3edd1fd..5a73ac74e73 100644
--- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java
@@ -6,7 +6,7 @@ import io.swagger.model.*;
 import com.sun.jersey.multipart.FormDataParam;
 
 import io.swagger.model.User;
-import java.util.*;
+import java.util.List;
 
 import java.util.List;
 import io.swagger.api.NotFoundException;
@@ -19,63 +19,63 @@ import com.sun.jersey.multipart.FormDataParam;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-11-23T10:25:42.314Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-03T13:30:41.715-06:00")
 public class UserApiServiceImpl extends UserApiService {
-  
-      @Override
-      public Response createUser(User body,SecurityContext securityContext)
-      throws NotFoundException {
-      // do some magic!
-      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-  }
-  
-      @Override
-      public Response createUsersWithArrayInput(List<User> body,SecurityContext securityContext)
-      throws NotFoundException {
-      // do some magic!
-      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-  }
-  
-      @Override
-      public Response createUsersWithListInput(List<User> body,SecurityContext securityContext)
-      throws NotFoundException {
-      // do some magic!
-      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-  }
-  
-      @Override
-      public Response loginUser(String username,String password,SecurityContext securityContext)
-      throws NotFoundException {
-      // do some magic!
-      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-  }
-  
-      @Override
-      public Response logoutUser(SecurityContext securityContext)
-      throws NotFoundException {
-      // do some magic!
-      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-  }
-  
-      @Override
-      public Response getUserByName(String username,SecurityContext securityContext)
-      throws NotFoundException {
-      // do some magic!
-      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-  }
-  
-      @Override
-      public Response updateUser(String username,User body,SecurityContext securityContext)
-      throws NotFoundException {
-      // do some magic!
-      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-  }
-  
-      @Override
-      public Response deleteUser(String username,SecurityContext securityContext)
-      throws NotFoundException {
-      // do some magic!
-      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-  }
-  
+    
+    @Override
+    public Response createUser(User body, SecurityContext securityContext)
+    throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response createUsersWithArrayInput(List<User> body, SecurityContext securityContext)
+    throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response createUsersWithListInput(List<User> body, SecurityContext securityContext)
+    throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response deleteUser(String username, SecurityContext securityContext)
+    throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response getUserByName(String username, SecurityContext securityContext)
+    throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response loginUser(String username, String password, SecurityContext securityContext)
+    throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response logoutUser(SecurityContext securityContext)
+    throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response updateUser(String username, User body, SecurityContext securityContext)
+    throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
 }
diff --git a/samples/server/petstore/jersey2/README.md b/samples/server/petstore/jersey2/README.md
new file mode 100644
index 00000000000..4e7da8b7f63
--- /dev/null
+++ b/samples/server/petstore/jersey2/README.md
@@ -0,0 +1,23 @@
+# Swagger Jersey 2 generated server
+
+## Overview
+This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project. By using the 
+[OpenAPI-Spec](https://github.com/swagger-api/swagger-core/wiki) from a remote server, you can easily generate a server stub.  This
+is an example of building a swagger-enabled JAX-RS server.
+
+This example uses the [JAX-RS](https://jax-rs-spec.java.net/) framework.
+
+To run the server, please execute the following:
+
+```
+mvn clean package jetty:run
+```
+
+You can then view the swagger listing here:
+
+```
+http://localhost:8080/v2/swagger.json
+```
+
+Note that if you have configured the `host` to be something other than localhost, the calls through
+swagger-ui will be directed to that host and not localhost!
\ No newline at end of file
diff --git a/samples/server/petstore/jersey2/pom.xml b/samples/server/petstore/jersey2/pom.xml
new file mode 100644
index 00000000000..4b70918e691
--- /dev/null
+++ b/samples/server/petstore/jersey2/pom.xml
@@ -0,0 +1,145 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>io.swagger</groupId>
+  <artifactId>swagger-jaxrs-server</artifactId>
+  <packaging>jar</packaging>
+  <name>swagger-jaxrs-server</name>
+  <version>1.0.0</version>
+  <build>
+    <sourceDirectory>src/main/java</sourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.1.1</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <version>2.6</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-maven-plugin</artifactId>
+        <version>${jetty-version}</version>
+        <configuration>
+          <webApp>
+            <contextPath>/</contextPath>
+          </webApp>
+          <webAppSourceDirectory>target/${project.artifactId}-${project.version}</webAppSourceDirectory>
+          <stopPort>8079</stopPort>
+          <stopKey>stopit</stopKey>
+          <httpConnector>
+            <port>8080</port>
+            <idleTimeout>60000</idleTimeout>
+          </httpConnector>
+        </configuration>
+        <executions>
+          <execution>
+            <id>start-jetty</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>start</goal>
+            </goals>
+            <configuration>
+              <scanIntervalSeconds>0</scanIntervalSeconds>
+              <daemon>true</daemon>
+            </configuration>
+          </execution>
+          <execution>
+            <id>stop-jetty</id>
+            <phase>post-integration-test</phase>
+            <goals>
+              <goal>stop</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.9.1</version>
+        <executions>
+          <execution>
+            <id>add-source</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>src/gen/java</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>io.swagger</groupId>
+      <artifactId>swagger-jersey2-jaxrs</artifactId>
+      <scope>compile</scope>
+      <version>${swagger-core-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>${logback-version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+      <version>${logback-version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit-version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>${servlet-api-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.containers</groupId>
+      <artifactId>jersey-container-servlet-core</artifactId>
+      <version>${jersey2-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.media</groupId>
+      <artifactId>jersey-media-multipart</artifactId>
+      <version>${jersey2-version}</version>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <id>sonatype-snapshots</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+  <properties>
+    <swagger-core-version>1.5.8</swagger-core-version>
+    <jetty-version>9.2.9.v20150224</jetty-version>
+    <jersey2-version>2.6</jersey2-version>
+    <slf4j-version>1.6.3</slf4j-version>
+    <junit-version>4.8.1</junit-version>
+    <logback-version>1.0.1</logback-version>
+    <servlet-api-version>2.5</servlet-api-version>
+  </properties>
+</project>
\ No newline at end of file
diff --git a/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/ApiException.java b/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/ApiException.java
new file mode 100644
index 00000000000..97e535d3c21
--- /dev/null
+++ b/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/ApiException.java
@@ -0,0 +1,10 @@
+package io.swagger.api;
+
+
+public class ApiException extends Exception{
+    private int code;
+    public ApiException (int code, String msg) {
+        super(msg);
+        this.code = code;
+    }
+}
diff --git a/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/ApiOriginFilter.java b/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/ApiOriginFilter.java
new file mode 100644
index 00000000000..38791eef046
--- /dev/null
+++ b/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/ApiOriginFilter.java
@@ -0,0 +1,22 @@
+package io.swagger.api;
+
+import java.io.IOException;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletResponse;
+
+
+public class ApiOriginFilter implements javax.servlet.Filter {
+    public void doFilter(ServletRequest request, ServletResponse response,
+            FilterChain chain) throws IOException, ServletException {
+        HttpServletResponse res = (HttpServletResponse) response;
+        res.addHeader("Access-Control-Allow-Origin", "*");
+        res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT");
+        res.addHeader("Access-Control-Allow-Headers", "Content-Type");
+        chain.doFilter(request, response);
+    }
+
+    public void destroy() {}
+
+    public void init(FilterConfig filterConfig) throws ServletException {}
+}
\ No newline at end of file
diff --git a/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/ApiResponseMessage.java b/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/ApiResponseMessage.java
new file mode 100644
index 00000000000..87db95c1009
--- /dev/null
+++ b/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/ApiResponseMessage.java
@@ -0,0 +1,69 @@
+package io.swagger.api;
+
+import javax.xml.bind.annotation.XmlTransient;
+
+@javax.xml.bind.annotation.XmlRootElement
+
+public class ApiResponseMessage {
+    public static final int ERROR = 1;
+    public static final int WARNING = 2;
+    public static final int INFO = 3;
+    public static final int OK = 4;
+    public static final int TOO_BUSY = 5;
+
+    int code;
+    String type;
+    String message;
+
+    public ApiResponseMessage(){}
+
+    public ApiResponseMessage(int code, String message){
+        this.code = code;
+        switch(code){
+        case ERROR:
+            setType("error");
+            break;
+        case WARNING:
+            setType("warning");
+            break;
+        case INFO:
+            setType("info");
+            break;
+        case OK:
+            setType("ok");
+            break;
+        case TOO_BUSY:
+            setType("too busy");
+            break;
+        default:
+            setType("unknown");
+            break;
+        }
+        this.message = message;
+    }
+
+    @XmlTransient
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}
diff --git a/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/Bootstrap.java b/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/Bootstrap.java
new file mode 100644
index 00000000000..0651af80f18
--- /dev/null
+++ b/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/Bootstrap.java
@@ -0,0 +1,31 @@
+package io.swagger.api;
+
+import io.swagger.jaxrs.config.SwaggerContextService;
+import io.swagger.models.*;
+
+import io.swagger.models.auth.*;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+
+public class Bootstrap extends HttpServlet {
+  @Override
+  public void init(ServletConfig config) throws ServletException {
+    Info info = new Info()
+      .title("Swagger Server")
+      .description("This is a sample server Petstore server.  You can find out more about\nSwagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).\nFor this sample, you can use the api key `special-key` to test the authorization filters.\n")
+      .termsOfService("http://swagger.io/terms/")
+      .contact(new Contact()
+        .email("apiteam@swagger.io"))
+      .license(new License()
+        .name("Apache 2.0")
+        .url("http://www.apache.org/licenses/LICENSE-2.0.html"));
+
+    ServletContext context = config.getServletContext();
+    Swagger swagger = new Swagger().info(info);
+
+    new SwaggerContextService().withServletConfig(config).updateSwagger(swagger);
+  }
+}
diff --git a/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/JacksonJsonProvider.java b/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/JacksonJsonProvider.java
new file mode 100644
index 00000000000..49792814c5e
--- /dev/null
+++ b/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/JacksonJsonProvider.java
@@ -0,0 +1,19 @@
+package io.swagger.api;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
+import io.swagger.util.Json;
+
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@Produces({MediaType.APPLICATION_JSON})
+public class JacksonJsonProvider extends JacksonJaxbJsonProvider {
+    private static ObjectMapper commonMapper = Json.mapper();
+
+    public JacksonJsonProvider() {
+        super.setMapper(commonMapper);
+    }
+}
\ No newline at end of file
diff --git a/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/NotFoundException.java b/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/NotFoundException.java
new file mode 100644
index 00000000000..b28b67ea4b2
--- /dev/null
+++ b/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/NotFoundException.java
@@ -0,0 +1,10 @@
+package io.swagger.api;
+
+
+public class NotFoundException extends ApiException {
+    private int code;
+    public NotFoundException (int code, String msg) {
+        super(code, msg);
+        this.code = code;
+    }
+}
diff --git a/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/PetApi.java b/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/PetApi.java
new file mode 100644
index 00000000000..1f9043ab85a
--- /dev/null
+++ b/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/PetApi.java
@@ -0,0 +1,175 @@
+package io.swagger.api;
+
+import io.swagger.model.*;
+import io.swagger.api.PetApiService;
+import io.swagger.api.factories.PetApiServiceFactory;
+
+import io.swagger.annotations.ApiParam;
+
+import io.swagger.model.Pet;
+import io.swagger.model.ApiResponse;
+import java.io.File;
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataParam;
+
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.*;
+
+@Path("/pet")
+
+
+@io.swagger.annotations.Api(description = "the pet API")
+
+public class PetApi  {
+   private final PetApiService delegate = PetApiServiceFactory.getPetApi();
+
+    @POST
+    
+    @Consumes({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Add a new pet to the store", notes = "", response = void.class, authorizations = {
+        @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
+            @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+            @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets")
+        })
+    }, tags={ "pet", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = void.class) })
+    public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet body,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.addPet(body,securityContext);
+    }
+    @DELETE
+    @Path("/{petId}")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Deletes a pet", notes = "", response = void.class, authorizations = {
+        @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
+            @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+            @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets")
+        })
+    }, tags={ "pet", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = void.class),
+        
+        @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = void.class) })
+    public Response deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathParam("petId") Long petId,@ApiParam(value = "" )@HeaderParam("api_key") String apiKey,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.deletePet(petId,apiKey,securityContext);
+    }
+    @GET
+    @Path("/findByStatus")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Finds Pets by status", notes = "Multiple status values can be provided with comma separated strings", response = Pet.class, responseContainer = "List", authorizations = {
+        @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
+            @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+            @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets")
+        })
+    }, tags={ "pet", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
+        
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid status value", response = Pet.class, responseContainer = "List") })
+    public Response findPetsByStatus(@ApiParam(value = "Status values that need to be considered for filter",required=true) @QueryParam("status") List<String> status,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.findPetsByStatus(status,securityContext);
+    }
+    @GET
+    @Path("/findByTags")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Finds Pets by tags", notes = "Muliple tags can be provided with comma separated strings. Use\ntag1, tag2, tag3 for testing.\n", response = Pet.class, responseContainer = "List", authorizations = {
+        @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
+            @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+            @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets")
+        })
+    }, tags={ "pet", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
+        
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid tag value", response = Pet.class, responseContainer = "List") })
+    public Response findPetsByTags(@ApiParam(value = "Tags to filter by",required=true) @QueryParam("tags") List<String> tags,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.findPetsByTags(tags,securityContext);
+    }
+    @GET
+    @Path("/{petId}")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Find pet by ID", notes = "Returns a single pet", response = Pet.class, authorizations = {
+        @io.swagger.annotations.Authorization(value = "api_key")
+    }, tags={ "pet", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class),
+        
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Pet.class),
+        
+        @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Pet.class) })
+    public Response getPetById(@ApiParam(value = "ID of pet to return",required=true) @PathParam("petId") Long petId,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.getPetById(petId,securityContext);
+    }
+    @PUT
+    
+    @Consumes({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Update an existing pet", notes = "", response = void.class, authorizations = {
+        @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
+            @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+            @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets")
+        })
+    }, tags={ "pet", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = void.class),
+        
+        @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = void.class),
+        
+        @io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception", response = void.class) })
+    public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet body,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.updatePet(body,securityContext);
+    }
+    @POST
+    @Path("/{petId}")
+    @Consumes({ "application/x-www-form-urlencoded" })
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Updates a pet in the store with form data", notes = "null", response = void.class, authorizations = {
+        @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
+            @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+            @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets")
+        })
+    }, tags={ "pet", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = void.class) })
+    public Response updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated",required=true) @PathParam("petId") Long petId,@ApiParam(value = "Updated name of the pet")@FormParam("name")  String name,@ApiParam(value = "Updated status of the pet")@FormParam("status")  String status,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.updatePetWithForm(petId,name,status,securityContext);
+    }
+    @POST
+    @Path("/{petId}/uploadImage")
+    @Consumes({ "multipart/form-data" })
+    @Produces({ "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "uploads an image", notes = "", response = ApiResponse.class, authorizations = {
+        @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
+            @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+            @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets")
+        })
+    }, tags={ "pet", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = ApiResponse.class) })
+    public Response uploadFile(@ApiParam(value = "ID of pet to update",required=true) @PathParam("petId") Long petId,@ApiParam(value = "Additional data to pass to server")@FormDataParam("additionalMetadata")  String additionalMetadata,
+            @FormDataParam("file") InputStream inputStream,
+            @FormDataParam("file") FormDataContentDisposition fileDetail,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.uploadFile(petId,additionalMetadata,inputStream, fileDetail,securityContext);
+    }
+}
diff --git a/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/PetApiService.java b/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/PetApiService.java
new file mode 100644
index 00000000000..80d5170b242
--- /dev/null
+++ b/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/PetApiService.java
@@ -0,0 +1,39 @@
+package io.swagger.api;
+
+import io.swagger.api.*;
+import io.swagger.model.*;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+
+import io.swagger.model.Pet;
+import io.swagger.model.ApiResponse;
+import java.io.File;
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+
+
+public abstract class PetApiService {
+    
+    public abstract Response addPet(Pet body,SecurityContext securityContext) throws NotFoundException;
+    
+    public abstract Response deletePet(Long petId,String apiKey,SecurityContext securityContext) throws NotFoundException;
+    
+    public abstract Response findPetsByStatus(List<String> status,SecurityContext securityContext) throws NotFoundException;
+    
+    public abstract Response findPetsByTags(List<String> tags,SecurityContext securityContext) throws NotFoundException;
+    
+    public abstract Response getPetById(Long petId,SecurityContext securityContext) throws NotFoundException;
+    
+    public abstract Response updatePet(Pet body,SecurityContext securityContext) throws NotFoundException;
+    
+    public abstract Response updatePetWithForm(Long petId,String name,String status,SecurityContext securityContext) throws NotFoundException;
+    
+    public abstract Response uploadFile(Long petId,String additionalMetadata,InputStream inputStream, FormDataContentDisposition fileDetail,SecurityContext securityContext) throws NotFoundException;
+    
+}
diff --git a/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/StoreApi.java b/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/StoreApi.java
new file mode 100644
index 00000000000..2708e4b2cf9
--- /dev/null
+++ b/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/StoreApi.java
@@ -0,0 +1,87 @@
+package io.swagger.api;
+
+import io.swagger.model.*;
+import io.swagger.api.StoreApiService;
+import io.swagger.api.factories.StoreApiServiceFactory;
+
+import io.swagger.annotations.ApiParam;
+
+import java.util.Map;
+import io.swagger.model.Order;
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataParam;
+
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.*;
+
+@Path("/store")
+
+
+@io.swagger.annotations.Api(description = "the store API")
+
+public class StoreApi  {
+   private final StoreApiService delegate = StoreApiServiceFactory.getStoreApi();
+
+    @DELETE
+    @Path("/order/{orderId}")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with positive integer value.\\ \\ Negative or non-integer values will generate API errors", response = void.class, tags={ "store", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = void.class),
+        
+        @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = void.class) })
+    public Response deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathParam("orderId") Long orderId,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.deleteOrder(orderId,securityContext);
+    }
+    @GET
+    @Path("/inventory")
+    
+    @Produces({ "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", response = Integer.class, responseContainer = "Map", authorizations = {
+        @io.swagger.annotations.Authorization(value = "api_key")
+    }, tags={ "store", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Integer.class, responseContainer = "Map") })
+    public Response getInventory(@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.getInventory(securityContext);
+    }
+    @GET
+    @Path("/order/{orderId}")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value >= 1 and <= 10.\nOther values will generated exceptions\n", response = Order.class, tags={ "store", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
+        
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Order.class),
+        
+        @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Order.class) })
+    public Response getOrderById(@ApiParam(value = "ID of pet that needs to be fetched",required=true) @PathParam("orderId") Long orderId,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.getOrderById(orderId,securityContext);
+    }
+    @POST
+    @Path("/order")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Place an order for a pet", notes = "", response = Order.class, tags={ "store", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
+        
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order", response = Order.class) })
+    public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) Order body,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.placeOrder(body,securityContext);
+    }
+}
diff --git a/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/StoreApiService.java b/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/StoreApiService.java
new file mode 100644
index 00000000000..43078d32756
--- /dev/null
+++ b/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/StoreApiService.java
@@ -0,0 +1,30 @@
+package io.swagger.api;
+
+import io.swagger.api.*;
+import io.swagger.model.*;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+
+import java.util.Map;
+import io.swagger.model.Order;
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+
+
+public abstract class StoreApiService {
+    
+    public abstract Response deleteOrder(Long orderId,SecurityContext securityContext) throws NotFoundException;
+    
+    public abstract Response getInventory(SecurityContext securityContext) throws NotFoundException;
+    
+    public abstract Response getOrderById(Long orderId,SecurityContext securityContext) throws NotFoundException;
+    
+    public abstract Response placeOrder(Order body,SecurityContext securityContext) throws NotFoundException;
+    
+}
diff --git a/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/StringUtil.java b/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/StringUtil.java
new file mode 100644
index 00000000000..6f4a3dadbbf
--- /dev/null
+++ b/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/StringUtil.java
@@ -0,0 +1,42 @@
+package io.swagger.api;
+
+
+public class StringUtil {
+  /**
+   * Check if the given array contains the given value (with case-insensitive comparison).
+   *
+   * @param array The array
+   * @param value The value to search
+   * @return true if the array contains the value
+   */
+  public static boolean containsIgnoreCase(String[] array, String value) {
+    for (String str : array) {
+      if (value == null && str == null) return true;
+      if (value != null && value.equalsIgnoreCase(str)) return true;
+    }
+    return false;
+  }
+
+  /**
+   * Join an array of strings with the given separator.
+   * <p>
+   * Note: This might be replaced by utility method from commons-lang or guava someday
+   * if one of those libraries is added as dependency.
+   * </p>
+   *
+   * @param array     The array of strings
+   * @param separator The separator
+   * @return the resulting string
+   */
+  public static String join(String[] array, String separator) {
+    int len = array.length;
+    if (len == 0) return "";
+
+    StringBuilder out = new StringBuilder();
+    out.append(array[0]);
+    for (int i = 1; i < len; i++) {
+      out.append(separator).append(array[i]);
+    }
+    return out.toString();
+  }
+}
diff --git a/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/UserApi.java b/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/UserApi.java
new file mode 100644
index 00000000000..cf4af7071eb
--- /dev/null
+++ b/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/UserApi.java
@@ -0,0 +1,131 @@
+package io.swagger.api;
+
+import io.swagger.model.*;
+import io.swagger.api.UserApiService;
+import io.swagger.api.factories.UserApiServiceFactory;
+
+import io.swagger.annotations.ApiParam;
+
+import io.swagger.model.User;
+import java.util.List;
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataParam;
+
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.*;
+
+@Path("/user")
+
+
+@io.swagger.annotations.Api(description = "the user API")
+
+public class UserApi  {
+   private final UserApiService delegate = UserApiServiceFactory.getUserApi();
+
+    @POST
+    
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = void.class, tags={ "user", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = void.class) })
+    public Response createUser(@ApiParam(value = "Created user object" ,required=true) User body,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.createUser(body,securityContext);
+    }
+    @POST
+    @Path("/createWithArray")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = void.class, tags={ "user", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = void.class) })
+    public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) List<User> body,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.createUsersWithArrayInput(body,securityContext);
+    }
+    @POST
+    @Path("/createWithList")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = void.class, tags={ "user", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = void.class) })
+    public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) List<User> body,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.createUsersWithListInput(body,securityContext);
+    }
+    @DELETE
+    @Path("/{username}")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = void.class, tags={ "user", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = void.class),
+        
+        @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = void.class) })
+    public Response deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathParam("username") String username,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.deleteUser(username,securityContext);
+    }
+    @GET
+    @Path("/{username}")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Get user by user name", notes = "", response = User.class, tags={ "user", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = User.class),
+        
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = User.class),
+        
+        @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = User.class) })
+    public Response getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.",required=true) @PathParam("username") String username,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.getUserByName(username,securityContext);
+    }
+    @GET
+    @Path("/login")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Logs user into the system", notes = "", response = String.class, tags={ "user", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = String.class),
+        
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username/password supplied", response = String.class) })
+    public Response loginUser(@ApiParam(value = "The user name for login",required=true) @QueryParam("username") String username,@ApiParam(value = "The password for login in clear text",required=true) @QueryParam("password") String password,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.loginUser(username,password,securityContext);
+    }
+    @GET
+    @Path("/logout")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Logs out current logged in user session", notes = "null", response = void.class, tags={ "user", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = void.class) })
+    public Response logoutUser(@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.logoutUser(securityContext);
+    }
+    @PUT
+    @Path("/{username}")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = void.class, tags={ "user", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid user supplied", response = void.class),
+        
+        @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = void.class) })
+    public Response updateUser(@ApiParam(value = "name that need to be updated",required=true) @PathParam("username") String username,@ApiParam(value = "Updated user object" ,required=true) User body,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.updateUser(username,body,securityContext);
+    }
+}
diff --git a/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/UserApiService.java b/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/UserApiService.java
new file mode 100644
index 00000000000..0cfc9c1fb35
--- /dev/null
+++ b/samples/server/petstore/jersey2/src/gen/java/io/swagger/api/UserApiService.java
@@ -0,0 +1,38 @@
+package io.swagger.api;
+
+import io.swagger.api.*;
+import io.swagger.model.*;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+
+import io.swagger.model.User;
+import java.util.List;
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+
+
+public abstract class UserApiService {
+    
+    public abstract Response createUser(User body,SecurityContext securityContext) throws NotFoundException;
+    
+    public abstract Response createUsersWithArrayInput(List<User> body,SecurityContext securityContext) throws NotFoundException;
+    
+    public abstract Response createUsersWithListInput(List<User> body,SecurityContext securityContext) throws NotFoundException;
+    
+    public abstract Response deleteUser(String username,SecurityContext securityContext) throws NotFoundException;
+    
+    public abstract Response getUserByName(String username,SecurityContext securityContext) throws NotFoundException;
+    
+    public abstract Response loginUser(String username,String password,SecurityContext securityContext) throws NotFoundException;
+    
+    public abstract Response logoutUser(SecurityContext securityContext) throws NotFoundException;
+    
+    public abstract Response updateUser(String username,User body,SecurityContext securityContext) throws NotFoundException;
+    
+}
diff --git a/samples/server/petstore/jersey2/src/gen/java/io/swagger/model/ApiResponse.java b/samples/server/petstore/jersey2/src/gen/java/io/swagger/model/ApiResponse.java
new file mode 100644
index 00000000000..dd6bcbf2cb1
--- /dev/null
+++ b/samples/server/petstore/jersey2/src/gen/java/io/swagger/model/ApiResponse.java
@@ -0,0 +1,117 @@
+package io.swagger.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+
+
+
+
+public class ApiResponse   {
+  
+  private Integer code = null;
+  private String type = null;
+  private String message = null;
+
+  
+  /**
+   **/
+  public ApiResponse code(Integer code) {
+    this.code = code;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("code")
+  public Integer getCode() {
+    return code;
+  }
+  public void setCode(Integer code) {
+    this.code = code;
+  }
+
+  
+  /**
+   **/
+  public ApiResponse type(String type) {
+    this.type = type;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("type")
+  public String getType() {
+    return type;
+  }
+  public void setType(String type) {
+    this.type = type;
+  }
+
+  
+  /**
+   **/
+  public ApiResponse message(String message) {
+    this.message = message;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("message")
+  public String getMessage() {
+    return message;
+  }
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ApiResponse apiResponse = (ApiResponse) o;
+    return Objects.equals(code, apiResponse.code) &&
+        Objects.equals(type, apiResponse.type) &&
+        Objects.equals(message, apiResponse.message);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(code, type, message);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ApiResponse {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    type: ").append(toIndentedString(type)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jersey2/src/gen/java/io/swagger/model/Category.java b/samples/server/petstore/jersey2/src/gen/java/io/swagger/model/Category.java
new file mode 100644
index 00000000000..fd27ccac1c4
--- /dev/null
+++ b/samples/server/petstore/jersey2/src/gen/java/io/swagger/model/Category.java
@@ -0,0 +1,96 @@
+package io.swagger.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+
+
+
+
+public class Category   {
+  
+  private Long id = null;
+  private String name = null;
+
+  
+  /**
+   **/
+  public Category id(Long id) {
+    this.id = id;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  public Category name(String name) {
+    this.name = name;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Category category = (Category) o;
+    return Objects.equals(id, category.id) &&
+        Objects.equals(name, category.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, name);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Category {\n");
+    
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jersey2/src/gen/java/io/swagger/model/Order.java b/samples/server/petstore/jersey2/src/gen/java/io/swagger/model/Order.java
new file mode 100644
index 00000000000..0dd4222776c
--- /dev/null
+++ b/samples/server/petstore/jersey2/src/gen/java/io/swagger/model/Order.java
@@ -0,0 +1,203 @@
+package io.swagger.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+
+
+
+
+
+
+public class Order   {
+  
+  private Long id = null;
+  private Long petId = null;
+  private Integer quantity = null;
+  private Date shipDate = null;
+
+
+  public enum StatusEnum {
+    PLACED("placed"),
+    APPROVED("approved"),
+    DELIVERED("delivered");
+
+    private String value;
+
+    StatusEnum(String value) {
+      this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+      return value;
+    }
+  }
+
+  private StatusEnum status = null;
+  private Boolean complete = false;
+
+  
+  /**
+   **/
+  public Order id(Long id) {
+    this.id = id;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  public Order petId(Long petId) {
+    this.petId = petId;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("petId")
+  public Long getPetId() {
+    return petId;
+  }
+  public void setPetId(Long petId) {
+    this.petId = petId;
+  }
+
+  
+  /**
+   **/
+  public Order quantity(Integer quantity) {
+    this.quantity = quantity;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("quantity")
+  public Integer getQuantity() {
+    return quantity;
+  }
+  public void setQuantity(Integer quantity) {
+    this.quantity = quantity;
+  }
+
+  
+  /**
+   **/
+  public Order shipDate(Date shipDate) {
+    this.shipDate = shipDate;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("shipDate")
+  public Date getShipDate() {
+    return shipDate;
+  }
+  public void setShipDate(Date shipDate) {
+    this.shipDate = shipDate;
+  }
+
+  
+  /**
+   * Order Status
+   **/
+  public Order status(StatusEnum status) {
+    this.status = status;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "Order Status")
+  @JsonProperty("status")
+  public StatusEnum getStatus() {
+    return status;
+  }
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+  
+  /**
+   **/
+  public Order complete(Boolean complete) {
+    this.complete = complete;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("complete")
+  public Boolean getComplete() {
+    return complete;
+  }
+  public void setComplete(Boolean complete) {
+    this.complete = complete;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Order order = (Order) o;
+    return Objects.equals(id, order.id) &&
+        Objects.equals(petId, order.petId) &&
+        Objects.equals(quantity, order.quantity) &&
+        Objects.equals(shipDate, order.shipDate) &&
+        Objects.equals(status, order.status) &&
+        Objects.equals(complete, order.complete);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Order {\n");
+    
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    petId: ").append(toIndentedString(petId)).append("\n");
+    sb.append("    quantity: ").append(toIndentedString(quantity)).append("\n");
+    sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jersey2/src/gen/java/io/swagger/model/Pet.java b/samples/server/petstore/jersey2/src/gen/java/io/swagger/model/Pet.java
new file mode 100644
index 00000000000..514bb24508d
--- /dev/null
+++ b/samples/server/petstore/jersey2/src/gen/java/io/swagger/model/Pet.java
@@ -0,0 +1,206 @@
+package io.swagger.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.model.Category;
+import io.swagger.model.Tag;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+public class Pet   {
+  
+  private Long id = null;
+  private Category category = null;
+  private String name = null;
+  private List<String> photoUrls = new ArrayList<String>();
+  private List<Tag> tags = new ArrayList<Tag>();
+
+
+  public enum StatusEnum {
+    AVAILABLE("available"),
+    PENDING("pending"),
+    SOLD("sold");
+
+    private String value;
+
+    StatusEnum(String value) {
+      this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+      return value;
+    }
+  }
+
+  private StatusEnum status = null;
+
+  
+  /**
+   **/
+  public Pet id(Long id) {
+    this.id = id;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  public Pet category(Category category) {
+    this.category = category;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("category")
+  public Category getCategory() {
+    return category;
+  }
+  public void setCategory(Category category) {
+    this.category = category;
+  }
+
+  
+  /**
+   **/
+  public Pet name(String name) {
+    this.name = name;
+    return this;
+  }
+
+  
+  @ApiModelProperty(example = "doggie", required = true, value = "")
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  
+  /**
+   **/
+  public Pet photoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+    return this;
+  }
+
+  
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("photoUrls")
+  public List<String> getPhotoUrls() {
+    return photoUrls;
+  }
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
+  
+  /**
+   **/
+  public Pet tags(List<Tag> tags) {
+    this.tags = tags;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("tags")
+  public List<Tag> getTags() {
+    return tags;
+  }
+  public void setTags(List<Tag> tags) {
+    this.tags = tags;
+  }
+
+  
+  /**
+   * pet status in the store
+   **/
+  public Pet status(StatusEnum status) {
+    this.status = status;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "pet status in the store")
+  @JsonProperty("status")
+  public StatusEnum getStatus() {
+    return status;
+  }
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Pet pet = (Pet) o;
+    return Objects.equals(id, pet.id) &&
+        Objects.equals(category, pet.category) &&
+        Objects.equals(name, pet.name) &&
+        Objects.equals(photoUrls, pet.photoUrls) &&
+        Objects.equals(tags, pet.tags) &&
+        Objects.equals(status, pet.status);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, category, name, photoUrls, tags, status);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Pet {\n");
+    
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    category: ").append(toIndentedString(category)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jersey2/src/gen/java/io/swagger/model/Tag.java b/samples/server/petstore/jersey2/src/gen/java/io/swagger/model/Tag.java
new file mode 100644
index 00000000000..b46638ccb69
--- /dev/null
+++ b/samples/server/petstore/jersey2/src/gen/java/io/swagger/model/Tag.java
@@ -0,0 +1,96 @@
+package io.swagger.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+
+
+
+
+public class Tag   {
+  
+  private Long id = null;
+  private String name = null;
+
+  
+  /**
+   **/
+  public Tag id(Long id) {
+    this.id = id;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  public Tag name(String name) {
+    this.name = name;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Tag tag = (Tag) o;
+    return Objects.equals(id, tag.id) &&
+        Objects.equals(name, tag.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, name);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Tag {\n");
+    
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jersey2/src/gen/java/io/swagger/model/User.java b/samples/server/petstore/jersey2/src/gen/java/io/swagger/model/User.java
new file mode 100644
index 00000000000..7f18c02f599
--- /dev/null
+++ b/samples/server/petstore/jersey2/src/gen/java/io/swagger/model/User.java
@@ -0,0 +1,223 @@
+package io.swagger.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+
+
+
+
+public class User   {
+  
+  private Long id = null;
+  private String username = null;
+  private String firstName = null;
+  private String lastName = null;
+  private String email = null;
+  private String password = null;
+  private String phone = null;
+  private Integer userStatus = null;
+
+  
+  /**
+   **/
+  public User id(Long id) {
+    this.id = id;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  public User username(String username) {
+    this.username = username;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("username")
+  public String getUsername() {
+    return username;
+  }
+  public void setUsername(String username) {
+    this.username = username;
+  }
+
+  
+  /**
+   **/
+  public User firstName(String firstName) {
+    this.firstName = firstName;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("firstName")
+  public String getFirstName() {
+    return firstName;
+  }
+  public void setFirstName(String firstName) {
+    this.firstName = firstName;
+  }
+
+  
+  /**
+   **/
+  public User lastName(String lastName) {
+    this.lastName = lastName;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("lastName")
+  public String getLastName() {
+    return lastName;
+  }
+  public void setLastName(String lastName) {
+    this.lastName = lastName;
+  }
+
+  
+  /**
+   **/
+  public User email(String email) {
+    this.email = email;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("email")
+  public String getEmail() {
+    return email;
+  }
+  public void setEmail(String email) {
+    this.email = email;
+  }
+
+  
+  /**
+   **/
+  public User password(String password) {
+    this.password = password;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("password")
+  public String getPassword() {
+    return password;
+  }
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+  
+  /**
+   **/
+  public User phone(String phone) {
+    this.phone = phone;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("phone")
+  public String getPhone() {
+    return phone;
+  }
+  public void setPhone(String phone) {
+    this.phone = phone;
+  }
+
+  
+  /**
+   * User Status
+   **/
+  public User userStatus(Integer userStatus) {
+    this.userStatus = userStatus;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "User Status")
+  @JsonProperty("userStatus")
+  public Integer getUserStatus() {
+    return userStatus;
+  }
+  public void setUserStatus(Integer userStatus) {
+    this.userStatus = userStatus;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    User user = (User) o;
+    return Objects.equals(id, user.id) &&
+        Objects.equals(username, user.username) &&
+        Objects.equals(firstName, user.firstName) &&
+        Objects.equals(lastName, user.lastName) &&
+        Objects.equals(email, user.email) &&
+        Objects.equals(password, user.password) &&
+        Objects.equals(phone, user.phone) &&
+        Objects.equals(userStatus, user.userStatus);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class User {\n");
+    
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    username: ").append(toIndentedString(username)).append("\n");
+    sb.append("    firstName: ").append(toIndentedString(firstName)).append("\n");
+    sb.append("    lastName: ").append(toIndentedString(lastName)).append("\n");
+    sb.append("    email: ").append(toIndentedString(email)).append("\n");
+    sb.append("    password: ").append(toIndentedString(password)).append("\n");
+    sb.append("    phone: ").append(toIndentedString(phone)).append("\n");
+    sb.append("    userStatus: ").append(toIndentedString(userStatus)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jersey2/src/main/java/io/swagger/api/Bootstrap.java b/samples/server/petstore/jersey2/src/main/java/io/swagger/api/Bootstrap.java
new file mode 100644
index 00000000000..0651af80f18
--- /dev/null
+++ b/samples/server/petstore/jersey2/src/main/java/io/swagger/api/Bootstrap.java
@@ -0,0 +1,31 @@
+package io.swagger.api;
+
+import io.swagger.jaxrs.config.SwaggerContextService;
+import io.swagger.models.*;
+
+import io.swagger.models.auth.*;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+
+public class Bootstrap extends HttpServlet {
+  @Override
+  public void init(ServletConfig config) throws ServletException {
+    Info info = new Info()
+      .title("Swagger Server")
+      .description("This is a sample server Petstore server.  You can find out more about\nSwagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).\nFor this sample, you can use the api key `special-key` to test the authorization filters.\n")
+      .termsOfService("http://swagger.io/terms/")
+      .contact(new Contact()
+        .email("apiteam@swagger.io"))
+      .license(new License()
+        .name("Apache 2.0")
+        .url("http://www.apache.org/licenses/LICENSE-2.0.html"));
+
+    ServletContext context = config.getServletContext();
+    Swagger swagger = new Swagger().info(info);
+
+    new SwaggerContextService().withServletConfig(config).updateSwagger(swagger);
+  }
+}
diff --git a/samples/server/petstore/jersey2/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java b/samples/server/petstore/jersey2/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java
new file mode 100644
index 00000000000..50f0288b26c
--- /dev/null
+++ b/samples/server/petstore/jersey2/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java
@@ -0,0 +1,13 @@
+package io.swagger.api.factories;
+
+import io.swagger.api.PetApiService;
+import io.swagger.api.impl.PetApiServiceImpl;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-02T18:35:30.846-06:00")
+public class PetApiServiceFactory {
+    private final static PetApiService service = new PetApiServiceImpl();
+
+    public static PetApiService getPetApi() {
+        return service;
+    }
+}
diff --git a/samples/server/petstore/jersey2/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java b/samples/server/petstore/jersey2/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java
new file mode 100644
index 00000000000..46ebd48a86f
--- /dev/null
+++ b/samples/server/petstore/jersey2/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java
@@ -0,0 +1,13 @@
+package io.swagger.api.factories;
+
+import io.swagger.api.StoreApiService;
+import io.swagger.api.impl.StoreApiServiceImpl;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-02T18:35:30.846-06:00")
+public class StoreApiServiceFactory {
+    private final static StoreApiService service = new StoreApiServiceImpl();
+
+    public static StoreApiService getStoreApi() {
+        return service;
+    }
+}
diff --git a/samples/server/petstore/jersey2/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java b/samples/server/petstore/jersey2/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java
new file mode 100644
index 00000000000..9703e297248
--- /dev/null
+++ b/samples/server/petstore/jersey2/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java
@@ -0,0 +1,13 @@
+package io.swagger.api.factories;
+
+import io.swagger.api.UserApiService;
+import io.swagger.api.impl.UserApiServiceImpl;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-02T18:35:30.846-06:00")
+public class UserApiServiceFactory {
+    private final static UserApiService service = new UserApiServiceImpl();
+
+    public static UserApiService getUserApi() {
+        return service;
+    }
+}
diff --git a/samples/server/petstore/jersey2/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jersey2/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java
new file mode 100644
index 00000000000..fead74f3b6c
--- /dev/null
+++ b/samples/server/petstore/jersey2/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java
@@ -0,0 +1,71 @@
+package io.swagger.api.impl;
+
+import io.swagger.api.*;
+import io.swagger.model.*;
+
+import io.swagger.model.Pet;
+import io.swagger.model.ApiResponse;
+import java.io.File;
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-02T18:35:30.846-06:00")
+public class PetApiServiceImpl extends PetApiService {
+    
+    @Override
+    public Response addPet(Pet body, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response deletePet(Long petId, String apiKey, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response findPetsByStatus(List<String> status, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response findPetsByTags(List<String> tags, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response getPetById(Long petId, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response updatePet(Pet body, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response updatePetWithForm(Long petId, String name, String status, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response uploadFile(Long petId, String additionalMetadata, InputStream inputStream, FormDataContentDisposition fileDetail, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+}
diff --git a/samples/server/petstore/jersey2/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jersey2/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java
new file mode 100644
index 00000000000..176e893db35
--- /dev/null
+++ b/samples/server/petstore/jersey2/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java
@@ -0,0 +1,46 @@
+package io.swagger.api.impl;
+
+import io.swagger.api.*;
+import io.swagger.model.*;
+
+import java.util.Map;
+import io.swagger.model.Order;
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-02T18:35:30.846-06:00")
+public class StoreApiServiceImpl extends StoreApiService {
+    
+    @Override
+    public Response deleteOrder(Long orderId, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response getInventory(SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response getOrderById(Long orderId, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response placeOrder(Order body, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+}
diff --git a/samples/server/petstore/jersey2/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jersey2/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java
new file mode 100644
index 00000000000..1c4d449a7bd
--- /dev/null
+++ b/samples/server/petstore/jersey2/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java
@@ -0,0 +1,70 @@
+package io.swagger.api.impl;
+
+import io.swagger.api.*;
+import io.swagger.model.*;
+
+import io.swagger.model.User;
+import java.util.List;
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-02T18:35:30.846-06:00")
+public class UserApiServiceImpl extends UserApiService {
+    
+    @Override
+    public Response createUser(User body, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response createUsersWithArrayInput(List<User> body, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response createUsersWithListInput(List<User> body, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response deleteUser(String username, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response getUserByName(String username, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response loginUser(String username, String password, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response logoutUser(SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+    @Override
+    public Response updateUser(String username, User body, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    
+}
diff --git a/samples/server/petstore/jersey2/src/main/webapp/WEB-INF/web.xml b/samples/server/petstore/jersey2/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 00000000000..66837dccab8
--- /dev/null
+++ b/samples/server/petstore/jersey2/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+  xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee    http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+    <servlet>
+        <servlet-name>jersey</servlet-name>
+        <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
+        <init-param>
+            <param-name>jersey.config.server.provider.packages</param-name>
+            <param-value>
+                io.swagger.jaxrs.listing,
+                io.swagger.sample.resource,
+                io.swagger.api
+            </param-value>
+        </init-param>
+        <init-param>
+            <param-name>jersey.config.server.provider.classnames</param-name>
+            <param-value>org.glassfish.jersey.media.multipart.MultiPartFeature</param-value>
+        </init-param>
+        <init-param>
+            <param-name>jersey.config.server.wadl.disableWadl</param-name>
+            <param-value>true</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>Jersey2Config</servlet-name>
+        <servlet-class>io.swagger.jersey.config.JerseyJaxrsConfig</servlet-class>
+        <init-param>
+            <param-name>api.version</param-name>
+            <param-value>1.0.0</param-value>
+        </init-param>
+        <init-param>
+            <param-name>swagger.api.title</param-name>
+            <param-value>Swagger Server</param-value>
+        </init-param>
+        <init-param>
+            <param-name>swagger.api.basepath</param-name>
+            <param-value>http://petstore.swagger.io/v2</param-value>
+        </init-param>
+
+        <load-on-startup>2</load-on-startup>
+    </servlet>
+    <servlet>
+        <servlet-name>Bootstrap</servlet-name>
+        <servlet-class>io.swagger.api.Bootstrap</servlet-class>
+        <load-on-startup>2</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>jersey</servlet-name>
+        <url-pattern>/v2/*</url-pattern>
+    </servlet-mapping>
+    <filter>
+        <filter-name>ApiOriginFilter</filter-name>
+        <filter-class>io.swagger.api.ApiOriginFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>ApiOriginFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+</web-app>
diff --git a/samples/server/petstore/nodejs/README.md b/samples/server/petstore/nodejs/README.md
index 2efc45fe33e..d94aa385ec0 100644
--- a/samples/server/petstore/nodejs/README.md
+++ b/samples/server/petstore/nodejs/README.md
@@ -1,11 +1,11 @@
 # Swagger generated server
 
 ## Overview
-This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.  By using the [swagger-spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate a server stub.  This is an example of building a node.js server.
+This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.  By using the [OpenAPI-Spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate a server stub.  This is an example of building a node.js server.
 
 This example uses the [expressjs](http://expressjs.com/) framework.  To see how to make this your own, look here:
 
-[README](https://github.com/swagger-api/swagger-codegen/README.md)
+[README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md)
 
 ### Running the server
 To run the server, follow these simple steps:
@@ -21,4 +21,4 @@ To view the Swagger UI interface:
 open http://localhost:8080/docs
 ```
 
-This project leverages the mega-awesome [swagger-tools](https://github.com/apigee-127/swagger-tools) middleware which does most all the work.
\ No newline at end of file
+This project leverages the mega-awesome [swagger-tools](https://github.com/apigee-127/swagger-tools) middleware which does most all the work.
diff --git a/samples/server/petstore/nodejs/api/swagger.yaml b/samples/server/petstore/nodejs/api/swagger.yaml
index 49a3405de09..3cbdf63c594 100644
--- a/samples/server/petstore/nodejs/api/swagger.yaml
+++ b/samples/server/petstore/nodejs/api/swagger.yaml
@@ -1,10 +1,10 @@
 ---
 swagger: "2.0"
 info:
-  description: "This is a sample server Petstore server.  You can find out more about\
-    \ Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net,\
-    \ #swagger.  For this sample, you can use the api key \"special-key\" to test\
-    \ the authorization filters"
+  description: "This is a sample server Petstore server.  You can find out more about\n\
+    Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).\n\
+    For this sample, you can use the api key `special-key` to test the authorization\
+    \ filters.\n"
   version: "1.0.0"
   title: "Swagger Petstore"
   termsOfService: "http://swagger.io/terms/"
@@ -15,6 +15,19 @@ info:
     url: "http://www.apache.org/licenses/LICENSE-2.0.html"
 host: "petstore.swagger.io"
 basePath: "/v2"
+tags:
+- name: "pet"
+  description: "Everything about your Pets"
+  externalDocs:
+    description: "Find out more"
+    url: "http://swagger.io"
+- name: "store"
+  description: "Access to Petstore orders"
+- name: "user"
+  description: "Operations about user"
+  externalDocs:
+    description: "Find out more about our store"
+    url: "http://swagger.io"
 schemes:
 - "http"
 paths:
@@ -23,19 +36,18 @@ paths:
       tags:
       - "pet"
       summary: "Add a new pet to the store"
-      description: ""
       operationId: "addPet"
       consumes:
       - "application/json"
       - "application/xml"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "Pet object that needs to be added to the store"
-        required: false
+        required: true
         schema:
           $ref: "#/definitions/Pet"
       responses:
@@ -45,23 +57,23 @@ paths:
       - petstore_auth:
         - "write:pets"
         - "read:pets"
+      x-swagger-router-controller: "Pet"
     put:
       tags:
       - "pet"
       summary: "Update an existing pet"
-      description: ""
       operationId: "updatePet"
       consumes:
       - "application/json"
       - "application/xml"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "Pet object that needs to be added to the store"
-        required: false
+        required: true
         schema:
           $ref: "#/definitions/Pet"
       responses:
@@ -75,26 +87,31 @@ paths:
       - petstore_auth:
         - "write:pets"
         - "read:pets"
+      x-swagger-router-controller: "Pet"
   /pet/findByStatus:
     get:
       tags:
       - "pet"
       summary: "Finds Pets by status"
-      description: "Multiple status values can be provided with comma seperated strings"
+      description: "Multiple status values can be provided with comma separated strings"
       operationId: "findPetsByStatus"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "status"
         in: "query"
         description: "Status values that need to be considered for filter"
-        required: false
+        required: true
         type: "array"
         items:
           type: "string"
+          default: "available"
+          enum:
+          - "available"
+          - "pending"
+          - "sold"
         collectionFormat: "multi"
-        default: "available"
       responses:
         200:
           description: "successful operation"
@@ -108,22 +125,23 @@ paths:
       - petstore_auth:
         - "write:pets"
         - "read:pets"
+      x-swagger-router-controller: "Pet"
   /pet/findByTags:
     get:
       tags:
       - "pet"
       summary: "Finds Pets by tags"
-      description: "Muliple tags can be provided with comma seperated strings. Use\
-        \ tag1, tag2, tag3 for testing."
+      description: "Muliple tags can be provided with comma separated strings. Use\n\
+        tag1, tag2, tag3 for testing.\n"
       operationId: "findPetsByTags"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "tags"
         in: "query"
         description: "Tags to filter by"
-        required: false
+        required: true
         type: "array"
         items:
           type: "string"
@@ -141,21 +159,22 @@ paths:
       - petstore_auth:
         - "write:pets"
         - "read:pets"
+      deprecated: true
+      x-swagger-router-controller: "Pet"
   /pet/{petId}:
     get:
       tags:
       - "pet"
       summary: "Find pet by ID"
-      description: "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate\
-        \ API error conditions"
+      description: "Returns a single pet"
       operationId: "getPetById"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "petId"
         in: "path"
-        description: "ID of pet that needs to be fetched"
+        description: "ID of pet to return"
         required: true
         type: "integer"
         format: "int64"
@@ -170,26 +189,25 @@ paths:
           description: "Pet not found"
       security:
       - api_key: []
-      - petstore_auth:
-        - "write:pets"
-        - "read:pets"
+      x-swagger-router-controller: "Pet"
     post:
       tags:
       - "pet"
       summary: "Updates a pet in the store with form data"
-      description: ""
+      description: "null"
       operationId: "updatePetWithForm"
       consumes:
       - "application/x-www-form-urlencoded"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "petId"
         in: "path"
         description: "ID of pet that needs to be updated"
         required: true
-        type: "string"
+        type: "integer"
+        format: "int64"
       - name: "name"
         in: "formData"
         description: "Updated name of the pet"
@@ -207,19 +225,18 @@ paths:
       - petstore_auth:
         - "write:pets"
         - "read:pets"
+      x-swagger-router-controller: "Pet"
     delete:
       tags:
       - "pet"
       summary: "Deletes a pet"
-      description: ""
       operationId: "deletePet"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "api_key"
         in: "header"
-        description: ""
         required: false
         type: "string"
       - name: "petId"
@@ -230,23 +247,24 @@ paths:
         format: "int64"
       responses:
         400:
-          description: "Invalid pet value"
+          description: "Invalid ID supplied"
+        404:
+          description: "Pet not found"
       security:
       - petstore_auth:
         - "write:pets"
         - "read:pets"
+      x-swagger-router-controller: "Pet"
   /pet/{petId}/uploadImage:
     post:
       tags:
       - "pet"
       summary: "uploads an image"
-      description: ""
       operationId: "uploadFile"
       consumes:
       - "multipart/form-data"
       produces:
       - "application/json"
-      - "application/xml"
       parameters:
       - name: "petId"
         in: "path"
@@ -265,12 +283,15 @@ paths:
         required: false
         type: "file"
       responses:
-        default:
+        200:
           description: "successful operation"
+          schema:
+            $ref: "#/definitions/ApiResponse"
       security:
       - petstore_auth:
         - "write:pets"
         - "read:pets"
+      x-swagger-router-controller: "Pet"
   /store/inventory:
     get:
       tags:
@@ -280,7 +301,6 @@ paths:
       operationId: "getInventory"
       produces:
       - "application/json"
-      - "application/xml"
       parameters: []
       responses:
         200:
@@ -292,21 +312,21 @@ paths:
               format: "int32"
       security:
       - api_key: []
+      x-swagger-router-controller: "Store"
   /store/order:
     post:
       tags:
       - "store"
       summary: "Place an order for a pet"
-      description: ""
       operationId: "placeOrder"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "order placed for purchasing the pet"
-        required: false
+        required: true
         schema:
           $ref: "#/definitions/Order"
       responses:
@@ -316,23 +336,27 @@ paths:
             $ref: "#/definitions/Order"
         400:
           description: "Invalid Order"
+      x-swagger-router-controller: "Store"
   /store/order/{orderId}:
     get:
       tags:
       - "store"
       summary: "Find purchase order by ID"
-      description: "For valid response try integer IDs with value <= 5 or > 10. Other\
-        \ values will generated exceptions"
+      description: "For valid response try integer IDs with value >= 1 and <= 10.\n\
+        Other values will generated exceptions\n"
       operationId: "getOrderById"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "orderId"
         in: "path"
         description: "ID of pet that needs to be fetched"
         required: true
-        type: "string"
+        type: "integer"
+        maximum: 10
+        minimum: 1
+        format: "int64"
       responses:
         200:
           description: "successful operation"
@@ -342,27 +366,31 @@ paths:
           description: "Invalid ID supplied"
         404:
           description: "Order not found"
+      x-swagger-router-controller: "Store"
     delete:
       tags:
       - "store"
       summary: "Delete purchase order by ID"
-      description: "For valid response try integer IDs with value < 1000. Anything\
-        \ above 1000 or nonintegers will generate API errors"
+      description: "For valid response try integer IDs with positive integer value.\\\
+        \ \\ Negative or non-integer values will generate API errors"
       operationId: "deleteOrder"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "orderId"
         in: "path"
         description: "ID of the order that needs to be deleted"
         required: true
-        type: "string"
+        type: "integer"
+        minimum: 1
+        format: "int64"
       responses:
         400:
           description: "Invalid ID supplied"
         404:
           description: "Order not found"
+      x-swagger-router-controller: "Store"
   /user:
     post:
       tags:
@@ -371,33 +399,33 @@ paths:
       description: "This can only be done by the logged in user."
       operationId: "createUser"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "Created user object"
-        required: false
+        required: true
         schema:
           $ref: "#/definitions/User"
       responses:
         default:
           description: "successful operation"
+      x-swagger-router-controller: "User"
   /user/createWithArray:
     post:
       tags:
       - "user"
       summary: "Creates list of users with given input array"
-      description: ""
       operationId: "createUsersWithArrayInput"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "List of user object"
-        required: false
+        required: true
         schema:
           type: "array"
           items:
@@ -405,21 +433,21 @@ paths:
       responses:
         default:
           description: "successful operation"
+      x-swagger-router-controller: "User"
   /user/createWithList:
     post:
       tags:
       - "user"
       summary: "Creates list of users with given input array"
-      description: ""
       operationId: "createUsersWithListInput"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "List of user object"
-        required: false
+        required: true
         schema:
           type: "array"
           items:
@@ -427,62 +455,72 @@ paths:
       responses:
         default:
           description: "successful operation"
+      x-swagger-router-controller: "User"
   /user/login:
     get:
       tags:
       - "user"
       summary: "Logs user into the system"
-      description: ""
       operationId: "loginUser"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "username"
         in: "query"
         description: "The user name for login"
-        required: false
+        required: true
         type: "string"
       - name: "password"
         in: "query"
         description: "The password for login in clear text"
-        required: false
+        required: true
         type: "string"
       responses:
         200:
           description: "successful operation"
           schema:
             type: "string"
+          headers:
+            X-Rate-Limit:
+              type: "integer"
+              format: "int32"
+              description: "calls per hour allowed by the user"
+            X-Expires-After:
+              type: "string"
+              format: "date-time"
+              description: "date in UTC when token expires"
         400:
           description: "Invalid username/password supplied"
+      x-swagger-router-controller: "User"
   /user/logout:
     get:
       tags:
       - "user"
       summary: "Logs out current logged in user session"
-      description: ""
+      description: "null"
       operationId: "logoutUser"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters: []
       responses:
         default:
           description: "successful operation"
+      x-swagger-router-controller: "User"
   /user/{username}:
     get:
       tags:
       - "user"
       summary: "Get user by user name"
-      description: ""
       operationId: "getUserByName"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "username"
         in: "path"
-        description: "The name that needs to be fetched. Use user1 for testing. "
+        description: "The name that needs to be fetched. Use user1 for testing."
         required: true
         type: "string"
       responses:
@@ -490,20 +528,11 @@ paths:
           description: "successful operation"
           schema:
             $ref: "#/definitions/User"
-          examples:
-            application/json:
-              id: 1
-              username: "johnp"
-              firstName: "John"
-              lastName: "Public"
-              email: "johnp@swagger.io"
-              password: "-secret-"
-              phone: "0123456789"
-              userStatus: 0
         400:
           description: "Invalid username supplied"
         404:
           description: "User not found"
+      x-swagger-router-controller: "User"
     put:
       tags:
       - "user"
@@ -511,18 +540,18 @@ paths:
       description: "This can only be done by the logged in user."
       operationId: "updateUser"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "username"
         in: "path"
-        description: "name that need to be deleted"
+        description: "name that need to be updated"
         required: true
         type: "string"
       - in: "body"
         name: "body"
         description: "Updated user object"
-        required: false
+        required: true
         schema:
           $ref: "#/definitions/User"
       responses:
@@ -530,6 +559,7 @@ paths:
           description: "Invalid user supplied"
         404:
           description: "User not found"
+      x-swagger-router-controller: "User"
     delete:
       tags:
       - "user"
@@ -537,8 +567,8 @@ paths:
       description: "This can only be done by the logged in user."
       operationId: "deleteUser"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "username"
         in: "path"
@@ -550,6 +580,7 @@ paths:
           description: "Invalid username supplied"
         404:
           description: "User not found"
+      x-swagger-router-controller: "User"
 securityDefinitions:
   api_key:
     type: "apiKey"
@@ -557,13 +588,41 @@ securityDefinitions:
     in: "header"
   petstore_auth:
     type: "oauth2"
-    authorizationUrl: "http://petstore.swagger.io/api/oauth/dialog"
+    authorizationUrl: "http://petstore.swagger.io/oauth/dialog"
     flow: "implicit"
     scopes:
       write:pets: "modify pets in your account"
       read:pets: "read your pets"
 definitions:
+  Order:
+    type: "object"
+    properties:
+      id:
+        type: "integer"
+        format: "int64"
+      petId:
+        type: "integer"
+        format: "int64"
+      quantity:
+        type: "integer"
+        format: "int32"
+      shipDate:
+        type: "string"
+        format: "date-time"
+      status:
+        type: "string"
+        description: "Order Status"
+        enum:
+        - "placed"
+        - "approved"
+        - "delivered"
+      complete:
+        type: "boolean"
+        default: false
+    xml:
+      name: "Order"
   User:
+    type: "object"
     properties:
       id:
         type: "integer"
@@ -587,6 +646,7 @@ definitions:
     xml:
       name: "User"
   Category:
+    type: "object"
     properties:
       id:
         type: "integer"
@@ -595,7 +655,18 @@ definitions:
         type: "string"
     xml:
       name: "Category"
+  Tag:
+    type: "object"
+    properties:
+      id:
+        type: "integer"
+        format: "int64"
+      name:
+        type: "string"
+    xml:
+      name: "Tag"
   Pet:
+    type: "object"
     required:
     - "name"
     - "photoUrls"
@@ -631,37 +702,16 @@ definitions:
         - "sold"
     xml:
       name: "Pet"
-  Tag:
+  ApiResponse:
+    type: "object"
     properties:
-      id:
-        type: "integer"
-        format: "int64"
-      name:
-        type: "string"
-    xml:
-      name: "Tag"
-  Order:
-    properties:
-      id:
-        type: "integer"
-        format: "int64"
-      petId:
-        type: "integer"
-        format: "int64"
-      quantity:
+      code:
         type: "integer"
         format: "int32"
-      shipDate:
+      type:
         type: "string"
-        format: "date-time"
-      status:
+      message:
         type: "string"
-        description: "Order Status"
-        enum:
-        - "placed"
-        - "approved"
-        - "delivered"
-      complete:
-        type: "boolean"
-    xml:
-      name: "Order"
+externalDocs:
+  description: "Find out more about Swagger"
+  url: "http://swagger.io"
diff --git a/samples/server/petstore/nodejs/controllers/Pet.js b/samples/server/petstore/nodejs/controllers/Pet.js
index d272cb8240f..3748305bfbe 100644
--- a/samples/server/petstore/nodejs/controllers/Pet.js
+++ b/samples/server/petstore/nodejs/controllers/Pet.js
@@ -6,14 +6,14 @@ var url = require('url');
 var Pet = require('./PetService');
 
 
-module.exports.updatePet = function updatePet (req, res, next) {
-  Pet.updatePet(req.swagger.params, res, next);
-};
-
 module.exports.addPet = function addPet (req, res, next) {
   Pet.addPet(req.swagger.params, res, next);
 };
 
+module.exports.deletePet = function deletePet (req, res, next) {
+  Pet.deletePet(req.swagger.params, res, next);
+};
+
 module.exports.findPetsByStatus = function findPetsByStatus (req, res, next) {
   Pet.findPetsByStatus(req.swagger.params, res, next);
 };
@@ -26,12 +26,12 @@ module.exports.getPetById = function getPetById (req, res, next) {
   Pet.getPetById(req.swagger.params, res, next);
 };
 
-module.exports.updatePetWithForm = function updatePetWithForm (req, res, next) {
-  Pet.updatePetWithForm(req.swagger.params, res, next);
+module.exports.updatePet = function updatePet (req, res, next) {
+  Pet.updatePet(req.swagger.params, res, next);
 };
 
-module.exports.deletePet = function deletePet (req, res, next) {
-  Pet.deletePet(req.swagger.params, res, next);
+module.exports.updatePetWithForm = function updatePetWithForm (req, res, next) {
+  Pet.updatePetWithForm(req.swagger.params, res, next);
 };
 
 module.exports.uploadFile = function uploadFile (req, res, next) {
diff --git a/samples/server/petstore/nodejs/controllers/PetService.js b/samples/server/petstore/nodejs/controllers/PetService.js
index 97a1d3ede62..212f5f41313 100644
--- a/samples/server/petstore/nodejs/controllers/PetService.js
+++ b/samples/server/petstore/nodejs/controllers/PetService.js
@@ -1,37 +1,36 @@
 'use strict';
 
-exports.updatePet = function(args, res, next) {
-  /**
-   * parameters expected in the args:
-   * body (Pet)
-   **/
-
-var examples = {};
-  
-
-  
-  res.end();
-}
 exports.addPet = function(args, res, next) {
   /**
    * parameters expected in the args:
-   * body (Pet)
-   **/
-
-var examples = {};
+  * body (Pet)
+  **/
+  // no response value expected for this operation
   
-
   
   res.end();
 }
+
+exports.deletePet = function(args, res, next) {
+  /**
+   * parameters expected in the args:
+  * petId (Long)
+  * apiKey (String)
+  **/
+  // no response value expected for this operation
+  
+  
+  res.end();
+}
+
 exports.findPetsByStatus = function(args, res, next) {
   /**
    * parameters expected in the args:
-   * status (List)
-   **/
-
-var examples = {};
+  * status (List)
+  **/
   
+  
+  var examples = {};
   examples['application/json'] = [ {
   "tags" : [ {
     "id" : 123456789,
@@ -47,8 +46,6 @@ var examples = {};
   "photoUrls" : [ "aeiou" ]
 } ];
   
-
-  
   if(Object.keys(examples).length > 0) {
     res.setHeader('Content-Type', 'application/json');
     res.end(JSON.stringify(examples[Object.keys(examples)[0]] || {}, null, 2));
@@ -59,14 +56,15 @@ var examples = {};
   
   
 }
+
 exports.findPetsByTags = function(args, res, next) {
   /**
    * parameters expected in the args:
-   * tags (List)
-   **/
-
-var examples = {};
+  * tags (List)
+  **/
   
+  
+  var examples = {};
   examples['application/json'] = [ {
   "tags" : [ {
     "id" : 123456789,
@@ -82,8 +80,6 @@ var examples = {};
   "photoUrls" : [ "aeiou" ]
 } ];
   
-
-  
   if(Object.keys(examples).length > 0) {
     res.setHeader('Content-Type', 'application/json');
     res.end(JSON.stringify(examples[Object.keys(examples)[0]] || {}, null, 2));
@@ -94,14 +90,15 @@ var examples = {};
   
   
 }
+
 exports.getPetById = function(args, res, next) {
   /**
    * parameters expected in the args:
-   * petId (Long)
-   **/
-
-var examples = {};
+  * petId (Long)
+  **/
   
+  
+  var examples = {};
   examples['application/json'] = {
   "tags" : [ {
     "id" : 123456789,
@@ -117,7 +114,56 @@ var examples = {};
   "photoUrls" : [ "aeiou" ]
 };
   
+  if(Object.keys(examples).length > 0) {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify(examples[Object.keys(examples)[0]] || {}, null, 2));
+  }
+  else {
+    res.end();
+  }
+  
+  
+}
 
+exports.updatePet = function(args, res, next) {
+  /**
+   * parameters expected in the args:
+  * body (Pet)
+  **/
+  // no response value expected for this operation
+  
+  
+  res.end();
+}
+
+exports.updatePetWithForm = function(args, res, next) {
+  /**
+   * parameters expected in the args:
+  * petId (Long)
+  * name (String)
+  * status (String)
+  **/
+  // no response value expected for this operation
+  
+  
+  res.end();
+}
+
+exports.uploadFile = function(args, res, next) {
+  /**
+   * parameters expected in the args:
+  * petId (Long)
+  * additionalMetadata (String)
+  * file (file)
+  **/
+  
+  
+  var examples = {};
+  examples['application/json'] = {
+  "message" : "aeiou",
+  "code" : 123,
+  "type" : "aeiou"
+};
   
   if(Object.keys(examples).length > 0) {
     res.setHeader('Content-Type', 'application/json');
@@ -129,44 +175,4 @@ var examples = {};
   
   
 }
-exports.updatePetWithForm = function(args, res, next) {
-  /**
-   * parameters expected in the args:
-   * petId (String)
-   * name (String)
-   * status (String)
-   **/
 
-var examples = {};
-  
-
-  
-  res.end();
-}
-exports.deletePet = function(args, res, next) {
-  /**
-   * parameters expected in the args:
-   * petId (Long)
-   * apiKey (String)
-   **/
-
-var examples = {};
-  
-
-  
-  res.end();
-}
-exports.uploadFile = function(args, res, next) {
-  /**
-   * parameters expected in the args:
-   * petId (Long)
-   * additionalMetadata (String)
-   * file (file)
-   **/
-
-var examples = {};
-  
-
-  
-  res.end();
-}
diff --git a/samples/server/petstore/nodejs/controllers/Store.js b/samples/server/petstore/nodejs/controllers/Store.js
index 8a07dc76ed3..ac67c740d29 100644
--- a/samples/server/petstore/nodejs/controllers/Store.js
+++ b/samples/server/petstore/nodejs/controllers/Store.js
@@ -6,18 +6,18 @@ var url = require('url');
 var Store = require('./StoreService');
 
 
-module.exports.getInventory = function getInventory (req, res, next) {
-  Store.getInventory(req.swagger.params, res, next);
+module.exports.deleteOrder = function deleteOrder (req, res, next) {
+  Store.deleteOrder(req.swagger.params, res, next);
 };
 
-module.exports.placeOrder = function placeOrder (req, res, next) {
-  Store.placeOrder(req.swagger.params, res, next);
+module.exports.getInventory = function getInventory (req, res, next) {
+  Store.getInventory(req.swagger.params, res, next);
 };
 
 module.exports.getOrderById = function getOrderById (req, res, next) {
   Store.getOrderById(req.swagger.params, res, next);
 };
 
-module.exports.deleteOrder = function deleteOrder (req, res, next) {
-  Store.deleteOrder(req.swagger.params, res, next);
+module.exports.placeOrder = function placeOrder (req, res, next) {
+  Store.placeOrder(req.swagger.params, res, next);
 };
diff --git a/samples/server/petstore/nodejs/controllers/StoreService.js b/samples/server/petstore/nodejs/controllers/StoreService.js
index 3bb37b6c01f..de42d786581 100644
--- a/samples/server/petstore/nodejs/controllers/StoreService.js
+++ b/samples/server/petstore/nodejs/controllers/StoreService.js
@@ -1,18 +1,27 @@
 'use strict';
 
+exports.deleteOrder = function(args, res, next) {
+  /**
+   * parameters expected in the args:
+  * orderId (Long)
+  **/
+  // no response value expected for this operation
+  
+  
+  res.end();
+}
+
 exports.getInventory = function(args, res, next) {
   /**
    * parameters expected in the args:
-   **/
-
-var examples = {};
+  **/
   
+  
+  var examples = {};
   examples['application/json'] = {
   "key" : 123
 };
   
-
-  
   if(Object.keys(examples).length > 0) {
     res.setHeader('Content-Type', 'application/json');
     res.end(JSON.stringify(examples[Object.keys(examples)[0]] || {}, null, 2));
@@ -23,54 +32,24 @@ var examples = {};
   
   
 }
-exports.placeOrder = function(args, res, next) {
-  /**
-   * parameters expected in the args:
-   * body (Order)
-   **/
 
-var examples = {};
-  
-  examples['application/json'] = {
-  "id" : 123456789,
-  "petId" : 123456789,
-  "complete" : true,
-  "status" : "aeiou",
-  "quantity" : 123,
-  "shipDate" : "2015-11-18T02:43:54.540+0000"
-};
-  
-
-  
-  if(Object.keys(examples).length > 0) {
-    res.setHeader('Content-Type', 'application/json');
-    res.end(JSON.stringify(examples[Object.keys(examples)[0]] || {}, null, 2));
-  }
-  else {
-    res.end();
-  }
-  
-  
-}
 exports.getOrderById = function(args, res, next) {
   /**
    * parameters expected in the args:
-   * orderId (String)
-   **/
-
-var examples = {};
+  * orderId (Long)
+  **/
   
+  
+  var examples = {};
   examples['application/json'] = {
   "id" : 123456789,
   "petId" : 123456789,
   "complete" : true,
   "status" : "aeiou",
   "quantity" : 123,
-  "shipDate" : "2015-11-18T02:43:54.544+0000"
+  "shipDate" : "2000-01-23T04:56:07.000+0000"
 };
   
-
-  
   if(Object.keys(examples).length > 0) {
     res.setHeader('Content-Type', 'application/json');
     res.end(JSON.stringify(examples[Object.keys(examples)[0]] || {}, null, 2));
@@ -81,15 +60,32 @@ var examples = {};
   
   
 }
-exports.deleteOrder = function(args, res, next) {
+
+exports.placeOrder = function(args, res, next) {
   /**
    * parameters expected in the args:
-   * orderId (String)
-   **/
-
-var examples = {};
+  * body (Order)
+  **/
+  
+  
+  var examples = {};
+  examples['application/json'] = {
+  "id" : 123456789,
+  "petId" : 123456789,
+  "complete" : true,
+  "status" : "aeiou",
+  "quantity" : 123,
+  "shipDate" : "2000-01-23T04:56:07.000+0000"
+};
+  
+  if(Object.keys(examples).length > 0) {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify(examples[Object.keys(examples)[0]] || {}, null, 2));
+  }
+  else {
+    res.end();
+  }
   
-
   
-  res.end();
 }
+
diff --git a/samples/server/petstore/nodejs/controllers/User.js b/samples/server/petstore/nodejs/controllers/User.js
index d2ce361da52..bac1d7f6a88 100644
--- a/samples/server/petstore/nodejs/controllers/User.js
+++ b/samples/server/petstore/nodejs/controllers/User.js
@@ -18,6 +18,14 @@ module.exports.createUsersWithListInput = function createUsersWithListInput (req
   User.createUsersWithListInput(req.swagger.params, res, next);
 };
 
+module.exports.deleteUser = function deleteUser (req, res, next) {
+  User.deleteUser(req.swagger.params, res, next);
+};
+
+module.exports.getUserByName = function getUserByName (req, res, next) {
+  User.getUserByName(req.swagger.params, res, next);
+};
+
 module.exports.loginUser = function loginUser (req, res, next) {
   User.loginUser(req.swagger.params, res, next);
 };
@@ -26,14 +34,6 @@ module.exports.logoutUser = function logoutUser (req, res, next) {
   User.logoutUser(req.swagger.params, res, next);
 };
 
-module.exports.getUserByName = function getUserByName (req, res, next) {
-  User.getUserByName(req.swagger.params, res, next);
-};
-
 module.exports.updateUser = function updateUser (req, res, next) {
   User.updateUser(req.swagger.params, res, next);
 };
-
-module.exports.deleteUser = function deleteUser (req, res, next) {
-  User.deleteUser(req.swagger.params, res, next);
-};
diff --git a/samples/server/petstore/nodejs/controllers/UserService.js b/samples/server/petstore/nodejs/controllers/UserService.js
index 71f34f35bfb..13ddbee03fc 100644
--- a/samples/server/petstore/nodejs/controllers/UserService.js
+++ b/samples/server/petstore/nodejs/controllers/UserService.js
@@ -3,126 +3,118 @@
 exports.createUser = function(args, res, next) {
   /**
    * parameters expected in the args:
-   * body (User)
-   **/
-
-var examples = {};
+  * body (User)
+  **/
+  // no response value expected for this operation
   
-
   
   res.end();
 }
+
 exports.createUsersWithArrayInput = function(args, res, next) {
   /**
    * parameters expected in the args:
-   * body (List)
-   **/
-
-var examples = {};
+  * body (List)
+  **/
+  // no response value expected for this operation
   
-
   
   res.end();
 }
+
 exports.createUsersWithListInput = function(args, res, next) {
   /**
    * parameters expected in the args:
-   * body (List)
-   **/
-
-var examples = {};
+  * body (List)
+  **/
+  // no response value expected for this operation
   
-
   
   res.end();
 }
-exports.loginUser = function(args, res, next) {
-  /**
-   * parameters expected in the args:
-   * username (String)
-   * password (String)
-   **/
 
-var examples = {};
-  
-  examples['application/json'] = "aeiou";
-  
-
-  
-  if(Object.keys(examples).length > 0) {
-    res.setHeader('Content-Type', 'application/json');
-    res.end(JSON.stringify(examples[Object.keys(examples)[0]] || {}, null, 2));
-  }
-  else {
-    res.end();
-  }
-  
-  
-}
-exports.logoutUser = function(args, res, next) {
-  /**
-   * parameters expected in the args:
-   **/
-
-var examples = {};
-  
-
-  
-  res.end();
-}
-exports.getUserByName = function(args, res, next) {
-  /**
-   * parameters expected in the args:
-   * username (String)
-   **/
-
-var examples = {};
-  
-  examples['application/json'] = {
-  "id" : 1,
-  "username" : "johnp",
-  "firstName" : "John",
-  "lastName" : "Public",
-  "email" : "johnp@swagger.io",
-  "password" : "-secret-",
-  "phone" : "0123456789",
-  "userStatus" : 0
-};
-  
-
-  
-  if(Object.keys(examples).length > 0) {
-    res.setHeader('Content-Type', 'application/json');
-    res.end(JSON.stringify(examples[Object.keys(examples)[0]] || {}, null, 2));
-  }
-  else {
-    res.end();
-  }
-  
-  
-}
-exports.updateUser = function(args, res, next) {
-  /**
-   * parameters expected in the args:
-   * username (String)
-   * body (User)
-   **/
-
-var examples = {};
-  
-
-  
-  res.end();
-}
 exports.deleteUser = function(args, res, next) {
   /**
    * parameters expected in the args:
-   * username (String)
-   **/
-
-var examples = {};
+  * username (String)
+  **/
+  // no response value expected for this operation
   
-
   
   res.end();
 }
+
+exports.getUserByName = function(args, res, next) {
+  /**
+   * parameters expected in the args:
+  * username (String)
+  **/
+  
+  
+  var examples = {};
+  examples['application/json'] = {
+  "id" : 123456789,
+  "lastName" : "aeiou",
+  "phone" : "aeiou",
+  "username" : "aeiou",
+  "email" : "aeiou",
+  "userStatus" : 123,
+  "firstName" : "aeiou",
+  "password" : "aeiou"
+};
+  
+  if(Object.keys(examples).length > 0) {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify(examples[Object.keys(examples)[0]] || {}, null, 2));
+  }
+  else {
+    res.end();
+  }
+  
+  
+}
+
+exports.loginUser = function(args, res, next) {
+  /**
+   * parameters expected in the args:
+  * username (String)
+  * password (String)
+  **/
+  
+  
+  var examples = {};
+  examples['application/json'] = "aeiou";
+  
+  if(Object.keys(examples).length > 0) {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify(examples[Object.keys(examples)[0]] || {}, null, 2));
+  }
+  else {
+    res.end();
+  }
+  
+  
+}
+
+exports.logoutUser = function(args, res, next) {
+  /**
+   * parameters expected in the args:
+  **/
+  // no response value expected for this operation
+  
+  
+  res.end();
+}
+
+exports.updateUser = function(args, res, next) {
+  /**
+   * parameters expected in the args:
+  * username (String)
+  * body (User)
+  **/
+  // no response value expected for this operation
+  
+  
+  res.end();
+}
+
diff --git a/samples/server/petstore/nodejs/package.json b/samples/server/petstore/nodejs/package.json
index 8befd2669d2..fbc49f2a725 100644
--- a/samples/server/petstore/nodejs/package.json
+++ b/samples/server/petstore/nodejs/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "",
+  "name": "swagger-petstore",
   "version": "1.0.0",
-  "description": "This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters",
+  "description": "This is a sample server Petstore server.  You can find out more about\nSwagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).\nFor this sample, you can use the api key `special-key` to test the authorization filters.\n",
   "main": "index.js",
   "keywords": [
     "swagger"
diff --git a/samples/server/petstore/silex/SwaggerServer/README.md b/samples/server/petstore/silex/SwaggerServer/README.md
index 9f35636b3f8..d335e2f4ab8 100644
--- a/samples/server/petstore/silex/SwaggerServer/README.md
+++ b/samples/server/petstore/silex/SwaggerServer/README.md
@@ -2,7 +2,7 @@
 
 ## Overview
 This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.  By using the
-[swagger-spec](https://github.com/swagger-api/swagger-core/wiki) from a remote server, you can easily generate a server stub.  This
+[OpenAPI-Spec](https://github.com/swagger-api/swagger-core/wiki) from a remote server, you can easily generate a server stub.  This
 is an example of building a PHP server.
 
 This example uses the [Silex](http://silex.sensiolabs.org/) micro-framework.  To see how to make this your own, please take a look at the template here:
diff --git a/samples/server/petstore/silex/SwaggerServer/index.php b/samples/server/petstore/silex/SwaggerServer/index.php
index 1526f3cb8f3..450b8e74967 100644
--- a/samples/server/petstore/silex/SwaggerServer/index.php
+++ b/samples/server/petstore/silex/SwaggerServer/index.php
@@ -142,6 +142,22 @@ $app->POST('/pet/{petId}/uploadImage', function(Application $app, Request $reque
             });
 
             
+
+$app->GET('/pet/{petId}?testing_byte_array=true', function(Application $app, Request $request, $pet_id) {
+            
+            
+            return new Response('How about implementing getPetByIdWithByteArray as a GET method ?');
+            });
+
+            
+
+$app->POST('/pet?testing_byte_array=true', function(Application $app, Request $request) {
+            
+            
+            return new Response('How about implementing addPetUsingByteArray as a POST method ?');
+            });
+
+            
         
     
         
diff --git a/samples/server/petstore/sinatra/api/pet_api.rb b/samples/server/petstore/sinatra/api/pet_api.rb
index 7ccad2056b9..3ca40f568d3 100644
--- a/samples/server/petstore/sinatra/api/pet_api.rb
+++ b/samples/server/petstore/sinatra/api/pet_api.rb
@@ -1,39 +1,12 @@
 require 'json'
 
 
-MyApp.add_route('PUT', '/v2/pet', {
-  "resourcePath" => "/Pet",
-  "summary" => "Update an existing pet",
-  "nickname" => "update_pet", 
-  "responseClass" => "void", 
-  "endpoint" => "/pet", 
-  "notes" => "",
-  "parameters" => [
-    
-    
-    
-    
-    {
-      "name" => "body",
-      "description" => "Pet object that needs to be added to the store",
-      "dataType" => "Pet",
-      "paramType" => "body",
-    }
-    
-    ]}) do
-  cross_origin
-  # the guts live here
-
-  {"message" => "yes, it worked"}.to_json
-end
-
-
-MyApp.add_route('POST', '/v2/pet', {
+MyApp.add_route('POST', '/v2/pets', {
   "resourcePath" => "/Pet",
   "summary" => "Add a new pet to the store",
   "nickname" => "add_pet", 
   "responseClass" => "void", 
-  "endpoint" => "/pet", 
+  "endpoint" => "/pets", 
   "notes" => "",
   "parameters" => [
     
@@ -55,126 +28,12 @@ MyApp.add_route('POST', '/v2/pet', {
 end
 
 
-MyApp.add_route('GET', '/v2/pet/findByStatus', {
-  "resourcePath" => "/Pet",
-  "summary" => "Finds Pets by status",
-  "nickname" => "find_pets_by_status", 
-  "responseClass" => "array[Pet]", 
-  "endpoint" => "/pet/findByStatus", 
-  "notes" => "Multiple status values can be provided with comma seperated strings",
-  "parameters" => [
-    
-    {
-      "name" => "status",
-      "description" => "Status values that need to be considered for filter",
-      "dataType" => "array[string]",
-      "paramType" => "query",
-      "collectionFormat" => "multi",
-      "allowableValues" => "",
-      "defaultValue" => "available"
-    },
-    
-    
-    
-    
-    ]}) do
-  cross_origin
-  # the guts live here
-
-  {"message" => "yes, it worked"}.to_json
-end
-
-
-MyApp.add_route('GET', '/v2/pet/findByTags', {
-  "resourcePath" => "/Pet",
-  "summary" => "Finds Pets by tags",
-  "nickname" => "find_pets_by_tags", 
-  "responseClass" => "array[Pet]", 
-  "endpoint" => "/pet/findByTags", 
-  "notes" => "Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.",
-  "parameters" => [
-    
-    {
-      "name" => "tags",
-      "description" => "Tags to filter by",
-      "dataType" => "array[string]",
-      "paramType" => "query",
-      "collectionFormat" => "multi",
-      "allowableValues" => "",
-      
-    },
-    
-    
-    
-    
-    ]}) do
-  cross_origin
-  # the guts live here
-
-  {"message" => "yes, it worked"}.to_json
-end
-
-
-MyApp.add_route('GET', '/v2/pet/{petId}', {
-  "resourcePath" => "/Pet",
-  "summary" => "Find pet by ID",
-  "nickname" => "get_pet_by_id", 
-  "responseClass" => "Pet", 
-  "endpoint" => "/pet/{petId}", 
-  "notes" => "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions",
-  "parameters" => [
-    
-    
-    {
-      "name" => "pet_id",
-      "description" => "ID of pet that needs to be fetched",
-      "dataType" => "int",
-      "paramType" => "path",
-    },
-    
-    
-    
-    ]}) do
-  cross_origin
-  # the guts live here
-
-  {"message" => "yes, it worked"}.to_json
-end
-
-
-MyApp.add_route('POST', '/v2/pet/{petId}', {
-  "resourcePath" => "/Pet",
-  "summary" => "Updates a pet in the store with form data",
-  "nickname" => "update_pet_with_form", 
-  "responseClass" => "void", 
-  "endpoint" => "/pet/{petId}", 
-  "notes" => "",
-  "parameters" => [
-    
-    
-    {
-      "name" => "pet_id",
-      "description" => "ID of pet that needs to be updated",
-      "dataType" => "string",
-      "paramType" => "path",
-    },
-    
-    
-    
-    ]}) do
-  cross_origin
-  # the guts live here
-
-  {"message" => "yes, it worked"}.to_json
-end
-
-
-MyApp.add_route('DELETE', '/v2/pet/{petId}', {
+MyApp.add_route('DELETE', '/v2/pets/{petId}', {
   "resourcePath" => "/Pet",
   "summary" => "Deletes a pet",
   "nickname" => "delete_pet", 
   "responseClass" => "void", 
-  "endpoint" => "/pet/{petId}", 
+  "endpoint" => "/pets/{petId}", 
   "notes" => "",
   "parameters" => [
     
@@ -203,25 +62,139 @@ MyApp.add_route('DELETE', '/v2/pet/{petId}', {
 end
 
 
-MyApp.add_route('POST', '/v2/pet/{petId}/uploadImage', {
+MyApp.add_route('GET', '/v2/pets/findByStatus', {
   "resourcePath" => "/Pet",
-  "summary" => "uploads an image",
-  "nickname" => "upload_file", 
-  "responseClass" => "void", 
-  "endpoint" => "/pet/{petId}/uploadImage", 
-  "notes" => "",
+  "summary" => "Finds Pets by status",
+  "nickname" => "find_pets_by_status", 
+  "responseClass" => "array[Pet]", 
+  "endpoint" => "/pets/findByStatus", 
+  "notes" => "Multiple status values can be provided with comma seperated strings",
+  "parameters" => [
+    
+    {
+      "name" => "status",
+      "description" => "Status values that need to be considered for filter",
+      "dataType" => "array[string]",
+      "paramType" => "query",
+      "collectionFormat" => "multi",
+      "allowableValues" => "",
+      
+    },
+    
+    
+    
+    
+    ]}) do
+  cross_origin
+  # the guts live here
+
+  {"message" => "yes, it worked"}.to_json
+end
+
+
+MyApp.add_route('GET', '/v2/pets/findByTags', {
+  "resourcePath" => "/Pet",
+  "summary" => "Finds Pets by tags",
+  "nickname" => "find_pets_by_tags", 
+  "responseClass" => "array[Pet]", 
+  "endpoint" => "/pets/findByTags", 
+  "notes" => "Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.",
+  "parameters" => [
+    
+    {
+      "name" => "tags",
+      "description" => "Tags to filter by",
+      "dataType" => "array[string]",
+      "paramType" => "query",
+      "collectionFormat" => "multi",
+      "allowableValues" => "",
+      
+    },
+    
+    
+    
+    
+    ]}) do
+  cross_origin
+  # the guts live here
+
+  {"message" => "yes, it worked"}.to_json
+end
+
+
+MyApp.add_route('GET', '/v2/pets/{petId}', {
+  "resourcePath" => "/Pet",
+  "summary" => "Find pet by ID",
+  "nickname" => "get_pet_by_id", 
+  "responseClass" => "Pet", 
+  "endpoint" => "/pets/{petId}", 
+  "notes" => "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions",
   "parameters" => [
     
     
     {
       "name" => "pet_id",
-      "description" => "ID of pet to update",
+      "description" => "ID of pet that needs to be fetched",
       "dataType" => "int",
       "paramType" => "path",
     },
     
     
     
+    ]}) do
+  cross_origin
+  # the guts live here
+
+  {"message" => "yes, it worked"}.to_json
+end
+
+
+MyApp.add_route('PUT', '/v2/pets', {
+  "resourcePath" => "/Pet",
+  "summary" => "Update an existing pet",
+  "nickname" => "update_pet", 
+  "responseClass" => "void", 
+  "endpoint" => "/pets", 
+  "notes" => "",
+  "parameters" => [
+    
+    
+    
+    
+    {
+      "name" => "body",
+      "description" => "Pet object that needs to be added to the store",
+      "dataType" => "Pet",
+      "paramType" => "body",
+    }
+    
+    ]}) do
+  cross_origin
+  # the guts live here
+
+  {"message" => "yes, it worked"}.to_json
+end
+
+
+MyApp.add_route('POST', '/v2/pets/{petId}', {
+  "resourcePath" => "/Pet",
+  "summary" => "Updates a pet in the store with form data",
+  "nickname" => "update_pet_with_form", 
+  "responseClass" => "void", 
+  "endpoint" => "/pets/{petId}", 
+  "notes" => "",
+  "parameters" => [
+    
+    
+    {
+      "name" => "pet_id",
+      "description" => "ID of pet that needs to be updated",
+      "dataType" => "string",
+      "paramType" => "path",
+    },
+    
+    
+    
     ]}) do
   cross_origin
   # the guts live here
diff --git a/samples/server/petstore/sinatra/api/store_api.rb b/samples/server/petstore/sinatra/api/store_api.rb
index 37938b304db..26ac567759b 100644
--- a/samples/server/petstore/sinatra/api/store_api.rb
+++ b/samples/server/petstore/sinatra/api/store_api.rb
@@ -1,44 +1,24 @@
 require 'json'
 
 
-MyApp.add_route('GET', '/v2/store/inventory', {
+MyApp.add_route('DELETE', '/v2/stores/order/{orderId}', {
   "resourcePath" => "/Store",
-  "summary" => "Returns pet inventories by status",
-  "nickname" => "get_inventory", 
-  "responseClass" => "map[string,int]", 
-  "endpoint" => "/store/inventory", 
-  "notes" => "Returns a map of status codes to quantities",
+  "summary" => "Delete purchase order by ID",
+  "nickname" => "delete_order", 
+  "responseClass" => "void", 
+  "endpoint" => "/stores/order/{orderId}", 
+  "notes" => "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors",
   "parameters" => [
     
     
-    
-    
-    ]}) do
-  cross_origin
-  # the guts live here
-
-  {"message" => "yes, it worked"}.to_json
-end
-
-
-MyApp.add_route('POST', '/v2/store/order', {
-  "resourcePath" => "/Store",
-  "summary" => "Place an order for a pet",
-  "nickname" => "place_order", 
-  "responseClass" => "Order", 
-  "endpoint" => "/store/order", 
-  "notes" => "",
-  "parameters" => [
-    
-    
-    
-    
     {
-      "name" => "body",
-      "description" => "order placed for purchasing the pet",
-      "dataType" => "Order",
-      "paramType" => "body",
-    }
+      "name" => "order_id",
+      "description" => "ID of the order that needs to be deleted",
+      "dataType" => "string",
+      "paramType" => "path",
+    },
+    
+    
     
     ]}) do
   cross_origin
@@ -48,12 +28,12 @@ MyApp.add_route('POST', '/v2/store/order', {
 end
 
 
-MyApp.add_route('GET', '/v2/store/order/{orderId}', {
+MyApp.add_route('GET', '/v2/stores/order/{orderId}', {
   "resourcePath" => "/Store",
   "summary" => "Find purchase order by ID",
   "nickname" => "get_order_by_id", 
   "responseClass" => "Order", 
-  "endpoint" => "/store/order/{orderId}", 
+  "endpoint" => "/stores/order/{orderId}", 
   "notes" => "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
   "parameters" => [
     
@@ -75,24 +55,24 @@ MyApp.add_route('GET', '/v2/store/order/{orderId}', {
 end
 
 
-MyApp.add_route('DELETE', '/v2/store/order/{orderId}', {
+MyApp.add_route('POST', '/v2/stores/order', {
   "resourcePath" => "/Store",
-  "summary" => "Delete purchase order by ID",
-  "nickname" => "delete_order", 
-  "responseClass" => "void", 
-  "endpoint" => "/store/order/{orderId}", 
-  "notes" => "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors",
+  "summary" => "Place an order for a pet",
+  "nickname" => "place_order", 
+  "responseClass" => "Order", 
+  "endpoint" => "/stores/order", 
+  "notes" => "",
   "parameters" => [
     
     
+    
+    
     {
-      "name" => "order_id",
-      "description" => "ID of the order that needs to be deleted",
-      "dataType" => "string",
-      "paramType" => "path",
-    },
-    
-    
+      "name" => "body",
+      "description" => "order placed for purchasing the pet",
+      "dataType" => "Order",
+      "paramType" => "body",
+    }
     
     ]}) do
   cross_origin
diff --git a/samples/server/petstore/sinatra/api/user_api.rb b/samples/server/petstore/sinatra/api/user_api.rb
index 7b890004891..aaa76430310 100644
--- a/samples/server/petstore/sinatra/api/user_api.rb
+++ b/samples/server/petstore/sinatra/api/user_api.rb
@@ -1,12 +1,12 @@
 require 'json'
 
 
-MyApp.add_route('POST', '/v2/user', {
+MyApp.add_route('POST', '/v2/users', {
   "resourcePath" => "/User",
   "summary" => "Create user",
   "nickname" => "create_user", 
   "responseClass" => "void", 
-  "endpoint" => "/user", 
+  "endpoint" => "/users", 
   "notes" => "This can only be done by the logged in user.",
   "parameters" => [
     
@@ -28,12 +28,12 @@ MyApp.add_route('POST', '/v2/user', {
 end
 
 
-MyApp.add_route('POST', '/v2/user/createWithArray', {
+MyApp.add_route('POST', '/v2/users/createWithArray', {
   "resourcePath" => "/User",
   "summary" => "Creates list of users with given input array",
   "nickname" => "create_users_with_array_input", 
   "responseClass" => "void", 
-  "endpoint" => "/user/createWithArray", 
+  "endpoint" => "/users/createWithArray", 
   "notes" => "",
   "parameters" => [
     
@@ -55,12 +55,12 @@ MyApp.add_route('POST', '/v2/user/createWithArray', {
 end
 
 
-MyApp.add_route('POST', '/v2/user/createWithList', {
+MyApp.add_route('POST', '/v2/users/createWithList', {
   "resourcePath" => "/User",
   "summary" => "Creates list of users with given input array",
   "nickname" => "create_users_with_list_input", 
   "responseClass" => "void", 
-  "endpoint" => "/user/createWithList", 
+  "endpoint" => "/users/createWithList", 
   "notes" => "",
   "parameters" => [
     
@@ -82,12 +82,66 @@ MyApp.add_route('POST', '/v2/user/createWithList', {
 end
 
 
-MyApp.add_route('GET', '/v2/user/login', {
+MyApp.add_route('DELETE', '/v2/users/{username}', {
+  "resourcePath" => "/User",
+  "summary" => "Delete user",
+  "nickname" => "delete_user", 
+  "responseClass" => "void", 
+  "endpoint" => "/users/{username}", 
+  "notes" => "This can only be done by the logged in user.",
+  "parameters" => [
+    
+    
+    {
+      "name" => "username",
+      "description" => "The name that needs to be deleted",
+      "dataType" => "string",
+      "paramType" => "path",
+    },
+    
+    
+    
+    ]}) do
+  cross_origin
+  # the guts live here
+
+  {"message" => "yes, it worked"}.to_json
+end
+
+
+MyApp.add_route('GET', '/v2/users/{username}', {
+  "resourcePath" => "/User",
+  "summary" => "Get user by user name",
+  "nickname" => "get_user_by_name", 
+  "responseClass" => "User", 
+  "endpoint" => "/users/{username}", 
+  "notes" => "",
+  "parameters" => [
+    
+    
+    {
+      "name" => "username",
+      "description" => "The name that needs to be fetched. Use user1 for testing.",
+      "dataType" => "string",
+      "paramType" => "path",
+    },
+    
+    
+    
+    ]}) do
+  cross_origin
+  # the guts live here
+
+  {"message" => "yes, it worked"}.to_json
+end
+
+
+MyApp.add_route('GET', '/v2/users/login', {
   "resourcePath" => "/User",
   "summary" => "Logs user into the system",
   "nickname" => "login_user", 
   "responseClass" => "string", 
-  "endpoint" => "/user/login", 
+  "endpoint" => "/users/login", 
   "notes" => "",
   "parameters" => [
     
@@ -122,12 +176,12 @@ MyApp.add_route('GET', '/v2/user/login', {
 end
 
 
-MyApp.add_route('GET', '/v2/user/logout', {
+MyApp.add_route('GET', '/v2/users/logout', {
   "resourcePath" => "/User",
   "summary" => "Logs out current logged in user session",
   "nickname" => "logout_user", 
   "responseClass" => "void", 
-  "endpoint" => "/user/logout", 
+  "endpoint" => "/users/logout", 
   "notes" => "",
   "parameters" => [
     
@@ -142,39 +196,12 @@ MyApp.add_route('GET', '/v2/user/logout', {
 end
 
 
-MyApp.add_route('GET', '/v2/user/{username}', {
-  "resourcePath" => "/User",
-  "summary" => "Get user by user name",
-  "nickname" => "get_user_by_name", 
-  "responseClass" => "User", 
-  "endpoint" => "/user/{username}", 
-  "notes" => "",
-  "parameters" => [
-    
-    
-    {
-      "name" => "username",
-      "description" => "The name that needs to be fetched. Use user1 for testing.",
-      "dataType" => "string",
-      "paramType" => "path",
-    },
-    
-    
-    
-    ]}) do
-  cross_origin
-  # the guts live here
-
-  {"message" => "yes, it worked"}.to_json
-end
-
-
-MyApp.add_route('PUT', '/v2/user/{username}', {
+MyApp.add_route('PUT', '/v2/users/{username}', {
   "resourcePath" => "/User",
   "summary" => "Updated user",
   "nickname" => "update_user", 
   "responseClass" => "void", 
-  "endpoint" => "/user/{username}", 
+  "endpoint" => "/users/{username}", 
   "notes" => "This can only be done by the logged in user.",
   "parameters" => [
     
@@ -202,30 +229,3 @@ MyApp.add_route('PUT', '/v2/user/{username}', {
   {"message" => "yes, it worked"}.to_json
 end
 
-
-MyApp.add_route('DELETE', '/v2/user/{username}', {
-  "resourcePath" => "/User",
-  "summary" => "Delete user",
-  "nickname" => "delete_user", 
-  "responseClass" => "void", 
-  "endpoint" => "/user/{username}", 
-  "notes" => "This can only be done by the logged in user.",
-  "parameters" => [
-    
-    
-    {
-      "name" => "username",
-      "description" => "The name that needs to be deleted",
-      "dataType" => "string",
-      "paramType" => "path",
-    },
-    
-    
-    
-    ]}) do
-  cross_origin
-  # the guts live here
-
-  {"message" => "yes, it worked"}.to_json
-end
-
diff --git a/samples/server/petstore/sinatra/lib/swaggering.rb b/samples/server/petstore/sinatra/lib/swaggering.rb
index 1357bb19134..69cc74556ac 100644
--- a/samples/server/petstore/sinatra/lib/swaggering.rb
+++ b/samples/server/petstore/sinatra/lib/swaggering.rb
@@ -39,7 +39,7 @@ class Swaggering < Sinatra::Base
   
   def self.add_route(method, path, swag={}, opts={}, &block)
     #fullPath = swag["resourcePath"].to_s + @@configuration.format_specifier + path
-    fullPath = path.gsub(/{(.*)}/, ':\1')
+    fullPath = path.gsub(/{(.*?)}/, ':\1')
     
     accepted = case method.to_s.downcase
       when 'get'
diff --git a/samples/server/petstore/sinatra/swagger.yaml b/samples/server/petstore/sinatra/swagger.yaml
index 49a3405de09..4aa26a9539c 100644
--- a/samples/server/petstore/sinatra/swagger.yaml
+++ b/samples/server/petstore/sinatra/swagger.yaml
@@ -1,15 +1,14 @@
 ---
 swagger: "2.0"
 info:
-  description: "This is a sample server Petstore server.  You can find out more about\
-    \ Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net,\
-    \ #swagger.  For this sample, you can use the api key \"special-key\" to test\
-    \ the authorization filters"
+  description: "This is a sample server Petstore server.\n\n[Learn about Swagger](http://swagger.io)\
+    \ or join the IRC channel `#swagger` on irc.freenode.net.\n\nFor this sample,\
+    \ you can use the api key `special-key` to test the authorization filters\n"
   version: "1.0.0"
   title: "Swagger Petstore"
-  termsOfService: "http://swagger.io/terms/"
+  termsOfService: "http://helloreverb.com/terms/"
   contact:
-    email: "apiteam@swagger.io"
+    name: "apiteam@swagger.io"
   license:
     name: "Apache 2.0"
     url: "http://www.apache.org/licenses/LICENSE-2.0.html"
@@ -18,7 +17,7 @@ basePath: "/v2"
 schemes:
 - "http"
 paths:
-  /pet:
+  /pets:
     post:
       tags:
       - "pet"
@@ -43,8 +42,8 @@ paths:
           description: "Invalid input"
       security:
       - petstore_auth:
-        - "write:pets"
-        - "read:pets"
+        - "write_pets"
+        - "read_pets"
     put:
       tags:
       - "pet"
@@ -73,9 +72,9 @@ paths:
           description: "Validation exception"
       security:
       - petstore_auth:
-        - "write:pets"
-        - "read:pets"
-  /pet/findByStatus:
+        - "write_pets"
+        - "read_pets"
+  /pets/findByStatus:
     get:
       tags:
       - "pet"
@@ -94,7 +93,6 @@ paths:
         items:
           type: "string"
         collectionFormat: "multi"
-        default: "available"
       responses:
         200:
           description: "successful operation"
@@ -106,9 +104,9 @@ paths:
           description: "Invalid status value"
       security:
       - petstore_auth:
-        - "write:pets"
-        - "read:pets"
-  /pet/findByTags:
+        - "write_pets"
+        - "read_pets"
+  /pets/findByTags:
     get:
       tags:
       - "pet"
@@ -139,9 +137,9 @@ paths:
           description: "Invalid tag value"
       security:
       - petstore_auth:
-        - "write:pets"
-        - "read:pets"
-  /pet/{petId}:
+        - "write_pets"
+        - "read_pets"
+  /pets/{petId}:
     get:
       tags:
       - "pet"
@@ -171,8 +169,8 @@ paths:
       security:
       - api_key: []
       - petstore_auth:
-        - "write:pets"
-        - "read:pets"
+        - "write_pets"
+        - "read_pets"
     post:
       tags:
       - "pet"
@@ -193,20 +191,20 @@ paths:
       - name: "name"
         in: "formData"
         description: "Updated name of the pet"
-        required: false
+        required: true
         type: "string"
       - name: "status"
         in: "formData"
         description: "Updated status of the pet"
-        required: false
+        required: true
         type: "string"
       responses:
         405:
           description: "Invalid input"
       security:
       - petstore_auth:
-        - "write:pets"
-        - "read:pets"
+        - "write_pets"
+        - "read_pets"
     delete:
       tags:
       - "pet"
@@ -220,7 +218,7 @@ paths:
       - name: "api_key"
         in: "header"
         description: ""
-        required: false
+        required: true
         type: "string"
       - name: "petId"
         in: "path"
@@ -233,66 +231,9 @@ paths:
           description: "Invalid pet value"
       security:
       - petstore_auth:
-        - "write:pets"
-        - "read:pets"
-  /pet/{petId}/uploadImage:
-    post:
-      tags:
-      - "pet"
-      summary: "uploads an image"
-      description: ""
-      operationId: "uploadFile"
-      consumes:
-      - "multipart/form-data"
-      produces:
-      - "application/json"
-      - "application/xml"
-      parameters:
-      - name: "petId"
-        in: "path"
-        description: "ID of pet to update"
-        required: true
-        type: "integer"
-        format: "int64"
-      - name: "additionalMetadata"
-        in: "formData"
-        description: "Additional data to pass to server"
-        required: false
-        type: "string"
-      - name: "file"
-        in: "formData"
-        description: "file to upload"
-        required: false
-        type: "file"
-      responses:
-        default:
-          description: "successful operation"
-      security:
-      - petstore_auth:
-        - "write:pets"
-        - "read:pets"
-  /store/inventory:
-    get:
-      tags:
-      - "store"
-      summary: "Returns pet inventories by status"
-      description: "Returns a map of status codes to quantities"
-      operationId: "getInventory"
-      produces:
-      - "application/json"
-      - "application/xml"
-      parameters: []
-      responses:
-        200:
-          description: "successful operation"
-          schema:
-            type: "object"
-            additionalProperties:
-              type: "integer"
-              format: "int32"
-      security:
-      - api_key: []
-  /store/order:
+        - "write_pets"
+        - "read_pets"
+  /stores/order:
     post:
       tags:
       - "store"
@@ -316,7 +257,7 @@ paths:
             $ref: "#/definitions/Order"
         400:
           description: "Invalid Order"
-  /store/order/{orderId}:
+  /stores/order/{orderId}:
     get:
       tags:
       - "store"
@@ -363,7 +304,7 @@ paths:
           description: "Invalid ID supplied"
         404:
           description: "Order not found"
-  /user:
+  /users:
     post:
       tags:
       - "user"
@@ -383,7 +324,7 @@ paths:
       responses:
         default:
           description: "successful operation"
-  /user/createWithArray:
+  /users/createWithArray:
     post:
       tags:
       - "user"
@@ -405,7 +346,7 @@ paths:
       responses:
         default:
           description: "successful operation"
-  /user/createWithList:
+  /users/createWithList:
     post:
       tags:
       - "user"
@@ -427,7 +368,7 @@ paths:
       responses:
         default:
           description: "successful operation"
-  /user/login:
+  /users/login:
     get:
       tags:
       - "user"
@@ -455,7 +396,7 @@ paths:
             type: "string"
         400:
           description: "Invalid username/password supplied"
-  /user/logout:
+  /users/logout:
     get:
       tags:
       - "user"
@@ -469,7 +410,7 @@ paths:
       responses:
         default:
           description: "successful operation"
-  /user/{username}:
+  /users/{username}:
     get:
       tags:
       - "user"
@@ -482,7 +423,7 @@ paths:
       parameters:
       - name: "username"
         in: "path"
-        description: "The name that needs to be fetched. Use user1 for testing. "
+        description: "The name that needs to be fetched. Use user1 for testing."
         required: true
         type: "string"
       responses:
@@ -490,16 +431,6 @@ paths:
           description: "successful operation"
           schema:
             $ref: "#/definitions/User"
-          examples:
-            application/json:
-              id: 1
-              username: "johnp"
-              firstName: "John"
-              lastName: "Public"
-              email: "johnp@swagger.io"
-              password: "-secret-"
-              phone: "0123456789"
-              userStatus: 0
         400:
           description: "Invalid username supplied"
         404:
@@ -560,10 +491,11 @@ securityDefinitions:
     authorizationUrl: "http://petstore.swagger.io/api/oauth/dialog"
     flow: "implicit"
     scopes:
-      write:pets: "modify pets in your account"
-      read:pets: "read your pets"
+      write_pets: "modify pets in your account"
+      read_pets: "read your pets"
 definitions:
   User:
+    type: "object"
     properties:
       id:
         type: "integer"
@@ -584,18 +516,16 @@ definitions:
         type: "integer"
         format: "int32"
         description: "User Status"
-    xml:
-      name: "User"
   Category:
+    type: "object"
     properties:
       id:
         type: "integer"
         format: "int64"
       name:
         type: "string"
-    xml:
-      name: "Category"
   Pet:
+    type: "object"
     required:
     - "name"
     - "photoUrls"
@@ -610,37 +540,25 @@ definitions:
         example: "doggie"
       photoUrls:
         type: "array"
-        xml:
-          name: "photoUrl"
-          wrapped: true
         items:
           type: "string"
       tags:
         type: "array"
-        xml:
-          name: "tag"
-          wrapped: true
         items:
           $ref: "#/definitions/Tag"
       status:
         type: "string"
         description: "pet status in the store"
-        enum:
-        - "available"
-        - "pending"
-        - "sold"
-    xml:
-      name: "Pet"
   Tag:
+    type: "object"
     properties:
       id:
         type: "integer"
         format: "int64"
       name:
         type: "string"
-    xml:
-      name: "Tag"
   Order:
+    type: "object"
     properties:
       id:
         type: "integer"
@@ -657,11 +575,5 @@ definitions:
       status:
         type: "string"
         description: "Order Status"
-        enum:
-        - "placed"
-        - "approved"
-        - "delivered"
       complete:
         type: "boolean"
-    xml:
-      name: "Order"
diff --git a/samples/server/petstore/slim/SwaggerServer/README.md b/samples/server/petstore/slim/SwaggerServer/README.md
index 3b19f46bd38..03910060439 100644
--- a/samples/server/petstore/slim/SwaggerServer/README.md
+++ b/samples/server/petstore/slim/SwaggerServer/README.md
@@ -2,7 +2,7 @@
 
 ## Overview
 This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.  By using the
-[swagger-spec](https://github.com/swagger-api/swagger-core/wiki) from a remote server, you can easily generate a server stub.  This
+[OpenAPI-Spec](https://github.com/swagger-api/swagger-core/wiki) from a remote server, you can easily generate a server stub.  This
 is an example of building a PHP server.
 
 This example uses the [Slim Framework](http://www.slimframework.com/).  To see how to make this your own, please take a look at the template here:
diff --git a/samples/server/petstore/slim/SwaggerServer/index.php b/samples/server/petstore/slim/SwaggerServer/index.php
index 1db11f806fb..2ee51c0d71f 100644
--- a/samples/server/petstore/slim/SwaggerServer/index.php
+++ b/samples/server/petstore/slim/SwaggerServer/index.php
@@ -13,7 +13,7 @@ $app = new Slim\App();
  * POST createUser
  * Summary: Create user
  * Notes: This can only be done by the logged in user.
- * Output-Formats: [application/xml, application/json]
+ * Output-Formats: [application/json, application/xml]
  */
 $app->POST('/user', function($request, $response, $args) {
             
@@ -29,7 +29,7 @@ $app->POST('/user', function($request, $response, $args) {
  * POST createUsersWithArrayInput
  * Summary: Creates list of users with given input array
  * Notes: 
- * Output-Formats: [application/xml, application/json]
+ * Output-Formats: [application/json, application/xml]
  */
 $app->POST('/user/createWithArray', function($request, $response, $args) {
             
@@ -45,7 +45,7 @@ $app->POST('/user/createWithArray', function($request, $response, $args) {
  * POST createUsersWithListInput
  * Summary: Creates list of users with given input array
  * Notes: 
- * Output-Formats: [application/xml, application/json]
+ * Output-Formats: [application/json, application/xml]
  */
 $app->POST('/user/createWithList', function($request, $response, $args) {
             
@@ -61,7 +61,7 @@ $app->POST('/user/createWithList', function($request, $response, $args) {
  * GET loginUser
  * Summary: Logs user into the system
  * Notes: 
- * Output-Formats: [application/xml, application/json]
+ * Output-Formats: [application/json, application/xml]
  */
 $app->GET('/user/login', function($request, $response, $args) {
             
@@ -78,7 +78,7 @@ $app->GET('/user/login', function($request, $response, $args) {
  * GET logoutUser
  * Summary: Logs out current logged in user session
  * Notes: 
- * Output-Formats: [application/xml, application/json]
+ * Output-Formats: [application/json, application/xml]
  */
 $app->GET('/user/logout', function($request, $response, $args) {
             
@@ -94,7 +94,7 @@ $app->GET('/user/logout', function($request, $response, $args) {
  * GET getUserByName
  * Summary: Get user by user name
  * Notes: 
- * Output-Formats: [application/xml, application/json]
+ * Output-Formats: [application/json, application/xml]
  */
 $app->GET('/user/{username}', function($request, $response, $args) {
             
@@ -110,7 +110,7 @@ $app->GET('/user/{username}', function($request, $response, $args) {
  * PUT updateUser
  * Summary: Updated user
  * Notes: This can only be done by the logged in user.
- * Output-Formats: [application/xml, application/json]
+ * Output-Formats: [application/json, application/xml]
  */
 $app->PUT('/user/{username}', function($request, $response, $args) {
             
@@ -126,7 +126,7 @@ $app->PUT('/user/{username}', function($request, $response, $args) {
  * DELETE deleteUser
  * Summary: Delete user
  * Notes: This can only be done by the logged in user.
- * Output-Formats: [application/xml, application/json]
+ * Output-Formats: [application/json, application/xml]
  */
 $app->DELETE('/user/{username}', function($request, $response, $args) {
             
@@ -138,75 +138,11 @@ $app->DELETE('/user/{username}', function($request, $response, $args) {
             });
 
 
-/**
- * GET getInventory
- * Summary: Returns pet inventories by status
- * Notes: Returns a map of status codes to quantities
- * Output-Formats: [application/json]
- */
-$app->GET('/store/inventory', function($request, $response, $args) {
-            
-            
-            
-            
-            $response->write('How about implementing getInventory as a GET method ?');
-            return $response;
-            });
-
-
-/**
- * POST placeOrder
- * Summary: Place an order for a pet
- * Notes: 
- * Output-Formats: [application/xml, application/json]
- */
-$app->POST('/store/order', function($request, $response, $args) {
-            
-            
-            
-            $body = $request->getParsedBody();
-            $response->write('How about implementing placeOrder as a POST method ?');
-            return $response;
-            });
-
-
-/**
- * GET getOrderById
- * Summary: Find purchase order by ID
- * Notes: For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
- * Output-Formats: [application/xml, application/json]
- */
-$app->GET('/store/order/{orderId}', function($request, $response, $args) {
-            
-            
-            
-            
-            $response->write('How about implementing getOrderById as a GET method ?');
-            return $response;
-            });
-
-
-/**
- * DELETE deleteOrder
- * Summary: Delete purchase order by ID
- * Notes: For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
- * Output-Formats: [application/xml, application/json]
- */
-$app->DELETE('/store/order/{orderId}', function($request, $response, $args) {
-            
-            
-            
-            
-            $response->write('How about implementing deleteOrder as a DELETE method ?');
-            return $response;
-            });
-
-
 /**
  * PUT updatePet
  * Summary: Update an existing pet
  * Notes: 
- * Output-Formats: [application/xml, application/json]
+ * Output-Formats: [application/json, application/xml]
  */
 $app->PUT('/pet', function($request, $response, $args) {
             
@@ -222,7 +158,7 @@ $app->PUT('/pet', function($request, $response, $args) {
  * POST addPet
  * Summary: Add a new pet to the store
  * Notes: 
- * Output-Formats: [application/xml, application/json]
+ * Output-Formats: [application/json, application/xml]
  */
 $app->POST('/pet', function($request, $response, $args) {
             
@@ -238,7 +174,7 @@ $app->POST('/pet', function($request, $response, $args) {
  * GET findPetsByStatus
  * Summary: Finds Pets by status
  * Notes: Multiple status values can be provided with comma seperated strings
- * Output-Formats: [application/xml, application/json]
+ * Output-Formats: [application/json, application/xml]
  */
 $app->GET('/pet/findByStatus', function($request, $response, $args) {
             
@@ -255,7 +191,7 @@ $app->GET('/pet/findByStatus', function($request, $response, $args) {
  * GET findPetsByTags
  * Summary: Finds Pets by tags
  * Notes: Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
- * Output-Formats: [application/xml, application/json]
+ * Output-Formats: [application/json, application/xml]
  */
 $app->GET('/pet/findByTags', function($request, $response, $args) {
             
@@ -271,8 +207,8 @@ $app->GET('/pet/findByTags', function($request, $response, $args) {
 /**
  * GET getPetById
  * Summary: Find pet by ID
- * Notes: Returns a single pet
- * Output-Formats: [application/xml, application/json]
+ * Notes: Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+ * Output-Formats: [application/json, application/xml]
  */
 $app->GET('/pet/{petId}', function($request, $response, $args) {
             
@@ -288,7 +224,7 @@ $app->GET('/pet/{petId}', function($request, $response, $args) {
  * POST updatePetWithForm
  * Summary: Updates a pet in the store with form data
  * Notes: 
- * Output-Formats: [application/xml, application/json]
+ * Output-Formats: [application/json, application/xml]
  */
 $app->POST('/pet/{petId}', function($request, $response, $args) {
             
@@ -304,7 +240,7 @@ $app->POST('/pet/{petId}', function($request, $response, $args) {
  * DELETE deletePet
  * Summary: Deletes a pet
  * Notes: 
- * Output-Formats: [application/xml, application/json]
+ * Output-Formats: [application/json, application/xml]
  */
 $app->DELETE('/pet/{petId}', function($request, $response, $args) {
             $headers = $request->getHeaders();
@@ -320,7 +256,7 @@ $app->DELETE('/pet/{petId}', function($request, $response, $args) {
  * POST uploadFile
  * Summary: uploads an image
  * Notes: 
- * Output-Formats: [application/json]
+ * Output-Formats: [application/json, application/xml]
  */
 $app->POST('/pet/{petId}/uploadImage', function($request, $response, $args) {
             
@@ -332,5 +268,101 @@ $app->POST('/pet/{petId}/uploadImage', function($request, $response, $args) {
             });
 
 
+/**
+ * GET getPetByIdWithByteArray
+ * Summary: Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+ * Notes: Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+ * Output-Formats: [application/json, application/xml]
+ */
+$app->GET('/pet/{petId}?testing_byte_array=true', function($request, $response, $args) {
+            
+            
+            
+            
+            $response->write('How about implementing getPetByIdWithByteArray as a GET method ?');
+            return $response;
+            });
+
+
+/**
+ * POST addPetUsingByteArray
+ * Summary: Fake endpoint to test byte array in body parameter for adding a new pet to the store
+ * Notes: 
+ * Output-Formats: [application/json, application/xml]
+ */
+$app->POST('/pet?testing_byte_array=true', function($request, $response, $args) {
+            
+            
+            
+            $body = $request->getParsedBody();
+            $response->write('How about implementing addPetUsingByteArray as a POST method ?');
+            return $response;
+            });
+
+
+/**
+ * GET getInventory
+ * Summary: Returns pet inventories by status
+ * Notes: Returns a map of status codes to quantities
+ * Output-Formats: [application/json, application/xml]
+ */
+$app->GET('/store/inventory', function($request, $response, $args) {
+            
+            
+            
+            
+            $response->write('How about implementing getInventory as a GET method ?');
+            return $response;
+            });
+
+
+/**
+ * POST placeOrder
+ * Summary: Place an order for a pet
+ * Notes: 
+ * Output-Formats: [application/json, application/xml]
+ */
+$app->POST('/store/order', function($request, $response, $args) {
+            
+            
+            
+            $body = $request->getParsedBody();
+            $response->write('How about implementing placeOrder as a POST method ?');
+            return $response;
+            });
+
+
+/**
+ * GET getOrderById
+ * Summary: Find purchase order by ID
+ * Notes: For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+ * Output-Formats: [application/json, application/xml]
+ */
+$app->GET('/store/order/{orderId}', function($request, $response, $args) {
+            
+            
+            
+            
+            $response->write('How about implementing getOrderById as a GET method ?');
+            return $response;
+            });
+
+
+/**
+ * DELETE deleteOrder
+ * Summary: Delete purchase order by ID
+ * Notes: For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+ * Output-Formats: [application/json, application/xml]
+ */
+$app->DELETE('/store/order/{orderId}', function($request, $response, $args) {
+            
+            
+            
+            
+            $response->write('How about implementing deleteOrder as a DELETE method ?');
+            return $response;
+            });
+
+
 
 $app->run();
diff --git a/samples/server/petstore/spring-mvc-j8-async/README.md b/samples/server/petstore/spring-mvc-j8-async/README.md
new file mode 100644
index 00000000000..c98ef6ecff7
--- /dev/null
+++ b/samples/server/petstore/spring-mvc-j8-async/README.md
@@ -0,0 +1,12 @@
+# Swagger generated server
+
+Spring MVC Server
+
+
+## Overview
+This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.  By using the [OpenAPI-Spec](https://github.com/swagger-api/swagger-core), you can easily generate a server stub.  This is an example of building a swagger-enabled server in Java using the Spring MVC framework.
+
+The underlying library integrating swagger to Spring-MVC is [springfox](https://github.com/springfox/springfox)
+
+You can view the server in swagger-ui by pointing to
+http://localhost:8002/v2/swagger-ui.html
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc-j8-async/pom.xml b/samples/server/petstore/spring-mvc-j8-async/pom.xml
new file mode 100644
index 00000000000..cc78851ae30
--- /dev/null
+++ b/samples/server/petstore/spring-mvc-j8-async/pom.xml
@@ -0,0 +1,172 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>io.swagger</groupId>
+  <artifactId>swagger-spring-mvc-server</artifactId>
+  <packaging>jar</packaging>
+  <name>swagger-spring-mvc-server</name>
+  <version>1.0.0</version>
+  <build>
+    <sourceDirectory>src/main/java</sourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.1.1</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <version>2.6</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-maven-plugin</artifactId>
+        <version>${jetty-version}</version>
+        <configuration>
+          <webAppConfig>
+            <contextPath>/v2</contextPath>
+          </webAppConfig>
+          <webAppSourceDirectory>target/${project.artifactId}-${project.version}</webAppSourceDirectory>
+          <stopPort>8079</stopPort>
+          <stopKey>stopit</stopKey>
+          <httpConnector>
+            <port>8002</port>
+            <idleTimeout>60000</idleTimeout>
+          </httpConnector>
+        </configuration>
+        <executions>
+          <execution>
+            <id>start-jetty</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>start</goal>
+            </goals>
+            <configuration>
+              <scanIntervalSeconds>0</scanIntervalSeconds>
+              <daemon>true</daemon>
+            </configuration>
+          </execution>
+          <execution>
+            <id>stop-jetty</id>
+            <phase>post-integration-test</phase>
+            <goals>
+              <goal>stop</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.3</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>io.swagger</groupId>
+      <artifactId>swagger-jersey-jaxrs</artifactId>
+      <version>${swagger-core-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>${slf4j-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-core</artifactId>
+      <version>${jersey-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-json</artifactId>
+      <version>${jersey-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-servlet</artifactId>
+      <version>${jersey-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey.contribs</groupId>
+      <artifactId>jersey-multipart</artifactId>
+      <version>${jersey-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-server</artifactId>
+      <version>${jersey-version}</version>
+    </dependency>
+
+    <!--Spring dependencies -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>${spring-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>${spring-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>${spring-version}</version>
+    </dependency>
+
+    <!--SpringFox dependencies-->
+    <dependency>
+      <groupId>io.springfox</groupId>
+      <artifactId>springfox-swagger2</artifactId>
+      <version>${springfox-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.springfox</groupId>
+      <artifactId>springfox-swagger-ui</artifactId>
+      <version>${springfox-version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit-version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>${servlet-api-version}</version>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <id>jcenter-snapshots</id>
+      <name>jcenter</name>
+      <url>http://oss.jfrog.org/artifactory/oss-snapshot-local/</url>
+    </repository>
+  </repositories>
+  <properties>
+    <swagger-core-version>1.5.7</swagger-core-version>
+    <jetty-version>9.2.9.v20150224</jetty-version>
+    <jersey-version>1.13</jersey-version>
+    <slf4j-version>1.6.3</slf4j-version>
+    <scala-test-version>1.6.1</scala-test-version>
+    <junit-version>4.8.1</junit-version>
+    <servlet-api-version>2.5</servlet-api-version>
+    <springfox-version>2.0.4-SNAPSHOT</springfox-version>
+    <spring-version>4.0.9.RELEASE</spring-version>
+  </properties>
+</project>
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiException.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiException.java
new file mode 100644
index 00000000000..5cba2d3db86
--- /dev/null
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiException.java
@@ -0,0 +1,10 @@
+package io.swagger.api;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+public class ApiException extends Exception{
+	private int code;
+	public ApiException (int code, String msg) {
+		super(msg);
+		this.code = code;
+	}
+}
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiOriginFilter.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiOriginFilter.java
new file mode 100644
index 00000000000..81dbc940508
--- /dev/null
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiOriginFilter.java
@@ -0,0 +1,27 @@
+package io.swagger.api;
+
+import java.io.IOException;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletResponse;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+public class ApiOriginFilter implements javax.servlet.Filter {
+	@Override
+	public void doFilter(ServletRequest request, ServletResponse response,
+			FilterChain chain) throws IOException, ServletException {
+		HttpServletResponse res = (HttpServletResponse) response;
+		res.addHeader("Access-Control-Allow-Origin", "*");
+		res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT");
+		res.addHeader("Access-Control-Allow-Headers", "Content-Type");
+		chain.doFilter(request, response);
+	}
+
+	@Override
+	public void destroy() {
+	}
+
+	@Override
+	public void init(FilterConfig filterConfig) throws ServletException {
+	}
+}
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiResponseMessage.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiResponseMessage.java
new file mode 100644
index 00000000000..51d9bb1e2d0
--- /dev/null
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiResponseMessage.java
@@ -0,0 +1,69 @@
+package io.swagger.api;
+
+import javax.xml.bind.annotation.XmlTransient;
+
+@javax.xml.bind.annotation.XmlRootElement
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+public class ApiResponseMessage {
+	public static final int ERROR = 1;
+	public static final int WARNING = 2;
+	public static final int INFO = 3;
+	public static final int OK = 4;
+	public static final int TOO_BUSY = 5;
+
+	int code;
+	String type;
+	String message;
+	
+	public ApiResponseMessage(){}
+	
+	public ApiResponseMessage(int code, String message){
+		this.code = code;
+		switch(code){
+		case ERROR:
+			setType("error");
+			break;
+		case WARNING:
+			setType("warning");
+			break;
+		case INFO:
+			setType("info");
+			break;
+		case OK:
+			setType("ok");
+			break;
+		case TOO_BUSY:
+			setType("too busy");
+			break;
+		default:
+			setType("unknown");
+			break;
+		}
+		this.message = message;
+	}
+
+	@XmlTransient
+	public int getCode() {
+		return code;
+	}
+
+	public void setCode(int code) {
+		this.code = code;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+}
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/NotFoundException.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/NotFoundException.java
new file mode 100644
index 00000000000..0e298e5c443
--- /dev/null
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/NotFoundException.java
@@ -0,0 +1,10 @@
+package io.swagger.api;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+public class NotFoundException extends ApiException {
+	private int code;
+	public NotFoundException (int code, String msg) {
+		super(code, msg);
+		this.code = code;
+	}
+}
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/PetApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/PetApi.java
new file mode 100644
index 00000000000..ff793304ac5
--- /dev/null
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/PetApi.java
@@ -0,0 +1,280 @@
+package io.swagger.api;
+
+import io.swagger.model.*;
+
+import io.swagger.model.Pet;
+import java.io.File;
+
+import java.util.concurrent.Callable;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.Authorization;
+import io.swagger.annotations.AuthorizationScope;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+import static org.springframework.http.MediaType.*;
+
+@Controller
+@RequestMapping(value = "/pet", produces = {APPLICATION_JSON_VALUE})
+@Api(value = "/pet", description = "the pet API")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+public interface PetApi {
+  
+
+  @ApiOperation(value = "Update an existing pet", notes = "", response = Void.class, authorizations = {
+    @Authorization(value = "petstore_auth", scopes = {
+      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+      @AuthorizationScope(scope = "read:pets", description = "read your pets")
+      })
+  })
+  @ApiResponses(value = { 
+    @ApiResponse(code = 400, message = "Invalid ID supplied"),
+    @ApiResponse(code = 404, message = "Pet not found"),
+    @ApiResponse(code = 405, message = "Validation exception") })
+  @RequestMapping(value = "", 
+    produces = { "application/json", "application/xml" }, 
+    consumes = { "application/json", "application/xml" },
+    method = RequestMethod.PUT)
+  default Callable<ResponseEntity<Void>> updatePet(
+
+@ApiParam(value = "Pet object that needs to be added to the store"  ) @RequestBody Pet body
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class, authorizations = {
+    @Authorization(value = "petstore_auth", scopes = {
+      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+      @AuthorizationScope(scope = "read:pets", description = "read your pets")
+      })
+  })
+  @ApiResponses(value = { 
+    @ApiResponse(code = 405, message = "Invalid input") })
+  @RequestMapping(value = "", 
+    produces = { "application/json", "application/xml" }, 
+    consumes = { "application/json", "application/xml" },
+    method = RequestMethod.POST)
+  default Callable<ResponseEntity<Void>> addPet(
+
+@ApiParam(value = "Pet object that needs to be added to the store"  ) @RequestBody Pet body
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Finds Pets by status", notes = "Multiple status values can be provided with comma seperated strings", response = Pet.class, responseContainer = "List", authorizations = {
+    @Authorization(value = "petstore_auth", scopes = {
+      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+      @AuthorizationScope(scope = "read:pets", description = "read your pets")
+      })
+  })
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation"),
+    @ApiResponse(code = 400, message = "Invalid status value") })
+  @RequestMapping(value = "/findByStatus", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.GET)
+  default Callable<ResponseEntity<List<Pet>>> findPetsByStatus(@ApiParam(value = "Status values that need to be considered for filter", defaultValue = "available") @RequestParam(value = "status", required = false, defaultValue="available") List<String> status
+
+
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<List<Pet>>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Finds Pets by tags", notes = "Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = {
+    @Authorization(value = "petstore_auth", scopes = {
+      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+      @AuthorizationScope(scope = "read:pets", description = "read your pets")
+      })
+  })
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation"),
+    @ApiResponse(code = 400, message = "Invalid tag value") })
+  @RequestMapping(value = "/findByTags", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.GET)
+  default Callable<ResponseEntity<List<Pet>>> findPetsByTags(@ApiParam(value = "Tags to filter by") @RequestParam(value = "tags", required = false) List<String> tags
+
+
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<List<Pet>>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Find pet by ID", notes = "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions", response = Pet.class, authorizations = {
+    @Authorization(value = "petstore_auth", scopes = {
+      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+      @AuthorizationScope(scope = "read:pets", description = "read your pets")
+      }),
+    @Authorization(value = "api_key")
+  })
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation"),
+    @ApiResponse(code = 400, message = "Invalid ID supplied"),
+    @ApiResponse(code = 404, message = "Pet not found") })
+  @RequestMapping(value = "/{petId}", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.GET)
+  default Callable<ResponseEntity<Pet>> getPetById(
+@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("petId") Long petId
+
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<Pet>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Updates a pet in the store with form data", notes = "", response = Void.class, authorizations = {
+    @Authorization(value = "petstore_auth", scopes = {
+      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+      @AuthorizationScope(scope = "read:pets", description = "read your pets")
+      })
+  })
+  @ApiResponses(value = { 
+    @ApiResponse(code = 405, message = "Invalid input") })
+  @RequestMapping(value = "/{petId}", 
+    produces = { "application/json", "application/xml" }, 
+    consumes = { "application/x-www-form-urlencoded" },
+    method = RequestMethod.POST)
+  default Callable<ResponseEntity<Void>> updatePetWithForm(
+@ApiParam(value = "ID of pet that needs to be updated",required=true ) @PathVariable("petId") String petId
+
+,
+    
+
+
+@ApiParam(value = "Updated name of the pet" ) @RequestPart(value="name", required=false)  String name
+,
+    
+
+
+@ApiParam(value = "Updated status of the pet" ) @RequestPart(value="status", required=false)  String status
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Deletes a pet", notes = "", response = Void.class, authorizations = {
+    @Authorization(value = "petstore_auth", scopes = {
+      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+      @AuthorizationScope(scope = "read:pets", description = "read your pets")
+      })
+  })
+  @ApiResponses(value = { 
+    @ApiResponse(code = 400, message = "Invalid pet value") })
+  @RequestMapping(value = "/{petId}", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.DELETE)
+  default Callable<ResponseEntity<Void>> deletePet(
+@ApiParam(value = "Pet id to delete",required=true ) @PathVariable("petId") Long petId
+
+,
+    
+@ApiParam(value = ""  ) @RequestHeader(value="apiKey", required=false) String apiKey
+
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "uploads an image", notes = "", response = Void.class, authorizations = {
+    @Authorization(value = "petstore_auth", scopes = {
+      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+      @AuthorizationScope(scope = "read:pets", description = "read your pets")
+      })
+  })
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation") })
+  @RequestMapping(value = "/{petId}/uploadImage", 
+    produces = { "application/json", "application/xml" }, 
+    consumes = { "multipart/form-data" },
+    method = RequestMethod.POST)
+  default Callable<ResponseEntity<Void>> uploadFile(
+@ApiParam(value = "ID of pet to update",required=true ) @PathVariable("petId") Long petId
+
+,
+    
+
+
+@ApiParam(value = "Additional data to pass to server" ) @RequestPart(value="additionalMetadata", required=false)  String additionalMetadata
+,
+    
+
+@ApiParam(value = "file detail") @RequestPart("file") MultipartFile file
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Fake endpoint to test byte array return by 'Find pet by ID'", notes = "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions", response = byte[].class, authorizations = {
+    @Authorization(value = "petstore_auth", scopes = {
+      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+      @AuthorizationScope(scope = "read:pets", description = "read your pets")
+      }),
+    @Authorization(value = "api_key")
+  })
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation"),
+    @ApiResponse(code = 400, message = "Invalid ID supplied"),
+    @ApiResponse(code = 404, message = "Pet not found") })
+  @RequestMapping(value = "/{petId}?testing_byte_array=true", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.GET)
+  default Callable<ResponseEntity<byte[]>> petPetIdtestingByteArraytrueGet(
+@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("petId") Long petId
+
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<byte[]>(HttpStatus.OK);
+  }
+
+  
+}
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/PettestingByteArraytrueApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/PettestingByteArraytrueApi.java
new file mode 100644
index 00000000000..22559ad5c9b
--- /dev/null
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/PettestingByteArraytrueApi.java
@@ -0,0 +1,61 @@
+package io.swagger.api;
+
+import io.swagger.model.*;
+
+
+import java.util.concurrent.Callable;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.Authorization;
+import io.swagger.annotations.AuthorizationScope;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+import static org.springframework.http.MediaType.*;
+
+@Controller
+@RequestMapping(value = "/pet?testing_byte_array=true", produces = {APPLICATION_JSON_VALUE})
+@Api(value = "/pet?testing_byte_array=true", description = "the pet?testing_byte_array=true API")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+public interface PettestingByteArraytrueApi {
+  
+
+  @ApiOperation(value = "Fake endpoint to test byte array in body parameter for adding a new pet to the store", notes = "", response = Void.class, authorizations = {
+    @Authorization(value = "petstore_auth", scopes = {
+      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+      @AuthorizationScope(scope = "read:pets", description = "read your pets")
+      })
+  })
+  @ApiResponses(value = { 
+    @ApiResponse(code = 405, message = "Invalid input") })
+  @RequestMapping(value = "", 
+    produces = { "application/json", "application/xml" }, 
+    consumes = { "application/json", "application/xml" },
+    method = RequestMethod.POST)
+  default Callable<ResponseEntity<Void>> addPetUsingByteArray(
+
+@ApiParam(value = "Pet object in the form of byte array"  ) @RequestBody byte[] body
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+  
+}
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/StoreApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/StoreApi.java
new file mode 100644
index 00000000000..a664cac3c60
--- /dev/null
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/StoreApi.java
@@ -0,0 +1,121 @@
+package io.swagger.api;
+
+import io.swagger.model.*;
+
+import java.util.Map;
+import io.swagger.model.Order;
+
+import java.util.concurrent.Callable;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.Authorization;
+import io.swagger.annotations.AuthorizationScope;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+import static org.springframework.http.MediaType.*;
+
+@Controller
+@RequestMapping(value = "/store", produces = {APPLICATION_JSON_VALUE})
+@Api(value = "/store", description = "the store API")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+public interface StoreApi {
+  
+
+  @ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", response = Integer.class, responseContainer = "Map", authorizations = {
+    @Authorization(value = "api_key")
+  })
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation") })
+  @RequestMapping(value = "/inventory", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.GET)
+  default Callable<ResponseEntity<Map<String, Integer>>> getInventory()
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<Map<String, Integer>>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Place an order for a pet", notes = "", response = Order.class, authorizations = {
+    @Authorization(value = "test_api_client_id"),
+    @Authorization(value = "test_api_client_secret")
+  })
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation"),
+    @ApiResponse(code = 400, message = "Invalid Order") })
+  @RequestMapping(value = "/order", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.POST)
+  default Callable<ResponseEntity<Order>> placeOrder(
+
+@ApiParam(value = "order placed for purchasing the pet"  ) @RequestBody Order body
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<Order>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, authorizations = {
+    @Authorization(value = "test_api_key_query"),
+    @Authorization(value = "test_api_key_header")
+  })
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation"),
+    @ApiResponse(code = 400, message = "Invalid ID supplied"),
+    @ApiResponse(code = 404, message = "Order not found") })
+  @RequestMapping(value = "/order/{orderId}", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.GET)
+  default Callable<ResponseEntity<Order>> getOrderById(
+@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("orderId") String orderId
+
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<Order>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 400, message = "Invalid ID supplied"),
+    @ApiResponse(code = 404, message = "Order not found") })
+  @RequestMapping(value = "/order/{orderId}", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.DELETE)
+  default Callable<ResponseEntity<Void>> deleteOrder(
+@ApiParam(value = "ID of the order that needs to be deleted",required=true ) @PathVariable("orderId") String orderId
+
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+  
+}
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/UserApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/UserApi.java
new file mode 100644
index 00000000000..d0fb1070a6f
--- /dev/null
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/UserApi.java
@@ -0,0 +1,194 @@
+package io.swagger.api;
+
+import io.swagger.model.*;
+
+import io.swagger.model.User;
+import java.util.List;
+
+import java.util.concurrent.Callable;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.Authorization;
+import io.swagger.annotations.AuthorizationScope;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+import static org.springframework.http.MediaType.*;
+
+@Controller
+@RequestMapping(value = "/user", produces = {APPLICATION_JSON_VALUE})
+@Api(value = "/user", description = "the user API")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+public interface UserApi {
+  
+
+  @ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation") })
+  @RequestMapping(value = "", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.POST)
+  default Callable<ResponseEntity<Void>> createUser(
+
+@ApiParam(value = "Created user object"  ) @RequestBody User body
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation") })
+  @RequestMapping(value = "/createWithArray", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.POST)
+  default Callable<ResponseEntity<Void>> createUsersWithArrayInput(
+
+@ApiParam(value = "List of user object"  ) @RequestBody List<User> body
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation") })
+  @RequestMapping(value = "/createWithList", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.POST)
+  default Callable<ResponseEntity<Void>> createUsersWithListInput(
+
+@ApiParam(value = "List of user object"  ) @RequestBody List<User> body
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Logs user into the system", notes = "", response = String.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation"),
+    @ApiResponse(code = 400, message = "Invalid username/password supplied") })
+  @RequestMapping(value = "/login", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.GET)
+  default Callable<ResponseEntity<String>> loginUser(@ApiParam(value = "The user name for login") @RequestParam(value = "username", required = false) String username
+
+
+,
+    @ApiParam(value = "The password for login in clear text") @RequestParam(value = "password", required = false) String password
+
+
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<String>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation") })
+  @RequestMapping(value = "/logout", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.GET)
+  default Callable<ResponseEntity<Void>> logoutUser()
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Get user by user name", notes = "", response = User.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation"),
+    @ApiResponse(code = 400, message = "Invalid username supplied"),
+    @ApiResponse(code = 404, message = "User not found") })
+  @RequestMapping(value = "/{username}", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.GET)
+  default Callable<ResponseEntity<User>> getUserByName(
+@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.",required=true ) @PathVariable("username") String username
+
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<User>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = Void.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 400, message = "Invalid user supplied"),
+    @ApiResponse(code = 404, message = "User not found") })
+  @RequestMapping(value = "/{username}", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.PUT)
+  default Callable<ResponseEntity<Void>> updateUser(
+@ApiParam(value = "name that need to be deleted",required=true ) @PathVariable("username") String username
+
+,
+    
+
+@ApiParam(value = "Updated user object"  ) @RequestBody User body
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = Void.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 400, message = "Invalid username supplied"),
+    @ApiResponse(code = 404, message = "User not found") })
+  @RequestMapping(value = "/{username}", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.DELETE)
+  default Callable<ResponseEntity<Void>> deleteUser(
+@ApiParam(value = "The name that needs to be deleted",required=true ) @PathVariable("username") String username
+
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+  
+}
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/SwaggerConfig.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/SwaggerConfig.java
new file mode 100644
index 00000000000..0069b4ee73e
--- /dev/null
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/SwaggerConfig.java
@@ -0,0 +1,41 @@
+package io.swagger.configuration;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.context.annotation.Import;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+
+@Configuration
+@ComponentScan(basePackages = "io.swagger.api")
+@EnableWebMvc
+@EnableSwagger2 //Loads the spring beans required by the framework
+@PropertySource("classpath:swagger.properties")
+@Import(SwaggerUiConfiguration.class)
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+public class SwaggerConfig {
+    @Bean
+    ApiInfo apiInfo() {
+        ApiInfo apiInfo = new ApiInfo(
+        "Swagger Petstore",
+        "This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters",
+        "1.0.0",
+        "",
+        "apiteam@swagger.io",
+        "Apache 2.0",
+        "http://www.apache.org/licenses/LICENSE-2.0.html" );
+        return apiInfo;
+    }
+
+    @Bean
+    public Docket customImplementation(){
+        return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo());
+    }
+
+}
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/SwaggerUiConfiguration.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/SwaggerUiConfiguration.java
new file mode 100644
index 00000000000..491739a2ad0
--- /dev/null
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/SwaggerUiConfiguration.java
@@ -0,0 +1,47 @@
+package io.swagger.configuration;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+
+@Configuration
+@EnableWebMvc
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+public class SwaggerUiConfiguration extends WebMvcConfigurerAdapter {
+  private static final String[] SERVLET_RESOURCE_LOCATIONS = { "/" };
+
+  private static final String[] CLASSPATH_RESOURCE_LOCATIONS = {
+      "classpath:/META-INF/resources/", "classpath:/resources/",
+      "classpath:/static/", "classpath:/public/" };
+
+  private static final String[] RESOURCE_LOCATIONS;
+  static {
+    RESOURCE_LOCATIONS = new String[CLASSPATH_RESOURCE_LOCATIONS.length
+        + SERVLET_RESOURCE_LOCATIONS.length];
+    System.arraycopy(SERVLET_RESOURCE_LOCATIONS, 0, RESOURCE_LOCATIONS, 0,
+        SERVLET_RESOURCE_LOCATIONS.length);
+    System.arraycopy(CLASSPATH_RESOURCE_LOCATIONS, 0, RESOURCE_LOCATIONS,
+        SERVLET_RESOURCE_LOCATIONS.length, CLASSPATH_RESOURCE_LOCATIONS.length);
+  }
+
+  private static final String[] STATIC_INDEX_HTML_RESOURCES;
+  static {
+    STATIC_INDEX_HTML_RESOURCES = new String[RESOURCE_LOCATIONS.length];
+    for (int i = 0; i < STATIC_INDEX_HTML_RESOURCES.length; i++) {
+      STATIC_INDEX_HTML_RESOURCES[i] = RESOURCE_LOCATIONS[i] + "index.html";
+    }
+  }
+
+  @Override
+  public void addResourceHandlers(ResourceHandlerRegistry registry) {
+    if (!registry.hasMappingForPattern("/webjars/**")) {
+      registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+    }
+    if (!registry.hasMappingForPattern("/**")) {
+      registry.addResourceHandler("/**").addResourceLocations(RESOURCE_LOCATIONS);
+    }
+  }
+
+}
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/WebApplication.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/WebApplication.java
new file mode 100644
index 00000000000..dfa0e46a747
--- /dev/null
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/WebApplication.java
@@ -0,0 +1,22 @@
+package io.swagger.configuration;
+
+import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+public class WebApplication extends AbstractAnnotationConfigDispatcherServletInitializer {
+
+    @Override
+    protected Class<?>[] getRootConfigClasses() {
+        return new Class[] { SwaggerConfig.class };
+    }
+
+    @Override
+    protected Class<?>[] getServletConfigClasses() {
+        return new Class<?>[] { WebMvcConfiguration.class };
+    }
+
+    @Override
+    protected String[] getServletMappings() {
+        return new String[] { "/" };
+    }
+}
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/WebMvcConfiguration.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/WebMvcConfiguration.java
new file mode 100644
index 00000000000..fd2cd4c5667
--- /dev/null
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/WebMvcConfiguration.java
@@ -0,0 +1,12 @@
+package io.swagger.configuration;
+
+import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+public class WebMvcConfiguration extends WebMvcConfigurationSupport {
+    @Override
+    public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
+        configurer.enable();
+    }
+}
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Category.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Category.java
new file mode 100644
index 00000000000..a88265302f8
--- /dev/null
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Category.java
@@ -0,0 +1,73 @@
+package io.swagger.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Objects;
+
+
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+public class Category  {
+  
+  private Long id = null;
+  private String name = null;
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Category category = (Category) o;
+    return Objects.equals(id, category.id) &&
+        Objects.equals(name, category.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, name);
+  }
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Category {\n");
+    
+    sb.append("  id: ").append(id).append("\n");
+    sb.append("  name: ").append(name).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Order.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Order.java
new file mode 100644
index 00000000000..2d17233f461
--- /dev/null
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Order.java
@@ -0,0 +1,139 @@
+package io.swagger.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Objects;
+
+
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+public class Order  {
+  
+  private Long id = null;
+  private Long petId = null;
+  private Integer quantity = null;
+  private Date shipDate = null;
+  public enum StatusEnum {
+     placed,  approved,  delivered, 
+  };
+  
+  private StatusEnum status = null;
+  private Boolean complete = null;
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("petId")
+  public Long getPetId() {
+    return petId;
+  }
+  public void setPetId(Long petId) {
+    this.petId = petId;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("quantity")
+  public Integer getQuantity() {
+    return quantity;
+  }
+  public void setQuantity(Integer quantity) {
+    this.quantity = quantity;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("shipDate")
+  public Date getShipDate() {
+    return shipDate;
+  }
+  public void setShipDate(Date shipDate) {
+    this.shipDate = shipDate;
+  }
+
+  
+  /**
+   * Order Status
+   **/
+  @ApiModelProperty(value = "Order Status")
+  @JsonProperty("status")
+  public StatusEnum getStatus() {
+    return status;
+  }
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("complete")
+  public Boolean getComplete() {
+    return complete;
+  }
+  public void setComplete(Boolean complete) {
+    this.complete = complete;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Order order = (Order) o;
+    return Objects.equals(id, order.id) &&
+        Objects.equals(petId, order.petId) &&
+        Objects.equals(quantity, order.quantity) &&
+        Objects.equals(shipDate, order.shipDate) &&
+        Objects.equals(status, order.status) &&
+        Objects.equals(complete, order.complete);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+  }
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Order {\n");
+    
+    sb.append("  id: ").append(id).append("\n");
+    sb.append("  petId: ").append(petId).append("\n");
+    sb.append("  quantity: ").append(quantity).append("\n");
+    sb.append("  shipDate: ").append(shipDate).append("\n");
+    sb.append("  status: ").append(status).append("\n");
+    sb.append("  complete: ").append(complete).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Pet.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Pet.java
new file mode 100644
index 00000000000..0ef203c0e0b
--- /dev/null
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Pet.java
@@ -0,0 +1,142 @@
+package io.swagger.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.model.Category;
+import io.swagger.model.Tag;
+import java.util.ArrayList;
+import java.util.List;
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Objects;
+
+
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+public class Pet  {
+  
+  private Long id = null;
+  private Category category = null;
+  private String name = null;
+  private List<String> photoUrls = new ArrayList<String>();
+  private List<Tag> tags = new ArrayList<Tag>();
+  public enum StatusEnum {
+     available,  pending,  sold, 
+  };
+  
+  private StatusEnum status = null;
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("category")
+  public Category getCategory() {
+    return category;
+  }
+  public void setCategory(Category category) {
+    this.category = category;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("photoUrls")
+  public List<String> getPhotoUrls() {
+    return photoUrls;
+  }
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("tags")
+  public List<Tag> getTags() {
+    return tags;
+  }
+  public void setTags(List<Tag> tags) {
+    this.tags = tags;
+  }
+
+  
+  /**
+   * pet status in the store
+   **/
+  @ApiModelProperty(value = "pet status in the store")
+  @JsonProperty("status")
+  public StatusEnum getStatus() {
+    return status;
+  }
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Pet pet = (Pet) o;
+    return Objects.equals(id, pet.id) &&
+        Objects.equals(category, pet.category) &&
+        Objects.equals(name, pet.name) &&
+        Objects.equals(photoUrls, pet.photoUrls) &&
+        Objects.equals(tags, pet.tags) &&
+        Objects.equals(status, pet.status);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, category, name, photoUrls, tags, status);
+  }
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Pet {\n");
+    
+    sb.append("  id: ").append(id).append("\n");
+    sb.append("  category: ").append(category).append("\n");
+    sb.append("  name: ").append(name).append("\n");
+    sb.append("  photoUrls: ").append(photoUrls).append("\n");
+    sb.append("  tags: ").append(tags).append("\n");
+    sb.append("  status: ").append(status).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Tag.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Tag.java
new file mode 100644
index 00000000000..1cdbf92b021
--- /dev/null
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Tag.java
@@ -0,0 +1,73 @@
+package io.swagger.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Objects;
+
+
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+public class Tag  {
+  
+  private Long id = null;
+  private String name = null;
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Tag tag = (Tag) o;
+    return Objects.equals(id, tag.id) &&
+        Objects.equals(name, tag.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, name);
+  }
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Tag {\n");
+    
+    sb.append("  id: ").append(id).append("\n");
+    sb.append("  name: ").append(name).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/User.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/User.java
new file mode 100644
index 00000000000..49c4e4c3b46
--- /dev/null
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/User.java
@@ -0,0 +1,164 @@
+package io.swagger.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Objects;
+
+
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+public class User  {
+  
+  private Long id = null;
+  private String username = null;
+  private String firstName = null;
+  private String lastName = null;
+  private String email = null;
+  private String password = null;
+  private String phone = null;
+  private Integer userStatus = null;
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("username")
+  public String getUsername() {
+    return username;
+  }
+  public void setUsername(String username) {
+    this.username = username;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("firstName")
+  public String getFirstName() {
+    return firstName;
+  }
+  public void setFirstName(String firstName) {
+    this.firstName = firstName;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("lastName")
+  public String getLastName() {
+    return lastName;
+  }
+  public void setLastName(String lastName) {
+    this.lastName = lastName;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("email")
+  public String getEmail() {
+    return email;
+  }
+  public void setEmail(String email) {
+    this.email = email;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("password")
+  public String getPassword() {
+    return password;
+  }
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("phone")
+  public String getPhone() {
+    return phone;
+  }
+  public void setPhone(String phone) {
+    this.phone = phone;
+  }
+
+  
+  /**
+   * User Status
+   **/
+  @ApiModelProperty(value = "User Status")
+  @JsonProperty("userStatus")
+  public Integer getUserStatus() {
+    return userStatus;
+  }
+  public void setUserStatus(Integer userStatus) {
+    this.userStatus = userStatus;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    User user = (User) o;
+    return Objects.equals(id, user.id) &&
+        Objects.equals(username, user.username) &&
+        Objects.equals(firstName, user.firstName) &&
+        Objects.equals(lastName, user.lastName) &&
+        Objects.equals(email, user.email) &&
+        Objects.equals(password, user.password) &&
+        Objects.equals(phone, user.phone) &&
+        Objects.equals(userStatus, user.userStatus);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus);
+  }
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class User {\n");
+    
+    sb.append("  id: ").append(id).append("\n");
+    sb.append("  username: ").append(username).append("\n");
+    sb.append("  firstName: ").append(firstName).append("\n");
+    sb.append("  lastName: ").append(lastName).append("\n");
+    sb.append("  email: ").append(email).append("\n");
+    sb.append("  password: ").append(password).append("\n");
+    sb.append("  phone: ").append(phone).append("\n");
+    sb.append("  userStatus: ").append(userStatus).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/resources/swagger.properties b/samples/server/petstore/spring-mvc-j8-async/src/main/resources/swagger.properties
new file mode 100644
index 00000000000..fdbe5371934
--- /dev/null
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/resources/swagger.properties
@@ -0,0 +1 @@
+springfox.documentation.swagger.v2.path=/api-docs
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc/pom.xml b/samples/server/petstore/spring-mvc/pom.xml
index 994b717dcfb..65d216606a8 100644
--- a/samples/server/petstore/spring-mvc/pom.xml
+++ b/samples/server/petstore/spring-mvc/pom.xml
@@ -75,31 +75,6 @@
       <artifactId>slf4j-log4j12</artifactId>
       <version>${slf4j-version}</version>
     </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-core</artifactId>
-      <version>${jersey-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-json</artifactId>
-      <version>${jersey-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-servlet</artifactId>
-      <version>${jersey-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey.contribs</groupId>
-      <artifactId>jersey-multipart</artifactId>
-      <version>${jersey-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-server</artifactId>
-      <version>${jersey-version}</version>
-    </dependency>
 
     <!--Spring dependencies -->
     <dependency>
@@ -142,22 +117,14 @@
       <version>${servlet-api-version}</version>
     </dependency>
   </dependencies>
-  <repositories>
-    <repository>
-      <id>jcenter-snapshots</id>
-      <name>jcenter</name>
-      <url>http://oss.jfrog.org/artifactory/oss-snapshot-local/</url>
-    </repository>
-  </repositories>
   <properties>
-    <swagger-core-version>1.5.4</swagger-core-version>
+    <swagger-core-version>1.5.7</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey-version>1.13</jersey-version>
     <slf4j-version>1.6.3</slf4j-version>
-    <scala-test-version>1.6.1</scala-test-version>
     <junit-version>4.8.1</junit-version>
     <servlet-api-version>2.5</servlet-api-version>
-    <springfox-version>2.0.4-SNAPSHOT</springfox-version>
-    <spring-version>4.0.9.RELEASE</spring-version>
+    <springfox-version>2.3.1</springfox-version>
+    <spring-version>4.1.8.RELEASE</spring-version>
   </properties>
 </project>
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiException.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiException.java
index f44e2fb1107..b41beea3e3e 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiException.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiException.java
@@ -1,6 +1,6 @@
 package io.swagger.api;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-05T15:01:20.501+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
 public class ApiException extends Exception{
 	private int code;
 	public ApiException (int code, String msg) {
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiOriginFilter.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiOriginFilter.java
index a159b42ffac..c128b43b3ee 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiOriginFilter.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiOriginFilter.java
@@ -5,7 +5,7 @@ import java.io.IOException;
 import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-05T15:01:20.501+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
 public class ApiOriginFilter implements javax.servlet.Filter {
 	@Override
 	public void doFilter(ServletRequest request, ServletResponse response,
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiResponseMessage.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiResponseMessage.java
index b8a03ce3290..9b6e484b90b 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiResponseMessage.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiResponseMessage.java
@@ -3,7 +3,7 @@ package io.swagger.api;
 import javax.xml.bind.annotation.XmlTransient;
 
 @javax.xml.bind.annotation.XmlRootElement
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-05T15:01:20.501+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
 public class ApiResponseMessage {
 	public static final int ERROR = 1;
 	public static final int WARNING = 2;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/NotFoundException.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/NotFoundException.java
index 094c3355bd5..f7f196c51af 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/NotFoundException.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/NotFoundException.java
@@ -1,6 +1,6 @@
 package io.swagger.api;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-05T15:01:20.501+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
 public class NotFoundException extends ApiException {
 	private int code;
 	public NotFoundException (int code, String msg) {
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java
index e6eee98d257..f907458e17a 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java
@@ -8,7 +8,6 @@ import java.io.File;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import io.swagger.annotations.Authorization;
 import io.swagger.annotations.AuthorizationScope;
@@ -32,7 +31,7 @@ import static org.springframework.http.MediaType.*;
 @Controller
 @RequestMapping(value = "/pet", produces = {APPLICATION_JSON_VALUE})
 @Api(value = "/pet", description = "the pet API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-05T15:01:20.501+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
 public class PetApi {
   
 
@@ -42,10 +41,10 @@ public class PetApi {
       @AuthorizationScope(scope = "read:pets", description = "read your pets")
       })
   })
-  @ApiResponses(value = { 
-    @ApiResponse(code = 400, message = "Invalid ID supplied"),
-    @ApiResponse(code = 404, message = "Pet not found"),
-    @ApiResponse(code = 405, message = "Validation exception") })
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied"),
+    @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found"),
+    @io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception") })
   @RequestMapping(value = "", 
     produces = { "application/json", "application/xml" }, 
     consumes = { "application/json", "application/xml" },
@@ -67,8 +66,8 @@ public class PetApi {
       @AuthorizationScope(scope = "read:pets", description = "read your pets")
       })
   })
-  @ApiResponses(value = { 
-    @ApiResponse(code = 405, message = "Invalid input") })
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input") })
   @RequestMapping(value = "", 
     produces = { "application/json", "application/xml" }, 
     consumes = { "application/json", "application/xml" },
@@ -90,9 +89,9 @@ public class PetApi {
       @AuthorizationScope(scope = "read:pets", description = "read your pets")
       })
   })
-  @ApiResponses(value = { 
-    @ApiResponse(code = 200, message = "successful operation"),
-    @ApiResponse(code = 400, message = "Invalid status value") })
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
+    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid status value") })
   @RequestMapping(value = "/findByStatus", 
     produces = { "application/json", "application/xml" }, 
     
@@ -114,9 +113,9 @@ public class PetApi {
       @AuthorizationScope(scope = "read:pets", description = "read your pets")
       })
   })
-  @ApiResponses(value = { 
-    @ApiResponse(code = 200, message = "successful operation"),
-    @ApiResponse(code = 400, message = "Invalid tag value") })
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
+    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid tag value") })
   @RequestMapping(value = "/findByTags", 
     produces = { "application/json", "application/xml" }, 
     
@@ -133,12 +132,16 @@ public class PetApi {
   
 
   @ApiOperation(value = "Find pet by ID", notes = "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions", response = Pet.class, authorizations = {
+    @Authorization(value = "petstore_auth", scopes = {
+      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+      @AuthorizationScope(scope = "read:pets", description = "read your pets")
+      }),
     @Authorization(value = "api_key")
   })
-  @ApiResponses(value = { 
-    @ApiResponse(code = 200, message = "successful operation"),
-    @ApiResponse(code = 400, message = "Invalid ID supplied"),
-    @ApiResponse(code = 404, message = "Pet not found") })
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
+    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied"),
+    @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found") })
   @RequestMapping(value = "/{petId}", 
     produces = { "application/json", "application/xml" }, 
     
@@ -160,8 +163,8 @@ public class PetApi {
       @AuthorizationScope(scope = "read:pets", description = "read your pets")
       })
   })
-  @ApiResponses(value = { 
-    @ApiResponse(code = 405, message = "Invalid input") })
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input") })
   @RequestMapping(value = "/{petId}", 
     produces = { "application/json", "application/xml" }, 
     consumes = { "application/x-www-form-urlencoded" },
@@ -193,8 +196,8 @@ public class PetApi {
       @AuthorizationScope(scope = "read:pets", description = "read your pets")
       })
   })
-  @ApiResponses(value = { 
-    @ApiResponse(code = 400, message = "Invalid pet value") })
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid pet value") })
   @RequestMapping(value = "/{petId}", 
     produces = { "application/json", "application/xml" }, 
     
@@ -220,8 +223,8 @@ public class PetApi {
       @AuthorizationScope(scope = "read:pets", description = "read your pets")
       })
   })
-  @ApiResponses(value = { 
-    @ApiResponse(code = 200, message = "successful operation") })
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation") })
   @RequestMapping(value = "/{petId}/uploadImage", 
     produces = { "application/json", "application/xml" }, 
     consumes = { "multipart/form-data" },
@@ -245,4 +248,30 @@ public class PetApi {
   }
 
   
+
+  @ApiOperation(value = "Fake endpoint to test byte array return by 'Find pet by ID'", notes = "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions", response = byte[].class, authorizations = {
+    @Authorization(value = "petstore_auth", scopes = {
+      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+      @AuthorizationScope(scope = "read:pets", description = "read your pets")
+      }),
+    @Authorization(value = "api_key")
+  })
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
+    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied"),
+    @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found") })
+  @RequestMapping(value = "/{petId}?testing_byte_array=true", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.GET)
+  public ResponseEntity<byte[]> petPetIdtestingByteArraytrueGet(
+@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("petId") Long petId
+
+)
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<byte[]>(HttpStatus.OK);
+  }
+
+  
 }
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PettestingByteArraytrueApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PettestingByteArraytrueApi.java
new file mode 100644
index 00000000000..6151c000b82
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PettestingByteArraytrueApi.java
@@ -0,0 +1,58 @@
+package io.swagger.api;
+
+import io.swagger.model.*;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.Authorization;
+import io.swagger.annotations.AuthorizationScope;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+import static org.springframework.http.MediaType.*;
+
+@Controller
+@RequestMapping(value = "/pet?testing_byte_array=true", produces = {APPLICATION_JSON_VALUE})
+@Api(value = "/pet?testing_byte_array=true", description = "the pet?testing_byte_array=true API")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
+public class PettestingByteArraytrueApi {
+  
+
+  @ApiOperation(value = "Fake endpoint to test byte array in body parameter for adding a new pet to the store", notes = "", response = Void.class, authorizations = {
+    @Authorization(value = "petstore_auth", scopes = {
+      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+      @AuthorizationScope(scope = "read:pets", description = "read your pets")
+      })
+  })
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input") })
+  @RequestMapping(value = "", 
+    produces = { "application/json", "application/xml" }, 
+    consumes = { "application/json", "application/xml" },
+    method = RequestMethod.POST)
+  public ResponseEntity<Void> addPetUsingByteArray(
+
+@ApiParam(value = "Pet object in the form of byte array"  ) @RequestBody byte[] body
+)
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+  
+}
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java
index 17bbe217dd1..bfd0765ecd6 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java
@@ -8,7 +8,6 @@ import io.swagger.model.Order;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import io.swagger.annotations.Authorization;
 import io.swagger.annotations.AuthorizationScope;
@@ -32,15 +31,15 @@ import static org.springframework.http.MediaType.*;
 @Controller
 @RequestMapping(value = "/store", produces = {APPLICATION_JSON_VALUE})
 @Api(value = "/store", description = "the store API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-05T15:01:20.501+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
 public class StoreApi {
   
 
   @ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", response = Integer.class, responseContainer = "Map", authorizations = {
     @Authorization(value = "api_key")
   })
-  @ApiResponses(value = { 
-    @ApiResponse(code = 200, message = "successful operation") })
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation") })
   @RequestMapping(value = "/inventory", 
     produces = { "application/json", "application/xml" }, 
     
@@ -53,10 +52,13 @@ public class StoreApi {
 
   
 
-  @ApiOperation(value = "Place an order for a pet", notes = "", response = Order.class)
-  @ApiResponses(value = { 
-    @ApiResponse(code = 200, message = "successful operation"),
-    @ApiResponse(code = 400, message = "Invalid Order") })
+  @ApiOperation(value = "Place an order for a pet", notes = "", response = Order.class, authorizations = {
+    @Authorization(value = "test_api_client_id"),
+    @Authorization(value = "test_api_client_secret")
+  })
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
+    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order") })
   @RequestMapping(value = "/order", 
     produces = { "application/json", "application/xml" }, 
     
@@ -72,11 +74,14 @@ public class StoreApi {
 
   
 
-  @ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class)
-  @ApiResponses(value = { 
-    @ApiResponse(code = 200, message = "successful operation"),
-    @ApiResponse(code = 400, message = "Invalid ID supplied"),
-    @ApiResponse(code = 404, message = "Order not found") })
+  @ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, authorizations = {
+    @Authorization(value = "test_api_key_query"),
+    @Authorization(value = "test_api_key_header")
+  })
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
+    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied"),
+    @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found") })
   @RequestMapping(value = "/order/{orderId}", 
     produces = { "application/json", "application/xml" }, 
     
@@ -93,9 +98,9 @@ public class StoreApi {
   
 
   @ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class)
-  @ApiResponses(value = { 
-    @ApiResponse(code = 400, message = "Invalid ID supplied"),
-    @ApiResponse(code = 404, message = "Order not found") })
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied"),
+    @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found") })
   @RequestMapping(value = "/order/{orderId}", 
     produces = { "application/json", "application/xml" }, 
     
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java
index 64fd8894f88..eafb9a3356e 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java
@@ -3,12 +3,11 @@ package io.swagger.api;
 import io.swagger.model.*;
 
 import io.swagger.model.User;
-import java.util.*;
+import java.util.List;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import io.swagger.annotations.Authorization;
 import io.swagger.annotations.AuthorizationScope;
@@ -32,13 +31,13 @@ import static org.springframework.http.MediaType.*;
 @Controller
 @RequestMapping(value = "/user", produces = {APPLICATION_JSON_VALUE})
 @Api(value = "/user", description = "the user API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-05T15:01:20.501+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
 public class UserApi {
   
 
   @ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class)
-  @ApiResponses(value = { 
-    @ApiResponse(code = 200, message = "successful operation") })
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation") })
   @RequestMapping(value = "", 
     produces = { "application/json", "application/xml" }, 
     
@@ -55,8 +54,8 @@ public class UserApi {
   
 
   @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class)
-  @ApiResponses(value = { 
-    @ApiResponse(code = 200, message = "successful operation") })
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation") })
   @RequestMapping(value = "/createWithArray", 
     produces = { "application/json", "application/xml" }, 
     
@@ -73,8 +72,8 @@ public class UserApi {
   
 
   @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class)
-  @ApiResponses(value = { 
-    @ApiResponse(code = 200, message = "successful operation") })
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation") })
   @RequestMapping(value = "/createWithList", 
     produces = { "application/json", "application/xml" }, 
     
@@ -91,9 +90,9 @@ public class UserApi {
   
 
   @ApiOperation(value = "Logs user into the system", notes = "", response = String.class)
-  @ApiResponses(value = { 
-    @ApiResponse(code = 200, message = "successful operation"),
-    @ApiResponse(code = 400, message = "Invalid username/password supplied") })
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
+    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username/password supplied") })
   @RequestMapping(value = "/login", 
     produces = { "application/json", "application/xml" }, 
     
@@ -114,8 +113,8 @@ public class UserApi {
   
 
   @ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class)
-  @ApiResponses(value = { 
-    @ApiResponse(code = 200, message = "successful operation") })
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation") })
   @RequestMapping(value = "/logout", 
     produces = { "application/json", "application/xml" }, 
     
@@ -129,10 +128,10 @@ public class UserApi {
   
 
   @ApiOperation(value = "Get user by user name", notes = "", response = User.class)
-  @ApiResponses(value = { 
-    @ApiResponse(code = 200, message = "successful operation"),
-    @ApiResponse(code = 400, message = "Invalid username supplied"),
-    @ApiResponse(code = 404, message = "User not found") })
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
+    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied"),
+    @io.swagger.annotations.ApiResponse(code = 404, message = "User not found") })
   @RequestMapping(value = "/{username}", 
     produces = { "application/json", "application/xml" }, 
     
@@ -149,9 +148,9 @@ public class UserApi {
   
 
   @ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = Void.class)
-  @ApiResponses(value = { 
-    @ApiResponse(code = 400, message = "Invalid user supplied"),
-    @ApiResponse(code = 404, message = "User not found") })
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid user supplied"),
+    @io.swagger.annotations.ApiResponse(code = 404, message = "User not found") })
   @RequestMapping(value = "/{username}", 
     produces = { "application/json", "application/xml" }, 
     
@@ -172,9 +171,9 @@ public class UserApi {
   
 
   @ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = Void.class)
-  @ApiResponses(value = { 
-    @ApiResponse(code = 400, message = "Invalid username supplied"),
-    @ApiResponse(code = 404, message = "User not found") })
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied"),
+    @io.swagger.annotations.ApiResponse(code = 404, message = "User not found") })
   @RequestMapping(value = "/{username}", 
     produces = { "application/json", "application/xml" }, 
     
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerConfig.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerConfig.java
index 14e93aa3397..f9a4e70eedf 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerConfig.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerConfig.java
@@ -18,7 +18,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @EnableSwagger2 //Loads the spring beans required by the framework
 @PropertySource("classpath:swagger.properties")
 @Import(SwaggerUiConfiguration.class)
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-05T15:01:20.501+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
 public class SwaggerConfig {
     @Bean
     ApiInfo apiInfo() {
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerUiConfiguration.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerUiConfiguration.java
index 831a6cdfd1f..d5f6abb5b58 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerUiConfiguration.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerUiConfiguration.java
@@ -8,7 +8,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
 
 @Configuration
 @EnableWebMvc
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-05T15:01:20.501+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
 public class SwaggerUiConfiguration extends WebMvcConfigurerAdapter {
   private static final String[] SERVLET_RESOURCE_LOCATIONS = { "/" };
 
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/WebApplication.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/WebApplication.java
index 101c89830ed..ad7b104266e 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/WebApplication.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/WebApplication.java
@@ -2,7 +2,7 @@ package io.swagger.configuration;
 
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-05T15:01:20.501+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
 public class WebApplication extends AbstractAnnotationConfigDispatcherServletInitializer {
 
     @Override
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/WebMvcConfiguration.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/WebMvcConfiguration.java
index 5ba1162c8f3..67c3f82ac7a 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/WebMvcConfiguration.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/WebMvcConfiguration.java
@@ -3,7 +3,7 @@ package io.swagger.configuration;
 import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-05T15:01:20.501+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
 public class WebMvcConfiguration extends WebMvcConfigurationSupport {
     @Override
     public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ApiResponse.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ApiResponse.java
new file mode 100644
index 00000000000..89364524a61
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ApiResponse.java
@@ -0,0 +1,90 @@
+package io.swagger.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Objects;
+
+
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-22T15:27:38.634-06:00")
+public class ApiResponse  {
+  
+  private Integer code = null;
+  private String type = null;
+  private String message = null;
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("code")
+  public Integer getCode() {
+    return code;
+  }
+  public void setCode(Integer code) {
+    this.code = code;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("type")
+  public String getType() {
+    return type;
+  }
+  public void setType(String type) {
+    this.type = type;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("message")
+  public String getMessage() {
+    return message;
+  }
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ApiResponse apiResponse = (ApiResponse) o;
+    return Objects.equals(code, apiResponse.code) &&
+        Objects.equals(type, apiResponse.type) &&
+        Objects.equals(message, apiResponse.message);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(code, type, message);
+  }
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ApiResponse {\n");
+    
+    sb.append("  code: ").append(code).append("\n");
+    sb.append("  type: ").append(type).append("\n");
+    sb.append("  message: ").append(message).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Category.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Category.java
index 557e974e2fa..6a928dfc593 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Category.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Category.java
@@ -1,7 +1,6 @@
 package io.swagger.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -12,7 +11,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-05T15:01:20.501+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
 public class Category  {
   
   private Long id = null;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Order.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Order.java
index 3ce6477230c..19c3a0ed7da 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Order.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Order.java
@@ -13,7 +13,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-05T15:01:20.501+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
 public class Order  {
   
   private Long id = null;
@@ -23,6 +23,7 @@ public class Order  {
   public enum StatusEnum {
      placed,  approved,  delivered, 
   };
+  
   private StatusEnum status = null;
   private Boolean complete = null;
 
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Pet.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Pet.java
index 69ee09fa7ee..dfe4f8ab170 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Pet.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Pet.java
@@ -6,7 +6,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.model.Category;
 import io.swagger.model.Tag;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 import io.swagger.annotations.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -15,7 +16,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-05T15:01:20.501+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
 public class Pet  {
   
   private Long id = null;
@@ -26,6 +27,7 @@ public class Pet  {
   public enum StatusEnum {
      available,  pending,  sold, 
   };
+  
   private StatusEnum status = null;
 
   
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Tag.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Tag.java
index c988a0682ca..af418119b39 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Tag.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Tag.java
@@ -1,7 +1,6 @@
 package io.swagger.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -12,7 +11,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-05T15:01:20.501+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
 public class Tag  {
   
   private Long id = null;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/User.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/User.java
index 0e87d9b86c8..1862568a35e 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/User.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/User.java
@@ -1,7 +1,6 @@
 package io.swagger.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -12,7 +11,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-05T15:01:20.501+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
 public class User  {
   
   private Long id = null;